diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-10-25 10:25:04 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-25 11:41:23 +0100 |
commit | 3c0bfd4271a92cd05f5c8b096376519e3c5b4754 (patch) | |
tree | b47fc990d4e2114fecf62ec36327e4717b374ecd /sfx2 | |
parent | d2b4a0d5ff18db30bd93b9d88dd85ba421a557c9 (diff) |
drop HID_CTRL_CUSTOMPROPS_YES_NO that does nowhere
Change-Id: Ibf64359936ea224dc7342585b99691f88630c6ca
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 9 | ||||
-rw-r--r-- | sfx2/source/dialog/dinfdlg.src | 9 | ||||
-rw-r--r-- | sfx2/source/inc/sfxlocal.hrc | 6 |
3 files changed, 5 insertions, 19 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 8be42ddc01b8..3242135ae317 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1232,12 +1232,11 @@ void SfxDocumentInfoDialog::AddFontTabPage() // class CustomPropertiesYesNoButton ------------------------------------- -CustomPropertiesYesNoButton::CustomPropertiesYesNoButton(vcl::Window* pParent, const ResId& rResId) - : Control(pParent, rResId) +CustomPropertiesYesNoButton::CustomPropertiesYesNoButton(vcl::Window* pParent) + : Control(pParent, WB_DIALOGCONTROL | WB_BORDER) , m_aYesButton(VclPtr<RadioButton>::Create(this, WB_TABSTOP)) , m_aNoButton(VclPtr<RadioButton>::Create(this, WB_TABSTOP)) { - FreeResource(); m_aYesButton->SetText(MnemonicGenerator::EraseAllMnemonicChars(Button::GetStandardText(StandardButtonType::Yes))); m_aYesButton->Show(); m_aNoButton->SetText(MnemonicGenerator::EraseAllMnemonicChars(Button::GetStandardText(StandardButtonType::No))); @@ -1443,7 +1442,7 @@ CustomPropertyLine::CustomPropertyLine( vcl::Window* pParent ) : m_sDurationFormat( SfxResId( SFX_ST_DURATION_FORMAT ).toString() ), m_aDurationField( VclPtr<CustomPropertiesDurationField>::Create(pParent, WB_BORDER|WB_TABSTOP|WB_READONLY, this ) ), m_aEditButton ( VclPtr<CustomPropertiesEditButton>::Create(pParent, WB_TABSTOP, this) ), - m_aYesNoButton ( VclPtr<CustomPropertiesYesNoButton>::Create(pParent, SfxResId( SFX_WIN_PROPERTY_YESNO )) ), + m_aYesNoButton ( VclPtr<CustomPropertiesYesNoButton>::Create(pParent) ), m_aRemoveButton ( VclPtr<CustomPropertiesRemoveButton>::Create(pParent, 0, this) ), m_bIsDate ( false ), m_bIsRemoved ( false ), @@ -1489,7 +1488,7 @@ CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent, m_aTimeField ( VclPtr<TimeField>::Create( this, WB_BORDER|WB_TABSTOP|WB_SPIN|WB_LEFT ) ), m_aDurationField( VclPtr<Edit>::Create( this, WB_BORDER|WB_TABSTOP|WB_READONLY ) ), m_aEditButton ( VclPtr<PushButton>::Create( this, WB_TABSTOP ) ), - m_aYesNoButton ( VclPtr<CustomPropertiesYesNoButton>::Create( this, SfxResId( SFX_WIN_PROPERTY_YESNO )) ), + m_aYesNoButton ( VclPtr<CustomPropertiesYesNoButton>::Create(this) ), m_aRemoveButton ( VclPtr<ImageButton>::Create( this, 0 ) ), m_nScrollPos (0), m_pCurrentLine (nullptr), diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src index a3afd7685abb..558588bdddeb 100644 --- a/sfx2/source/dialog/dinfdlg.src +++ b/sfx2/source/dialog/dinfdlg.src @@ -88,15 +88,6 @@ String SFX_ST_DURATION_FORMAT Text [en-US] = " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6"; }; -Control SFX_WIN_PROPERTY_YESNO -{ - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 127 , 2 ) ; - Size = MAP_APPFONT ( 61 , RSC_CD_TEXTBOX_HEIGHT ) ; - Border = TRUE ; - DialogControl = TRUE ; -}; - String STR_SFX_REMOVE_PROPERTY { Text [ en-US ] = "Remove Property" ; diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc index e8d2d5d432ee..ea9f8354f18a 100644 --- a/sfx2/source/inc/sfxlocal.hrc +++ b/sfx2/source/inc/sfxlocal.hrc @@ -34,16 +34,12 @@ #define STR_SFX_EXPLORERFILE_EXPORT (RID_SFX_SFXLOCAL_START + 6) #define STR_SFX_DOCK (RID_SFX_SFXLOCAL_START + 7) #define STR_SFX_UNDOCK (RID_SFX_SFXLOCAL_START + 8) +#define SFX_ST_DURATION_FORMAT (RID_SFX_SFXLOCAL_START + 9) #define STR_SFX_QUERY_WRONG_TYPE (RID_SFX_SFXLOCAL_START + 11) #define SFX_LB_PROPERTY_STRINGARRAY (RID_SFX_SFXLOCAL_START + 12) #define SFX_CB_PROPERTY_STRINGARRAY (RID_SFX_SFXLOCAL_START + 13) -// Controls -------------------------------------------------------------- -#define SFX_WIN_PROPERTY_YESNO (RID_SFX_SFXLOCAL_START + 6) -#define SFX_ST_DURATION_FORMAT (RID_SFX_SFXLOCAL_START + 13) - // Images ---------------------------------------------------------------- - #define SFX_IMG_PROPERTY_REMOVE (RID_SFX_SFXLOCAL_START + 0) #define SFX_IMG_CLOSE_DOC (RID_SFX_SFXLOCAL_START + 2) |