diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-02-26 12:26:25 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-26 12:44:48 +0000 |
commit | 07c584ad8ce44cc6fe098a177c8b07e6cfc7881e (patch) | |
tree | 62a0dc8ecaff0ac58c672d1f6ff52bddcf82b6fe /cui | |
parent | 217a0f0c2a920f5aef66a383e470258f5547f792 (diff) |
postit dialog is always used for redline comments now
Change-Id: Id3ec1c12c354aabf2556e91e4fa75d60bb2c0f3c
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/postdlg.cxx | 10 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.cxx | 4 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/helpid.hrc | 4 | ||||
-rw-r--r-- | cui/source/inc/postdlg.hxx | 4 |
5 files changed, 5 insertions, 19 deletions
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 7fbf2e7d079a..cec8c014ebbc 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -41,7 +41,7 @@ // class SvxPostItDialog ------------------------------------------------- SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, - bool bPrevNext, bool bRedline) + bool bPrevNext) : SfxModalDialog(pParent, "CommentDialog", "cui/ui/comment.ui") , rSet(rCoreSet) , pOutSet(0) @@ -54,14 +54,6 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, get(m_pNextBtn, "next"); get(m_pEditED, "edit"); - if (bRedline) // HelpIDs for redlining - { - SetHelpId(HID_REDLINING_DLG); - m_pEditED->SetHelpId(HID_REDLINING_EDIT); - m_pPrevBtn->SetHelpId(HID_REDLINING_PREV); - m_pNextBtn->SetHelpId(HID_REDLINING_NEXT); - } - m_pPrevBtn->SetClickHdl( LINK( this, SvxPostItDialog, PrevHdl ) ); m_pNextBtn->SetClickHdl( LINK( this, SvxPostItDialog, NextHdl ) ); m_pAuthorBtn->SetClickHdl( LINK( this, SvxPostItDialog, Stamp ) ); diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index e63292ec9a71..dfe6cce877f7 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1665,9 +1665,9 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( Window* pParent, const SfxItemSet& rCoreSet, - sal_Bool bPrevNext, sal_Bool bRedline ) + sal_Bool bPrevNext ) { - SvxPostItDialog* pDlg = new SvxPostItDialog( pParent, rCoreSet, bPrevNext, bRedline ); + SvxPostItDialog* pDlg = new SvxPostItDialog( pParent, rCoreSet, bPrevNext ); return new AbstractSvxPostItDialog_Impl( pDlg ); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 539dfe105e73..e8211f878bdc 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -742,7 +742,7 @@ public: sal_Bool bHasObj = sal_True ); virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog const SfxItemSet& rCoreSet, - sal_Bool bPrevNext = sal_False, sal_Bool bRedline = sal_False ); + sal_Bool bPrevNext = sal_False ); // For TabPage virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ); diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index c62a3353dad9..8f26261724ea 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -258,10 +258,6 @@ #define HID_PAGE_MEASURE "CUI_HID_PAGE_MEASURE" #define HID_MEASURE_CTL_POSITION "CUI_HID_MEASURE_CTL_POSITION" #define HID_FORMAT_PAGE "CUI_HID_FORMAT_PAGE" -#define HID_REDLINING_DLG "CUI_HID_REDLINING_DLG" -#define HID_REDLINING_EDIT "CUI_HID_REDLINING_EDIT" -#define HID_REDLINING_PREV "CUI_HID_REDLINING_PREV" -#define HID_REDLINING_NEXT "CUI_HID_REDLINING_NEXT" #define HID_FORMAT_PARAGRAPH_STD "CUI_HID_FORMAT_PARAGRAPH_STD" #define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM" #define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW" diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 21b49a9303b5..74c763bef5d3 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -29,8 +29,6 @@ // class SvxPostItDialog ------------------------------------------------- /* - {k:\svx\prototyp\dialog\memo.bmp} - [Description] In this dialog a note can be created or edited. If the application holds a list of notes, it can be iterated @@ -46,7 +44,7 @@ class SvxPostItDialog : public SfxModalDialog { public: SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, - bool bPrevNext = false, bool bRedline = false); + bool bPrevNext = false); ~SvxPostItDialog(); static sal_uInt16* GetRanges(); |