diff options
author | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
---|---|---|
committer | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
commit | ecf66d8aa3b1792e53d8b691a7b679fd47133ac9 (patch) | |
tree | 3e08d97c782594c74bc2e88c552150f71e016e5e /cui/source/factory | |
parent | 16ae4c1524769458f6d205430e7dcb8fc4ae333b (diff) | |
parent | 8373a5b7946d6731609f989f1aa4a762ed70854a (diff) |
removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework
Diffstat (limited to 'cui/source/factory')
-rw-r--r-- | cui/source/factory/dlgfact.cxx | 75 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.hxx | 45 |
2 files changed, 68 insertions, 52 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 8929e9ebdef5..1f441d728d63 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -100,6 +100,7 @@ #include "macroass.hxx" #include "acccfg.hxx" #include "insrc.hxx" +#include "passwdomdlg.hxx" #include "hyphen.hxx" #include "thesdlg.hxx" @@ -162,6 +163,7 @@ IMPL_ABSTDLG_BASE(AbstractInsertObjectDialog_Impl); IMPL_ABSTDLG_BASE(AbstractLinksDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSpellDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxPostItDialog_Impl); +IMPL_ABSTDLG_BASE(AbstractPasswordToOpenModifyDialog_Impl); ////////////////////////////////////////////////////////////////////////// // VclAbstractDialog2_Impl @@ -723,13 +725,13 @@ void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link& rLink, bool bCheck else pDlg->SetCheckNameHdl( Link(), bCheckImmediately ); } -void AbstractSvxNameDialog_Impl::SetEditHelpId(ULONG nHelpId) +void AbstractSvxNameDialog_Impl::SetEditHelpId(const rtl::OString& aHelpId) { - pDlg->SetEditHelpId( nHelpId ); + pDlg->SetEditHelpId( aHelpId ); } -void AbstractSvxNameDialog_Impl::SetHelpId( ULONG nHelpId ) +void AbstractSvxNameDialog_Impl::SetHelpId( const rtl::OString& aHelpId ) { - pDlg->SetHelpId( nHelpId ); + pDlg->SetHelpId( aHelpId ); } void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr ) { @@ -841,9 +843,9 @@ void AbstractSvxMultiFileDialog_Impl::SetTitle( const String& rNewTitle ) pDlg->SetText( rNewTitle ); } -void AbstractSvxMultiFileDialog_Impl::SetHelpId( ULONG nHelpId ) +void AbstractSvxMultiFileDialog_Impl::SetHelpId( const rtl::OString& aHelpId ) { - pDlg->SetHelpId( nHelpId ); + pDlg->SetHelpId( aHelpId ); } Window * AbstractSvxHpLinkDlg_Impl::GetWindow() @@ -983,6 +985,19 @@ Window * AbstractSvxPostItDialog_Impl::GetWindow() return (Window *)pDlg; } +String AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToOpen() const +{ + return pDlg->GetPasswordToOpen(); +} +String AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToModify() const +{ + return pDlg->GetPasswordToModify(); +} +bool AbstractPasswordToOpenModifyDialog_Impl::IsRecommendToOpenReadonly() const +{ + return pDlg->IsRecommendToOpenReadonly(); +} + // Create dialogs with simplest interface VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent, sal_uInt32 nResId ) { @@ -1873,47 +1888,41 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( USHORT nId ) return 0; } -SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, USHORT nSlotId, +SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand, const Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList ) { InsertObjectDialog_Impl* pDlg=0; - switch ( nSlotId ) - { - case SID_INSERT_OBJECT : pDlg = new SvInsertOleDlg( pParent, xStor, pList ); break; - case SID_INSERT_PLUGIN : pDlg = new SvInsertPlugInDialog( pParent, xStor ); break; - case SID_INSERT_APPLET : pDlg = new SvInsertAppletDialog( pParent, xStor ); break; - case SID_INSERT_FLOATINGFRAME : pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor ); break; - default: break; - } + if ( rCommand.equalsAscii(".uno:InsertObject" ) ) + pDlg = new SvInsertOleDlg( pParent, xStor, pList ); + else if ( rCommand.equalsAscii(".uno:InsertPlugin" ) ) + pDlg = new SvInsertPlugInDialog( pParent, xStor ); + else if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) ) + pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor ); if ( pDlg ) { - pDlg->SetHelpId( nSlotId ); + pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) ); return new AbstractInsertObjectDialog_Impl( pDlg ); } return 0; } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, USHORT nSlotId, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand, const Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) { InsertObjectDialog_Impl* pDlg=0; - switch ( nSlotId ) - { - case SID_INSERT_APPLET : pDlg = new SvInsertAppletDialog( pParent, xObj ); break; - case SID_INSERT_FLOATINGFRAME : pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); break; - default: break; - } - - if ( pDlg ) + if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) ) { - pDlg->SetHelpId( nSlotId ); + pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); + pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) ); return new VclAbstractDialog_Impl( pDlg ); } return 0; } + + SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( Window* pParent ) { return new AbstractPasteDialog_Impl( new SvPasteObjectDialog( pParent ) ); @@ -1948,7 +1957,17 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog( return new VclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) ); } -SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ) +SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) { - return new SvxInsRowColDlg( pParent, bCol, nHelpId ); + return new SvxInsRowColDlg( pParent, bCol, sHelpId ); } + +AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog( + Window * pParent, + sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) +{ + PasswordToOpenModifyDialog * pDlg = new PasswordToOpenModifyDialog( pParent, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ); + return new AbstractPasswordToOpenModifyDialog_Impl( pDlg ); +} + + diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 844439efbf61..b68e10c25cdd 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -235,24 +235,6 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog virtual SfxBindings& GetBindings(); }; -//for SvxSpellCheckDialog begin -//STRIP001 class AbstractSvxSpellCheckDialog_Impl : public AbstractSvxSpellCheckDialog //add for FmShowColsDialog -//STRIP001 { -//STRIP001 SvxSpellCheckDialog * pDlg; -//STRIP001 public -//STRIP001 AbstractSvxSpellCheckDialog_Impl ( SvxSpellCheckDialog* p) -//STRIP001 : pDlg(p) -//STRIP001 {} -//STRIP001 virtual USHORT Execute() ; -//STRIP001 virtual void SetNewEditWord( const String& _rNew ) ; -//STRIP001 virtual void SetLanguage( sal_uInt16 nLang ) ; -//STRIP001 virtual void HideAutoCorrect() ; -//STRIP001 virtual String GetNewEditWord(); -//STRIP001 virtual void SetNewEditWord( const String& _rNew ); -//STRIP001 } -//for SvxSpellCheckDialog end - - //for SearchProgress begin class SearchProgress; class AbstractSearchProgress_Impl : public AbstractSearchProgress @@ -414,9 +396,9 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog) virtual void GetName( String& rName ) ; virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) ; - virtual void SetEditHelpId(ULONG nHelpId) ; + virtual void SetEditHelpId(const rtl::OString&) ; //from class Window - virtual void SetHelpId( ULONG nHelpId ) ; + virtual void SetHelpId( const rtl::OString& ) ; virtual void SetText( const XubString& rStr ) ; private: Link aCheckNameHdl; @@ -486,7 +468,7 @@ class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog virtual void EnableRadioButtonMode(); virtual void SetTitle( const String& rNewTitle ); //From Class Window - virtual void SetHelpId( ULONG nHelpId ) ; + virtual void SetHelpId( const rtl::OString& ) ; }; //for SvxMultiFileDialog end @@ -589,6 +571,19 @@ private: }; //add for SvxPostItDialog end +//for PasswordToOpenModifyDialog begin +class PasswordToOpenModifyDialog; +class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenModifyDialog +{ + DECL_ABSTDLG_BASE( AbstractPasswordToOpenModifyDialog_Impl, PasswordToOpenModifyDialog ) + + virtual String GetPasswordToOpen() const; + virtual String GetPasswordToModify() const; + virtual bool IsRecommendToOpenReadonly() const; +}; +//for PasswordToOpenModifyDialog end + + //------------------------------------------------------------------------ //AbstractDialogFactory_Impl implementations class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory @@ -636,10 +631,10 @@ public: const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId, + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 ); - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, USHORT nSlotId, + 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 ); @@ -795,7 +790,9 @@ public: virtual VclAbstractDialog* CreateOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& rApplicationContext ); - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ); + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ); + + virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); }; #endif |