diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:40:35 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:40:35 +0100 |
| commit | a0c13ffcceea4978bf95b8559bff4a71aa55aa88 (patch) | |
| tree | 2adb4d620b027141c5578565d860434657ba0b3c /sd/inc | |
| parent | remove debugging conditions that can no longer be hit with post List removal (diff) | |
| parent | operator= should accept const args too to make stl implementations happy (diff) | |
| download | core-a0c13ffcceea4978bf95b8559bff4a71aa55aa88.tar.gz core-a0c13ffcceea4978bf95b8559bff4a71aa55aa88.zip | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
sd/source/ui/func/fuinsfil.cxx
sd/source/ui/func/fuprobjs.cxx
sd/source/ui/slideshow/slideshowimpl.cxx
sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
sd/source/ui/toolpanel/ToolPanelViewShell.cxx
sd/source/ui/view/drawview.cxx
sd/source/ui/view/drtxtob.cxx
sd/source/ui/view/outlnvsh.cxx
sd/source/ui/view/outlview.cxx
Diffstat (limited to 'sd/inc')
| -rw-r--r-- | sd/inc/Outliner.hxx | 38 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/inc/anminfo.hxx | 20 | ||||
| -rw-r--r-- | sd/inc/app.hrc | 44 | ||||
| -rw-r--r-- | sd/inc/drawdoc.hxx | 155 | ||||
| -rwxr-xr-x | sd/inc/glob.hrc | 2 | ||||
| -rw-r--r-- | sd/inc/glob.hxx | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/inc/helpids.h | 475 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/inc/pch/precompiled_sd.hxx | 6 | ||||
| -rw-r--r-- | sd/inc/sdabstdlg.hxx | 34 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/inc/sdattr.hxx | 22 | ||||
| -rw-r--r-- | sd/inc/sdcommands.h | 311 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/inc/sderror.hxx | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/inc/sdgrffilter.hxx | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/inc/sdhtmlfilter.hxx | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/inc/sdiocmpt.hxx | 20 | ||||
| -rw-r--r-- | sd/inc/sdmod.hxx | 16 | ||||
| -rw-r--r-- | sd/inc/sdpage.hxx | 80 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/inc/sdresid.hxx | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/inc/sdxmlwrp.hxx | 4 | ||||
| -rw-r--r-- | sd/inc/shapelist.hxx | 2 | ||||
| -rw-r--r-- | sd/inc/stlpool.hxx | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/inc/stlsheet.hxx | 20 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/inc/undo/undomanager.hxx | 20 |
23 files changed, 806 insertions, 483 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index a04cf7763174..aa75c763a459 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -121,7 +121,7 @@ public: <const>OUTLINERMODE_OUTLINEVIEW</const> are defined in editeng/outliner.hxx. */ - Outliner( SdDrawDocument* pDoc, USHORT nMode ); + Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode ); virtual ~Outliner(); /** Despite the name this method is called prior to spell cheking *and* @@ -142,8 +142,8 @@ public: /** Initiate a find and/or replace on the next relevant text object. @return - Returns </TRUE> when the search/replace is finished (as - indicated by user input to the search dialog). A </FALSE> value + Returns </sal_True> when the search/replace is finished (as + indicated by user input to the search dialog). A </sal_False> value indicates that another call to this method is required. */ bool StartSearchAndReplace (const SvxSearchItem* pSearchItem); @@ -164,8 +164,8 @@ public: /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional) for the current viewshell */ - void StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage, - const Font *pTargetFont, INT32 nOptions, BOOL bIsInteractive ); + void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, + const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive ); /** This is called internaly when text conversion is started. The position of current view mode/page/object/caret position @@ -204,7 +204,7 @@ private: /** this is the language that is used for current text conversion. Only valid if meMode is TEXT_CONVERSION. */ - INT16 mnConversionLanguage; + sal_Int16 mnConversionLanguage; /** While the value of this flag is greater than 0 changes of the current page do not lead to selecting the corresponding text in the outliner. @@ -216,17 +216,17 @@ private: /** This flag indicates whether there may exist a match of the search string before/after the current position in the document. It can be - set to </FALSE> only when starting from the beginning/end of the + set to </sal_False> only when starting from the beginning/end of the document. When reaching the end/beginning with it still be set to - </FALSE> then there exists no match and the search can be terminated. + </sal_False> then there exists no match and the search can be terminated. */ bool mbMatchMayExist; /// The number of pages in the current view. - USHORT mnPageCount; + sal_uInt16 mnPageCount; /// Number of objects on the current page / in the current selection. - INT32 mnObjectCount; + sal_Int32 mnObjectCount; /** A <TRUE/> value indicates that the end of the find&replace or spell check has been reached. @@ -235,7 +235,7 @@ private: /** Set to <TRUE/> when an object has been prepared successfully for searching/spell checking. This flag directs the internal iteration - which stops when set to </TRUE>. + which stops when set to </sal_True>. */ bool mbFoundObject; @@ -297,7 +297,7 @@ private: EditMode meStartEditMode; /// The current page index on starting to search/spell check. - USHORT mnStartPageIndex; + sal_uInt16 mnStartPageIndex; /// The object in edit mode when searching /spell checking was started /// (if any). @@ -370,8 +370,8 @@ private: /** Do search and replace for next match. @return - The return value specifies whether the search ended (</TRUE>) or - another call to this method is required (</FALSE>). + The return value specifies whether the search ended (</sal_True>) or + another call to this method is required (</sal_False>). */ bool SearchAndReplaceOnce (void); @@ -410,7 +410,7 @@ private: /** Handle the situation that the iterator has reached the last object. This may result in setting the <member>mbEndOfSearch</member> flag - back to </FALSE>. This method may show either the end-of-search + back to </sal_False>. This method may show either the end-of-search dialog or the wrap-arround dialog. */ void EndOfSearch (void); @@ -470,11 +470,11 @@ private: @param nPageIndex The new page index. */ - void SetPage (EditMode eEditMode, USHORT nPageIndex); + void SetPage (EditMode eEditMode, sal_uInt16 nPageIndex); /** Switch on edit mode for the currently selected text object. */ - void EnterEditMode (BOOL bGrabFocus=TRUE); + void EnterEditMode (sal_Bool bGrabFocus=sal_True); /** Return the position at which a new search is started with respect to the search direction as specified by the argument. @@ -538,14 +538,14 @@ private: required. When all text objects have been processed then <FALSE/> is returned. */ - virtual BOOL SpellNextDocument (void); + virtual sal_Bool SpellNextDocument (void); /** Show the given message box and make it modal. It is assumed that the parent of the given dialog is NULL, i.e. the application window. This function makes sure that the otherwise non-modal search dialog, if visible, is locked, too. */ - USHORT ShowModalMessageBox (Dialog& rMessageBox); + sal_uInt16 ShowModalMessageBox (Dialog& rMessageBox); }; } // end of namespace sd diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx index 326cccef37d8..54aacefdf79f 100644..100755 --- a/sd/inc/anminfo.hxx +++ b/sd/inc/anminfo.hxx @@ -55,24 +55,24 @@ public: ::com::sun::star::presentation::AnimationEffect meEffect; // Animationseffekt ::com::sun::star::presentation::AnimationEffect meTextEffect; // Animationseffekt fuer Textinhalt ::com::sun::star::presentation::AnimationSpeed meSpeed; // Geschwindigkeit der Animation - BOOL mbActive; // eingeschaltet ? - BOOL mbDimPrevious; // Objekt abblenden - BOOL mbIsMovie; // wenn Gruppenobjekt, dann Sequenz aus den - BOOL mbDimHide; // verstecken statt abblenden + sal_Bool mbActive; // eingeschaltet ? + sal_Bool mbDimPrevious; // Objekt abblenden + sal_Bool mbIsMovie; // wenn Gruppenobjekt, dann Sequenz aus den + sal_Bool mbDimHide; // verstecken statt abblenden Color maBlueScreen; // identifiziert "Hintergrundpixel" Color maDimColor; // zum Abblenden des Objekts String maSoundFile; // Pfad zum Soundfile in MSDOS-Notation - BOOL mbSoundOn; // Sound ein/aus - BOOL mbPlayFull; // Sound ganz abspielen + sal_Bool mbSoundOn; // Sound ein/aus + sal_Bool mbPlayFull; // Sound ganz abspielen SdrPathObj* mpPathObj; // das Pfadobjekt ::com::sun::star::presentation::ClickAction meClickAction; // Aktion bei Mausklick ::com::sun::star::presentation::AnimationEffect meSecondEffect; // fuer Objekt ausblenden ::com::sun::star::presentation::AnimationSpeed meSecondSpeed; // fuer Objekt ausblenden String maSecondSoundFile; // fuer Objekt ausblenden - BOOL mbSecondSoundOn; // fuer Objekt ausblenden - BOOL mbSecondPlayFull;// fuer Objekt ausblenden - USHORT mnVerb; // fuer OLE-Objekt - ULONG mnPresOrder; + sal_Bool mbSecondSoundOn; // fuer Objekt ausblenden + sal_Bool mbSecondPlayFull;// fuer Objekt ausblenden + sal_uInt16 mnVerb; // fuer OLE-Objekt + sal_uLong mnPresOrder; SdrObject& mrObject; SD_DLLPUBLIC void SetBookmark( const String& rBookmark ); diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index eb622351dc1b..707a62fd791d 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -32,6 +32,50 @@ #include <sfx2/sfx.hrc> #endif +// HelpIDs fuer Vorlagen +#define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70) +#define HID_POOLSHEET_OBJWITHARROW (HID_SD_START + 71) +#define HID_POOLSHEET_OBJWITHSHADOW (HID_SD_START + 72) +#define HID_POOLSHEET_OBJWITHOUTFILL (HID_SD_START + 73) +#define HID_POOLSHEET_TEXT (HID_SD_START + 74) +#define HID_POOLSHEET_TEXTBODY (HID_SD_START + 75) +#define HID_POOLSHEET_TEXTBODY_JUSTIFY (HID_SD_START + 76) +#define HID_POOLSHEET_TEXTBODY_INDENT (HID_SD_START + 77) +#define HID_POOLSHEET_TITLE (HID_SD_START + 78) +#define HID_POOLSHEET_TITLE1 (HID_SD_START + 79) +#define HID_POOLSHEET_TITLE2 (HID_SD_START + 80) +#define HID_POOLSHEET_HEADLINE (HID_SD_START + 81) +#define HID_POOLSHEET_HEADLINE1 (HID_SD_START + 82) +#define HID_POOLSHEET_HEADLINE2 (HID_SD_START + 83) +#define HID_POOLSHEET_MEASURE (HID_SD_START + 84) +#define HID_PSEUDOSHEET_TITLE (HID_SD_START + 85) +#define HID_PSEUDOSHEET_OUTLINE (HID_SD_START + 86) +#define HID_PSEUDOSHEET_OUTLINE1 (HID_SD_START + 87) +#define HID_PSEUDOSHEET_OUTLINE2 (HID_SD_START + 88) +#define HID_PSEUDOSHEET_OUTLINE3 (HID_SD_START + 89) +#define HID_PSEUDOSHEET_OUTLINE4 (HID_SD_START + 90) +#define HID_PSEUDOSHEET_OUTLINE5 (HID_SD_START + 91) +#define HID_PSEUDOSHEET_OUTLINE6 (HID_SD_START + 92) +#define HID_PSEUDOSHEET_OUTLINE7 (HID_SD_START + 93) +#define HID_PSEUDOSHEET_OUTLINE8 (HID_SD_START + 94) +#define HID_PSEUDOSHEET_OUTLINE9 (HID_SD_START + 95) +#define HID_PSEUDOSHEET_BACKGROUNDOBJECTS (HID_SD_START + 96) +#define HID_PSEUDOSHEET_BACKGROUND (HID_SD_START + 97) +#define HID_PSEUDOSHEET_NOTES (HID_SD_START + 98) +#define HID_PSEUDOSHEET_SUBTITLE (HID_SD_START + 101) + +#define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194) +#define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195) +#define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 196) +#define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 197) +#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198) +#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199) + +#define SHELLID_SD_TASK_PANE_PREVIEW_CURRENT (HID_SD_START + 174) +#define SHELLID_SD_TASK_PANE_PREVIEW_RECENT (HID_SD_START + 175) +#define SHELLID_SD_TASK_PANE_PREVIEW_ALL (HID_SD_START + 176) +#define SHELLID_SD_TASK_PANE_PREVIEW_LAYOUTS (HID_SD_START + 177) + #define SID_BACKGROUND (SID_SD_START) #define SID_LASTVERSION (SID_SD_START+1) #define SID_PAGESETUP (SID_SD_START+2) diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 47cf7eddb0a9..7c74a3dc6524 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -171,8 +171,8 @@ private: List* mpCustomShowList; ::sd::DrawDocShell* mpDocSh; SdTransferable * mpCreatingTransferable; - BOOL mbHasOnlineSpellErrors; - BOOL mbInitialOnlineSpellingEnabled; + sal_Bool mbHasOnlineSpellErrors; + sal_Bool mbInitialOnlineSpellingEnabled; String maBookmarkFile; ::sd::DrawDocShellRef mxBookmarkDocShRef; @@ -180,17 +180,17 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 > mxPresentation; - BOOL mbNewOrLoadCompleted; + sal_Bool mbNewOrLoadCompleted; - BOOL mbOnlineSpell; - BOOL mbSummationOfParagraphs; + sal_Bool mbOnlineSpell; + sal_Bool mbSummationOfParagraphs; bool mbStartWithPresentation; // is set to true when starting with command line parameter -start LanguageType meLanguage; LanguageType meLanguageCJK; LanguageType meLanguageCTL; SvxNumType mePageNumType; ::sd::DrawDocShellRef mxAllocedDocShRef; // => AllocModel() - BOOL mbAllocDocSh; // => AllocModel() + sal_Bool mbAllocDocSh; // => AllocModel() DocumentType meDocType; CharClass* mpCharClass; ::com::sun::star::lang::Locale* mpLocale; @@ -198,8 +198,8 @@ private: ::std::auto_ptr<ImpDrawPageListWatcher> mpDrawPageListWatcher; ::std::auto_ptr<ImpMasterPageListWatcher> mpMasterPageListWatcher; - void UpdatePageObjectsInNotes(USHORT nStartPos); - void UpdatePageRelativeURLs(SdPage* pPage, USHORT nPos, sal_Int32 nIncrement); + void UpdatePageObjectsInNotes(sal_uInt16 nStartPos); + void UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_Int32 nIncrement); void FillOnlineSpellingList(SdPage* pPage); void SpellObject(SdrTextObj* pObj); @@ -232,21 +232,21 @@ public: SfxItemPool& GetPool() { return( *pItemPool ); } - ::sd::Outliner* GetOutliner(BOOL bCreateOutliner=TRUE); - SD_DLLPUBLIC ::sd::Outliner* GetInternalOutliner(BOOL bCreateOutliner=TRUE); + ::sd::Outliner* GetOutliner(sal_Bool bCreateOutliner=sal_True); + SD_DLLPUBLIC ::sd::Outliner* GetInternalOutliner(sal_Bool bCreateOutliner=sal_True); ::sd::DrawDocShell* GetDocSh() const { return mpDocSh; } - LanguageType GetLanguage( const USHORT nId ) const; - void SetLanguage( const LanguageType eLang, const USHORT nId ); + LanguageType GetLanguage( const sal_uInt16 nId ) const; + void SetLanguage( const LanguageType eLang, const sal_uInt16 nId ); SvxNumType GetPageNumType() const; void SetPageNumType(SvxNumType eType) { mePageNumType = eType; } - SD_DLLPUBLIC String CreatePageNumValue(USHORT nNum) const; + SD_DLLPUBLIC String CreatePageNumValue(sal_uInt16 nNum) const; DocumentType GetDocumentType() const { return meDocType; } - void SetAllocDocSh(BOOL bAlloc); + void SetAllocDocSh(sal_Bool bAlloc); void CreatingDataObj( SdTransferable* pTransferable ) { mpCreatingTransferable = pTransferable; } @@ -256,25 +256,25 @@ public: for newly created slides. */ SD_DLLPUBLIC void CreateFirstPages( SdDrawDocument* pRefDocument = 0 ); - SD_DLLPUBLIC BOOL CreateMissingNotesAndHandoutPages(); + SD_DLLPUBLIC sal_Bool CreateMissingNotesAndHandoutPages(); - void MovePage(USHORT nPgNum, USHORT nNewPos); - void InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF); - void DeletePage(USHORT nPgNum); - SdrPage* RemovePage(USHORT nPgNum); + void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos); + void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); + void DeletePage(sal_uInt16 nPgNum); + SdrPage* RemovePage(sal_uInt16 nPgNum); - virtual void InsertMasterPage(SdrPage* pPage, USHORT nPos=0xFFFF); - virtual SdrPage* RemoveMasterPage(USHORT nPgNum); + virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); + virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum); - void RemoveUnnecessaryMasterPages( SdPage* pMaster=NULL, BOOL bOnlyDuplicatePages=FALSE, BOOL bUndo=TRUE ); - SD_DLLPUBLIC void SetMasterPage(USHORT nSdPageNum, const String& rLayoutName, - SdDrawDocument* pSourceDoc, BOOL bMaster, BOOL bCheckMasters); + void RemoveUnnecessaryMasterPages( SdPage* pMaster=NULL, sal_Bool bOnlyDuplicatePages=sal_False, sal_Bool bUndo=sal_True ); + SD_DLLPUBLIC void SetMasterPage(sal_uInt16 nSdPageNum, const String& rLayoutName, + SdDrawDocument* pSourceDoc, sal_Bool bMaster, sal_Bool bCheckMasters); SD_DLLPUBLIC SdDrawDocument* OpenBookmarkDoc(const String& rBookmarkFile); SdDrawDocument* OpenBookmarkDoc(SfxMedium& rMedium); - BOOL InsertBookmark(List* pBookmarkList, List* pExchangeList, BOOL bLink, - BOOL bReplace, USHORT nPgPos, BOOL bNoDialogs, - ::sd::DrawDocShell* pBookmarkDocSh, BOOL bCopy, + sal_Bool InsertBookmark(List* pBookmarkList, List* pExchangeList, sal_Bool bLink, + sal_Bool bReplace, sal_uInt16 nPgPos, sal_Bool bNoDialogs, + ::sd::DrawDocShell* pBookmarkDocSh, sal_Bool bCopy, Point* pObjPos); bool IsStartWithPresentation() const; @@ -288,7 +288,7 @@ public: @attention Beware! This method in it's current state does not handle all combinations of their input parameters - correctly. For example, for pBookmarkList=NULL, bReplace=TRUE + correctly. For example, for pBookmarkList=NULL, bReplace=sal_True is ignored (no replace happens). @param pBookmarkList @@ -325,16 +325,16 @@ public: Whether the replace operation should take the name from the new page, or preserve the old name */ - BOOL InsertBookmarkAsPage(List* pBookmarkList, List* pExchangeList, - BOOL bLink, BOOL bReplace, USHORT nPgPos, - BOOL bNoDialogs, ::sd::DrawDocShell* pBookmarkDocSh, - BOOL bCopy, BOOL bMergeMasterPages, - BOOL bPreservePageNames); - BOOL InsertBookmarkAsObject(List* pBookmarkList, List* pExchangeListL, - BOOL bLink, ::sd::DrawDocShell* pBookmarkDocSh, + sal_Bool InsertBookmarkAsPage(List* pBookmarkList, List* pExchangeList, + sal_Bool bLink, sal_Bool bReplace, sal_uInt16 nPgPos, + sal_Bool bNoDialogs, ::sd::DrawDocShell* pBookmarkDocSh, + sal_Bool bCopy, sal_Bool bMergeMasterPages, + sal_Bool bPreservePageNames); + sal_Bool InsertBookmarkAsObject(List* pBookmarkList, List* pExchangeListL, + sal_Bool bLink, ::sd::DrawDocShell* pBookmarkDocSh, Point* pObjPos); void IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* pBookmarkList, - USHORT nBMSdPageCount, + sal_uInt16 nBMSdPageCount, InsertBookmarkAsPage_PageFunctorBase& rPageIterator ); SD_DLLPUBLIC void CloseBookmarkDoc(); @@ -353,25 +353,25 @@ public: Returns the index of the page with the given name or SDRPAGE_NOTFOUND (=0xffff) when such a page does not exist. */ - USHORT GetPageByName(const String& rPgName, BOOL& rbIsMasterPage ) const; - SD_DLLPUBLIC SdPage*GetSdPage(USHORT nPgNum, PageKind ePgKind) const; - SD_DLLPUBLIC USHORT GetSdPageCount(PageKind ePgKind) const; + sal_uInt16 GetPageByName(const String& rPgName, sal_Bool& rbIsMasterPage ) const; + SD_DLLPUBLIC SdPage*GetSdPage(sal_uInt16 nPgNum, PageKind ePgKind) const; + SD_DLLPUBLIC sal_uInt16 GetSdPageCount(PageKind ePgKind) const; - void SetSelected(SdPage* pPage, BOOL bSelect); - BOOL MovePages(USHORT nTargetPage); + void SetSelected(SdPage* pPage, sal_Bool bSelect); + sal_Bool MovePages(sal_uInt16 nTargetPage); - SD_DLLPUBLIC SdPage*GetMasterSdPage(USHORT nPgNum, PageKind ePgKind); - SD_DLLPUBLIC USHORT GetMasterSdPageCount(PageKind ePgKind) const; + SD_DLLPUBLIC SdPage*GetMasterSdPage(sal_uInt16 nPgNum, PageKind ePgKind); + SD_DLLPUBLIC sal_uInt16 GetMasterSdPageCount(PageKind ePgKind) const; - USHORT GetMasterPageUserCount(SdrPage* pMaster) const; + sal_uInt16 GetMasterPageUserCount(SdrPage* pMaster) const; const sd::PresentationSettings& getPresentationSettings() const { return maPresentationSettings; } sd::PresentationSettings& getPresentationSettings() { return maPresentationSettings; } const ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 >& getPresentation() const; - void SetSummationOfParagraphs( BOOL bOn = TRUE ) { mbSummationOfParagraphs = bOn; } - BOOL IsSummationOfParagraphs() const { return mbSummationOfParagraphs; } + void SetSummationOfParagraphs( sal_Bool bOn = sal_True ) { mbSummationOfParagraphs = bOn; } + sal_Bool IsSummationOfParagraphs() const { return mbSummationOfParagraphs; } /** Set the mode that controls whether (and later how) the formatting of the document depends on the current printer metrics. @@ -395,20 +395,20 @@ public: */ sal_Int32 GetPrinterIndependentLayout (void); - void SetOnlineSpell( BOOL bIn ); - BOOL GetOnlineSpell() const { return mbOnlineSpell; } + void SetOnlineSpell( sal_Bool bIn ); + sal_Bool GetOnlineSpell() const { return mbOnlineSpell; } void StopOnlineSpelling(); - void StartOnlineSpelling(BOOL bForceSpelling=TRUE); + void StartOnlineSpelling(sal_Bool bForceSpelling=sal_True); void ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* pObj, SdrOutliner* pOutl); void InsertObject(SdrObject* pObj, SdPage* pPage); void RemoveObject(SdrObject* pObj, SdPage* pPage); - ULONG GetLinkCount(); + sal_uLong GetLinkCount(); List* GetFrameViewList() const { return mpFrameViewList; } - SD_DLLPUBLIC List* GetCustomShowList(BOOL bCreate = FALSE); + SD_DLLPUBLIC List* GetCustomShowList(sal_Bool bCreate = sal_False); void NbcSetChanged(sal_Bool bFlag = sal_True); @@ -423,9 +423,9 @@ public: void NewOrLoadCompleted(DocCreationMode eMode); void NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool ); - BOOL IsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; } + sal_Bool IsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; } - ::sd::FrameView* GetFrameView(ULONG nPos) { + ::sd::FrameView* GetFrameView(sal_uLong nPos) { return static_cast< ::sd::FrameView*>( mpFrameViewList->GetObject(nPos));} @@ -446,8 +446,8 @@ public: void CheckMasterPages(); void Merge(SdrModel& rSourceModel, - USHORT nFirstPageNum=0, USHORT nLastPageNum=0xFFFF, - USHORT nDestPos=0xFFFF, + sal_uInt16 nFirstPageNum=0, sal_uInt16 nLastPageNum=0xFFFF, + sal_uInt16 nDestPos=0xFFFF, bool bMergeMasterPages = false, bool bAllMasterPages = false, bool bUndo = true, bool bTreadSourceAsConst = false); @@ -492,20 +492,24 @@ public: This flag indicates whether to show the background shape. @param bIsPageObj This flag indicates whether to show the shapes on the master page. + @param nInsertPosition + Position where to insert the standard page. When -1 then the + new page set is inserted after the current page. @return Returns an index of the inserted pages that can be used with the <member>GetSdPage()</member> method. */ - USHORT CreatePage ( + sal_uInt16 CreatePage ( SdPage* pCurrentPage, PageKind ePageKind, const String& sStandardPageName, const String& sNotesPageName, AutoLayout eStandardLayout, AutoLayout eNotesLayout, - BOOL bIsPageBack, - BOOL bIsPageObj); + sal_Bool bIsPageBack, + sal_Bool bIsPageObj, + const sal_Int32 nInsertPosition = -1); /** This method acts as a simplified front end for the more complex <member>DuplicatePage()</member> method. @@ -517,7 +521,7 @@ public: Returns an index of the inserted pages that can be used with the <member>GetSdPage()</member> method. */ - USHORT DuplicatePage (USHORT nPageNum); + sal_uInt16 DuplicatePage (sal_uInt16 nPageNum); /** Create and insert a set of two new pages that are copies of the given <argument>pCurrentPage</argument> and its associated notes @@ -548,20 +552,24 @@ public: This flag indicates whether to show the background shape. @param bIsPageObj This flag indicates whether to show the shapes on the master page. + @param nInsertPosition + Position where to insert the standard page. When -1 then the + new page set is inserted after the current page. @return Returns an index of the inserted pages that can be used with the <member>GetSdPage()</member> method. */ - USHORT DuplicatePage ( + sal_uInt16 DuplicatePage ( SdPage* pCurrentPage, PageKind ePageKind, const String& sStandardPageName, const String& sNotesPageName, AutoLayout eStandardLayout, AutoLayout eNotesLayout, - BOOL bIsPageBack, - BOOL bIsPageObj); + sal_Bool bIsPageBack, + sal_Bool bIsPageObj, + const sal_Int32 nInsertPosition = -1); /** return the document fonts for latin, cjk and ctl according to the current languages set at this document */ @@ -619,23 +627,26 @@ private: The standard page to insert. @param pNotesPage The notes page to insert. + @param nInsertPosition + Position where to insert the standard page. When -1 then the + new page set is inserted after the current page. @return Returns an index of the inserted pages that can be used with the <member>GetSdPage()</member> method. */ - USHORT InsertPageSet ( + sal_uInt16 InsertPageSet ( SdPage* pCurrentPage, PageKind ePageKind, const String& sStandardPageName, const String& sNotesPageName, AutoLayout eStandardLayout, AutoLayout eNotesLayout, - BOOL bIsPageBack, - BOOL bIsPageObj, - + sal_Bool bIsPageBack, + sal_Bool bIsPageObj, SdPage* pStandardPage, - SdPage* pNotesPage); + SdPage* pNotesPage, + sal_Int32 nInsertPosition = -1); /** Set up a newly created page and insert it into the list of pages. @param pPreviousPage @@ -656,9 +667,9 @@ private: SdPage* pPreviousPage, SdPage* pPage, const String& sPageName, - USHORT nInsertionPoint, - BOOL bIsPageBack, - BOOL bIsPageObj); + sal_uInt16 nInsertionPoint, + sal_Bool bIsPageBack, + sal_Bool bIsPageObj); virtual void PageListChanged(); virtual void MasterPageListChanged(); @@ -680,8 +691,8 @@ private: DrawDocShell* mpDocShell; SdDrawDocument* mpDoc; - BOOL mbIsEnableSetModified; - BOOL mbIsDocumentChanged; + sal_Bool mbIsEnableSetModified; + sal_Bool mbIsDocumentChanged; }; } diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 73189f135e62..89b2b670adf9 100755 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -154,5 +154,7 @@ #define STR_CUSTOMANIMATIONPANE RID_GLOB_START+227 #define STR_SLIDE_TRANSITION_PANE RID_GLOB_START+228 +#define RID_SLIDESORTER_ICONS RID_GLOB_START+227 + diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index 77adcd8503eb..20b264651847 100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx @@ -71,10 +71,10 @@ #define SD_IF_SDTOOLPANELSHELL SFX_INTERFACE_SD_START + 30 // Inventor-Id fuer StarDraw UserData -const UINT32 SdUDInventor=UINT32('S')*0x00000001+ - UINT32('D')*0x00000100+ - UINT32('U')*0x00010000+ - UINT32('D')*0x01000000; +const sal_uInt32 SdUDInventor=sal_uInt32('S')*0x00000001+ + sal_uInt32('D')*0x00000100+ + sal_uInt32('U')*0x00010000+ + sal_uInt32('D')*0x01000000; // Object-Ids fuer StarDraw UserData #define SD_ANIMATIONINFO_ID 1 diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index 9a0bad271409..9056d9eb2051 100644..100755 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -25,259 +25,230 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _SOLAR_HRC -#include <svl/solar.hrc> -#endif - -#define HID_SD_PRINT_OPTIONS (HID_SD_START + 0) -#define HID_SD_OPTIONS_SNAP (HID_SD_START + 1) -#define HID_SD_OPTIONS_VIEW (HID_SD_START + 2) - -#define HID_SD_AUTOPILOT_PAGE1 (HID_SD_START + 3) -#define HID_SD_AUTOPILOT_PAGE2 (HID_SD_START + 4) -#define HID_SD_AUTOPILOT_PAGE3 (HID_SD_START + 5) -#define HID_SD_AUTOPILOT_PAGE4 (HID_SD_START + 6) -#define HID_SD_AUTOPILOT_PAGE5 (HID_SD_START + 7) -#define HID_SD_AUTOPILOT_PAGE6 (HID_SD_START + 8) - -#define HID_SD_CBX_ONLYSELECTED (HID_SD_START + 9) -#define HID_SD_BTN_FILTERDIALOG (HID_SD_START + 10) - -#define HID_SD_BTN_PAGE (HID_SD_START + 11) -#define HID_SD_BTN_MASTERPAGE (HID_SD_START + 12) -#define HID_SD_BTN_LAYER (HID_SD_START + 13) - -#define HID_SD_BTN_DRAW (HID_SD_START + 14) -#define HID_SD_BTN_SLIDE (HID_SD_START + 15) -#define HID_SD_BTN_OUTLINE (HID_SD_START + 16) -#define HID_SD_BTN_NOTES (HID_SD_START + 17) -#define HID_SD_BTN_HANDOUT (HID_SD_START + 18) - -#define HID_SD_WIN_DOCUMENT (HID_SD_START + 19) - -#define HID_SD_OPTIONS_LAYOUT (HID_SD_START + 20) -#define HID_SD_OPTIONS_CONTENTS (HID_SD_START + 21) -#define HID_SD_OPTIONS_MISC (HID_SD_START + 22) - -#define HID_SD_EFFECT_PREVIEW (HID_SD_START + 23) -#define HID_SD_CTL_NEWFOIL (HID_SD_START + 24) -#define HID_SD_NAVIGATOR_TLB (HID_SD_START + 25) -#define HID_SD_NAVIGATOR (HID_SD_START + 26) - -#define HID_SD_CTL_EFFECTS (HID_SD_START + 27) -#define HID_SD_CTL_TEXT_EFFECTS (HID_SD_START + 28) - -#define HID_SD_CTL_SLIDE_CHANGE (HID_SD_START + 29) - -#define HID_SD_NAVIGATOR_TBX (HID_SD_START + 30) -#define HID_SD_NAVIGATOR_LB (HID_SD_START + 31) - -#define HID_SD_NAVIGATOR_TBI_PEN (HID_SD_START + 33) -#define HID_SD_NAVIGATOR_TBI_FIRST (HID_SD_START + 34) -#define HID_SD_NAVIGATOR_TBI_PREV (HID_SD_START + 35) -#define HID_SD_NAVIGATOR_TBI_NEXT (HID_SD_START + 36) -#define HID_SD_NAVIGATOR_TBI_LAST (HID_SD_START + 37) -#define HID_SD_NAVIGATOR_TBI_DRAGTYPE (HID_SD_START + 38) -#define HID_SD_NAVIGATOR_TBI_SHAPE_FILTER (HID_SD_START + 39) +#include <sfx2/sfxcommands.h> +#include <svx/svxcommands.h> +#include "sdcommands.h" + +#define HID_SDDRAWVIEWSHELL "SD_HID_SDDRAWVIEWSHELL" +#define HID_SDGRAPHICVIEWSHELL "SD_HID_SDGRAPHICVIEWSHELL" +#define HID_SDOUTLINEVIEWSHELL "SD_HID_SDOUTLINEVIEWSHELL" +#define HID_SD_PRINT_OPTIONS "SD_HID_SD_PRINT_OPTIONS" +#define HID_SD_OPTIONS_SNAP "SD_HID_SD_OPTIONS_SNAP" +#define HID_SD_OPTIONS_VIEW "SD_HID_SD_OPTIONS_VIEW" +#define HID_SD_AUTOPILOT_PAGE1 "SD_HID_SD_AUTOPILOT_PAGE1" +#define HID_SD_AUTOPILOT_PAGE2 "SD_HID_SD_AUTOPILOT_PAGE2" +#define HID_SD_AUTOPILOT_PAGE3 "SD_HID_SD_AUTOPILOT_PAGE3" +#define HID_SD_AUTOPILOT_PAGE4 "SD_HID_SD_AUTOPILOT_PAGE4" +#define HID_SD_AUTOPILOT_PAGE5 "SD_HID_SD_AUTOPILOT_PAGE5" +#define HID_SD_AUTOPILOT_PAGE6 "SD_HID_SD_AUTOPILOT_PAGE6" +#define HID_SD_CBX_ONLYSELECTED "SD_HID_SD_CBX_ONLYSELECTED" +#define HID_SD_BTN_FILTERDIALOG "SD_HID_SD_BTN_FILTERDIALOG" +#define HID_SD_BTN_PAGE "SD_HID_SD_BTN_PAGE" +#define HID_SD_BTN_MASTERPAGE "SD_HID_SD_BTN_MASTERPAGE" +#define HID_SD_BTN_LAYER "SD_HID_SD_BTN_LAYER" +#define HID_SD_BTN_DRAW "SD_HID_SD_BTN_DRAW" +#define HID_SD_BTN_SLIDE "SD_HID_SD_BTN_SLIDE" +#define HID_SD_BTN_OUTLINE "SD_HID_SD_BTN_OUTLINE" +#define HID_SD_BTN_NOTES "SD_HID_SD_BTN_NOTES" +#define HID_SD_BTN_HANDOUT "SD_HID_SD_BTN_HANDOUT" +#define HID_SD_WIN_DOCUMENT "SD_HID_SD_WIN_DOCUMENT" +#define HID_SD_OPTIONS_LAYOUT "SD_HID_SD_OPTIONS_LAYOUT" +#define HID_SD_OPTIONS_CONTENTS "SD_HID_SD_OPTIONS_CONTENTS" +#define HID_SD_OPTIONS_MISC "SD_HID_SD_OPTIONS_MISC" +#define HID_SD_EFFECT_PREVIEW "SD_HID_SD_EFFECT_PREVIEW" +#define HID_SD_CTL_NEWFOIL "SD_HID_SD_CTL_NEWFOIL" +#define HID_SD_NAVIGATOR_TLB "SD_HID_SD_NAVIGATOR_TLB" +#define HID_SD_NAVIGATOR "SD_HID_SD_NAVIGATOR" +#define HID_SD_CTL_EFFECTS "SD_HID_SD_CTL_EFFECTS" +#define HID_SD_CTL_TEXT_EFFECTS "SD_HID_SD_CTL_TEXT_EFFECTS" +#define HID_SD_CTL_SLIDE_CHANGE "SD_HID_SD_CTL_SLIDE_CHANGE" +#define HID_SD_NAVIGATOR_TBX "SD_HID_SD_NAVIGATOR_TBX" +#define HID_SD_NAVIGATOR_LB "SD_HID_SD_NAVIGATOR_LB" +#define HID_SD_NAVIGATOR_TBI_PEN "SD_HID_SD_NAVIGATOR_TBI_PEN" +#define HID_SD_NAVIGATOR_TBI_FIRST "SD_HID_SD_NAVIGATOR_TBI_FIRST" +#define HID_SD_NAVIGATOR_TBI_PREV "SD_HID_SD_NAVIGATOR_TBI_PREV" +#define HID_SD_NAVIGATOR_TBI_NEXT "SD_HID_SD_NAVIGATOR_TBI_NEXT" +#define HID_SD_NAVIGATOR_TBI_LAST "SD_HID_SD_NAVIGATOR_TBI_LAST" +#define HID_SD_NAVIGATOR_TBI_DRAGTYPE "SD_HID_SD_NAVIGATOR_TBI_DRAGTYPE" +#define HID_SD_NAVIGATOR_TBI_SHAPE_FILTER "SD_HID_SD_NAVIGATOR_TBI_SHAPE_FILTER" // Toolboxen -#define HID_SD_DRAW_DEFAULTTOOLBOX (HID_SD_START + 40) -#define HID_SD_PLUGINTOOLBOX (HID_SD_START + 41) -#define HID_SD_DRAW_TOOLBOX (HID_SD_START + 42) -#define HID_SD_SLIDE_TOOLBOX (HID_SD_START + 43) -#define HID_SD_OUTLINE_TOOLBOX (HID_SD_START + 44) -#define HID_SD_DRAW_OBJ_TOOLBOX (HID_SD_START + 45) -#define HID_SD_DRAW_OPTIONS_TOOLBOX (HID_SD_START + 46) -#define HID_SD_DRAW_COMMONTASK_TOOLBOX (HID_SD_START + 47) -#define HID_SD_BEZIER_TOOLBOX (HID_SD_START + 48) -#define HID_SD_TEXT_TOOLBOX (HID_SD_START + 49) -#define HID_SD_GLUEPOINTS_TOOLBOX (HID_SD_START + 50) -#define HID_SD_SLIDE_OBJ_TOOLBOX (HID_SD_START + 51) +#define HID_SD_DRAW_DEFAULTTOOLBOX "SD_HID_SD_DRAW_DEFAULTTOOLBOX" +#define HID_SD_PLUGINTOOLBOX "SD_HID_SD_PLUGINTOOLBOX" +#define HID_SD_DRAW_TOOLBOX "SD_HID_SD_DRAW_TOOLBOX" +#define HID_SD_SLIDE_TOOLBOX "SD_HID_SD_SLIDE_TOOLBOX" +#define HID_SD_OUTLINE_TOOLBOX "SD_HID_SD_OUTLINE_TOOLBOX" +#define HID_SD_DRAW_OBJ_TOOLBOX "SD_HID_SD_DRAW_OBJ_TOOLBOX" +#define HID_SD_DRAW_OPTIONS_TOOLBOX "SD_HID_SD_DRAW_OPTIONS_TOOLBOX" +#define HID_SD_DRAW_COMMONTASK_TOOLBOX "SD_HID_SD_DRAW_COMMONTASK_TOOLBOX" +#define HID_SD_BEZIER_TOOLBOX "SD_HID_SD_BEZIER_TOOLBOX" +#define HID_SD_TEXT_TOOLBOX "SD_HID_SD_TEXT_TOOLBOX" +#define HID_SD_GLUEPOINTS_TOOLBOX "SD_HID_SD_GLUEPOINTS_TOOLBOX" +#define HID_SD_SLIDE_OBJ_TOOLBOX "SD_HID_SD_SLIDE_OBJ_TOOLBOX" // FloatingWindows -#define HID_SD_FW_ALIGNMENT (HID_SD_START + 52) -#define HID_SD_FW_ZOOM (HID_SD_START + 53) -#define HID_SD_FW_CHOOSE_MODE (HID_SD_START + 54) -#define HID_SD_FW_TEXT (HID_SD_START + 55) -#define HID_SD_FW_RECTANGLES (HID_SD_START + 56) -#define HID_SD_FW_ELLIPSES (HID_SD_START + 57) -#define HID_SD_FW_LINES (HID_SD_START + 58) -#define HID_SD_FW_ARROWS (HID_SD_START + 59) -#define HID_SD_FW_3D_OBJECTS (HID_SD_START + 60) -#define HID_SD_FW_CONNECTORS (HID_SD_START + 61) -#define HID_SD_FW_INSERT (HID_SD_START + 62) -#define HID_SD_FW_POSITION (HID_SD_START + 63) - -#define HID_SD_BTN_PREVIEW (HID_SD_START + 64) - -#define HID_SD_NAVIGATOR_MENU1 (HID_SD_START + 65) -#define HID_SD_NAVIGATOR_MENU2 (HID_SD_START + 66) -#define HID_SD_NAVIGATOR_MENU3 (HID_SD_START + 67) - -#define HID_SD_WIN_PRESENTATION (HID_SD_START + 68) - -// HelpIDs fuer Vorlagen -#define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70) -#define HID_POOLSHEET_OBJWITHARROW (HID_SD_START + 71) -#define HID_POOLSHEET_OBJWITHSHADOW (HID_SD_START + 72) -#define HID_POOLSHEET_OBJWITHOUTFILL (HID_SD_START + 73) -#define HID_POOLSHEET_TEXT (HID_SD_START + 74) -#define HID_POOLSHEET_TEXTBODY (HID_SD_START + 75) -#define HID_POOLSHEET_TEXTBODY_JUSTIFY (HID_SD_START + 76) -#define HID_POOLSHEET_TEXTBODY_INDENT (HID_SD_START + 77) -#define HID_POOLSHEET_TITLE (HID_SD_START + 78) -#define HID_POOLSHEET_TITLE1 (HID_SD_START + 79) -#define HID_POOLSHEET_TITLE2 (HID_SD_START + 80) -#define HID_POOLSHEET_HEADLINE (HID_SD_START + 81) -#define HID_POOLSHEET_HEADLINE1 (HID_SD_START + 82) -#define HID_POOLSHEET_HEADLINE2 (HID_SD_START + 83) -#define HID_POOLSHEET_MEASURE (HID_SD_START + 84) - -#define HID_PSEUDOSHEET_TITLE (HID_SD_START + 85) -#define HID_PSEUDOSHEET_OUTLINE (HID_SD_START + 86) -#define HID_PSEUDOSHEET_OUTLINE1 (HID_SD_START + 87) -#define HID_PSEUDOSHEET_OUTLINE2 (HID_SD_START + 88) -#define HID_PSEUDOSHEET_OUTLINE3 (HID_SD_START + 89) -#define HID_PSEUDOSHEET_OUTLINE4 (HID_SD_START + 90) -#define HID_PSEUDOSHEET_OUTLINE5 (HID_SD_START + 91) -#define HID_PSEUDOSHEET_OUTLINE6 (HID_SD_START + 92) -#define HID_PSEUDOSHEET_OUTLINE7 (HID_SD_START + 93) -#define HID_PSEUDOSHEET_OUTLINE8 (HID_SD_START + 94) -#define HID_PSEUDOSHEET_OUTLINE9 (HID_SD_START + 95) -#define HID_PSEUDOSHEET_BACKGROUNDOBJECTS (HID_SD_START + 96) -#define HID_PSEUDOSHEET_BACKGROUND (HID_SD_START + 97) -#define HID_PSEUDOSHEET_NOTES (HID_SD_START + 98) - -#define HID_DLG_DEFINE_CUSTOMSHOW (HID_SD_START + 99) -#define HID_DLG_DEFINE_CUSTOMSHOW_CTL (HID_SD_START + 100) - -#define HID_PSEUDOSHEET_SUBTITLE (HID_SD_START + 101) - -#define HID_CTL_ACTION_DLG_1 (HID_SD_START + 102) -#define HID_CTL_ACTION_DLG_2 (HID_SD_START + 103) - -#define HID_SD_BTN_PRESENTATION (HID_SD_START + 104) - -#define HID_SD_HTMLEXPORT_PAGE1 (HID_SD_START + 105) -#define HID_SD_HTMLEXPORT_PAGE2 (HID_SD_START + 106) -#define HID_SD_HTMLEXPORT_PAGE3 (HID_SD_START + 107) -#define HID_SD_HTMLEXPORT_PAGE4 (HID_SD_START + 108) -#define HID_SD_HTMLEXPORT_PAGE5 (HID_SD_START + 109) -#define HID_SD_HTMLEXPORT_PAGE6 (HID_SD_START + 110) - -#define HID_SD_CHGFOIL_LAYOUT (HID_SD_START + 111) -#define HID_SD_CHGFOIL_BACKGROUND (HID_SD_START + 112) -#define HID_SD_CHGFOIL_OBJECTS (HID_SD_START + 113) -#define HID_SD_CHGFOIL_NAME (HID_SD_START + 114) - -#define HID_SD_HTMLEXPORT_DLG_DNAME (HID_SD_START + 115) - -#define HID_FM_CTL_SELECTION (HID_SD_START + 116) - -#define HID_SD_AUTOPILOT_REGION (HID_SD_START + 117) -#define HID_SD_AUTOPILOT_TEMPLATES (HID_SD_START + 118) -#define HID_SD_AUTOPILOT_OPEN (HID_SD_START + 119) -#define HID_SD_AUTOPILOT_PAGETEMPLATES (HID_SD_START + 120) - -#define HID_SD_DRAW_GRAF_TOOLBOX (HID_SD_START + 121) - -#define HID_SD_FW_GRAFFILTERS (HID_SD_START + 122) - -#define HID_SD_TABBAR_PAGES (HID_SD_START + 123) -#define HID_SD_TABBAR_LAYERS (HID_SD_START + 124) - -#define HID_SD_UNDODELETEWARNING_DLG (HID_SD_START + 125) -#define HID_SD_UNDODELETEWARNING_CBX (HID_SD_START + 126) - -#define HID_SD_PAGEOBJSTLB (HID_SD_START + 127) - -#define HID_SD_NAMEDIALOG_OBJECT (HID_SD_START + 128) -#define HID_SD_NAMEDIALOG_PAGE (HID_SD_START + 129) -#define HID_SD_NAMEDIALOG_LINEEND (HID_SD_START + 130) - -#define HID_SD_DRAW_3D_TOOLBOX (HID_SD_START + 131) -#define HID_SD_DRAW_FONTWORK_TOOLBOX (HID_SD_START + 132) - -#define HID_SD_TABPAGE_HEADERFOOTER_SLIDE (HID_SD_START + 133) -#define HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT (HID_SD_START + 134) - -#define HID_SD_DRAW_MEDIA_TOOLBOX (HID_SD_START + 135) - -#define HID_SD_TASK_PANE (HID_SD_START + 136) -#define HID_SD_SLIDE_DESIGNS (HID_SD_START + 137) -#define HID_SD_CURRENT_MASTERS (HID_SD_START + 138) -#define HID_SD_RECENT_MASTERS (HID_SD_START + 139) -#define HID_SD_ALL_MASTERS (HID_SD_START + 140) -#define HID_SD_SLIDE_LAYOUTS (HID_SD_START + 141) -#define HID_SD_CUSTOM_ANIMATIONS (HID_SD_START + 142) -#define HID_SD_SLIDE_TRANSITIONS (HID_SD_START + 143) - -#define HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT (HID_SD_START + 144) -#define HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT (HID_SD_START + 145) -#define HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT (HID_SD_START + 146) -#define HID_SD_CUSTOMANIMATIONPANE_LB_START (HID_SD_START + 147) -#define HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY (HID_SD_START + 148) -#define HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE (HID_SD_START + 149) -#define HID_SD_CUSTOMANIMATIONPANE_CB_SPEED (HID_SD_START + 150) -#define HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST (HID_SD_START + 151) -#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP (HID_SD_START + 152) -#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN (HID_SD_START + 153) -#define HID_SD_CUSTOMANIMATIONPANE_PB_PLAY (HID_SD_START + 154) -#define HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW (HID_SD_START + 155) -#define HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW (HID_SD_START + 156) - -#define HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES (HID_SD_START + 157) -#define HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL (HID_SD_START + 158) -#define HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY (HID_SD_START + 159) -#define HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW (HID_SD_START + 160) -#define HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW (HID_SD_START + 161) - -#define HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS (HID_SD_START + 162) -#define HID_SD_SLIDETRANSITIONPANE_LB_SPEED (HID_SD_START + 163) -#define HID_SD_SLIDETRANSITIONPANE_LB_SOUND (HID_SD_START + 164) -#define HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND (HID_SD_START + 165) -#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE (HID_SD_START + 166) -#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO (HID_SD_START + 167) -#define HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER (HID_SD_START + 168) -#define HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL (HID_SD_START + 169) -#define HID_SD_SLIDETRANSITIONPANE_PB_PLAY (HID_SD_START + 170) -#define HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW (HID_SD_START + 171) -#define HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW (HID_SD_START + 172) - -#define HID_SD_TASK_PANE_VIEW_MENU (HID_SD_START + 173) -#define HID_SD_TASK_PANE_PREVIEW_CURRENT (HID_SD_START + 174) -#define HID_SD_TASK_PANE_PREVIEW_RECENT (HID_SD_START + 175) -#define HID_SD_TASK_PANE_PREVIEW_ALL (HID_SD_START + 176) -#define HID_SD_TASK_PANE_PREVIEW_LAYOUTS (HID_SD_START + 177) - -#define HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE (HID_SD_START + 178) -#define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS (HID_SD_START + 179) -#define HID_SD_CUSTOMANIMATIONDIALOG_EXIT (HID_SD_START + 180) -#define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH (HID_SD_START + 181) -#define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS (HID_SD_START + 182) - -#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX (HID_SD_START + 183) -#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX (HID_SD_START + 184) -#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX (HID_SD_START + 185) -#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX (HID_SD_START + 186) -#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX (HID_SD_START + 187) -#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX (HID_SD_START + 188) -#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX (HID_SD_START + 189) -#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX (HID_SD_START + 190) - -#define HID_SD_SLIDESHOW_DISPLAY (HID_SD_START + 191) - -#define HID_SD_RULER_HORIZONTAL (HID_SD_START + 192) -#define HID_SD_RULER_VERTICAL (HID_SD_START + 193) - -#define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194) -#define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195) -#define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 196) -#define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 197) -#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198) -#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199) - -#define HID_SD_TABLE_DESIGN (HID_SD_START + 200) -#define HID_SD_ANNOTATIONS (HID_SD_START + 201) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +#define HID_SD_FW_ALIGNMENT "SD_HID_SD_FW_ALIGNMENT" +#define HID_SD_FW_ZOOM "SD_HID_SD_FW_ZOOM" +#define HID_SD_FW_CHOOSE_MODE "SD_HID_SD_FW_CHOOSE_MODE" +#define HID_SD_FW_TEXT "SD_HID_SD_FW_TEXT" +#define HID_SD_FW_RECTANGLES "SD_HID_SD_FW_RECTANGLES" +#define HID_SD_FW_ELLIPSES "SD_HID_SD_FW_ELLIPSES" +#define HID_SD_FW_LINES "SD_HID_SD_FW_LINES" +#define HID_SD_FW_ARROWS "SD_HID_SD_FW_ARROWS" +#define HID_SD_FW_3D_OBJECTS "SD_HID_SD_FW_3D_OBJECTS" +#define HID_SD_FW_CONNECTORS "SD_HID_SD_FW_CONNECTORS" +#define HID_SD_FW_INSERT "SD_HID_SD_FW_INSERT" +#define HID_SD_FW_POSITION "SD_HID_SD_FW_POSITION" + +#define HID_SD_BTN_PREVIEW "SD_HID_SD_BTN_PREVIEW" + +#define HID_SD_NAVIGATOR_MENU1 "SD_HID_SD_NAVIGATOR_MENU1" +#define HID_SD_NAVIGATOR_MENU2 "SD_HID_SD_NAVIGATOR_MENU2" +#define HID_SD_NAVIGATOR_MENU3 "SD_HID_SD_NAVIGATOR_MENU3" + +#define HID_SD_WIN_PRESENTATION "SD_HID_SD_WIN_PRESENTATION" + +#define HID_DLG_DEFINE_CUSTOMSHOW "SD_HID_DLG_DEFINE_CUSTOMSHOW" +#define HID_DLG_DEFINE_CUSTOMSHOW_CTL "SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL" + +#define HID_CTL_ACTION_DLG_1 "SD_HID_CTL_ACTION_DLG_1" +#define HID_CTL_ACTION_DLG_2 "SD_HID_CTL_ACTION_DLG_2" + +#define HID_SD_BTN_PRESENTATION "SD_HID_SD_BTN_PRESENTATION" + +#define HID_SD_HTMLEXPORT_PAGE1 "SD_HID_SD_HTMLEXPORT_PAGE1" +#define HID_SD_HTMLEXPORT_PAGE2 "SD_HID_SD_HTMLEXPORT_PAGE2" +#define HID_SD_HTMLEXPORT_PAGE3 "SD_HID_SD_HTMLEXPORT_PAGE3" +#define HID_SD_HTMLEXPORT_PAGE4 "SD_HID_SD_HTMLEXPORT_PAGE4" +#define HID_SD_HTMLEXPORT_PAGE5 "SD_HID_SD_HTMLEXPORT_PAGE5" +#define HID_SD_HTMLEXPORT_PAGE6 "SD_HID_SD_HTMLEXPORT_PAGE6" + +#define HID_SD_CHGFOIL_LAYOUT "SD_HID_SD_CHGFOIL_LAYOUT" +#define HID_SD_CHGFOIL_BACKGROUND "SD_HID_SD_CHGFOIL_BACKGROUND" +#define HID_SD_CHGFOIL_OBJECTS "SD_HID_SD_CHGFOIL_OBJECTS" +#define HID_SD_CHGFOIL_NAME "SD_HID_SD_CHGFOIL_NAME" + +#define HID_SD_HTMLEXPORT_DLG_DNAME "SD_HID_SD_HTMLEXPORT_DLG_DNAME" + +#define HID_FM_CTL_SELECTION "SD_HID_FM_CTL_SELECTION" + +#define HID_SD_AUTOPILOT_REGION "SD_HID_SD_AUTOPILOT_REGION" +#define HID_SD_AUTOPILOT_TEMPLATES "SD_HID_SD_AUTOPILOT_TEMPLATES" +#define HID_SD_AUTOPILOT_OPEN "SD_HID_SD_AUTOPILOT_OPEN" +#define HID_SD_AUTOPILOT_PAGETEMPLATES "SD_HID_SD_AUTOPILOT_PAGETEMPLATES" + +#define HID_SD_DRAW_GRAF_TOOLBOX "SD_HID_SD_DRAW_GRAF_TOOLBOX" + +#define HID_SD_FW_GRAFFILTERS "SD_HID_SD_FW_GRAFFILTERS" + +#define HID_SD_TABBAR_PAGES "SD_HID_SD_TABBAR_PAGES" +#define HID_SD_TABBAR_LAYERS "SD_HID_SD_TABBAR_LAYERS" + +#define HID_SD_UNDODELETEWARNING_DLG "SD_HID_SD_UNDODELETEWARNING_DLG" +#define HID_SD_UNDODELETEWARNING_CBX "SD_HID_SD_UNDODELETEWARNING_CBX" + +#define HID_SD_PAGEOBJSTLB "SD_HID_SD_PAGEOBJSTLB" + +#define HID_SD_NAMEDIALOG_OBJECT "SD_HID_SD_NAMEDIALOG_OBJECT" +#define HID_SD_NAMEDIALOG_PAGE "SD_HID_SD_NAMEDIALOG_PAGE" +#define HID_SD_NAMEDIALOG_LINEEND "SD_HID_SD_NAMEDIALOG_LINEEND" + +#define HID_SD_DRAW_3D_TOOLBOX "SD_HID_SD_DRAW_3D_TOOLBOX" +#define HID_SD_DRAW_FONTWORK_TOOLBOX "SD_HID_SD_DRAW_FONTWORK_TOOLBOX" + +#define HID_SD_TABPAGE_HEADERFOOTER_SLIDE "SD_HID_SD_TABPAGE_HEADERFOOTER_SLIDE" +#define HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT "SD_HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT" + +#define HID_SD_DRAW_MEDIA_TOOLBOX "SD_HID_SD_DRAW_MEDIA_TOOLBOX" + +#define HID_SD_TASK_PANE "SD_HID_SD_TASK_PANE" +#define HID_SD_SLIDE_DESIGNS "SD_HID_SD_SLIDE_DESIGNS" +#define HID_SD_CURRENT_MASTERS "SD_HID_SD_CURRENT_MASTERS" +#define HID_SD_RECENT_MASTERS "SD_HID_SD_RECENT_MASTERS" +#define HID_SD_ALL_MASTERS "SD_HID_SD_ALL_MASTERS" +#define HID_SD_SLIDE_LAYOUTS "SD_HID_SD_SLIDE_LAYOUTS" +#define HID_SD_CUSTOM_ANIMATIONS "SD_HID_SD_CUSTOM_ANIMATIONS" +#define HID_SD_SLIDE_TRANSITIONS "SD_HID_SD_SLIDE_TRANSITIONS" + +#define HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT "SD_HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT" +#define HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT "SD_HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT" +#define HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT "SD_HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT" +#define HID_SD_CUSTOMANIMATIONPANE_LB_START "SD_HID_SD_CUSTOMANIMATIONPANE_LB_START" +#define HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY "SD_HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY" +#define HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE "SD_HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE" +#define HID_SD_CUSTOMANIMATIONPANE_CB_SPEED "SD_HID_SD_CUSTOMANIMATIONPANE_CB_SPEED" +#define HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST "SD_HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST" +#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP "SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP" +#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN "SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN" +#define HID_SD_CUSTOMANIMATIONPANE_PB_PLAY "SD_HID_SD_CUSTOMANIMATIONPANE_PB_PLAY" +#define HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW "SD_HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW" +#define HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW "SD_HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW" + +#define HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES "SD_HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES" +#define HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL" +#define HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY" +#define HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW" +#define HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW "SD_HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW" + +#define HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS "SD_HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS" +#define HID_SD_SLIDETRANSITIONPANE_LB_SPEED "SD_HID_SD_SLIDETRANSITIONPANE_LB_SPEED" +#define HID_SD_SLIDETRANSITIONPANE_LB_SOUND "SD_HID_SD_SLIDETRANSITIONPANE_LB_SOUND" +#define HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND "SD_HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND" +#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE "SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE" +#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO "SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO" +#define HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER "SD_HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER" +#define HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL "SD_HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL" +#define HID_SD_SLIDETRANSITIONPANE_PB_PLAY "SD_HID_SD_SLIDETRANSITIONPANE_PB_PLAY" +#define HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW "SD_HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW" +#define HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW "SD_HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW" + +#define HID_SD_TASK_PANE_VIEW_MENU "SD_HID_SD_TASK_PANE_VIEW_MENU" +#define HID_SD_TASK_PANE_PREVIEW_CURRENT "SD_HID_SD_TASK_PANE_PREVIEW_CURRENT" +#define HID_SD_TASK_PANE_PREVIEW_RECENT "SD_HID_SD_TASK_PANE_PREVIEW_RECENT" +#define HID_SD_TASK_PANE_PREVIEW_ALL "SD_HID_SD_TASK_PANE_PREVIEW_ALL" +#define HID_SD_TASK_PANE_PREVIEW_LAYOUTS "SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS" + +#define HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE "SD_HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE" +#define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS "SD_HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS" +#define HID_SD_CUSTOMANIMATIONDIALOG_EXIT "SD_HID_SD_CUSTOMANIMATIONDIALOG_EXIT" +#define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH "SD_HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH" +#define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS "SD_HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS" + +#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX" +#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX" +#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX" +#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX" +#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX" +#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX" +#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX" +#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX" + +#define HID_SD_SLIDESHOW_DISPLAY "SD_HID_SD_SLIDESHOW_DISPLAY" + +#define HID_SD_RULER_HORIZONTAL "SD_HID_SD_RULER_HORIZONTAL" +#define HID_SD_RULER_VERTICAL "SD_HID_SD_RULER_VERTICAL" + +#define HID_SD_TABLE_DESIGN "SD_HID_SD_TABLE_DESIGN" +#define HID_SD_ANNOTATIONS "SD_HID_SD_ANNOTATIONS" + +#define HID_DLG_INSERT_PAGES_OBJS "SD_HID_DLG_INSERT_PAGES_OBJS" +#define HID_TABPAGE_PARA_NUMBERING "SD_HID_TABPAGE_PARA_NUMBERING" +#define HID_VECTORIZE_DLG "SD_HID_VECTORIZE_DLG" +#define HID_UNDO_DELETE_WARNING "SD_HID_UNDO_DELETE_WARNING" + +#define HID_MN_SUB_GROUP "SD_HID_MN_SUB_GROUP" +#define HID_MN_SUB_GRAPHIC "SD_HID_MN_SUB_GRAPHIC" +#define HID_MN_SUB_SEND "SD_HID_MN_SUB_SEND" +#define HID_MN_SUB_MASTER_LAYOUTS "SD_HID_MN_SUB_MASTER_LAYOUTS" +#define HID_MN_SUB_VIEW "SD_HID_MN_SUB_VIEW" +#define HID_MN_SUB_MASTERPAGE "SD_HID_MN_SUB_MASTERPAGE" +#define HID_MN_SUB_FIELD "SD_HID_MN_SUB_FIELD" +#define HID_MN_SUB_TEMPLATES "SD_HID_MN_SUB_TEMPLATES" +#define HID_MN_SUB_SPELLING "SD_HID_MN_SUB_SPELLING" +#define HID_MN_SUB_POSITION "SD_HID_MN_SUB_POSITION" +#define HID_MN_SUB_OUTPUT_QUALITY "SD_HID_MN_SUB_OUTPUT_QUALITY" +#define HID_MN_SUB_PREVIEW_OUTPUT_QUALITY "SD_HID_MN_SUB_PREVIEW_OUTPUT_QUALITY" +#define HID_MN_SUB_CONVERT "SD_HID_MN_SUB_CONVERT" +#define HID_MN_SUB_MIRROR "SD_HID_MN_SUB_MIRROR" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 6b3ed86c68f0..8c8f7f0feba6 100644..100755 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -531,7 +531,6 @@ #include "unotools/pathoptions.hxx" #include "svl/poolitem.hxx" #include "svtools/prgsbar.hxx" -#include "svtools/printdlg.hxx" #include "svl/ptitem.hxx" #include "svl/rectitem.hxx" #include "unotools/saveopt.hxx" @@ -618,7 +617,6 @@ #include "svx/galbrws.hxx" #include "svx/gallery.hxx" #include "svx/globl3d.hxx" -#include "svx/globlac.hrc" #include "svx/globlmn.hrc" #include "svx/grafctrl.hxx" #include "svx/hlnkitem.hxx" @@ -864,7 +862,7 @@ #include "vcl/group.hxx" #include "vcl/help.hxx" #include "vcl/image.hxx" -#include "vcl/imagebtn.hxx" +#include "vcl/button.hxx" #include "vcl/jobset.hxx" #include "vcl/lineinfo.hxx" #include "vcl/lstbox.hxx" @@ -901,7 +899,7 @@ #include "vcl/virdev.hxx" #include "vcl/waitobj.hxx" #include "vcl/window.hxx" -#include "vcl/wintypes.hxx" +#include "tools/wintypes.hxx" #include "vcl/wrkwin.hxx" #include "osl/diagnose.h" diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index 936f0d11dc30..0fb8f600113c 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -81,8 +81,8 @@ public: class AbstractSdCustomShowDlg : public VclAbstractDialog //add for SdCustomShowDlg { public: - virtual BOOL IsModified() const = 0; - virtual BOOL IsCustomShow() const = 0; + virtual sal_Bool IsModified() const = 0; + virtual sal_Bool IsCustomShow() const = 0; }; class AbstractAssistentDlg : public VclAbstractDialog //add for AssistentDlg @@ -90,11 +90,11 @@ class AbstractAssistentDlg : public VclAbstractDialog //add for AssistentDlg public: virtual SfxObjectShellLock GetDocument() = 0; virtual OutputType GetOutputMedium() const = 0; - virtual BOOL IsSummary() const = 0; + virtual sal_Bool IsSummary() const = 0; virtual StartType GetStartType() const = 0; virtual String GetDocPath() const = 0; - virtual BOOL GetStartWithFlag() const = 0; - virtual BOOL IsDocEmpty() const = 0; + virtual sal_Bool GetStartWithFlag() const = 0; + virtual sal_Bool IsDocEmpty() const = 0; virtual String GetPassword() = 0; }; @@ -111,7 +111,7 @@ public: virtual void GetAttr(SfxItemSet& rOutAttrs) = 0; virtual void HideRadioGroup() = 0; virtual void HideDeleteBtn() = 0; - virtual void SetInputFields(BOOL bEnableX, BOOL bEnableY) = 0; + virtual void SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY) = 0; //from class ::Window virtual void SetText( const XubString& rStr ) = 0; }; @@ -121,31 +121,31 @@ class AbstractSdInsertLayerDlg : public VclAbstractDialog //add for SdInsertLay public: virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; //from class ::Window - virtual void SetHelpId( ULONG nHelpId ) = 0; + virtual void SetHelpId( const rtl::OString& rHelpId ) = 0; }; class AbstractSdInsertPasteDlg : public VclAbstractDialog //add for SdInsertPasteDlg { public: - virtual BOOL IsInsertBefore() const = 0; + virtual sal_Bool IsInsertBefore() const = 0; }; class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog //add for SdInsertPagesObjsDlg { public: virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer - virtual List* GetList( USHORT nType ) = 0; - virtual BOOL IsLink() = 0; - virtual BOOL IsRemoveUnnessesaryMasterPages() const = 0; + virtual List* GetList( sal_uInt16 nType ) = 0; + virtual sal_Bool IsLink() = 0; + virtual sal_Bool IsRemoveUnnessesaryMasterPages() const = 0; }; class AbstractMorphDlg : public VclAbstractDialog //add for MorphDlg { public: virtual void SaveSettings() const = 0; - virtual USHORT GetFadeSteps() const = 0; - virtual BOOL IsAttributeFade() const = 0; - virtual BOOL IsOrientationFade() const = 0; + virtual sal_uInt16 GetFadeSteps() const = 0; + virtual sal_Bool IsAttributeFade() const = 0; + virtual sal_Bool IsOrientationFade() const = 0; }; class AbstractSdStartPresDlg : public VclAbstractDialog //add for SdStartPresentationDlg @@ -186,12 +186,12 @@ class SdAbstractDialogFactory public: static SdAbstractDialogFactory* Create(); - virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, ULONG nSumActionCount, ULONG nObjCount ) = 0; + virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) = 0; virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ) = 0; virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) = 0; virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0; - virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, BOOL bAreaPage = TRUE ) = 0; - virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot) = 0; + virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage = sal_True ) = 0; + virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, sal_Bool bAutoPilot) = 0; virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) = 0; virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) = 0; virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ) = 0; diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index 7f055caf633a..3f9b927fd567 100644..100755 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -79,7 +79,7 @@ public: class SdAttrLayerVisible : public SfxBoolItem { public: - SdAttrLayerVisible( BOOL bValue = TRUE ) : + SdAttrLayerVisible( sal_Bool bValue = sal_True ) : SfxBoolItem( ATTR_LAYER_VISIBLE, bValue ) {} }; @@ -88,7 +88,7 @@ public: class SdAttrLayerPrintable : public SfxBoolItem { public: - SdAttrLayerPrintable( BOOL bValue = TRUE ) : + SdAttrLayerPrintable( sal_Bool bValue = sal_True ) : SfxBoolItem( ATTR_LAYER_PRINTABLE, bValue ) {} }; @@ -97,7 +97,7 @@ public: class SdAttrLayerLocked : public SfxBoolItem { public: - SdAttrLayerLocked( BOOL bValue = FALSE ) : + SdAttrLayerLocked( sal_Bool bValue = sal_False ) : SfxBoolItem( ATTR_LAYER_LOCKED, bValue ) {} }; @@ -106,7 +106,7 @@ public: class SdAttrLayerThisPage : public SfxBoolItem { public: - SdAttrLayerThisPage( BOOL bValue = FALSE ) : + SdAttrLayerThisPage( sal_Bool bValue = sal_False ) : SfxBoolItem( ATTR_LAYER_THISPAGE, bValue ) {} }; @@ -120,8 +120,8 @@ public: DiaEffectItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - USHORT GetValueCount() const { return FADE_EFFECT_COUNT; } + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + sal_uInt16 GetValueCount() const { return FADE_EFFECT_COUNT; } ::com::sun::star::presentation::FadeEffect GetValue() const { return (::com::sun::star::presentation::FadeEffect) SfxEnumItem::GetValue(); } }; @@ -136,8 +136,8 @@ public: DiaSpeedItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - USHORT GetValueCount() const { return FADE_SPEED_COUNT; } + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + sal_uInt16 GetValueCount() const { return FADE_SPEED_COUNT; } FadeSpeed GetValue() const { return (FadeSpeed) SfxEnumItem::GetValue(); } }; @@ -152,8 +152,8 @@ public: DiaAutoItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - USHORT GetValueCount() const { return PRESCHANGE_COUNT; } + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + sal_uInt16 GetValueCount() const { return PRESCHANGE_COUNT; } PresChange GetValue() const { return (PresChange) SfxEnumItem::GetValue(); } }; @@ -163,7 +163,7 @@ class DiaTimeItem : public SfxUInt32Item { public: TYPEINFO(); - DiaTimeItem( UINT32 nValue = 0L ); + DiaTimeItem( sal_uInt32 nValue = 0L ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h new file mode 100644 index 000000000000..439461de2f06 --- /dev/null +++ b/sd/inc/sdcommands.h @@ -0,0 +1,311 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SD_SDCOMMANDS_HRC +#define SD_SDCOMMANDS_HRC + +#define CMD_SID_OBJECT_MIRROR ".uno:Mirror" +#define CMD_SID_OBJECT_CHOOSE_MODE ".uno:AdvancedMode" +#define CMD_SID_ANIMATION_EFFECTS ".uno:AnimationEffects" +#define CMD_SID_ANIMATION_OBJECTS ".uno:AnimationObjects" +#define CMD_SID_ANIMATOR_ADD ".uno:AnimatorAddObject" +#define CMD_SID_ANIMATOR_CREATE ".uno:AnimatorCreateObject" +#define CMD_SID_ANIMATOR_INIT ".uno:AnimatorInit" +#define CMD_SID_ANIMATOR_STATE ".uno:AnimatorState" +#define CMD_SID_DRAWTBX_ARROWS ".uno:ArrowsToolbox" +#define CMD_SID_MOREBACK ".uno:Backward" +#define CMD_SID_BEFORE_OBJ ".uno:BeforeObject" +#define CMD_SID_BEHIND_OBJ ".uno:BehindObject" +#define CMD_SID_BIG_HANDLES ".uno:BigHandles" +#define CMD_SID_BREAK ".uno:Break" +#define CMD_SID_CAPTUREPOINT ".uno:CapturePoint" +#define CMD_SID_CHANGEBEZIER ".uno:ChangeBezier" +#define CMD_SID_CHANGEPOLYGON ".uno:ChangePolygon" +#define CMD_SID_CLICK_CHANGE_ROTATION ".uno:ClickChangeRotation" +#define CMD_SID_OBJECT_CLOSE ".uno:CloseObject" +#define CMD_SID_COLORVIEW ".uno:ColorView" +#define CMD_SID_COMBINE ".uno:Combine" +#define CMD_SID_3D_CONE ".uno:Cone" +#define CMD_SID_CONNECT ".uno:Connect" +#define CMD_SID_TOOL_CONNECTOR ".uno:Connector" +#define CMD_SID_CONNECTOR_ARROW_END ".uno:ConnectorArrowEnd" +#define CMD_SID_CONNECTOR_ARROWS ".uno:ConnectorArrows" +#define CMD_SID_CONNECTOR_ARROW_START ".uno:ConnectorArrowStart" +#define CMD_SID_CONNECTION_DLG ".uno:ConnectorAttributes" +#define CMD_SID_CONNECTOR_CIRCLE_END ".uno:ConnectorCircleEnd" +#define CMD_SID_CONNECTOR_CIRCLES ".uno:ConnectorCircles" +#define CMD_SID_CONNECTOR_CIRCLE_START ".uno:ConnectorCircleStart" +#define CMD_SID_CONNECTOR_CURVE ".uno:ConnectorCurve" +#define CMD_SID_CONNECTOR_CURVE_ARROW_END ".uno:ConnectorCurveArrowEnd" +#define CMD_SID_CONNECTOR_CURVE_ARROWS ".uno:ConnectorCurveArrows" +#define CMD_SID_CONNECTOR_CURVE_ARROW_START ".uno:ConnectorCurveArrowStart" +#define CMD_SID_CONNECTOR_CURVE_CIRCLE_END ".uno:ConnectorCurveCircleEnd" +#define CMD_SID_CONNECTOR_CURVE_CIRCLES ".uno:ConnectorCurveCircles" +#define CMD_SID_CONNECTOR_CURVE_CIRCLE_START ".uno:ConnectorCurveCircleStart" +#define CMD_SID_CONNECTOR_LINE ".uno:ConnectorLine" +#define CMD_SID_CONNECTOR_LINE_ARROW_END ".uno:ConnectorLineArrowEnd" +#define CMD_SID_CONNECTOR_LINE_ARROWS ".uno:ConnectorLineArrows" +#define CMD_SID_CONNECTOR_LINE_ARROW_START ".uno:ConnectorLineArrowStart" +#define CMD_SID_CONNECTOR_LINE_CIRCLE_END ".uno:ConnectorLineCircleEnd" +#define CMD_SID_CONNECTOR_LINE_CIRCLES ".uno:ConnectorLineCircles" +#define CMD_SID_CONNECTOR_LINE_CIRCLE_START ".uno:ConnectorLineCircleStart" +#define CMD_SID_CONNECTOR_LINES ".uno:ConnectorLines" +#define CMD_SID_CONNECTOR_LINES_ARROW_END ".uno:ConnectorLinesArrowEnd" +#define CMD_SID_CONNECTOR_LINES_ARROWS ".uno:ConnectorLinesArrows" +#define CMD_SID_CONNECTOR_LINES_ARROW_START ".uno:ConnectorLinesArrowStart" +#define CMD_SID_CONNECTOR_LINES_CIRCLE_END ".uno:ConnectorLinesCircleEnd" +#define CMD_SID_CONNECTOR_LINES_CIRCLES ".uno:ConnectorLinesCircles" +#define CMD_SID_CONNECTOR_LINES_CIRCLE_START ".uno:ConnectorLinesCircleStart" +#define CMD_SID_DRAWTBX_CONNECTORS ".uno:ConnectorToolbox" +#define CMD_SID_CONVERT_TO_CONTOUR ".uno:convert_to_contour" +#define CMD_SID_CONVERT_TO_3D ".uno:ConvertInto3D" +#define CMD_SID_CONVERT_TO_3D_LATHE ".uno:ConvertInto3DLathe" +#define CMD_SID_CONVERT_TO_3D_LATHE_FAST ".uno:ConvertInto3DLatheFast" +#define CMD_SID_CONVERT_TO_BITMAP ".uno:ConvertIntoBitmap" +#define CMD_SID_CONVERT_TO_METAFILE ".uno:ConvertIntoMetaFile" +#define CMD_SID_CONVERT_TO_1BIT_MATRIX ".uno:ConvertTo1BitMatrix" +#define CMD_SID_CONVERT_TO_1BIT_THRESHOLD ".uno:ConvertTo1BitThreshold" +#define CMD_SID_CONVERT_TO_4BIT_COLORS ".uno:ConvertTo4BitColors" +#define CMD_SID_CONVERT_TO_4BIT_GRAYS ".uno:ConvertTo4BitGrays" +#define CMD_SID_CONVERT_TO_8BIT_COLORS ".uno:ConvertTo8BitColors" +#define CMD_SID_CONVERT_TO_8BIT_GRAYS ".uno:ConvertTo8BitGrays" +#define CMD_SID_CONVERT_TO_24BIT ".uno:ConvertToTrueColor" +#define CMD_SID_COPYOBJECTS ".uno:CopyObjects" +#define CMD_SID_OBJECT_CROOK_ROTATE ".uno:CrookRotate" +#define CMD_SID_OBJECT_CROOK_SLANT ".uno:CrookSlant" +#define CMD_SID_OBJECT_CROOK_STRETCH ".uno:CrookStretch" +#define CMD_SID_3D_CUBE ".uno:Cube" +#define CMD_SID_CUSTOMSHOW_DLG ".uno:CustomShowDialog" +#define CMD_SID_3D_CYLINDER ".uno:Cylinder" +#define CMD_SID_3D_PYRAMID ".uno:Cyramid" +#define CMD_SID_DELETE_LAYER ".uno:DeleteLayer" +#define CMD_SID_DELETE_PAGE ".uno:DeletePage" +#define CMD_SID_DELETE_SNAPITEM ".uno:DeleteSnapItem" +#define CMD_SID_UNSELECT ".uno:DeSelect" +#define CMD_SID_DIAMODE ".uno:DiaMode" +#define CMD_SID_DISMANTLE ".uno:Dismantle" +#define CMD_SID_DOUBLECLICK_TEXTEDIT ".uno:DoubleClickTextEdit" +#define CMD_SID_DRAWINGMODE ".uno:DrawingMode" +#define CMD_SID_DUPLICATE_PAGE ".uno:DuplicatePage" +#define CMD_SID_EDIT_HYPERLINK ".uno:EditHyperlink" +#define CMD_SID_EDIT_OUTLINER ".uno:EditOutline" +#define CMD_SID_CUSTOM_ANIMATION_PANEL ".uno:CustomAnimation" +#define CMD_SID_CUSTOM_ANIMATION_SCHEMES_PANEL ".uno:CustomAnimationSchemes" +#define CMD_SID_DRAWTBX_ELLIPSES ".uno:EllipseToolbox" +#define CMD_SID_EXPAND_PAGE ".uno:ExpandPage" +#define CMD_SID_SETFILLCOLOR ".uno:SetFillColor" +#define CMD_SID_MOREFRONT ".uno:Forward" +#define CMD_SID_GETBLUE ".uno:GetBlue" +#define CMD_SID_GETFILLSTYLE ".uno:GetFillStyle" +#define CMD_SID_GETGREEN ".uno:GetGreen" +#define CMD_SID_GETLINESTYLE ".uno:GetLineStyle" +#define CMD_SID_GETLINEWIDTH ".uno:GetLineWidth" +#define CMD_SID_GETRED ".uno:GetRed" +#define CMD_SID_GLUE_EDITMODE ".uno:GlueEditMode" +#define CMD_SID_GLUE_ESCDIR ".uno:GlueEscapeDirection" +#define CMD_SID_GLUE_ESCDIR_BOTTOM ".uno:GlueEscapeDirectionBottom" +#define CMD_SID_GLUE_ESCDIR_LEFT ".uno:GlueEscapeDirectionLeft" +#define CMD_SID_GLUE_ESCDIR_RIGHT ".uno:GlueEscapeDirectionRight" +#define CMD_SID_GLUE_ESCDIR_TOP ".uno:GlueEscapeDirectionTop" +#define CMD_SID_GLUE_HORZALIGN_CENTER ".uno:GlueHorzAlignCenter" +#define CMD_SID_GLUE_HORZALIGN_LEFT ".uno:GlueHorzAlignLeft" +#define CMD_SID_GLUE_HORZALIGN_RIGHT ".uno:GlueHorzAlignRight" +#define CMD_SID_GLUE_INSERT_POINT ".uno:GlueInsertPoint" +#define CMD_SID_GLUE_PERCENT ".uno:GluePercent" +#define CMD_SID_GLUE_VERTALIGN_BOTTOM ".uno:GlueVertAlignBottom" +#define CMD_SID_GLUE_VERTALIGN_CENTER ".uno:GlueVertAlignCenter" +#define CMD_SID_GLUE_VERTALIGN_TOP ".uno:GlueVertAlignTop" +#define CMD_SID_GRADIENT ".uno:Gradient" +#define CMD_SID_SETGRADENDCOLOR ".uno:GradientEndColor" +#define CMD_SID_SETGRADSTARTCOLOR ".uno:GradientStartColor" +#define CMD_SID_GRAPHIC_EXPORT ".uno:GraphicExport" +#define CMD_SID_GRID_FRONT ".uno:GridFront" +#define CMD_SID_3D_HALF_SPHERE ".uno:HalfSphere" +#define CMD_SID_HANDLES_DRAFT ".uno:HandlesDraft" +#define CMD_SID_HANDOUT_MASTERPAGE ".uno:HandoutMasterPage" +#define CMD_SID_HANDOUTMODE ".uno:HandoutMode" +#define CMD_SID_HATCH ".uno:Hatch" +#define CMD_SID_SETHATCHCOLOR ".uno:HatchColor" +#define CMD_SID_HELPLINES_FRONT ".uno:HelplinesFront" +#define CMD_SID_HELPLINES_USE ".uno:HelplinesUse" +#define CMD_SID_HELPLINES_VISIBLE ".uno:HelplinesVisible" +#define CMD_SID_HIDE_SLIDE ".uno:HideSlide" +#define CMD_SID_SHOW_SLIDE ".uno:ShowSlide" +#define CMD_SID_HYPHENATION ".uno:Hyphenation" +#define CMD_SID_INSERTFILE ".uno:ImportFromFile" +#define CMD_SID_INSERT_FLD_AUTHOR ".uno:InsertAuthorField" +#define CMD_SID_INSERT_FLD_DATE_FIX ".uno:InsertDateFieldFix" +#define CMD_SID_INSERT_FLD_DATE_VAR ".uno:InsertDateFieldVar" +#define CMD_SID_INSERT_FLD_FILE ".uno:InsertFileField" +#define CMD_SID_INSERTLAYER ".uno:InsertLayer" +#define CMD_SID_INSERTPAGE ".uno:InsertPage" +#define CMD_SID_INSERT_FLD_PAGE ".uno:InsertPageField" +#define CMD_SID_INSERT_FLD_PAGES ".uno:InsertPagesField" +#define CMD_SID_INSERTPAGE_QUICK ".uno:InsertPageQuick" +#define CMD_SID_INSERT_FLD_TIME_FIX ".uno:InsertTimeFieldFix" +#define CMD_SID_INSERT_FLD_TIME_VAR ".uno:InsertTimeFieldVar" +#define CMD_SID_DRAWTBX_INSERT ".uno:InsertToolbox" +#define CMD_SID_OBJECT_GRADIENT ".uno:InteractiveGradient" +#define CMD_SID_OBJECT_TRANSPARENCE ".uno:InteractiveTransparence" +#define CMD_SID_LAYERMODE ".uno:LayerMode" +#define CMD_SID_STATUS_LAYOUT ".uno:LayoutStatus" +#define CMD_SID_LEAVE_ALL_GROUPS ".uno:LeaveAllGroups" +#define CMD_SID_LINE_ARROW_CIRCLE ".uno:LineArrowCircle" +#define CMD_SID_LINE_ARROW_END ".uno:LineArrowEnd" +#define CMD_SID_LINE_ARROWS ".uno:LineArrows" +#define CMD_SID_LINE_ARROW_SQUARE ".uno:LineArrowSquare" +#define CMD_SID_LINE_ARROW_START ".uno:LineArrowStart" +#define CMD_SID_LINE_CIRCLE_ARROW ".uno:LineCircleArrow" +#define CMD_SID_SETLINECOLOR ".uno:LineColor" +#define CMD_SID_LINEEND_POLYGON ".uno:LineEndPolygon" +#define CMD_SID_LINE_SQUARE_ARROW ".uno:LineSquareArrow" +#define CMD_SID_LINETO ".uno:LineTo" +#define CMD_SID_DRAWTBX_LINES ".uno:LineToolbox" +#define CMD_SID_MANAGE_LINKS ".uno:ManageLinks" +#define CMD_SID_MASTERPAGE ".uno:MasterPage" +#define CMD_SID_MEASURE_DLG ".uno:MeasureAttributes" +#define CMD_SID_DRAW_MEASURELINE ".uno:MeasureLine" +#define CMD_SID_HORIZONTAL ".uno:MirrorHorz" +#define CMD_SID_VERTICAL ".uno:MirrorVert" +#define CMD_SID_MODIFY_FIELD ".uno:ModifyField" +#define CMD_SID_MODIFYLAYER ".uno:ModifyLayer" +#define CMD_SID_MODIFYPAGE ".uno:ModifyPage" +#define CMD_SID_ASSIGN_LAYOUT ".uno:AssignLayout" +#define CMD_SID_PRESENTATIONOBJECT ".uno:ModifyPresentationObject" +#define CMD_SID_POLYGON_MORPHING ".uno:Morphing" +#define CMD_SID_MOVETO ".uno:MoveTo" +#define CMD_SID_NAME_GROUP ".uno:NameGroup" +#define CMD_SID_OBJECT_TITLE_DESCRIPTION ".uno:ObjectTitleDescription" +#define CMD_SID_NAVIGATOR_INIT ".uno:NavigatorInit" +#define CMD_SID_NAVIGATOR_OBJECT ".uno:NavigatorObject" +#define CMD_SID_NAVIGATOR_PAGE ".uno:NavigatorPage" +#define CMD_SID_NAVIGATOR_PAGENAME ".uno:NavigatorPageName" +#define CMD_SID_NAVIGATOR_PEN ".uno:NavigatorPen" +#define CMD_SID_NAVIGATOR_STATE ".uno:NavigatorState" +#define CMD_SID_CONNECTION_NEW_ROUTING ".uno:NewRouting" +#define CMD_SID_NOTES_MASTERPAGE ".uno:NotesMasterPage" +#define CMD_SID_NOTESMODE ".uno:NotesMode" +#define CMD_SID_POSITION ".uno:ObjectPosition" +#define CMD_SID_DRAWTBX_3D_OBJECTS ".uno:Objects3DToolbox" +#define CMD_SID_ORIGINAL_SIZE ".uno:OriginalSize" +#define CMD_SID_SAVEGRAPHIC ".uno:SaveGraphic" +#define CMD_SID_OUTLINEMODE ".uno:OutlineMode" +#define CMD_SID_OUTLINE_TEXT_AUTOFIT ".uno.OutlineTextAutofit" +#define CMD_SID_OUTPUT_QUALITY_BLACKWHITE ".uno:OutputQualityBlackWhite" +#define CMD_SID_OUTPUT_QUALITY_COLOR ".uno:OutputQualityColor" +#define CMD_SID_OUTPUT_QUALITY_CONTRAST ".uno:OutputQualityContrast" +#define CMD_SID_OUTPUT_QUALITY_GRAYSCALE ".uno:OutputQualityGrayscale" +#define CMD_SID_PACKNGO ".uno:PackAndGo" +#define CMD_SID_PAGEMARGIN ".uno:PageMargin" +#define CMD_SID_PAGEMODE ".uno:PageMode" +#define CMD_SID_PAGESETUP ".uno:PageSetup" +#define CMD_SID_PAGESIZE ".uno:PageSize" +#define CMD_SID_PAGES_PER_ROW ".uno:PagesPerRow" +#define CMD_SID_STATUS_PAGE ".uno:PageStatus" +#define CMD_SID_PARASPACE_DECREASE ".uno:ParaspaceDecrease" +#define CMD_SID_PARASPACE_INCREASE ".uno:ParaspaceIncrease" +#define CMD_SID_PICK_THROUGH ".uno:PickThrough" +#define CMD_SID_DRAW_POLYGON ".uno:Polygon" +#define CMD_SID_PRESENTATION ".uno:Presentation" +#define CMD_SID_PRESENTATION_DLG ".uno:PresentationDialog" +#define CMD_SID_PRESENTATION_END ".uno:PresentationEnd" +#define CMD_SID_CLEAR_UNDO_STACK ".uno:ClearUndoStack" +#define CMD_SID_PRESENTATION_LAYOUT ".uno:PresentationLayout" +#define CMD_SID_PREVIEW_STATE ".uno:PreviewState" +#define CMD_SID_PREVIEW_WIN ".uno:PreviewWindow" +#define CMD_SID_QUICKEDIT ".uno:QuickEdit" +#define CMD_SID_DRAWTBX_RECTANGLES ".uno:RectangleToolbox" +#define CMD_SID_REHEARSE_TIMINGS ".uno:RehearseTimings" +#define CMD_SID_RENAMELAYER ".uno:RenameLayer" +#define CMD_SID_RENAMEPAGE ".uno:RenamePage" +#define CMD_SID_RENAMEPAGE_QUICK ".uno:RenamePageQuick" +#define CMD_SID_REVERSE_ORDER ".uno:ReverseOrder" +#define CMD_SID_RULER_OBJECT ".uno:RulerObject" +#define CMD_SID_SELECTAT ".uno:SelectAt" +#define CMD_SID_SELECTGRADIENT ".uno:SelectGradient" +#define CMD_SID_SELECTHATCH ".uno:SelectHatch" +#define CMD_SID_SETFILLSTYLE ".uno:SetFillStyle" +#define CMD_SID_SETLINESTYLE ".uno:SetLineStyle" +#define CMD_SID_SETLINEWIDTH ".uno:SetLineWidth" +#define CMD_SID_SET_SNAPITEM ".uno:SetSnapItem" +#define CMD_SID_OBJECT_SHEAR ".uno:Shear" +#define CMD_SID_3D_SHELL ".uno:Shell3D" +#define CMD_SID_SLIDE_TRANSITIONS_PANEL ".uno:SlideChangeWindow" +#define CMD_SID_SLIDE_MASTERPAGE ".uno:SlideMasterPage" +#define CMD_SID_SNAP_BORDER ".uno:SnapBorder" +#define CMD_SID_SNAP_FRAME ".uno:SnapFrame" +#define CMD_SID_SNAP_POINTS ".uno:SnapPoints" +#define CMD_SID_SOLID_CREATE ".uno:SolidCreate" +#define CMD_SID_3D_SPHERE ".uno:Sphere" +#define CMD_SID_STARTAPP ".uno:StartApplication" +#define CMD_SID_SUMMARY_PAGE ".uno:SummaryPage" +#define CMD_SID_SWITCHLAYER ".uno:SwitchLayer" +#define CMD_SID_SWITCHPAGE ".uno:SwitchPage" +#define CMD_SID_SWITCH_POINTEDIT ".uno:SwitchPointEdit" +#define CMD_SID_TEXTALIGNMENT ".uno:TextAlignment" +#define CMD_SID_TEXTATTR_DLG ".uno:TextAttributes" +#define CMD_SID_TEXT_FITTOSIZE ".uno:TextFitToSizeTool" +#define CMD_SID_DRAWTBX_TEXT ".uno:TextToolbox" +#define CMD_SID_TITLE_MASTERPAGE ".uno:TitleMasterPage" +#define CMD_SID_3D_TORUS ".uno:Torus" +#define CMD_SID_TEXT_FITTOSIZE_VERTICAL ".uno:VerticalTextFitToSizeTool" +#define CMD_SID_ZOOM_PANNING ".uno:ZoomPanning" +#define CMD_SID_OBJECT_CROP ".uno:Crop" +#define CMD_SID_HEADER_AND_FOOTER ".uno:HeaderAndFooter" +#define CMD_SID_INSERT_PAGE_NUMBER ".uno:InsertPageNumber" +#define CMD_SID_INSERT_DATE_TIME ".uno:InsertDateAndTime" +#define CMD_SID_MASTER_LAYOUTS ".uno:MasterLayouts" +#define CMD_SID_DRAW_FONTWORK ".uno:DrawFontwork" +#define CMD_SID_DRAW_FONTWORK_VERTICAL ".uno:DrawFontworkVertical" +#define CMD_SID_LAYER_DIALOG_WIN ".uno:LayerDialogChildWindow" +#define CMD_SID_INSERT_MASTER_PAGE ".uno:InsertMasterPage" +#define CMD_SID_DELETE_MASTER_PAGE ".uno:DeleteMasterPage" +#define CMD_SID_RENAME_MASTER_PAGE ".uno:RenameMasterPage" +#define CMD_SID_CLOSE_MASTER_VIEW ".uno:CloseMasterView" +#define CMD_SID_SELECT_BACKGROUND ".uno:SelectBackground" +#define CMD_SID_DISPLAY_MASTER_BACKGROUND ".uno:DisplayMasterBackground" +#define CMD_SID_DISPLAY_MASTER_OBJECTS ".uno:DisplayMasterObjects" +#define CMD_SID_TABLE_TOOLBOX ".uno:TableToolBox" +#define CMD_SID_TABLE_DISTRIBUTE_COLUMNS ".uno:DistributeColumns" +#define CMD_SID_TABLE_DISTRIBUTE_ROWS ".uno:DistributeRows" +#define CMD_SID_TP_APPLY_TO_ALL_SLIDES ".uno:TaskPaneApplyToAllSlides" +#define CMD_SID_TP_APPLY_TO_SELECTED_SLIDES ".uno:TaskPaneApplyToSelectedSlides" +#define CMD_SID_TP_USE_FOR_NEW_PRESENTATIONS ".uno:TaskPaneUseForNewPresentations" +#define CMD_SID_TP_SHOW_SMALL_PREVIEW ".uno:TaskPaneShowSmallPreview" +#define CMD_SID_TP_SHOW_LARGE_PREVIEW ".uno:TaskPaneShowLargePreview" +#define CMD_SID_TP_EDIT_MASTER ".uno:TaskPaneEditMaster" +#define CMD_SID_INSERTPAGE_LAYOUT_MENU ".uno:TaskPaneInsertPage" +#define CMD_SID_SWITCH_SHELL ".uno:SwitchViewShell" +#define CMD_SID_SWITCH_SHELL_PANE ".uno:SwitchViewShellPane" +#define CMD_SID_LEFT_PANE_IMPRESS ".uno:LeftPaneImpress" +#define CMD_SID_LEFT_PANE_DRAW ".uno:LeftPaneDraw" +#define CMD_SID_RIGHT_PANE ".uno:RightPane" +#define CMD_SID_NOTES_WINDOW ".uno:NotesChildWindow" +#define CMD_SID_NORMAL_MULTI_PANE_GUI ".uno:NormalMultiPaneGUI" +#define CMD_SID_SLIDE_SORTER_MULTI_PANE_GUI ".uno:SlideSorterMultiPaneGUI" +#define CMD_SID_TASK_PANE ".uno:TaskPaneShowPanel" + +#endif diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx index 1eb815eef6e1..e98f419b73b6 100644..100755 --- a/sd/inc/sderror.hxx +++ b/sd/inc/sderror.hxx @@ -50,12 +50,12 @@ #ifndef __RSC -inline bool IsWarning( ULONG nErr ) +inline bool IsWarning( sal_uLong nErr ) { return 0 != ( nErr & ERRCODE_WARNING_MASK & nErr ); } -inline bool IsError( ULONG nErr ) +inline bool IsError( sal_uLong nErr ) { return nErr && 0 == ( ERRCODE_WARNING_MASK & nErr ); } diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx index 83d4eae50800..d9c0446cc98e 100644..100755 --- a/sd/inc/sdgrffilter.hxx +++ b/sd/inc/sdgrffilter.hxx @@ -51,7 +51,7 @@ public: sal_Bool Export(); static void SaveGraphic( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); - static void HandleGraphicFilterError( USHORT nFilterError, ULONG nStreamError = ERRCODE_NONE ); + static void HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError = ERRCODE_NONE ); }; #endif // _SD_SDGRFFILTER_HXX diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx index 28f8df649a10..e2c52c1655d6 100644..100755 --- a/sd/inc/sdhtmlfilter.hxx +++ b/sd/inc/sdhtmlfilter.hxx @@ -48,7 +48,7 @@ public: virtual sal_Bool Export(); private: - DECL_LINK( IOProgressHdl, USHORT* ); + DECL_LINK( IOProgressHdl, sal_uInt16* ); }; diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx index 36fd3eb8e39b..7c25924ff009 100644..100755 --- a/sd/inc/sdiocmpt.hxx +++ b/sd/inc/sdiocmpt.hxx @@ -38,17 +38,17 @@ class old_SdrDownCompat { protected: SvStream& rStream; - UINT32 nSubRecSiz; - UINT32 nSubRecPos; - UINT16 nMode; - BOOL bOpen; + sal_uInt32 nSubRecSiz; + sal_uInt32 nSubRecPos; + sal_uInt16 nMode; + sal_Bool bOpen; protected: void Read(); void Write(); public: - old_SdrDownCompat(SvStream& rNewStream, UINT16 nNewMode); + old_SdrDownCompat(SvStream& rNewStream, sal_uInt16 nNewMode); ~old_SdrDownCompat(); void OpenSubRecord(); void CloseSubRecord(); @@ -56,20 +56,20 @@ public: ////////////////////////////////////////////////////////////////////////////// #include "sddllapi.h" -#define SDIOCOMPAT_VERSIONDONTKNOW (UINT16)0xffff +#define SDIOCOMPAT_VERSIONDONTKNOW (sal_uInt16)0xffff class SD_DLLPUBLIC SdIOCompat : public old_SdrDownCompat { private: - UINT16 nVersion; + sal_uInt16 nVersion; public: // nNewMode: STREAM_READ oder STREAM_WRITE // nVer: nur beim Schreiben angeben - SdIOCompat(SvStream& rNewStream, USHORT nNewMode, - UINT16 nVer = SDIOCOMPAT_VERSIONDONTKNOW); + SdIOCompat(SvStream& rNewStream, sal_uInt16 nNewMode, + sal_uInt16 nVer = SDIOCOMPAT_VERSIONDONTKNOW); ~SdIOCompat(); - UINT16 GetVersion() const { return nVersion; } + sal_uInt16 GetVersion() const { return nVersion; } }; #endif // _SD_SDIOCMPT_HXX diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 29aad772d6c3..f133e9320317 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -115,13 +115,11 @@ public: void Execute(SfxRequest& rReq); void GetState(SfxItemSet&); - virtual void FillStatusBar(StatusBar& rBar); - SdOptions* GetSdOptions(DocumentType eDocType); SD_DLLPUBLIC SvStorageStreamRef GetOptionStream( const String& rOptionName, SdOptionStreamMode eMode ); - BOOL GetWaterCan() const { return bWaterCan; } - void SetWaterCan( BOOL bWC ) { bWaterCan = bWC; } + sal_Bool GetWaterCan() const { return bWaterCan; } + void SetWaterCan( sal_Bool bWC ) { bWaterCan = bWC; } SvxSearchItem* GetSearchItem() { return (pSearchItem); } void SetSearchItem(SvxSearchItem* pItem) { pSearchItem = pItem; } @@ -143,9 +141,9 @@ public: SD_DLLPUBLIC SvNumberFormatter* GetNumberFormatter(); //virtuelle Methoden fuer den Optionendialog - virtual SfxItemSet* CreateItemSet( USHORT nId ); - virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); - virtual SfxTabPage* CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ); + virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ); + virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ); + virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ); protected: @@ -154,8 +152,8 @@ protected: SvxSearchItem* pSearchItem; SvNumberFormatter* pNumberFormatter; SvStorageRef xOptionStorage; - BOOL bAutoSave; - BOOL bWaterCan; + sal_Bool bAutoSave; + sal_Bool bWaterCan; SfxErrorHandler* mpErrorHdl; /** This device is used for printer independent layout. It is virtual in the sense that it does not represent a printer. The pointer may diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index a8ae44b9b524..68431d0c82d4 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -126,12 +126,12 @@ protected: AutoLayout meAutoLayout; // AutoLayout sd::ShapeList maPresentationShapeList; // Praesentationsobjekte sd::ScopeLock maLockAutoLayoutArrangement; - BOOL mbSelected; // Selektionskennung + sal_Bool mbSelected; // Selektionskennung PresChange mePresChange; // manuell/automatisch/halbautomatisch - UINT32 mnTime; // Anzeigedauer in Sekunden - BOOL mbSoundOn; // mit/ohne Sound (TRUE/FALSE) - BOOL mbExcluded; // wird in der Show nicht/doch - // angezeigt (TRUE/FALSE) + sal_uInt32 mnTime; // Anzeigedauer in Sekunden + sal_Bool mbSoundOn; // mit/ohne Sound (sal_True/sal_False) + sal_Bool mbExcluded; // wird in der Show nicht/doch + // angezeigt (sal_True/sal_False) String maLayoutName; // Name des Layouts String maSoundFile; // Pfad zum Soundfile (MSDOS-Notation) bool mbLoopSound; @@ -139,10 +139,10 @@ protected: String maCreatedPageName; // von GetPageName erzeugter Seitenname String maFileName; // Filename String maBookmarkName; // Bookmarkname - BOOL mbScaleObjects; // Objekte sollen skaliert werden - BOOL mbBackgroundFullSize; // Hintergrundobjekt auf ganze Seite darstellen + sal_Bool mbScaleObjects; // Objekte sollen skaliert werden + sal_Bool mbBackgroundFullSize; // Hintergrundobjekt auf ganze Seite darstellen rtl_TextEncoding meCharSet; // Text-Encoding - USHORT mnPaperBin; // PaperBin + sal_uInt16 mnPaperBin; // PaperBin Orientation meOrientation; // Print-Orientation SdPageLink* mpPageLink; // PageLink (nur bei gelinkten Seiten) @@ -172,25 +172,25 @@ protected: public: TYPEINFO(); - SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, BOOL bMasterPage=FALSE); + SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, sal_Bool bMasterPage=sal_False); SdPage(const SdPage& rSrcPage); ~SdPage(); virtual SdrPage* Clone() const; virtual SdrPage* Clone(SdrModel* pNewModel) const; virtual void SetSize(const Size& aSize); - virtual void SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 Lwr); - virtual void SetLftBorder(INT32 nBorder); - virtual void SetRgtBorder(INT32 nBorder); - virtual void SetUppBorder(INT32 nBorder); - virtual void SetLwrBorder(INT32 nBorder); + virtual void SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 Lwr); + virtual void SetLftBorder(sal_Int32 nBorder); + virtual void SetRgtBorder(sal_Int32 nBorder); + virtual void SetUppBorder(sal_Int32 nBorder); + virtual void SetLwrBorder(sal_Int32 nBorder); virtual void SetModel(SdrModel* pNewModel); virtual bool IsReadOnly() const; sd::ShapeList& GetPresentationShapeList() { return maPresentationShapeList; } void EnsureMasterPageDefaultBackground(); - SdrObject* CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rectangle& rRect, BOOL bInsert=FALSE); + SdrObject* CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const Rectangle& rRect, sal_Bool bInsert=sal_False); SdrObject* CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert); SdrObject* GetPresObj(PresObjKind eObjKind, int nIndex = 1, bool bFuzzySearch = false ); PresObjKind GetPresObjKind(SdrObject* pObj) const; @@ -208,20 +208,20 @@ public: /** inserts the given SdrObject into the presentation object list */ void InsertPresObj(SdrObject* pObj, PresObjKind eKind ); - void SetAutoLayout(AutoLayout eLayout, BOOL bInit=FALSE, BOOL bCreate=FALSE); + void SetAutoLayout(AutoLayout eLayout, sal_Bool bInit=sal_False, sal_Bool bCreate=sal_False); AutoLayout GetAutoLayout() const { return meAutoLayout; } - void CreateTitleAndLayout(BOOL bInit=FALSE, BOOL bCreate=FALSE); + void CreateTitleAndLayout(sal_Bool bInit=sal_False, sal_Bool bCreate=sal_False); SdrObject* InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind, bool bVertical, Rectangle aRect, bool bInit ); - virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND, + virtual void NbcInsertObject(SdrObject* pObj, sal_uLong nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL); - virtual SdrObject* NbcRemoveObject(ULONG nObjNum); - virtual SdrObject* RemoveObject(ULONG nObjNum); + virtual SdrObject* NbcRemoveObject(sal_uLong nObjNum); + virtual SdrObject* RemoveObject(sal_uLong nObjNum); // Also overload ReplaceObject methods to realize when // objects are removed with this mechanism instead of RemoveObject - virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum); - virtual SdrObject* ReplaceObject(SdrObject* pNewObj, ULONG nObjNum); + virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum); + virtual SdrObject* ReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum); virtual void SetLinkData(const String& rLinkName, const String& rLinkData); @@ -230,8 +230,8 @@ public: void SetPageKind(PageKind ePgType) { mePageKind = ePgType; } PageKind GetPageKind() const { return mePageKind; } - void SetSelected(BOOL bSel) { mbSelected = bSel; } - BOOL IsSelected() const { return mbSelected; } + void SetSelected(sal_Bool bSel) { mbSelected = bSel; } + sal_Bool IsSelected() const { return mbSelected; } void SetFadeEffect(::com::sun::star::presentation::FadeEffect eNewEffect); ::com::sun::star::presentation::FadeEffect GetFadeEffect() const; @@ -239,17 +239,17 @@ public: void SetPresChange(PresChange eChange) { mePresChange = eChange; } PresChange GetPresChange() const { return mePresChange; } - void SetTime(UINT32 nNewTime) { mnTime = nNewTime; } - UINT32 GetTime() const { return mnTime; } + void SetTime(sal_uInt32 nNewTime) { mnTime = nNewTime; } + sal_uInt32 GetTime() const { return mnTime; } - void SetSound(BOOL bNewSoundOn) { mbSoundOn = bNewSoundOn; } - BOOL IsSoundOn() const { return mbSoundOn; } + void SetSound(sal_Bool bNewSoundOn) { mbSoundOn = bNewSoundOn; } + sal_Bool IsSoundOn() const { return mbSoundOn; } - void SetExcluded(BOOL bNewExcluded) { mbExcluded = bNewExcluded; } - BOOL IsExcluded() const { return mbExcluded; } + void SetExcluded(sal_Bool bNewExcluded) { mbExcluded = bNewExcluded; } + sal_Bool IsExcluded() const { return mbExcluded; } - void SetScaleObjects(BOOL bScale) { mbScaleObjects = bScale; } - BOOL IsScaleObjects() const { return mbScaleObjects; } + void SetScaleObjects(sal_Bool bScale) { mbScaleObjects = bScale; } + sal_Bool IsScaleObjects() const { return mbScaleObjects; } void SetSoundFile(const String& rStr) { maSoundFile = rStr; } String GetSoundFile() const { return maSoundFile; } @@ -292,24 +292,24 @@ public: void DisconnectLink(); void ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect, - BOOL bScaleAllObj); + sal_Bool bScaleAllObj); const String& GetName() const; String GetRealName() const { return FmFormPage::GetName(); }; void SetPresentationLayout(const String& rLayoutName, - BOOL bReplaceStyleSheets = TRUE, - BOOL bSetMasterPage = TRUE, - BOOL bReverseOrder = FALSE); + sal_Bool bReplaceStyleSheets = sal_True, + sal_Bool bSetMasterPage = sal_True, + sal_Bool bReverseOrder = sal_False); void EndListenOutlineText(); - void SetBackgroundFullSize( BOOL bIn ); - BOOL IsBackgroundFullSize() const { return mbBackgroundFullSize; } + void SetBackgroundFullSize( sal_Bool bIn ); + sal_Bool IsBackgroundFullSize() const { return mbBackgroundFullSize; } rtl_TextEncoding GetCharSet() { return(meCharSet); } - void SetPaperBin(USHORT nBin) { mnPaperBin = nBin; } - USHORT GetPaperBin() const { return mnPaperBin; } + void SetPaperBin(sal_uInt16 nBin) { mnPaperBin = nBin; } + sal_uInt16 GetPaperBin() const { return mnPaperBin; } virtual void SetOrientation(Orientation eOrient); virtual Orientation GetOrientation() const; diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx index 617957b6b9e2..b764fc289c71 100644..100755 --- a/sd/inc/sdresid.hxx +++ b/sd/inc/sdresid.hxx @@ -35,7 +35,7 @@ class SD_DLLPUBLIC SdResId : public ResId { public: - SdResId(USHORT nId); + SdResId(sal_uInt16 nId); }; #endif /* _SD_SDRESID_HXX */ diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx index 46f534c509b2..1b8c00acff77 100644..100755 --- a/sd/inc/sdxmlwrp.hxx +++ b/sd/inc/sdxmlwrp.hxx @@ -50,7 +50,7 @@ public: ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress, SdXMLFilterMode eFilterMode = SDXMLMODE_Normal, - ULONG nStoreVer = SOFFICE_FILEFORMAT_8 ); + sal_uLong nStoreVer = SOFFICE_FILEFORMAT_8 ); virtual ~SdXMLFilter (void); sal_Bool Import( ErrCode& nError ); @@ -58,7 +58,7 @@ public: private: SdXMLFilterMode meFilterMode; - ULONG mnStoreVer; + sal_uLong mnStoreVer; }; #endif // _SDXMLWRP_HXX diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx index f2b97694bb5e..680d95cd2710 100644 --- a/sd/inc/shapelist.hxx +++ b/sd/inc/shapelist.hxx @@ -48,8 +48,6 @@ namespace sd a pointer to the next shape in list or 0*/ SdrObject* removeShape( SdrObject& rObject ); - void replaceShape( SdrObject& rOldObject, SdrObject& rNewObject ); - /** removes all shapes from this list */ void clear(); diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index b92177893fd4..2a7f82ad5f2e 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -131,7 +131,7 @@ public: protected: void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily ); - virtual SfxStyleSheetBase* Create(const String& rName, SfxStyleFamily eFamily, USHORT nMask); + virtual SfxStyleSheetBase* Create(const String& rName, SfxStyleFamily eFamily, sal_uInt16 nMask); virtual SfxStyleSheetBase* Create(const SdStyleSheet& rStyle); using SfxStyleSheetPool::Create; diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index 633510d7633e..cae4bbdb1066 100644..100755 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -60,19 +60,19 @@ typedef cppu::ImplInheritanceHelper5< SfxUnoStyleSheet, class SdStyleSheet : public SdStyleSheetBase, private ::cppu::BaseMutex { public: - SdStyleSheet( const rtl::OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, USHORT nMask ); + SdStyleSheet( const rtl::OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, sal_uInt16 nMask ); SdStyleSheet( const SdStyleSheet& ); - virtual BOOL SetParent (const String& rParentName); + virtual sal_Bool SetParent (const String& rParentName); virtual SfxItemSet& GetItemSet(); - virtual BOOL IsUsed() const; - virtual BOOL HasFollowSupport() const; - virtual BOOL HasParentSupport() const; - virtual BOOL HasClearParentSupport() const; - virtual BOOL SetName( const UniString& ); - virtual void SetHelpId( const String& r, ULONG nId ); + virtual sal_Bool IsUsed() const; + virtual sal_Bool HasFollowSupport() const; + virtual sal_Bool HasParentSupport() const; + virtual sal_Bool HasClearParentSupport() const; + virtual sal_Bool SetName( const UniString& ); + virtual void SetHelpId( const String& r, sal_uLong nId ); - void AdjustToFontHeight(SfxItemSet& rSet, BOOL bOnlyMissingItems = TRUE); + void AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingItems = sal_True); SdStyleSheet* GetRealStyleSheet() const; SdStyleSheet* GetPseudoStyleSheet() const; @@ -131,7 +131,7 @@ public: protected: const SfxItemPropertySimpleEntry* getPropertyMapEntry( const ::rtl::OUString& rPropertyName ) const throw(); - virtual void Load (SvStream& rIn, USHORT nVersion); + virtual void Load (SvStream& rIn, sal_uInt16 nVersion); virtual void Store(SvStream& rOut); virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index 9702fff68ac5..68437afe6703 100644..100755 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -38,34 +38,24 @@ namespace sd class UndoManager : public SfxUndoManager { public: - UndoManager( USHORT nMaxUndoActionCount = 20 ); + UndoManager( sal_uInt16 nMaxUndoActionCount = 20 ); - virtual void EnterListAction(const UniString &rComment, const UniString& rRepeatComment, USHORT nId=0); - virtual void LeaveListAction(); + virtual void EnterListAction(const UniString &rComment, const UniString& rRepeatComment, sal_uInt16 nId=0); - virtual void AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE ); - - bool isInListAction() const { return mnListLevel != 0; } - bool isInUndo() const { return maIsInUndoLock.isLocked(); } - - virtual BOOL Undo( USHORT nCount=1 ); - virtual BOOL Redo( USHORT nCount=1 ); + virtual void AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False ); /** Set or reset the undo manager linked with the called undo manager. */ - void SetLinkedUndoManager (SfxUndoManager* pLinkedUndoManager); + void SetLinkedUndoManager (::svl::IUndoManager* pLinkedUndoManager); private: using SfxUndoManager::Undo; using SfxUndoManager::Redo; - int mnListLevel; - ScopeLock maIsInUndoLock; - /** Used when the outline view is visible as a last resort to synchronize the undo managers. */ - SfxUndoManager* mpLinkedUndoManager; + ::svl::IUndoManager* mpLinkedUndoManager; /** Call ClearRedo() at the linked undo manager, when present. |