From 13c1c67ec50995550076b7085d1a955b9df09cd0 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Fri, 14 Jan 2011 12:41:27 +0100 Subject: removetooltypes01: #i112600# remove tooltypes from cui --- cui/source/factory/dlgfact.cxx | 102 ++++++++++++++++++++--------------------- cui/source/factory/dlgfact.hxx | 100 ++++++++++++++++++++-------------------- 2 files changed, 101 insertions(+), 101 deletions(-) (limited to 'cui/source/factory') diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 1f441d728d63..ee2266fc4c7c 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -204,7 +204,7 @@ IMPL_LINK( VclAbstractDialog2_Impl, EndDialogHdl, Dialog*, pDlg ) ////////////////////////////////////////////////////////////////////////// -void AbstractTabDialog_Impl::SetCurPageId( USHORT nId ) +void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); } @@ -214,7 +214,7 @@ const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const return pDlg->GetOutputItemSet(); } -const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } @@ -394,7 +394,7 @@ Reference < com::sun::star::embed::XEmbeddedObject > AbstractInsertObjectDialog_ return pDlg->GetObject(); } -BOOL AbstractInsertObjectDialog_Impl::IsCreateNew() +sal_Bool AbstractInsertObjectDialog_Impl::IsCreateNew() { return pDlg->IsCreateNew(); } @@ -414,7 +414,7 @@ void AbstractPasteDialog_Impl::SetObjName( const SvGlobalName & rClass, const St pDlg->SetObjName( rClass, rObjName ); } -ULONG AbstractPasteDialog_Impl::GetFormat( const TransferableDataHelper& aHelper, +sal_uLong AbstractPasteDialog_Impl::GetFormat( const TransferableDataHelper& aHelper, const DataFlavorExVector* pFormats, const TransferableObjectDescriptor* pDesc ) { @@ -426,12 +426,12 @@ void AbstractFmShowColsDialog_Impl::SetColumns(const ::Reference< ::com::sun::s pDlg->SetColumns(xCols); } -void AbstractSvxZoomDialog_Impl::SetLimits( USHORT nMin, USHORT nMax ) +void AbstractSvxZoomDialog_Impl::SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) { pDlg->SetLimits( nMin, nMax ); } -void AbstractSvxZoomDialog_Impl::HideButton( USHORT nBtnId ) +void AbstractSvxZoomDialog_Impl::HideButton( sal_uInt16 nBtnId ) { pDlg->HideButton( nBtnId ); } @@ -515,7 +515,7 @@ String AbstractTitleDialog_Impl::GetTitle() const return pDlg->GetTitle(); } -ULONG AbstractGalleryIdDialog_Impl::GetId() const +sal_uLong AbstractGalleryIdDialog_Impl::GetId() const { return pDlg->GetId(); } @@ -555,7 +555,7 @@ String AbstractURLDlg_Impl::GetName() const return pDlg->GetName(); } -void AbstractSvxHlinkDlgMarkWnd_Impl::Hide( USHORT nFlags ) +void AbstractSvxHlinkDlgMarkWnd_Impl::Hide( sal_uInt16 nFlags ) { ((Window*)pDlg)->Hide( nFlags ); } @@ -570,22 +570,22 @@ Size AbstractSvxHlinkDlgMarkWnd_Impl::GetSizePixel() const return pDlg->GetSizePixel(); } -BOOL AbstractSvxHlinkDlgMarkWnd_Impl::IsVisible( ) const +sal_Bool AbstractSvxHlinkDlgMarkWnd_Impl::IsVisible( ) const { return (( Window* )pDlg)->IsVisible(); } -void AbstractSvxHlinkDlgMarkWnd_Impl::Invalidate( USHORT nFlags ) +void AbstractSvxHlinkDlgMarkWnd_Impl::Invalidate( sal_uInt16 nFlags ) { (( Window* )pDlg)->Invalidate(nFlags); } -BOOL AbstractSvxHlinkDlgMarkWnd_Impl::MoveTo( Point aNewPos )const +sal_Bool AbstractSvxHlinkDlgMarkWnd_Impl::MoveTo( Point aNewPos )const { return pDlg->MoveTo(aNewPos); } -BOOL AbstractSvxHlinkDlgMarkWnd_Impl::ConnectToDialog( BOOL bDoit )const +sal_Bool AbstractSvxHlinkDlgMarkWnd_Impl::ConnectToDialog( sal_Bool bDoit )const { return pDlg->ConnectToDialog(bDoit); } @@ -600,33 +600,33 @@ void AbstractSvxHlinkDlgMarkWnd_Impl::SelectEntry ( String aStrMark ) pDlg->SelectEntry(aStrMark); } -USHORT AbstractSvxHlinkDlgMarkWnd_Impl::SetError( USHORT nError) +sal_uInt16 AbstractSvxHlinkDlgMarkWnd_Impl::SetError( sal_uInt16 nError) { return pDlg->SetError(nError); } -USHORT AbstractSvxSearchSimilarityDialog_Impl::GetOther() +sal_uInt16 AbstractSvxSearchSimilarityDialog_Impl::GetOther() { return pDlg->GetOther(); } -USHORT AbstractSvxSearchSimilarityDialog_Impl::GetShorter() +sal_uInt16 AbstractSvxSearchSimilarityDialog_Impl::GetShorter() { return pDlg->GetShorter(); } -USHORT AbstractSvxSearchSimilarityDialog_Impl::GetLonger() +sal_uInt16 AbstractSvxSearchSimilarityDialog_Impl::GetLonger() { return pDlg-> GetLonger(); } -BOOL AbstractSvxSearchSimilarityDialog_Impl::IsRelaxed() +sal_Bool AbstractSvxSearchSimilarityDialog_Impl::IsRelaxed() { return pDlg-> IsRelaxed(); } // AbstractSvxTransformTabDialog implementations just forwards everything to the dialog -void AbstractSvxTransformTabDialog_Impl::SetCurPageId( USHORT nId ) +void AbstractSvxTransformTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); } @@ -635,7 +635,7 @@ const SfxItemSet* AbstractSvxTransformTabDialog_Impl::GetOutputItemSet() const return pDlg->GetOutputItemSet(); } // -const USHORT* AbstractSvxTransformTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* AbstractSvxTransformTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } @@ -659,7 +659,7 @@ void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link& rL } // AbstractSvxCaptionDialog implementations just forwards everything to the dialog -void AbstractSvxCaptionDialog_Impl::SetCurPageId( USHORT nId ) +void AbstractSvxCaptionDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); } @@ -668,7 +668,7 @@ const SfxItemSet* AbstractSvxCaptionDialog_Impl::GetOutputItemSet() const return pDlg->GetOutputItemSet(); } // -const USHORT* AbstractSvxCaptionDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* AbstractSvxCaptionDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } @@ -691,7 +691,7 @@ void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link& rLink ) pDlg->SetValidateFramePosLink( rLink ); } -INT32 AbstractSvxJSearchOptionsDialog_Impl::GetTransliterationFlags() const +sal_Int32 AbstractSvxJSearchOptionsDialog_Impl::GetTransliterationFlags() const { return pDlg->GetTransliterationFlags(); } @@ -783,7 +783,7 @@ void AbstractSvxObjectTitleDescDialog_Impl::GetDescription(String& rDescription) pDlg->GetDescription(rDescription); } -void AbstractSvxMessDialog_Impl::SetButtonText( USHORT nBtnId, const String& rNewTxt ) +void AbstractSvxMessDialog_Impl::SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt ) { pDlg->SetButtonText( nBtnId, rNewTxt ); } @@ -878,7 +878,7 @@ Graphic AbstractGraphicFilterDialog_Impl::GetFilteredGraphic( const Graphic& rGr } // AbstractSvxAreaTabDialog implementations just forwards everything to the dialog -void AbstractSvxAreaTabDialog_Impl::SetCurPageId( USHORT nId ) +void AbstractSvxAreaTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); } @@ -888,7 +888,7 @@ const SfxItemSet* AbstractSvxAreaTabDialog_Impl::GetOutputItemSet() const return pDlg->GetOutputItemSet(); } -const USHORT* AbstractSvxAreaTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* AbstractSvxAreaTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } @@ -920,7 +920,7 @@ const SfxItemSet* AbstractSvxPostItDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -void AbstractSvxPostItDialog_Impl::EnableTravel(BOOL bNext, BOOL bPrev) +void AbstractSvxPostItDialog_Impl::EnableTravel(sal_Bool bNext, sal_Bool bPrev) { pDlg->EnableTravel( bNext, bPrev ); } @@ -944,11 +944,11 @@ void AbstractSvxPostItDialog_Impl::HideAuthor() { pDlg->HideAuthor(); } -void AbstractSvxPostItDialog_Impl::SetReadonlyPostIt(BOOL bDisable) +void AbstractSvxPostItDialog_Impl::SetReadonlyPostIt(sal_Bool bDisable) { pDlg->SetReadonlyPostIt( bDisable ); } -BOOL AbstractSvxPostItDialog_Impl::IsOkEnabled() const +sal_Bool AbstractSvxPostItDialog_Impl::IsOkEnabled() const { return pDlg->IsOkEnabled(); } @@ -1131,7 +1131,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* p //TabDialog that use functionality of the drawing layer and add AnchorTypes -- for SvxCaptionTabDialog CHINA001 AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( Window* pParent, const SdrView* pView, - USHORT nAnchorTypes ) + sal_uInt16 nAnchorTypes ) { SvxCaptionTabDialog* pDlg = new SvxCaptionTabDialog( pParent, pView, nAnchorTypes ); return new AbstractSvxCaptionDialog_Impl( pDlg ); @@ -1219,7 +1219,7 @@ AbstractDialogFactory_Impl::CreateScriptErrorDialog( AbstractScriptSelectorDialog* AbstractDialogFactory_Impl::CreateScriptSelectorDialog( - Window* pParent, BOOL bShowSlots, const Reference< frame::XFrame >& _rxFrame ) + Window* pParent, sal_Bool bShowSlots, const Reference< frame::XFrame >& _rxFrame ) { SvxScriptSelectorDialog* pDlg = NULL; @@ -1315,7 +1315,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32 nResI switch ( nResId ) { case RID_SVXDLG_CHARMAP : - pDlg = new SvxCharacterMap( pParent, TRUE, pAttrSet ); + pDlg = new SvxCharacterMap( pParent, sal_True, pAttrSet ); break; default: break; @@ -1347,17 +1347,17 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* p VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( Window* pParent, SearchAttrItemList& rLst, - const USHORT* pWhRanges ) + const sal_uInt16* pWhRanges ) { Dialog* pDlg = new SvxSearchAttributeDialog( pParent, rLst, pWhRanges); return new VclAbstractDialog_Impl( pDlg ); } AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( Window* pParent, - BOOL bRelax, - USHORT nOther, - USHORT nShorter, - USHORT nLonger) + sal_Bool bRelax, + sal_uInt16 nOther, + sal_uInt16 nShorter, + sal_uInt16 nLonger) { SvxSearchSimilarityDialog* pDlg = new SvxSearchSimilarityDialog( pParent, bRelax, nOther, nShorter, nLonger ); if ( pDlg ) @@ -1367,7 +1367,7 @@ AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchS SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( Window* pParent, const SfxItemSet& rCoreSet, - BOOL bEnableSelector) + sal_Bool bEnableSelector) { SfxTabDialog* pDlg = new SvxBorderBackgroundDlg( pParent, rCoreSet, bEnableSelector); return new AbstractTabDialog_Impl( pDlg ); @@ -1376,7 +1376,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr, const SdrView* pView, - USHORT nAnchorTypes ) + sal_uInt16 nAnchorTypes ) { SvxTransformTabDialog* pDlg = new SvxTransformTabDialog( pParent, pAttr,pView, nAnchorTypes); return new AbstractSvxTransformTabDialog_Impl( pDlg ); @@ -1416,7 +1416,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( W AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOptionsDialog( Window* pParent, const SfxItemSet& rOptionsSet, - INT32 nInitialFlags) + sal_Int32 nInitialFlags) { SvxJSearchOptionsDialog* pDlg = new SvxJSearchOptionsDialog( pParent, rOptionsSet, nInitialFlags ); return new AbstractSvxJSearchOptionsDialog_Impl( pDlg ); @@ -1502,13 +1502,13 @@ AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window* return 0; } -AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed ) +AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed ) { SvxMultiPathDialog* pDlg = new SvxMultiPathDialog( pParent, bEmptyAllowed ); return new AbstractSvxMultiPathDialog_Impl( pDlg ); } -AbstractSvxMultiFileDialog * AbstractDialogFactory_Impl::CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed ) +AbstractSvxMultiFileDialog * AbstractDialogFactory_Impl::CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed ) { SvxMultiFileDialog* pDlg = new SvxMultiFileDialog( pParent, bEmptyAllowed ); return new AbstractSvxMultiFileDialog_Impl( pDlg ); @@ -1556,7 +1556,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmb AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPosterSepia (Window* pParent, const Graphic& rGraphic, - USHORT nCount, + sal_uInt16 nCount, sal_uInt32 nResId) { GraphicFilterDialog* pDlg=NULL; @@ -1580,7 +1580,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPos AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize const Graphic& rGraphic, - BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 ) + sal_uInt8 nGreyThreshold, sal_Bool bInvert, sal_uInt32 ) { GraphicFilterDialog* pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert ); return new AbstractGraphicFilterDialog_Impl( pDlg ); @@ -1588,7 +1588,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSol AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic const Graphic& rGraphic, - USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, + sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges, sal_uInt32 nResId) { GraphicFilterDialog* pDlg=NULL; @@ -1618,7 +1618,7 @@ AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( Wi SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog SdrModel* pModel, const SdrObject* pObj , - BOOL bHasObj) + sal_Bool bHasObj) { SfxTabDialog* pDlg = new SvxLineTabDialog( pParent, pAttr, pModel,pObj,bHasObj ); return new AbstractTabDialog_Impl( pDlg ); @@ -1640,7 +1640,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, pDlg = new SvxShortcutAssignDlg( pParent, _rxDocumentFrame, rAttr ); break; case RID_SVXDLG_CHARMAP : - pDlg = new SvxCharacterMap( pParent, TRUE, &rAttr ); + pDlg = new SvxCharacterMap( pParent, sal_True, &rAttr ); break; default: break; @@ -1688,7 +1688,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( Window* pParent, const SfxItemSet& rCoreSet, - BOOL bPrevNext, BOOL bRedline ) + sal_Bool bPrevNext, sal_Bool bRedline ) { SvxPostItDialog* pDlg = new SvxPostItDialog( pParent, rCoreSet, bPrevNext, bRedline ); return new AbstractSvxPostItDialog_Impl( pDlg ); @@ -1730,7 +1730,7 @@ VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxMacroAssignDlg( } // Factories for TabPages -CreateTabPage AbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId ) +CreateTabPage AbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId ) { switch ( nId ) { @@ -1816,7 +1816,7 @@ CreateSvxDistributePage AbstractDialogFactory_Impl::GetSvxDistributePageCreatorF return SvxDistributePage::Create; } -DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc( USHORT nId ) +DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc( sal_uInt16 nId ) { switch ( nId ) { @@ -1828,7 +1828,7 @@ DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc( USHORT nId ) return 0; } -GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( USHORT nId ) +GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nId ) { switch ( nId ) { @@ -1928,7 +1928,7 @@ SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( Window* p return new AbstractPasteDialog_Impl( new SvPasteObjectDialog( pParent ) ); } -SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p) +SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML, sfx2::SvBaseLink* p) { SvBaseLinksDlg* pLinkDlg = new SvBaseLinksDlg( pParent, pMgr, bHTML ); if ( p ) diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index b68e10c25cdd..e38b9af1113e 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -79,7 +79,7 @@ public: \ {} \ virtual ~Class(); \ virtual short Execute() ; -// virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ) +// virtual void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 ) #define IMPL_ABSTDLG_BASE(Class) \ Class::~Class() \ @@ -133,9 +133,9 @@ class AbstractSfxDialog_Impl : public SfxAbstractDialog class AbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE(AbstractTabDialog_Impl,SfxTabDialog) - virtual void SetCurPageId( USHORT nId ); + virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001 + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001 virtual void SetInputSet( const SfxItemSet* pInSet ); //add by CHINA001 //From class Window. virtual void SetText( const XubString& rStr ); //add by CHINA001 @@ -215,8 +215,8 @@ class SvxZoomDialog; class AbstractSvxZoomDialog_Impl : public AbstractSvxZoomDialog { DECL_ABSTDLG_BASE(AbstractSvxZoomDialog_Impl,SvxZoomDialog) - virtual void SetLimits( USHORT nMin, USHORT nMax ); - virtual void HideButton( USHORT nBtnId ); + virtual void SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ); + virtual void HideButton( sal_uInt16 nBtnId ); virtual const SfxItemSet* GetOutputItemSet() const ; }; @@ -289,7 +289,7 @@ class GalleryIdDialog; class AbstractGalleryIdDialog_Impl : public AbstractGalleryIdDialog { DECL_ABSTDLG_BASE(AbstractGalleryIdDialog_Impl,GalleryIdDialog) - virtual ULONG GetId() const ; + virtual sal_uLong GetId() const ; }; //for GalleryIdDialog end @@ -312,16 +312,16 @@ class SvxHlinkDlgMarkWnd; class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd { DECL_ABSTDLG_BASE(AbstractSvxHlinkDlgMarkWnd_Impl,SvxHlinkDlgMarkWnd) - virtual void Hide( USHORT nFlags = 0 ); - virtual BOOL IsVisible() const ; - virtual void Invalidate( USHORT nFlags = 0 ); + virtual void Hide( sal_uInt16 nFlags = 0 ); + virtual sal_Bool IsVisible() const ; + virtual void Invalidate( sal_uInt16 nFlags = 0 ); virtual void SetSizePixel( const Size& rNewSize ); virtual Size GetSizePixel() const; - virtual BOOL MoveTo ( Point aNewPos )const; - virtual BOOL ConnectToDialog( BOOL bDoit = TRUE )const; + virtual sal_Bool MoveTo ( Point aNewPos )const; + virtual sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True )const; virtual void RefreshTree ( String aStrURL ) ; virtual void SelectEntry ( String aStrMark ); - virtual USHORT SetError( USHORT nError) ; + virtual sal_uInt16 SetError( sal_uInt16 nError) ; }; //for SvxHlinkDlgMarkWnd end @@ -331,10 +331,10 @@ class SvxSearchSimilarityDialog; class AbstractSvxSearchSimilarityDialog_Impl :public AbstractSvxSearchSimilarityDialog { DECL_ABSTDLG_BASE(AbstractSvxSearchSimilarityDialog_Impl,SvxSearchSimilarityDialog) - virtual USHORT GetOther(); - virtual USHORT GetShorter(); - virtual USHORT GetLonger(); - virtual BOOL IsRelaxed(); + virtual sal_uInt16 GetOther(); + virtual sal_uInt16 GetShorter(); + virtual sal_uInt16 GetLonger(); + virtual sal_Bool IsRelaxed(); }; //for SvxSearchSimilarityDialog end @@ -343,7 +343,7 @@ class SvxJSearchOptionsDialog; class AbstractSvxJSearchOptionsDialog_Impl :public AbstractSvxJSearchOptionsDialog { DECL_ABSTDLG_BASE(AbstractSvxJSearchOptionsDialog_Impl,SvxJSearchOptionsDialog) - virtual INT32 GetTransliterationFlags() const; + virtual sal_Int32 GetTransliterationFlags() const; }; //for SvxJSearchOptionsDialog end @@ -351,9 +351,9 @@ class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog { DECL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl,SvxTransformTabDialog) virtual void SetValidateFramePosLink( const Link& rLink ); - virtual void SetCurPageId( USHORT nId ); + virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); virtual void SetInputSet( const SfxItemSet* pInSet ); virtual void SetText( const XubString& rStr ); virtual String GetText() const; @@ -362,9 +362,9 @@ class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog { DECL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl,SvxCaptionTabDialog) virtual void SetValidateFramePosLink( const Link& rLink ); - virtual void SetCurPageId( USHORT nId ); + virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); virtual void SetInputSet( const SfxItemSet* pInSet ); virtual void SetText( const XubString& rStr ); virtual String GetText() const; @@ -438,7 +438,7 @@ class SvxMessDialog; class AbstractSvxMessDialog_Impl :public AbstractSvxMessDialog { DECL_ABSTDLG_BASE(AbstractSvxMessDialog_Impl,SvxMessDialog) - virtual void SetButtonText( USHORT nBtnId, const String& rNewTxt ); + virtual void SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt ); }; //for SvxMessDialog end @@ -508,9 +508,9 @@ class SvxAreaTabDialog; class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog { DECL_ABSTDLG_BASE(AbstractSvxAreaTabDialog_Impl,SvxAreaTabDialog) - virtual void SetCurPageId( USHORT nId ); + virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. virtual void SetText( const XubString& rStr ); @@ -524,7 +524,7 @@ class AbstractInsertObjectDialog_Impl : public SfxAbstractInsertObjectDialog DECL_ABSTDLG_BASE(AbstractInsertObjectDialog_Impl, InsertObjectDialog_Impl) virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType ); - virtual BOOL IsCreateNew(); + virtual sal_Bool IsCreateNew(); }; class AbstractPasteDialog_Impl : public SfxAbstractPasteDialog @@ -533,7 +533,7 @@ public: DECL_ABSTDLG_BASE(AbstractPasteDialog_Impl, SvPasteObjectDialog ) virtual void Insert( SotFormatStringId nFormat, const String & rFormatName ); virtual void SetObjName( const SvGlobalName & rClass, const String & rObjName ); - virtual ULONG GetFormat( const TransferableDataHelper& aHelper, + virtual sal_uLong GetFormat( const TransferableDataHelper& aHelper, const DataFlavorExVector* pFormats=0, const TransferableObjectDescriptor* pDesc=0 ); }; @@ -554,14 +554,14 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog virtual const SfxItemSet* GetOutputItemSet() const; virtual void SetPrevHdl( const Link& rLink ) ; virtual void SetNextHdl( const Link& rLink ) ; - virtual void EnableTravel(BOOL bNext, BOOL bPrev) ; + virtual void EnableTravel(sal_Bool bNext, sal_Bool bPrev) ; virtual String GetNote() ; virtual void SetNote(const String& rTxt) ; virtual void ShowLastAuthor(const String& rAuthor, const String& rDate) ; virtual void DontChangeAuthor() ; virtual void HideAuthor() ; - virtual void SetReadonlyPostIt(BOOL bDisable) ; - virtual BOOL IsOkEnabled() const ; + virtual void SetReadonlyPostIt(sal_Bool bDisable) ; + virtual sal_Bool IsOkEnabled() const ; virtual Window * GetWindow(); private: Link aNextHdl; @@ -626,7 +626,7 @@ public: sal_uInt32 nResId); //add by CHINA001 virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, const SdrView* pView, - USHORT nAnchorTypes = 0 ); //add for SvxCaptionTabDialog CHINA001 + sal_uInt16 nAnchorTypes = 0 ); //add for SvxCaptionTabDialog CHINA001 virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, @@ -637,7 +637,7 @@ public: virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent ); - virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p=0 ); + virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML, sfx2::SvBaseLink* p=0 ); virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, //add for HangulHanjaConversionDialog CHINA001 editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); @@ -654,11 +654,11 @@ public: const SfxItemSet& rCoreSet); virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg const SfxItemSet& rCoreSet, - BOOL bEnableSelector = FALSE) ; + sal_Bool bEnableSelector = sal_False) ; virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog const SfxItemSet* pAttr, const SdrView* pView, - USHORT nAnchorTypes = 0) ; + sal_uInt16 nAnchorTypes = 0) ; virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, //add for SchTransformTabDialog const SfxItemSet* pAttr, const SdrView* pSdrView, @@ -694,15 +694,15 @@ public: virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, SearchAttrItemList& rLst, - const USHORT* pWhRanges); + const sal_uInt16* pWhRanges); virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent, - BOOL bRelax, - USHORT nOther, - USHORT nShorter, - USHORT nLonger); //add for SvxSearchSimilarityDialog + sal_Bool bRelax, + sal_uInt16 nOther, + sal_uInt16 nShorter, + sal_uInt16 nLonger); //add for SvxSearchSimilarityDialog virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent, const SfxItemSet& rOptionsSet, - INT32 nInitialFlags); + sal_Int32 nInitialFlags); virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ); virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl, @@ -720,8 +720,8 @@ public: virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId, const String& rText, const String& rDesc, Image* pImg = NULL ); //add for SvxMessDialog - virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiPathDialog - virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiFileDialog + virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ); //add for SvxMultiPathDialog + virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ); //add for SvxMultiFileDialog virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, //add for SvxHpLink SfxBindings* pBindings, sal_uInt32 nResId); @@ -735,14 +735,14 @@ public: RECT_POINT eLightSource, sal_uInt32 nResId); virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia const Graphic& rGraphic, - USHORT nCount, + sal_uInt16 nCount, sal_uInt32 nResId); virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize const Graphic& rGraphic, - BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId); + sal_uInt8 nGreyThreshold, sal_Bool bInvert, sal_uInt32 nResId); virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic const Graphic& rGraphic, - USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId); + sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges, sal_uInt32 nResId); virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog const SfxItemSet* pAttr, SdrModel* pModel, @@ -750,23 +750,23 @@ public: virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add for SvxLineTabDialog SdrModel* pModel, const SdrObject* pObj = NULL, - BOOL bHasObj = TRUE ); + sal_Bool bHasObj = sal_True ); virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog const SfxItemSet& rCoreSet, - BOOL bPrevNext = FALSE, BOOL bRedline = FALSE ); + sal_Bool bPrevNext = sal_False, sal_Bool bRedline = sal_False ); // For TabPage - virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ); + virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ); virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc(); - virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ); - virtual DialogGetRanges GetDialogGetRangesFunc( USHORT nId ); //add for SvxPostItDialog + virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ); + virtual DialogGetRanges GetDialogGetRangesFunc( sal_uInt16 nId ); //add for SvxPostItDialog virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage ); virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( Window* pParent, - BOOL bShowSlots, + sal_Bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); -- cgit v1.2.3