From 0f90e79325ecc9c8eaa7d142fe985b9b35e68808 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Wed, 3 Mar 2010 16:36:43 +0100 Subject: #109634# password to modify dialog --- cui/source/dialogs/makefile.mk | 2 + cui/source/dialogs/passwdomdlg.cxx | 256 +++++++++++++++++++++++++++++++++++++ cui/source/dialogs/passwdomdlg.hrc | 55 ++++++++ cui/source/dialogs/passwdomdlg.src | 188 +++++++++++++++++++++++++++ cui/source/factory/dlgfact.cxx | 17 +++ cui/source/factory/dlgfact.hxx | 14 ++ cui/source/inc/cuires.hrc | 3 + cui/source/inc/passwdomdlg.hxx | 58 +++++++++ 8 files changed, 593 insertions(+) create mode 100755 cui/source/dialogs/passwdomdlg.cxx create mode 100755 cui/source/dialogs/passwdomdlg.hrc create mode 100755 cui/source/dialogs/passwdomdlg.src mode change 100644 => 100755 cui/source/factory/dlgfact.cxx mode change 100644 => 100755 cui/source/factory/dlgfact.hxx mode change 100644 => 100755 cui/source/inc/cuires.hrc create mode 100755 cui/source/inc/passwdomdlg.hxx (limited to 'cui/source') diff --git a/cui/source/dialogs/makefile.mk b/cui/source/dialogs/makefile.mk index f7d597a21..edb9b124a 100755 --- a/cui/source/dialogs/makefile.mk +++ b/cui/source/dialogs/makefile.mk @@ -60,6 +60,7 @@ SRC1FILES = \ insrc.src \ multipat.src \ newtabledlg.src \ + passwdomdlg.src \ postdlg.src \ scriptdlg.src \ sdrcelldlg.src \ @@ -96,6 +97,7 @@ SLOFILES+=\ $(SLO)$/multifil.obj \ $(SLO)$/multipat.obj \ $(SLO)$/newtabledlg.obj \ + $(SLO)$/passwdomdlg.obj \ $(SLO)$/pastedlg.obj \ $(SLO)$/plfilter.obj \ $(SLO)$/postdlg.obj \ diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx new file mode 100755 index 000000000..854ba24eb --- /dev/null +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -0,0 +1,256 @@ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_cui.hxx" + +// include --------------------------------------------------------------- + +#include "passwdomdlg.hrc" +#include "passwdomdlg.hxx" + +#include "cuires.hrc" +#include "dialmgr.hxx" + +#include +#include +#include +#include +#include +#include +#include + + +////////////////////////////////////////////////////////////////////// + +class PasswordReenterEdit_Impl : public Edit +{ + String m_aDefaultTxt; + bool m_bForceNonEmptyPasswd; + + // disallow use of copy c-tor and assignment operator + PasswordReenterEdit_Impl( const PasswordReenterEdit_Impl & ); + PasswordReenterEdit_Impl & operator = ( const PasswordReenterEdit_Impl & ); + +public: + PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId, bool bForceNonEmptyPasswd ); + virtual ~PasswordReenterEdit_Impl(); + + // Edit +// virtual void Modify(); + virtual void Paint( const Rectangle& rRect ); +}; + + +PasswordReenterEdit_Impl::PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId, bool bForceNonEmptyPasswd ) : + Edit( pParent, rResId ), + m_bForceNonEmptyPasswd( bForceNonEmptyPasswd ) +{ + m_aDefaultTxt = String( CUI_RES( STR_PASSWD_MUST_BE_CONFIRMED ) ); +} + + +PasswordReenterEdit_Impl::~PasswordReenterEdit_Impl() +{ +} + +/* +void PasswordReenterEdit_Impl::Modify() +{ + Edit::Modify(); + SetModifyFlag(); + if (m_bForceNonEmptyPasswd && GetText().Len() == 0) + Invalidate(); // get the m_aDefaultTxt displayed again +} +*/ + +void PasswordReenterEdit_Impl::Paint( const Rectangle& rRect ) +{ + if (!IsEnabled() || !IsModified() || (m_bForceNonEmptyPasswd && GetText().Len() == 0)) + { + Push( PUSH_FILLCOLOR | PUSH_TEXTFILLCOLOR ); + + Color aFillColor( GetParent()->GetBackground().GetColor() ); + SetLineColor(); + SetFillColor( aFillColor ); + SetTextFillColor( aFillColor ); + + DrawRect( Rectangle( Point(), GetOutputSizePixel() ) ); + DrawText( Point(), m_aDefaultTxt ); + + Pop(); + } + else + Edit::Paint( rRect ); +} + + +////////////////////////////////////////////////////////////////////// + +struct PasswordToOpenModifyDialog_Impl +{ + Window * m_pParent; + + FixedText m_aPasswdToOpenFT; + Edit m_aPasswdToOpenED; + FixedText m_aReenterPasswdToOpenFT; + PasswordReenterEdit_Impl m_aReenterPasswdToOpenED; + FixedImage m_aPasswdToOpenMatchFI; + FixedText m_aPasswdNoteFT; + FixedLine m_aButtonsFL; + MoreButton m_aMoreFewerOptionsBTN; + OKButton m_aOk; + CancelButton m_aCancel; + FixedLine m_aFileSharingOptionsFL; + FixedText m_aPasswdToModifyFT; + Edit m_aPasswdToModifyED; + FixedText m_aReenterPasswdToModifyFT; + PasswordReenterEdit_Impl m_aReenterPasswdToModifyED; + FixedImage m_aPasswdToModifyMatchFI; + + bool m_bReenterPasswdToOpenEdited; + bool m_bReenterPasswdToModifyEdited; + + + DECL_LINK( ModifyHdl, Edit * ); + + PasswordToOpenModifyDialog_Impl( Window * pParent ); + ~PasswordToOpenModifyDialog_Impl(); +}; + + +PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( Window * pParent ) : + m_pParent( pParent ), + m_aPasswdToOpenFT ( pParent, CUI_RES( FT_PASSWD_TO_OPEN ) ), + m_aPasswdToOpenED ( pParent, CUI_RES( ED_PASSWD_TO_OPEN ) ), + m_aReenterPasswdToOpenFT ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_OPEN ) ), + m_aReenterPasswdToOpenED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_OPEN ), true ), + m_aPasswdToOpenMatchFI ( pParent, CUI_RES( FI_PASSWD_TO_OPEN_MATCH ) ), + m_aPasswdNoteFT ( pParent, CUI_RES( FT_PASSWD_NOTE ) ), + m_aButtonsFL ( pParent, CUI_RES( FL_BUTTONS ) ), + m_aMoreFewerOptionsBTN ( pParent, CUI_RES( BTN_MORE_FEWER_OPTIONS ) ), + m_aOk ( pParent, CUI_RES( BTN_OK ) ), + m_aCancel ( pParent, CUI_RES( BTN_CANCEL ) ), + m_aFileSharingOptionsFL ( pParent, CUI_RES( FL_FILE_SHARING_OPTIONS ) ), + m_aPasswdToModifyFT ( pParent, CUI_RES( FT_PASSWD_TO_MODIFY ) ), + m_aPasswdToModifyED ( pParent, CUI_RES( ED_PASSWD_TO_MODIFY ) ), + m_aReenterPasswdToModifyFT ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_MODIFY ) ), + m_aReenterPasswdToModifyED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_MODIFY ), false ), + m_aPasswdToModifyMatchFI ( pParent, CUI_RES( FI_PASSWD_TO_MODIFY_MATCH ) ), + m_bReenterPasswdToOpenEdited ( false ), + m_bReenterPasswdToModifyEdited ( false ) +{ + const sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode(); + const Image aImage( CUI_RES( bHighContrast ? IMG_PASSWD_MATCH_HC : IMG_PASSWD_MATCH ) ); + m_aPasswdToOpenMatchFI.SetImage( aImage ); + m_aPasswdToModifyMatchFI.SetImage( aImage ); + + m_aMoreFewerOptionsBTN.SetMoreText( String( CUI_RES( STR_MORE_OPTIONS ) ) ); + m_aMoreFewerOptionsBTN.SetLessText( String( CUI_RES( STR_FEWER_OPTIONS ) ) ); + + Link aModifyLink = LINK( this, PasswordToOpenModifyDialog_Impl, ModifyHdl ); + m_aPasswdToOpenED.SetModifyHdl( aModifyLink ); + m_aReenterPasswdToOpenED.SetModifyHdl( aModifyLink ); + m_aPasswdToModifyED.SetModifyHdl( aModifyLink ); + m_aReenterPasswdToModifyED.SetModifyHdl( aModifyLink ); + + m_aReenterPasswdToOpenED.Enable( FALSE ); + m_aReenterPasswdToModifyED.Enable( FALSE ); + m_aOk.Enable( FALSE ); + + ModifyHdl( NULL ); +} + + +PasswordToOpenModifyDialog_Impl::~PasswordToOpenModifyDialog_Impl() +{ +} + + +IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, pEdit ) +{ + if (pEdit == &m_aReenterPasswdToOpenED) + m_bReenterPasswdToOpenEdited = true; + if (pEdit == &m_aReenterPasswdToModifyED) + m_bReenterPasswdToModifyEdited = true; + + m_aReenterPasswdToOpenED.Enable( m_aPasswdToOpenED.GetText().Len() > 0 ); + m_aReenterPasswdToModifyED.Enable( m_aPasswdToModifyED.GetText().Len() > 0 ); + + const bool bToOpenEqual = m_aPasswdToOpenED.GetText() == m_aReenterPasswdToOpenED.GetText(); + const bool bToModifyEqual = m_aPasswdToModifyED.GetText() == m_aReenterPasswdToModifyED.GetText(); + const BOOL bEnableOk = + m_bReenterPasswdToOpenEdited && m_aPasswdToOpenED.GetText().Len() > 0 && + bToOpenEqual && (!m_bReenterPasswdToModifyEdited || bToModifyEqual); + m_aOk.Enable( bEnableOk ); + + m_aPasswdToOpenMatchFI.Enable( bToOpenEqual && m_aPasswdToOpenED.GetText().Len() > 0 ); + m_aPasswdToModifyMatchFI.Enable( bToModifyEqual ); + + if (m_aReenterPasswdToOpenED.GetText().Len() == 0) + m_aReenterPasswdToOpenED.Invalidate(); // get the m_aDefaultTxt displayed again + + return 0; +} + + +////////////////////////////////////////////////////////////////////// + + +PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( Window * pParent ) : + SfxModalDialog( pParent, CUI_RES( RID_DLG_PASSWORD_TO_OPEN_MODIFY ) ) +{ + m_pImpl = boost::shared_ptr< PasswordToOpenModifyDialog_Impl >( new PasswordToOpenModifyDialog_Impl( this ) ); + + FreeResource(); +} + + +PasswordToOpenModifyDialog::~PasswordToOpenModifyDialog() +{ +} + + +String PasswordToOpenModifyDialog::GetPasswordToOpen() const +{ + const bool bPasswdEditedAndOk = + m_pImpl->m_bReenterPasswdToOpenEdited && m_pImpl->m_aPasswdToOpenED.GetText().Len() > 0 && + m_pImpl->m_aPasswdToOpenED.GetText() == m_pImpl->m_aReenterPasswdToOpenED.GetText(); + return bPasswdEditedAndOk ? m_pImpl->m_aPasswdToOpenED.GetText() : String(); +} + + +String PasswordToOpenModifyDialog::GetPasswordToModify() const +{ + const bool bPasswdEditedAndOk = + m_pImpl->m_bReenterPasswdToModifyEdited && m_pImpl->m_aPasswdToModifyED.GetText().Len() > 0 && + m_pImpl->m_aPasswdToModifyED.GetText() == m_pImpl->m_aReenterPasswdToModifyED.GetText(); + return bPasswdEditedAndOk ? m_pImpl->m_aPasswdToModifyED.GetText() : String(); +} + +////////////////////////////////////////////////////////////////////// + diff --git a/cui/source/dialogs/passwdomdlg.hrc b/cui/source/dialogs/passwdomdlg.hrc new file mode 100755 index 000000000..df29e9fe3 --- /dev/null +++ b/cui/source/dialogs/passwdomdlg.hrc @@ -0,0 +1,55 @@ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _CUI_PASSWDOMDLG_HRC_ +#define _CUI_PASSWDOMDLG_HRC_ + +#define FT_PASSWD_TO_OPEN 11 +#define ED_PASSWD_TO_OPEN 12 +#define FT_REENTER_PASSWD_TO_OPEN 13 +#define ED_REENTER_PASSWD_TO_OPEN 14 +#define IMG_PASSWD_MATCH 15 +#define IMG_PASSWD_MATCH_HC 16 +#define FT_PASSWD_NOTE 17 +#define FL_BUTTONS 18 +#define BTN_MORE_FEWER_OPTIONS 19 +#define BTN_OK 20 +#define BTN_CANCEL 21 +#define FL_FILE_SHARING_OPTIONS 22 +#define FT_PASSWD_TO_MODIFY 23 +#define ED_PASSWD_TO_MODIFY 24 +#define FT_REENTER_PASSWD_TO_MODIFY 25 +#define ED_REENTER_PASSWD_TO_MODIFY 26 +#define FI_PASSWD_TO_OPEN_MATCH 27 +#define FI_PASSWD_TO_MODIFY_MATCH 28 + +#define STR_MORE_OPTIONS 51 +#define STR_FEWER_OPTIONS 52 +#define STR_PASSWD_MUST_BE_CONFIRMED 53 + +#endif + diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src new file mode 100755 index 000000000..24bf5a22c --- /dev/null +++ b/cui/source/dialogs/passwdomdlg.src @@ -0,0 +1,188 @@ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + + +#include +#include "passwdomdlg.hrc" + + +ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY +{ + Size = MAP_APPFONT( 201, 135 ); + Text [ en-US ] = "Password"; +// HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY; + Border = TRUE ; + Moveable = TRUE ; + OutputSize = TRUE ; + SVLook = TRUE ; + + FixedText FT_PASSWD_TO_OPEN + { + Pos = MAP_APPFONT( 3, 3 ); + Size = MAP_APPFONT( 175, 8 ); + Text [ en-US ] = "~Enter password to open"; + WordBreak = TRUE; + }; + + Edit ED_PASSWD_TO_OPEN + { + Pos = MAP_APPFONT( 3, 14 ); + Size = MAP_APPFONT( 175, 12 ); + Border = TRUE ; + PassWord = TRUE ; + }; + + FixedText FT_REENTER_PASSWD_TO_OPEN + { + Pos = MAP_APPFONT( 3, 31 ); + Size = MAP_APPFONT( 175, 8 ); + Text [ en-US ] = "~Reenter password to open"; + WordBreak = TRUE; + }; + + Edit ED_REENTER_PASSWD_TO_OPEN + { + Pos = MAP_APPFONT( 3, 42 ); + Size = MAP_APPFONT( 175, 12 ); + Border = TRUE ; + PassWord = TRUE ; + }; + + FixedImage FI_PASSWD_TO_OPEN_MATCH + { + Pos = MAP_APPFONT ( 180, 42 ) ; + Size = MAP_APPFONT ( 12 , 12 ) ; + }; + + FixedText FT_PASSWD_NOTE + { + Pos = MAP_APPFONT( 3, 66 ); + Size = MAP_APPFONT( 195, 4*8 ); // some extra space for translation in other languages + Text [ en-US ] = "Note: If you lose or forget the password, it can not be recovered. "\ + "It is advisable to keep passwords in a safe place. Passwords are "\ + "case-sensitive."; + WordBreak = TRUE; + }; + + FixedLine FL_BUTTONS + { + Pos = MAP_APPFONT( 0, 103 ); + Size = MAP_APPFONT( 201, 8 ); + }; + + MoreButton BTN_MORE_FEWER_OPTIONS + { + Pos = MAP_APPFONT( 3 , 116 ) ; + Size = MAP_APPFONT( 60 , 14 ) ; + Delta = 124+5 ; + State = FALSE ; + }; + + OKButton BTN_OK + { + Pos = MAP_APPFONT( 73, 116 ); + Size = MAP_APPFONT( 60, 14 ); + DefButton = TRUE ; + }; + + CancelButton BTN_CANCEL + { + Pos = MAP_APPFONT( 138, 116 ); + Size = MAP_APPFONT( 60, 14 ); + }; + + FixedLine FL_FILE_SHARING_OPTIONS + { + Pos = MAP_APPFONT( 3, 140 ); + Size = MAP_APPFONT( 195, 8 ); + Text [ en-US ] = "File sharing options"; + }; + + FixedText FT_PASSWD_TO_MODIFY + { + Pos = MAP_APPFONT( 8, 151+5 ); + Size = MAP_APPFONT( 170, 8 ); + Text [ en-US ] = "Enter password to modify"; + WordBreak = TRUE; + }; + + Edit ED_PASSWD_TO_MODIFY + { + Pos = MAP_APPFONT( 8, 162+5 ); + Size = MAP_APPFONT( 170, 12 ); + Border = TRUE ; + PassWord = TRUE ; + }; + + FixedText FT_REENTER_PASSWD_TO_MODIFY + { + Pos = MAP_APPFONT( 8, 180+5 ); + Size = MAP_APPFONT( 170, 8 ); + Text [ en-US ] = "Reenter password to modify"; + WordBreak = TRUE; + }; + + Edit ED_REENTER_PASSWD_TO_MODIFY + { + Pos = MAP_APPFONT( 8, 191+5 ); + Size = MAP_APPFONT( 170, 12 ); + Border = TRUE ; + PassWord = TRUE ; + }; + + FixedImage FI_PASSWD_TO_MODIFY_MATCH + { + Pos = MAP_APPFONT ( 180, 191+5 ) ; + Size = MAP_APPFONT ( 12 , 12 ) ; + }; + + String STR_PASSWD_MUST_BE_CONFIRMED + { + Text [ en-US ] = "Password must be confirmed" ; + }; + + String STR_MORE_OPTIONS + { + Text [ en-US ] = "More ~Options" ; + }; + + String STR_FEWER_OPTIONS + { + Text [ en-US ] = "Fewer ~Options" ; + }; + + Image IMG_PASSWD_MATCH + { + ImageBitmap = Bitmap { File = "apply.png"; }; + }; + + Image IMG_PASSWD_MATCH_HC + { + ImageBitmap = Bitmap { File = "apply_h.png"; }; + }; +}; + diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx old mode 100644 new mode 100755 index 9b24d4d5c..658fe3673 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -103,6 +103,7 @@ #include "macroass.hxx" #include "acccfg.hxx" #include "insrc.hxx" +#include "passwdomdlg.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::frame; @@ -161,6 +162,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 @@ -952,6 +954,15 @@ Window * AbstractSvxPostItDialog_Impl::GetWindow() return (Window *)pDlg; } +String AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToOpen() const +{ + return pDlg->GetPasswordToOpen(); +} +String AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToModify() const +{ + return pDlg->GetPasswordToModify(); +} + // Create dialogs with simplest interface VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent, sal_uInt32 nResId ) { @@ -1905,3 +1916,9 @@ SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Wind return new SvxInsRowColDlg( pParent, bCol, nHelpId ); } +AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog( Window * pParent ) +{ + PasswordToOpenModifyDialog * pDlg = new PasswordToOpenModifyDialog( pParent ); + return new AbstractPasswordToOpenModifyDialog_Impl( pDlg ); +} + diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx old mode 100644 new mode 100755 index f8f69b4f5..7bf79f3b2 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -575,6 +575,18 @@ 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; +}; +//for PasswordToOpenModifyDialog end + + //------------------------------------------------------------------------ //AbstractDialogFactory_Impl implementations class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory @@ -776,6 +788,8 @@ public: Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& rApplicationContext ); virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ); + + virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent ); }; #endif diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc old mode 100644 new mode 100755 index 239163603..8073568e0 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -283,6 +283,9 @@ #define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485) #define RID_SVXSTR_MULTIFILE_DBL_ERR (RID_SVX_START + 486) +// password to open/modify dialog +#define RID_DLG_PASSWORD_TO_OPEN_MODIFY (RID_SVX_START + 500) + // multi path dialog #define RID_SVXDLG_MULTIPATH (RID_SVX_START + 201) #define RID_MULTIPATH_DBL_ERR (RID_SVX_START + 207) diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx new file mode 100755 index 000000000..f00f10104 --- /dev/null +++ b/cui/source/inc/passwdomdlg.hxx @@ -0,0 +1,58 @@ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _CUI_PASSWDOMDLG_HXX_ +#define _CUI_PASSWDOMDLG_HXX_ + +#include + +#include + + +////////////////////////////////////////////////////////////////////// + +struct PasswordToOpenModifyDialog_Impl; + +class PasswordToOpenModifyDialog : public SfxModalDialog +{ + boost::shared_ptr< PasswordToOpenModifyDialog_Impl > m_pImpl; + + // disallow use of copy c-tor and assignment operator + PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & ); + PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ); + +public: + PasswordToOpenModifyDialog( Window * pParent ); + virtual ~PasswordToOpenModifyDialog(); + + virtual String GetPasswordToOpen() const; + virtual String GetPasswordToModify() const; +}; + +////////////////////////////////////////////////////////////////////// + +#endif + -- cgit v1.2.3 From 02ea5eaccc5b07a387fa5bcad2b2691f2db7c46e Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Thu, 4 Mar 2010 16:14:56 +0100 Subject: #i109634# password to open/modify dialog --- cui/source/dialogs/passwdomdlg.cxx | 123 ++++++++++++++++++++----------------- cui/source/dialogs/passwdomdlg.hrc | 1 + cui/source/dialogs/passwdomdlg.src | 56 +++++++++-------- cui/source/factory/dlgfact.cxx | 10 ++- cui/source/factory/dlgfact.hxx | 3 +- cui/source/inc/passwdomdlg.hxx | 8 ++- 6 files changed, 114 insertions(+), 87 deletions(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 854ba24eb..6914d4f72 100755 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -50,25 +50,22 @@ class PasswordReenterEdit_Impl : public Edit { String m_aDefaultTxt; - bool m_bForceNonEmptyPasswd; // disallow use of copy c-tor and assignment operator PasswordReenterEdit_Impl( const PasswordReenterEdit_Impl & ); PasswordReenterEdit_Impl & operator = ( const PasswordReenterEdit_Impl & ); public: - PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId, bool bForceNonEmptyPasswd ); + PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId ); virtual ~PasswordReenterEdit_Impl(); // Edit -// virtual void Modify(); virtual void Paint( const Rectangle& rRect ); }; -PasswordReenterEdit_Impl::PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId, bool bForceNonEmptyPasswd ) : - Edit( pParent, rResId ), - m_bForceNonEmptyPasswd( bForceNonEmptyPasswd ) +PasswordReenterEdit_Impl::PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId ) : + Edit( pParent, rResId ) { m_aDefaultTxt = String( CUI_RES( STR_PASSWD_MUST_BE_CONFIRMED ) ); } @@ -78,28 +75,22 @@ PasswordReenterEdit_Impl::~PasswordReenterEdit_Impl() { } -/* -void PasswordReenterEdit_Impl::Modify() -{ - Edit::Modify(); - SetModifyFlag(); - if (m_bForceNonEmptyPasswd && GetText().Len() == 0) - Invalidate(); // get the m_aDefaultTxt displayed again -} -*/ void PasswordReenterEdit_Impl::Paint( const Rectangle& rRect ) { - if (!IsEnabled() || !IsModified() || (m_bForceNonEmptyPasswd && GetText().Len() == 0)) + if (GetText().Len() == 0) { - Push( PUSH_FILLCOLOR | PUSH_TEXTFILLCOLOR ); - + Push( /*PUSH_FILLCOLOR | PUSH_TEXTFILLCOLOR |*/ PUSH_TEXTCOLOR ); +/* Color aFillColor( GetParent()->GetBackground().GetColor() ); - SetLineColor(); + SetLineColor(); // don't draw a border when painting the Edit field rectangle with the new background color SetFillColor( aFillColor ); SetTextFillColor( aFillColor ); + SetTextColor( GetParent()->GetTextColor() ); // use plain text color even if the Edit field is disabled (it is hard to read the text otherwise) DrawRect( Rectangle( Point(), GetOutputSizePixel() ) ); +*/ + SetTextColor( Color( COL_GRAY ) ); DrawText( Point(), m_aDefaultTxt ); Pop(); @@ -131,24 +122,25 @@ struct PasswordToOpenModifyDialog_Impl FixedText m_aReenterPasswdToModifyFT; PasswordReenterEdit_Impl m_aReenterPasswdToModifyED; FixedImage m_aPasswdToModifyMatchFI; - - bool m_bReenterPasswdToOpenEdited; - bool m_bReenterPasswdToModifyEdited; + CheckBox m_aOpenReadonlyCB; DECL_LINK( ModifyHdl, Edit * ); - PasswordToOpenModifyDialog_Impl( Window * pParent ); + PasswordToOpenModifyDialog_Impl( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen ); ~PasswordToOpenModifyDialog_Impl(); }; -PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( Window * pParent ) : +PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( + Window * pParent, + sal_uInt16 nMinPasswdLen, + sal_uInt16 nMaxPasswdLen ) : m_pParent( pParent ), m_aPasswdToOpenFT ( pParent, CUI_RES( FT_PASSWD_TO_OPEN ) ), m_aPasswdToOpenED ( pParent, CUI_RES( ED_PASSWD_TO_OPEN ) ), m_aReenterPasswdToOpenFT ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_OPEN ) ), - m_aReenterPasswdToOpenED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_OPEN ), true ), + m_aReenterPasswdToOpenED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_OPEN ) ), m_aPasswdToOpenMatchFI ( pParent, CUI_RES( FI_PASSWD_TO_OPEN_MATCH ) ), m_aPasswdNoteFT ( pParent, CUI_RES( FT_PASSWD_NOTE ) ), m_aButtonsFL ( pParent, CUI_RES( FL_BUTTONS ) ), @@ -159,10 +151,9 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( Window * pPare m_aPasswdToModifyFT ( pParent, CUI_RES( FT_PASSWD_TO_MODIFY ) ), m_aPasswdToModifyED ( pParent, CUI_RES( ED_PASSWD_TO_MODIFY ) ), m_aReenterPasswdToModifyFT ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_MODIFY ) ), - m_aReenterPasswdToModifyED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_MODIFY ), false ), + m_aReenterPasswdToModifyED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_MODIFY ) ), m_aPasswdToModifyMatchFI ( pParent, CUI_RES( FI_PASSWD_TO_MODIFY_MATCH ) ), - m_bReenterPasswdToOpenEdited ( false ), - m_bReenterPasswdToModifyEdited ( false ) + m_aOpenReadonlyCB ( pParent, CUI_RES( CB_OPEN_READONLY ) ) { const sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode(); const Image aImage( CUI_RES( bHighContrast ? IMG_PASSWD_MATCH_HC : IMG_PASSWD_MATCH ) ); @@ -178,10 +169,20 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( Window * pPare m_aPasswdToModifyED.SetModifyHdl( aModifyLink ); m_aReenterPasswdToModifyED.SetModifyHdl( aModifyLink ); - m_aReenterPasswdToOpenED.Enable( FALSE ); - m_aReenterPasswdToModifyED.Enable( FALSE ); m_aOk.Enable( FALSE ); + if (nMaxPasswdLen) + { + m_aPasswdToOpenED.SetMaxTextLen( nMaxPasswdLen ); + m_aReenterPasswdToOpenED.SetMaxTextLen( nMaxPasswdLen ); + m_aPasswdToModifyED.SetMaxTextLen( nMaxPasswdLen ); + m_aReenterPasswdToModifyED.SetMaxTextLen( nMaxPasswdLen ); + } + + (void) nMinPasswdLen; // currently not supported + + m_aPasswdToOpenED.GrabFocus(); + ModifyHdl( NULL ); } @@ -193,27 +194,24 @@ PasswordToOpenModifyDialog_Impl::~PasswordToOpenModifyDialog_Impl() IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, pEdit ) { - if (pEdit == &m_aReenterPasswdToOpenED) - m_bReenterPasswdToOpenEdited = true; - if (pEdit == &m_aReenterPasswdToModifyED) - m_bReenterPasswdToModifyEdited = true; - - m_aReenterPasswdToOpenED.Enable( m_aPasswdToOpenED.GetText().Len() > 0 ); - m_aReenterPasswdToModifyED.Enable( m_aPasswdToModifyED.GetText().Len() > 0 ); - - const bool bToOpenEqual = m_aPasswdToOpenED.GetText() == m_aReenterPasswdToOpenED.GetText(); - const bool bToModifyEqual = m_aPasswdToModifyED.GetText() == m_aReenterPasswdToModifyED.GetText(); - const BOOL bEnableOk = - m_bReenterPasswdToOpenEdited && m_aPasswdToOpenED.GetText().Len() > 0 && - bToOpenEqual && (!m_bReenterPasswdToModifyEdited || bToModifyEqual); - m_aOk.Enable( bEnableOk ); - - m_aPasswdToOpenMatchFI.Enable( bToOpenEqual && m_aPasswdToOpenED.GetText().Len() > 0 ); - m_aPasswdToModifyMatchFI.Enable( bToModifyEqual ); - + // force repaints to get the m_aDefaultTxt displayed again if (m_aReenterPasswdToOpenED.GetText().Len() == 0) - m_aReenterPasswdToOpenED.Invalidate(); // get the m_aDefaultTxt displayed again + m_aReenterPasswdToOpenED.Invalidate(); + if (m_aReenterPasswdToModifyED.GetText().Len() == 0) + m_aReenterPasswdToModifyED.Invalidate(); + + const sal_Int32 nPasswdToOpenLen = m_aPasswdToOpenED.GetText().Len(); + const sal_Int32 nPasswdToModifyLen = m_aPasswdToModifyED.GetText().Len(); + + const bool bBothEmpty = nPasswdToOpenLen == 0 && nPasswdToModifyLen == 0; + const bool bToOpenMatch = m_aPasswdToOpenED.GetText() == m_aReenterPasswdToOpenED.GetText(); + const bool bToModifyMatch = m_aPasswdToModifyED.GetText() == m_aReenterPasswdToModifyED.GetText(); + + m_aOk.Enable( bToOpenMatch && bToModifyMatch && !bBothEmpty ); + m_aPasswdToOpenMatchFI.Enable( bToOpenMatch && !bBothEmpty ); + m_aPasswdToModifyMatchFI.Enable( bToModifyMatch && !bBothEmpty ); + return 0; } @@ -221,10 +219,14 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, pEdit ) ////////////////////////////////////////////////////////////////////// -PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( Window * pParent ) : +PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( + Window * pParent, + sal_uInt16 nMinPasswdLen, + sal_uInt16 nMaxPasswdLen ) : SfxModalDialog( pParent, CUI_RES( RID_DLG_PASSWORD_TO_OPEN_MODIFY ) ) { - m_pImpl = boost::shared_ptr< PasswordToOpenModifyDialog_Impl >( new PasswordToOpenModifyDialog_Impl( this ) ); + m_pImpl = std::auto_ptr< PasswordToOpenModifyDialog_Impl >( + new PasswordToOpenModifyDialog_Impl( this, nMinPasswdLen, nMaxPasswdLen ) ); FreeResource(); } @@ -237,20 +239,27 @@ PasswordToOpenModifyDialog::~PasswordToOpenModifyDialog() String PasswordToOpenModifyDialog::GetPasswordToOpen() const { - const bool bPasswdEditedAndOk = - m_pImpl->m_bReenterPasswdToOpenEdited && m_pImpl->m_aPasswdToOpenED.GetText().Len() > 0 && + const bool bPasswdOk = + m_pImpl->m_aPasswdToOpenED.GetText().Len() > 0 && m_pImpl->m_aPasswdToOpenED.GetText() == m_pImpl->m_aReenterPasswdToOpenED.GetText(); - return bPasswdEditedAndOk ? m_pImpl->m_aPasswdToOpenED.GetText() : String(); + return bPasswdOk ? m_pImpl->m_aPasswdToOpenED.GetText() : String(); } String PasswordToOpenModifyDialog::GetPasswordToModify() const { - const bool bPasswdEditedAndOk = - m_pImpl->m_bReenterPasswdToModifyEdited && m_pImpl->m_aPasswdToModifyED.GetText().Len() > 0 && + const bool bPasswdOk = + m_pImpl->m_aPasswdToModifyED.GetText().Len() > 0 && m_pImpl->m_aPasswdToModifyED.GetText() == m_pImpl->m_aReenterPasswdToModifyED.GetText(); - return bPasswdEditedAndOk ? m_pImpl->m_aPasswdToModifyED.GetText() : String(); + return bPasswdOk ? m_pImpl->m_aPasswdToModifyED.GetText() : String(); } + +bool PasswordToOpenModifyDialog::IsRecommendToOpenReadonly() const +{ + return m_pImpl->m_aOpenReadonlyCB.IsChecked(); +} + + ////////////////////////////////////////////////////////////////////// diff --git a/cui/source/dialogs/passwdomdlg.hrc b/cui/source/dialogs/passwdomdlg.hrc index df29e9fe3..b9babd72f 100755 --- a/cui/source/dialogs/passwdomdlg.hrc +++ b/cui/source/dialogs/passwdomdlg.hrc @@ -46,6 +46,7 @@ #define ED_REENTER_PASSWD_TO_MODIFY 26 #define FI_PASSWD_TO_OPEN_MATCH 27 #define FI_PASSWD_TO_MODIFY_MATCH 28 +#define CB_OPEN_READONLY 29 #define STR_MORE_OPTIONS 51 #define STR_FEWER_OPTIONS 52 diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src index 24bf5a22c..a8d18b7ce 100755 --- a/cui/source/dialogs/passwdomdlg.src +++ b/cui/source/dialogs/passwdomdlg.src @@ -32,7 +32,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { - Size = MAP_APPFONT( 201, 135 ); + Size = MAP_APPFONT( 171, 135 ); Text [ en-US ] = "Password"; // HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY; Border = TRUE ; @@ -43,7 +43,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY FixedText FT_PASSWD_TO_OPEN { Pos = MAP_APPFONT( 3, 3 ); - Size = MAP_APPFONT( 175, 8 ); + Size = MAP_APPFONT( 145, 8 ); Text [ en-US ] = "~Enter password to open"; WordBreak = TRUE; }; @@ -51,7 +51,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY Edit ED_PASSWD_TO_OPEN { Pos = MAP_APPFONT( 3, 14 ); - Size = MAP_APPFONT( 175, 12 ); + Size = MAP_APPFONT( 145, 12 ); Border = TRUE ; PassWord = TRUE ; }; @@ -59,7 +59,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY FixedText FT_REENTER_PASSWD_TO_OPEN { Pos = MAP_APPFONT( 3, 31 ); - Size = MAP_APPFONT( 175, 8 ); + Size = MAP_APPFONT( 145, 8 ); Text [ en-US ] = "~Reenter password to open"; WordBreak = TRUE; }; @@ -67,21 +67,21 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY Edit ED_REENTER_PASSWD_TO_OPEN { Pos = MAP_APPFONT( 3, 42 ); - Size = MAP_APPFONT( 175, 12 ); + Size = MAP_APPFONT( 145, 12 ); Border = TRUE ; PassWord = TRUE ; }; FixedImage FI_PASSWD_TO_OPEN_MATCH { - Pos = MAP_APPFONT ( 180, 42 ) ; + Pos = MAP_APPFONT ( 150, 42 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; }; FixedText FT_PASSWD_NOTE { Pos = MAP_APPFONT( 3, 66 ); - Size = MAP_APPFONT( 195, 4*8 ); // some extra space for translation in other languages + Size = MAP_APPFONT( 165, 4*8 ); // some extra space for translation in other languages Text [ en-US ] = "Note: If you lose or forget the password, it can not be recovered. "\ "It is advisable to keep passwords in a safe place. Passwords are "\ "case-sensitive."; @@ -91,75 +91,83 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY FixedLine FL_BUTTONS { Pos = MAP_APPFONT( 0, 103 ); - Size = MAP_APPFONT( 201, 8 ); + Size = MAP_APPFONT( 171, 8 ); }; MoreButton BTN_MORE_FEWER_OPTIONS { Pos = MAP_APPFONT( 3 , 116 ) ; - Size = MAP_APPFONT( 60 , 14 ) ; - Delta = 124+5 ; + Size = MAP_APPFONT( 50 , 14 ) ; + Delta = 146 ; State = FALSE ; }; OKButton BTN_OK { - Pos = MAP_APPFONT( 73, 116 ); - Size = MAP_APPFONT( 60, 14 ); + Pos = MAP_APPFONT( 63, 116 ); + Size = MAP_APPFONT( 50, 14 ); DefButton = TRUE ; }; CancelButton BTN_CANCEL { - Pos = MAP_APPFONT( 138, 116 ); - Size = MAP_APPFONT( 60, 14 ); + Pos = MAP_APPFONT( 118, 116 ); + Size = MAP_APPFONT( 50, 14 ); }; FixedLine FL_FILE_SHARING_OPTIONS { Pos = MAP_APPFONT( 3, 140 ); - Size = MAP_APPFONT( 195, 8 ); + Size = MAP_APPFONT( 165, 8 ); Text [ en-US ] = "File sharing options"; }; FixedText FT_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 8, 151+5 ); - Size = MAP_APPFONT( 170, 8 ); + Pos = MAP_APPFONT( 8, 156 ); + Size = MAP_APPFONT( 140, 8 ); Text [ en-US ] = "Enter password to modify"; WordBreak = TRUE; }; Edit ED_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 8, 162+5 ); - Size = MAP_APPFONT( 170, 12 ); + Pos = MAP_APPFONT( 8, 166 ); + Size = MAP_APPFONT( 140, 12 ); Border = TRUE ; PassWord = TRUE ; }; FixedText FT_REENTER_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 8, 180+5 ); - Size = MAP_APPFONT( 170, 8 ); + Pos = MAP_APPFONT( 8, 184 ); + Size = MAP_APPFONT( 140, 8 ); Text [ en-US ] = "Reenter password to modify"; WordBreak = TRUE; }; Edit ED_REENTER_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 8, 191+5 ); - Size = MAP_APPFONT( 170, 12 ); + Pos = MAP_APPFONT( 8, 194 ); + Size = MAP_APPFONT( 140, 12 ); Border = TRUE ; PassWord = TRUE ; }; FixedImage FI_PASSWD_TO_MODIFY_MATCH { - Pos = MAP_APPFONT ( 180, 191+5 ) ; + Pos = MAP_APPFONT ( 150, 194 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; }; + CheckBox CB_OPEN_READONLY + { + Pos = MAP_APPFONT( 8, 212 ); + Size = MAP_APPFONT( 140, 8 ); + + Text [ en-US ] = "Recommend to open file read-only"; + }; + String STR_PASSWD_MUST_BE_CONFIRMED { Text [ en-US ] = "Password must be confirmed" ; diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 658fe3673..bacf52a6c 100755 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -962,6 +962,10 @@ 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 ) @@ -1916,9 +1920,11 @@ SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Wind return new SvxInsRowColDlg( pParent, bCol, nHelpId ); } -AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog( Window * pParent ) +AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog( + Window * pParent, + sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen ) { - PasswordToOpenModifyDialog * pDlg = new PasswordToOpenModifyDialog( pParent ); + PasswordToOpenModifyDialog * pDlg = new PasswordToOpenModifyDialog( pParent, nMinPasswdLen, nMaxPasswdLen ); return new AbstractPasswordToOpenModifyDialog_Impl( pDlg ); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 7bf79f3b2..af8448262 100755 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -583,6 +583,7 @@ class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenMod virtual String GetPasswordToOpen() const; virtual String GetPasswordToModify() const; + virtual bool IsRecommendToOpenReadonly() const; }; //for PasswordToOpenModifyDialog end @@ -789,7 +790,7 @@ public: virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ); - virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent ); + virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen ); }; #endif diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index f00f10104..7a13a7264 100755 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -27,10 +27,10 @@ #ifndef _CUI_PASSWDOMDLG_HXX_ #define _CUI_PASSWDOMDLG_HXX_ -#include #include +#include ////////////////////////////////////////////////////////////////////// @@ -38,18 +38,20 @@ struct PasswordToOpenModifyDialog_Impl; class PasswordToOpenModifyDialog : public SfxModalDialog { - boost::shared_ptr< PasswordToOpenModifyDialog_Impl > m_pImpl; + std::auto_ptr< PasswordToOpenModifyDialog_Impl > m_pImpl; // disallow use of copy c-tor and assignment operator PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & ); PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ); public: - PasswordToOpenModifyDialog( Window * pParent ); + PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */); virtual ~PasswordToOpenModifyDialog(); + // AbstractPasswordToOpenModifyDialog virtual String GetPasswordToOpen() const; virtual String GetPasswordToModify() const; + virtual bool IsRecommendToOpenReadonly() const; }; ////////////////////////////////////////////////////////////////////// -- cgit v1.2.3 From 05321c895f23278ad9621e2646b29e34b72eeaa1 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Mon, 8 Mar 2010 10:25:28 +0100 Subject: cws tl78: warning free code --- cui/source/dialogs/passwdomdlg.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 6914d4f72..9acb9d83c 100755 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -192,7 +192,7 @@ PasswordToOpenModifyDialog_Impl::~PasswordToOpenModifyDialog_Impl() } -IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, pEdit ) +IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit*/ ) { // force repaints to get the m_aDefaultTxt displayed again if (m_aReenterPasswdToOpenED.GetText().Len() == 0) -- cgit v1.2.3 From 3236907874418a04683aee334dc35bb887a3cd0c Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Mon, 8 Mar 2010 11:37:10 +0100 Subject: cws tl87: #i109634# password to open/modify dialog --- cui/source/dialogs/passwdomdlg.cxx | 22 ++++++---- cui/source/dialogs/passwdomdlg.hrc | 1 + cui/source/dialogs/passwdomdlg.src | 85 +++++++++++++++++++++----------------- 3 files changed, 61 insertions(+), 47 deletions(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 9acb9d83c..a6a75e18a 100755 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -106,23 +106,24 @@ struct PasswordToOpenModifyDialog_Impl { Window * m_pParent; + FixedLine m_aFileEncryptionFL; FixedText m_aPasswdToOpenFT; Edit m_aPasswdToOpenED; FixedText m_aReenterPasswdToOpenFT; PasswordReenterEdit_Impl m_aReenterPasswdToOpenED; - FixedImage m_aPasswdToOpenMatchFI; +// FixedImage m_aPasswdToOpenMatchFI; FixedText m_aPasswdNoteFT; FixedLine m_aButtonsFL; MoreButton m_aMoreFewerOptionsBTN; OKButton m_aOk; CancelButton m_aCancel; FixedLine m_aFileSharingOptionsFL; + CheckBox m_aOpenReadonlyCB; FixedText m_aPasswdToModifyFT; Edit m_aPasswdToModifyED; FixedText m_aReenterPasswdToModifyFT; PasswordReenterEdit_Impl m_aReenterPasswdToModifyED; - FixedImage m_aPasswdToModifyMatchFI; - CheckBox m_aOpenReadonlyCB; +// FixedImage m_aPasswdToModifyMatchFI; DECL_LINK( ModifyHdl, Edit * ); @@ -137,28 +138,31 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen ) : m_pParent( pParent ), + m_aFileEncryptionFL ( pParent, CUI_RES( FL_FILE_ENCRYPTION ) ), m_aPasswdToOpenFT ( pParent, CUI_RES( FT_PASSWD_TO_OPEN ) ), m_aPasswdToOpenED ( pParent, CUI_RES( ED_PASSWD_TO_OPEN ) ), m_aReenterPasswdToOpenFT ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_OPEN ) ), m_aReenterPasswdToOpenED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_OPEN ) ), - m_aPasswdToOpenMatchFI ( pParent, CUI_RES( FI_PASSWD_TO_OPEN_MATCH ) ), +// m_aPasswdToOpenMatchFI ( pParent, CUI_RES( FI_PASSWD_TO_OPEN_MATCH ) ), m_aPasswdNoteFT ( pParent, CUI_RES( FT_PASSWD_NOTE ) ), m_aButtonsFL ( pParent, CUI_RES( FL_BUTTONS ) ), m_aMoreFewerOptionsBTN ( pParent, CUI_RES( BTN_MORE_FEWER_OPTIONS ) ), m_aOk ( pParent, CUI_RES( BTN_OK ) ), m_aCancel ( pParent, CUI_RES( BTN_CANCEL ) ), m_aFileSharingOptionsFL ( pParent, CUI_RES( FL_FILE_SHARING_OPTIONS ) ), + m_aOpenReadonlyCB ( pParent, CUI_RES( CB_OPEN_READONLY ) ), m_aPasswdToModifyFT ( pParent, CUI_RES( FT_PASSWD_TO_MODIFY ) ), m_aPasswdToModifyED ( pParent, CUI_RES( ED_PASSWD_TO_MODIFY ) ), m_aReenterPasswdToModifyFT ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_MODIFY ) ), - m_aReenterPasswdToModifyED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_MODIFY ) ), - m_aPasswdToModifyMatchFI ( pParent, CUI_RES( FI_PASSWD_TO_MODIFY_MATCH ) ), - m_aOpenReadonlyCB ( pParent, CUI_RES( CB_OPEN_READONLY ) ) + m_aReenterPasswdToModifyED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_MODIFY ) ) +// m_aPasswdToModifyMatchFI ( pParent, CUI_RES( FI_PASSWD_TO_MODIFY_MATCH ) ) { +/* const sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode(); const Image aImage( CUI_RES( bHighContrast ? IMG_PASSWD_MATCH_HC : IMG_PASSWD_MATCH ) ); m_aPasswdToOpenMatchFI.SetImage( aImage ); m_aPasswdToModifyMatchFI.SetImage( aImage ); +*/ m_aMoreFewerOptionsBTN.SetMoreText( String( CUI_RES( STR_MORE_OPTIONS ) ) ); m_aMoreFewerOptionsBTN.SetLessText( String( CUI_RES( STR_FEWER_OPTIONS ) ) ); @@ -209,8 +213,8 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit* m_aOk.Enable( bToOpenMatch && bToModifyMatch && !bBothEmpty ); - m_aPasswdToOpenMatchFI.Enable( bToOpenMatch && !bBothEmpty ); - m_aPasswdToModifyMatchFI.Enable( bToModifyMatch && !bBothEmpty ); +// m_aPasswdToOpenMatchFI.Enable( bToOpenMatch && !bBothEmpty ); +// m_aPasswdToModifyMatchFI.Enable( bToModifyMatch && !bBothEmpty ); return 0; } diff --git a/cui/source/dialogs/passwdomdlg.hrc b/cui/source/dialogs/passwdomdlg.hrc index b9babd72f..64e560dec 100755 --- a/cui/source/dialogs/passwdomdlg.hrc +++ b/cui/source/dialogs/passwdomdlg.hrc @@ -28,6 +28,7 @@ #ifndef _CUI_PASSWDOMDLG_HRC_ #define _CUI_PASSWDOMDLG_HRC_ +#define FL_FILE_ENCRYPTION 10 #define FT_PASSWD_TO_OPEN 11 #define ED_PASSWD_TO_OPEN 12 #define FT_REENTER_PASSWD_TO_OPEN 13 diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src index a8d18b7ce..acc3819cb 100755 --- a/cui/source/dialogs/passwdomdlg.src +++ b/cui/source/dialogs/passwdomdlg.src @@ -32,56 +32,63 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { - Size = MAP_APPFONT( 171, 135 ); - Text [ en-US ] = "Password"; + Size = MAP_APPFONT( 171, 151 ); + Text [ en-US ] = "Set Password"; // HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY; Border = TRUE ; Moveable = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; - FixedText FT_PASSWD_TO_OPEN + FixedLine FL_FILE_ENCRYPTION { Pos = MAP_APPFONT( 3, 3 ); - Size = MAP_APPFONT( 145, 8 ); + Size = MAP_APPFONT( 165, 8 ); + Text [ en-US ] = "File encryption"; + }; + + FixedText FT_PASSWD_TO_OPEN + { + Pos = MAP_APPFONT( 6, 17 ); + Size = MAP_APPFONT( 159, 8 ); Text [ en-US ] = "~Enter password to open"; WordBreak = TRUE; }; Edit ED_PASSWD_TO_OPEN { - Pos = MAP_APPFONT( 3, 14 ); - Size = MAP_APPFONT( 145, 12 ); + Pos = MAP_APPFONT( 6, 28 ); + Size = MAP_APPFONT( 159, 12 ); Border = TRUE ; PassWord = TRUE ; }; FixedText FT_REENTER_PASSWD_TO_OPEN { - Pos = MAP_APPFONT( 3, 31 ); - Size = MAP_APPFONT( 145, 8 ); + Pos = MAP_APPFONT( 6, 45 ); + Size = MAP_APPFONT( 159, 8 ); Text [ en-US ] = "~Reenter password to open"; WordBreak = TRUE; }; Edit ED_REENTER_PASSWD_TO_OPEN { - Pos = MAP_APPFONT( 3, 42 ); - Size = MAP_APPFONT( 145, 12 ); + Pos = MAP_APPFONT( 6, 56 ); + Size = MAP_APPFONT( 159, 12 ); Border = TRUE ; PassWord = TRUE ; }; - +/* FixedImage FI_PASSWD_TO_OPEN_MATCH { Pos = MAP_APPFONT ( 150, 42 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; }; - +*/ FixedText FT_PASSWD_NOTE { - Pos = MAP_APPFONT( 3, 66 ); - Size = MAP_APPFONT( 165, 4*8 ); // some extra space for translation in other languages + Pos = MAP_APPFONT( 6, 80 ); + Size = MAP_APPFONT( 159, 4*8 ); // some extra space for translation in other languages Text [ en-US ] = "Note: If you lose or forget the password, it can not be recovered. "\ "It is advisable to keep passwords in a safe place. Passwords are "\ "case-sensitive."; @@ -90,13 +97,13 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY FixedLine FL_BUTTONS { - Pos = MAP_APPFONT( 0, 103 ); + Pos = MAP_APPFONT( 0, 117 ); Size = MAP_APPFONT( 171, 8 ); }; MoreButton BTN_MORE_FEWER_OPTIONS { - Pos = MAP_APPFONT( 3 , 116 ) ; + Pos = MAP_APPFONT( 6 , 130 ) ; Size = MAP_APPFONT( 50 , 14 ) ; Delta = 146 ; State = FALSE ; @@ -104,69 +111,70 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY OKButton BTN_OK { - Pos = MAP_APPFONT( 63, 116 ); + Pos = MAP_APPFONT( 62, 130 ); Size = MAP_APPFONT( 50, 14 ); DefButton = TRUE ; }; CancelButton BTN_CANCEL { - Pos = MAP_APPFONT( 118, 116 ); + Pos = MAP_APPFONT( 115, 130 ); Size = MAP_APPFONT( 50, 14 ); }; FixedLine FL_FILE_SHARING_OPTIONS { - Pos = MAP_APPFONT( 3, 140 ); + Pos = MAP_APPFONT( 3, 154 ); Size = MAP_APPFONT( 165, 8 ); Text [ en-US ] = "File sharing options"; }; + CheckBox CB_OPEN_READONLY + { + Pos = MAP_APPFONT( 6, 170 ); + Size = MAP_APPFONT( 159, 8 ); + + Text [ en-US ] = "Open file read-only"; + }; + FixedText FT_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 8, 156 ); - Size = MAP_APPFONT( 140, 8 ); + Pos = MAP_APPFONT( 6, 186 ); + Size = MAP_APPFONT( 159, 8 ); Text [ en-US ] = "Enter password to modify"; WordBreak = TRUE; }; Edit ED_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 8, 166 ); - Size = MAP_APPFONT( 140, 12 ); + Pos = MAP_APPFONT( 6, 196 ); + Size = MAP_APPFONT( 159, 12 ); Border = TRUE ; PassWord = TRUE ; }; FixedText FT_REENTER_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 8, 184 ); - Size = MAP_APPFONT( 140, 8 ); + Pos = MAP_APPFONT( 6, 214 ); + Size = MAP_APPFONT( 159, 8 ); Text [ en-US ] = "Reenter password to modify"; WordBreak = TRUE; }; Edit ED_REENTER_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 8, 194 ); - Size = MAP_APPFONT( 140, 12 ); + Pos = MAP_APPFONT( 6, 224 ); + Size = MAP_APPFONT( 159, 12 ); Border = TRUE ; PassWord = TRUE ; }; - +/* FixedImage FI_PASSWD_TO_MODIFY_MATCH { - Pos = MAP_APPFONT ( 150, 194 ) ; + Pos = MAP_APPFONT ( 150, 224 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; }; - - CheckBox CB_OPEN_READONLY - { - Pos = MAP_APPFONT( 8, 212 ); - Size = MAP_APPFONT( 140, 8 ); - - Text [ en-US ] = "Recommend to open file read-only"; - }; +*/ String STR_PASSWD_MUST_BE_CONFIRMED { @@ -182,7 +190,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Text [ en-US ] = "Fewer ~Options" ; }; - +/* Image IMG_PASSWD_MATCH { ImageBitmap = Bitmap { File = "apply.png"; }; @@ -192,5 +200,6 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { ImageBitmap = Bitmap { File = "apply_h.png"; }; }; +*/ }; -- cgit v1.2.3 From 61e48f45116c2290983e38737a56ba2fa44af6b4 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Fri, 19 Mar 2010 11:13:29 +0100 Subject: cws tl79: #i110254# new 'Security' tab page --- cui/source/options/optinet2.cxx | 216 +--------------------------------------- cui/source/options/optinet2.hrc | 6 -- cui/source/options/optinet2.hxx | 14 +-- cui/source/options/optinet2.src | 31 ------ 4 files changed, 3 insertions(+), 264 deletions(-) mode change 100644 => 100755 cui/source/options/optinet2.cxx mode change 100644 => 100755 cui/source/options/optinet2.hrc mode change 100644 => 100755 cui/source/options/optinet2.hxx mode change 100644 => 100755 cui/source/options/optinet2.src (limited to 'cui/source') diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx old mode 100644 new mode 100755 index 43800ae4d..6144bb40a --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -1329,17 +1329,10 @@ SvxSecurityTabPage::SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet ,maMacroSecFL ( this, CUI_RES( FL_SEC_MACROSEC ) ) ,maMacroSecFI ( this, CUI_RES( FI_SEC_MACROSEC ) ) ,maMacroSecPB ( this, CUI_RES( PB_SEC_MACROSEC ) ) - ,maFilesharingFL ( this, CUI_RES( FL_SEC_FILESHARING ) ) - ,maRecommReadOnlyCB ( this, CUI_RES( CB_SEC_RECOMMREADONLY ) ) - ,maRecordChangesCB ( this, CUI_RES( CB_SEC_RECORDCHANGES ) ) - ,maProtectRecordsPB ( this, CUI_RES( PB_SEC_PROTRECORDS ) ) ,mpSecOptions ( new SvtSecurityOptions ) ,mpSecOptDlg ( NULL ) - ,meRedlingMode ( RL_NONE ) - ,msProtectRecordsStr( CUI_RES( STR_SEC_PROTRECORDS ) ) - ,msUnprotectRecordsStr( CUI_RES( STR_SEC_UNPROTRECORDS ) ) ,msPasswordStoringDeactivateStr( CUI_RES( STR_SEC_NOPASSWDSAVE ) ) { @@ -1353,8 +1346,6 @@ SvxSecurityTabPage::SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet maMasterPasswordCB.SetClickHdl( LINK( this, SvxSecurityTabPage, MasterPasswordCBHdl ) ); maShowConnectionsPB.SetClickHdl( LINK( this, SvxSecurityTabPage, ShowPasswordsHdl ) ); maMacroSecPB.SetClickHdl( LINK( this, SvxSecurityTabPage, MacroSecPBHdl ) ); - maProtectRecordsPB.SetClickHdl( LINK( this, SvxSecurityTabPage, ProtectRecordsPBHdl ) ); - maRecordChangesCB.SetClickHdl( LINK( this, SvxSecurityTabPage, RecordChangesCBHdl ) ); ActivatePage( rSet ); } @@ -1524,127 +1515,6 @@ IMPL_LINK( SvxSecurityTabPage, MacroSecPBHdl, void*, EMPTYARG ) return 0; } -namespace -{ - enum RedlineFunc { RF_ON, RF_PROTECT }; - - const SfxBoolItem* ExecuteRecordChangesFunc( SvxSecurityTabPage::RedliningMode _eMode, RedlineFunc _eFunc, BOOL _bVal, Window* _pParent = NULL ) - { - const SfxBoolItem* pRet = NULL; - - if( _eMode != SvxSecurityTabPage::RL_NONE ) - { - USHORT nSlot; - if ( _eMode == SvxSecurityTabPage::RL_WRITER ) - nSlot = ( _eFunc == RF_ON )? FN_REDLINE_ON : FN_REDLINE_PROTECT; - else - nSlot = ( _eFunc == RF_ON )? FID_CHG_RECORD : SID_CHG_PROTECT; - - // execute - SfxViewShell* pViewSh = SfxViewShell::Current(); - if( pViewSh ) - { - bool bNeedItem = ( _eMode == SvxSecurityTabPage::RL_WRITER || _eFunc != RF_ON ); - SfxBoolItem* pItem = bNeedItem ? new SfxBoolItem( nSlot, _bVal ) : NULL; - SfxDispatcher* pDisp = pViewSh->GetDispatcher(); - if ( _pParent ) - { - OfaPtrItem aParentItem( SID_ATTR_PARENTWINDOW, _pParent ); - pRet = static_cast< const SfxBoolItem* >( - pDisp->Execute( nSlot, SFX_CALLMODE_SYNCHRON, &aParentItem, pItem, 0L ) ); - } - else - pRet = static_cast< const SfxBoolItem* >( - pDisp->Execute( nSlot, SFX_CALLMODE_SYNCHRON, pItem, 0L ) ); - delete pItem; - } - } - - return pRet; - } - - bool QueryState( USHORT _nSlot, bool& _rValue ) - { - bool bRet = false; - - SfxViewShell* pViewSh = SfxViewShell::Current(); - if( pViewSh ) - { - const SfxPoolItem* pItem; - SfxDispatcher* pDisp = pViewSh->GetDispatcher(); - bRet = SFX_ITEM_AVAILABLE <= pDisp->QueryState( _nSlot, pItem ); - if( bRet ) - _rValue = ( static_cast< const SfxBoolItem* >( pItem ) )->GetValue(); - } - - return bRet; - } - - bool QueryRecordChangesProtectionState( SvxSecurityTabPage::RedliningMode _eMode, bool& _rValue ) - { - bool bRet = false; - - if( _eMode != SvxSecurityTabPage::RL_NONE ) - { - USHORT nSlot = ( _eMode == SvxSecurityTabPage::RL_WRITER )? FN_REDLINE_PROTECT : SID_CHG_PROTECT; - bRet = QueryState( nSlot, _rValue ); - } - - return bRet; - } - - bool QueryRecordChangesState( SvxSecurityTabPage::RedliningMode _eMode, bool& _rValue ) - { - bool bRet = false; - - if( _eMode != SvxSecurityTabPage::RL_NONE ) - { - USHORT nSlot = ( _eMode == SvxSecurityTabPage::RL_WRITER )? FN_REDLINE_ON : FID_CHG_RECORD; - bRet = QueryState( nSlot, _rValue ); - } - - return bRet; - } -} - -IMPL_LINK( SvxSecurityTabPage, RecordChangesCBHdl, void*, EMPTYARG ) -{ - ExecuteRecordChangesFunc( meRedlingMode, RF_ON, maRecordChangesCB.IsChecked(), this ); - CheckRecordChangesState(); - return 0; -} - -IMPL_LINK( SvxSecurityTabPage, ProtectRecordsPBHdl, void*, EMPTYARG ) -{ - bool bProt; - QueryRecordChangesProtectionState( meRedlingMode, bProt ); - ExecuteRecordChangesFunc( meRedlingMode, RF_PROTECT, !bProt, this ); - CheckRecordChangesState(); - - if ( QueryRecordChangesProtectionState( meRedlingMode, bProt ) ) - { - // RecordChangesCB is enabled if protection is off - maRecordChangesCB.Enable( !bProt ); - // toggle text of button "Protect" <-> "Unprotect" - String sNewText = bProt ? msUnprotectRecordsStr : msProtectRecordsStr; - maProtectRecordsPB.SetText( sNewText ); - } - return 0; -} - -void SvxSecurityTabPage::CheckRecordChangesState( void ) -{ - bool bVal; - if( QueryRecordChangesState( meRedlingMode, bVal ) ) - { - maRecordChangesCB.Enable(); - maRecordChangesCB.Check( bVal ); - } - else - maRecordChangesCB.Disable(); // because now we don't know the state! - - maProtectRecordsPB.Enable( QueryRecordChangesProtectionState( meRedlingMode, bVal ) ); -} void SvxSecurityTabPage::InitControls() { @@ -1661,30 +1531,13 @@ void SvxSecurityTabPage::InitControls() maMacroSecFL.Hide(); maMacroSecFI.Hide(); maMacroSecPB.Hide(); - - // rearrange the following controls - Point aNewPos = maFilesharingFL.GetPosPixel(); - long nDelta = aNewPos.Y() - maMacroSecFL.GetPosPixel().Y(); - - Window* pWins[] = - { - &maFilesharingFL, &maRecommReadOnlyCB, &maRecordChangesCB, &maProtectRecordsPB - }; - Window** pCurrent = pWins; - const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[ 0 ] ); - for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent ) - { - aNewPos = (*pCurrent)->GetPosPixel(); - aNewPos.Y() -= nDelta; - (*pCurrent)->SetPosPixel( aNewPos ); - } } // one button too small for its text? sal_Int32 i = 0; long nBtnTextWidth = 0; Window* pButtons[] = { &maSecurityOptionsPB, &maMasterPasswordPB, - &maShowConnectionsPB, &maMacroSecPB, &maProtectRecordsPB }; + &maShowConnectionsPB, &maMacroSecPB }; Window** pButton = pButtons; const sal_Int32 nBCount = sizeof( pButtons ) / sizeof( pButtons[ 0 ] ); for ( ; i < nBCount; ++i, ++pButton ) @@ -1724,8 +1577,7 @@ void SvxSecurityTabPage::InitControls() } Window* pControls[] = { &maSecurityOptionsFI, &maSavePasswordsCB, - &maMasterPasswordFI, &maMacroSecFI, - &maRecommReadOnlyCB, &maRecordChangesCB }; + &maMasterPasswordFI, &maMacroSecFI }; Window** pControl = pControls; const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[ 0 ] ); for ( i = 0; i < nCCount; ++i, ++pControl ) @@ -1844,15 +1696,6 @@ BOOL SvxSecurityTabPage::FillItemSet( SfxItemSet& ) CheckAndSave( *mpSecOptions, SvtSecurityOptions::E_CTRLCLICK_HYPERLINK, mpSecOptDlg->IsCtrlHyperlinkChecked(), bModified ); } - // document options - SfxObjectShell* pCurDocShell = SfxObjectShell::Current(); - if( pCurDocShell ) - { - if( pCurDocShell->HasSecurityOptOpenReadOnly() ) - pCurDocShell->SetSecurityOptOpenReadOnly( maRecommReadOnlyCB.IsChecked() ); - - } - return bModified; } @@ -1860,65 +1703,10 @@ BOOL SvxSecurityTabPage::FillItemSet( SfxItemSet& ) void SvxSecurityTabPage::Reset( const SfxItemSet& ) { - String sNewText = msProtectRecordsStr; SfxObjectShell* pCurDocShell = SfxObjectShell::Current(); if( pCurDocShell ) { - bool bIsHTMLDoc = false; - SfxViewShell* pViewSh = SfxViewShell::Current(); - if( pViewSh ) - { - const SfxPoolItem* pItem; - SfxDispatcher* pDisp = pViewSh->GetDispatcher(); - if ( SFX_ITEM_AVAILABLE <= pDisp->QueryState( SID_HTML_MODE, pItem ) ) - { - USHORT nMode = static_cast< const SfxUInt16Item* >( pItem )->GetValue(); - bIsHTMLDoc = ( ( nMode & HTMLMODE_ON ) != 0 ); - } - } - - sal_Bool bIsReadonly = pCurDocShell->IsReadOnly(); - if( pCurDocShell->HasSecurityOptOpenReadOnly() && !bIsHTMLDoc ) - { - maRecommReadOnlyCB.Check( pCurDocShell->IsSecurityOptOpenReadOnly() ); - maRecommReadOnlyCB.Enable( !bIsReadonly ); - } - else - maRecommReadOnlyCB.Disable(); - - bool bVal; - if ( QueryRecordChangesState( RL_WRITER, bVal ) && !bIsHTMLDoc ) - meRedlingMode = RL_WRITER; - else if( QueryRecordChangesState( RL_CALC, bVal ) ) - meRedlingMode = RL_CALC; - else - meRedlingMode = RL_NONE; - - if ( meRedlingMode != RL_NONE ) - { - maRecordChangesCB.Check( bVal ); - maRecordChangesCB.Enable( !bVal && !bIsReadonly ); - maProtectRecordsPB.Enable( - QueryRecordChangesProtectionState( meRedlingMode, bVal ) && !bIsReadonly ); - // set the right text - if ( bVal ) - sNewText = msUnprotectRecordsStr; - } - else - { - // only Writer and Calc support redlining - maRecordChangesCB.Disable(); - maProtectRecordsPB.Disable(); - } } - else - { // no doc -> hide document settings - maRecommReadOnlyCB.Disable(); - maRecordChangesCB.Disable(); - maProtectRecordsPB.Disable(); - } - - maProtectRecordsPB.SetText( sNewText ); } //added by jmeng begin diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc old mode 100644 new mode 100755 index 993eabd4e..75f9445eb --- a/cui/source/options/optinet2.hrc +++ b/cui/source/options/optinet2.hrc @@ -116,13 +116,7 @@ #define FL_SEC_MACROSEC 19 #define FI_SEC_MACROSEC 20 #define PB_SEC_MACROSEC 21 -#define FL_SEC_FILESHARING 22 -#define CB_SEC_RECOMMREADONLY 23 -#define CB_SEC_RECORDCHANGES 24 -#define PB_SEC_PROTRECORDS 25 -#define STR_SEC_PROTRECORDS 10 -#define STR_SEC_UNPROTRECORDS 11 #define STR_SEC_NOPASSWDSAVE 12 #define TP_WIDTH 260 diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx old mode 100644 new mode 100755 index f4c8cbc56..fc199bf2e --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -232,8 +232,6 @@ class SvxSecurityTabPage : public SfxTabPage { using TabPage::ActivatePage; using TabPage::DeactivatePage; -public: - enum RedliningMode { RL_NONE, RL_WRITER, RL_CALC }; private: FixedLine maSecurityOptionsFL; @@ -251,17 +249,10 @@ private: FixedInfo maMacroSecFI; PushButton maMacroSecPB; - FixedLine maFilesharingFL; - CheckBox maRecommReadOnlyCB; - CheckBox maRecordChangesCB; - PushButton maProtectRecordsPB; SvtSecurityOptions* mpSecOptions; svx::SecurityOptionsDialog* mpSecOptDlg; - RedliningMode meRedlingMode; - String msProtectRecordsStr; - String msUnprotectRecordsStr; String msPasswordStoringDeactivateStr; DECL_LINK( SecurityOptionsHdl, PushButton* ); @@ -270,10 +261,7 @@ private: DECL_LINK( MasterPasswordCBHdl, void* ); DECL_LINK( ShowPasswordsHdl, PushButton* ); DECL_LINK( MacroSecPBHdl, void* ); - DECL_LINK( RecordChangesCBHdl, void* ); - DECL_LINK( ProtectRecordsPBHdl, void* ); - - void CheckRecordChangesState( void ); + void InitControls(); SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src old mode 100644 new mode 100755 index 538bed92f..848cdc278 --- a/cui/source/options/optinet2.src +++ b/cui/source/options/optinet2.src @@ -507,37 +507,6 @@ TabPage RID_SVXPAGE_INET_SECURITY Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Macro Security..."; }; - FixedLine FL_SEC_FILESHARING - { - Pos = MAP_APPFONT( COL_0, ROW_7 ); - Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT ); - Text [ en-US ] = "File sharing options for this document"; - }; - CheckBox CB_SEC_RECOMMREADONLY - { - Pos = MAP_APPFONT( COL_1, ROW_8 ); - Size = MAP_APPFONT( COL_2-COL_1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "Open this document in read-only mode"; - }; - CheckBox CB_SEC_RECORDCHANGES - { - Pos = MAP_APPFONT( COL_1, ROW_9 ); - Size = MAP_APPFONT( COL_2-COL_1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "Record changes"; - }; - PushButton PB_SEC_PROTRECORDS - { - Pos = MAP_APPFONT( COL_3, ROW_9-2 ); - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); - }; - String STR_SEC_PROTRECORDS - { - Text [ en-US ] = "Protect..."; - }; - String STR_SEC_UNPROTRECORDS - { - Text [ en-US ] = "Unprotect..."; - }; String STR_SEC_NOPASSWDSAVE { Text [ en-US ] = "Disabling the function to persistently store passwords deletes the list of passwords stored and resets the master password.\n\nDo you want to delete password list and reset master password?"; -- cgit v1.2.3 From addedfabc4cbb477edf9d17fecabe13628c28c9d Mon Sep 17 00:00:00 2001 From: Daniel Rentz Date: Thu, 8 Apr 2010 11:37:04 +0200 Subject: tl78: #i109634# use MAP_APPFONT for MoreButton delta --- cui/source/dialogs/passwdomdlg.src | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src index acc3819cb..4879e26a8 100755 --- a/cui/source/dialogs/passwdomdlg.src +++ b/cui/source/dialogs/passwdomdlg.src @@ -32,7 +32,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { - Size = MAP_APPFONT( 171, 151 ); + Size = MAP_APPFONT( 171, 150 ); Text [ en-US ] = "Set Password"; // HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY; Border = TRUE ; @@ -105,7 +105,8 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Pos = MAP_APPFONT( 6 , 130 ) ; Size = MAP_APPFONT( 50 , 14 ) ; - Delta = 146 ; + Delta = 92 ; + MapUnit = MAP_APPFONT ; State = FALSE ; }; -- cgit v1.2.3 From 79168a24fe31bdd6ff0cdea1d41b115d36be3106 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Thu, 22 Apr 2010 13:08:19 +0200 Subject: cws tl80: #i110341# problems with spell check dialog fixed --- cui/source/dialogs/SpellDialog.cxx | 42 +++++++++++++++++++------------------- cui/source/inc/SpellDialog.hxx | 13 ++++++++---- 2 files changed, 30 insertions(+), 25 deletions(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index f4329ffef..b95c8dc91 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -389,14 +389,14 @@ void SpellDialog::UpdateBoxes_Impl() } // ----------------------------------------------------------------------- -void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence) +void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrentError ) { //initially or after the last error of a sentence MarkNextError will fail //then GetNextSentence() has to be called followed again by MarkNextError() //MarkNextError is not initally called if the UndoEdit mode is active bool bNextSentence = false; - if((!aSentenceED.IsUndoEditMode() && aSentenceED.MarkNextError()) || - true == ( bNextSentence = GetNextSentence_Impl(bUseSavedSentence) && aSentenceED.MarkNextError())) + if((!aSentenceED.IsUndoEditMode() && aSentenceED.MarkNextError( bIgnoreCurrentError )) || + true == ( bNextSentence = GetNextSentence_Impl(bUseSavedSentence, aSentenceED.IsUndoEditMode()) && aSentenceED.MarkNextError( false ))) { const SpellErrorDescription* pSpellErrorDescription = aSentenceED.GetAlternatives(); if( pSpellErrorDescription ) @@ -795,14 +795,12 @@ IMPL_LINK( SpellDialog, IgnoreHdl, Button *, EMPTYARG ) } else { - //in case the error has been changed manually it has to be restored + //in case the error has been changed manually it has to be restored, + // since the users choice now was to ignore the error aSentenceED.RestoreCurrentError(); - rParent.ApplyChangedSentence(aSentenceED.CreateSpellPortions(true)); - aSentenceED.ResetModified(); // the word is being ignored - SpellContinue_Impl(); - bModified = false; + SpellContinue_Impl( false, true ); } return 1; } @@ -1074,11 +1072,8 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd) -----------------------------------------------------------------------*/ IMPL_LINK(SpellDialog, CancelHdl, Button *, EMPTYARG ) { - //apply changes first - if there are any - if(aSentenceED.IsModified()) - { - rParent.ApplyChangedSentence(aSentenceED.CreateSpellPortions(false)); - } + //apply changes and ignored text parts first - if there are any + rParent.ApplyChangedSentence(aSentenceED.CreateSpellPortions(true), false); Close(); return 0; } @@ -1158,15 +1153,17 @@ void SpellDialog::InvalidateDialog() /*-- 10.09.2003 08:35:56--------------------------------------------------- -----------------------------------------------------------------------*/ -bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence) +bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) { bool bRet = false; - if(!bUseSavedSentence && aSentenceED.IsModified()) + if(!bUseSavedSentence /*&& aSentenceED.IsModified()*/) { - rParent.ApplyChangedSentence(aSentenceED.CreateSpellPortions(false)); + //apply changes and ignored text parts + rParent.ApplyChangedSentence(aSentenceED.CreateSpellPortions(true), bRecheck); } + aSentenceED.ResetIgnoreErrorsAt(); aSentenceED.ResetModified(); - SpellPortions aSentence = bUseSavedSentence ? m_aSavedSentence : rParent.GetNextWrongSentence(); + SpellPortions aSentence = bUseSavedSentence ? m_aSavedSentence : rParent.GetNextWrongSentence( bRecheck ); if(!bUseSavedSentence) m_aSavedSentence = aSentence; bool bHasReplaced = false; @@ -1177,8 +1174,8 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence) if(!ApplyChangeAllList_Impl(aSentence, bHasReplaced)) { - rParent.ApplyChangedSentence(aSentence); - aSentence = rParent.GetNextWrongSentence(); + rParent.ApplyChangedSentence(aSentence, bRecheck); + aSentence = rParent.GetNextWrongSentence( bRecheck ); } else break; @@ -1642,8 +1639,10 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) /*-- 10.09.2003 13:38:14--------------------------------------------------- -----------------------------------------------------------------------*/ -bool SentenceEditWindow_Impl::MarkNextError() +bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError ) { + if (bIgnoreCurrentError) + m_aIgnoreErrorsAt.insert( m_nErrorStart ); ExtTextEngine* pTextEngine = GetTextEngine(); USHORT nTextLen = pTextEngine->GetTextLen(0); if(m_nErrorEnd >= nTextLen - 1) @@ -1981,7 +1980,8 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore aPortion1.eLanguage = eLang; aPortion1.sText = pTextEngine->GetText( TextSelection(TextPaM(0, nStart), TextPaM(0, aStart->nPosition))); - if( bSetIgnoreFlag && m_nErrorStart == nStart ) + bool bIsIgnoreError = m_aIgnoreErrorsAt.find( nStart ) != m_aIgnoreErrorsAt.end(); + if( bSetIgnoreFlag && bIsIgnoreError /*m_nErrorStart == nStart*/ ) { aPortion1.bIgnoreThisError = true; } diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 3fa62d432..49a219aa6 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -50,6 +50,8 @@ #include #include +#include + class ScrollBar; class TextEngine; class ExtTextView; @@ -72,11 +74,12 @@ class SentenceEditWindow_Impl : public MultiLineEdit/*, public SfxListener*/ using MultiLineEdit::SetText; private: + std::set< USHORT > m_aIgnoreErrorsAt; USHORT m_nErrorStart; USHORT m_nErrorEnd; bool m_bIsUndoEditMode; - Link m_aModifyLink; + Link m_aModifyLink; void CallModifyLink() {m_aModifyLink.Call(this);} @@ -93,7 +96,7 @@ public: void SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd ); void SetText( const String& rStr ); - bool MarkNextError(); + bool MarkNextError( bool bIgnoreCurrentError ); void ChangeMarkedWord(const String& rNewWord, LanguageType eLanguage); void MoveErrorMarkTo(USHORT nErrorStart, USHORT nErrorEnd, bool bGrammar); String GetErrorText() const; @@ -121,6 +124,8 @@ public: void UndoActionEnd( USHORT nId ); void MoveErrorEnd(long nOffset); + + void ResetIgnoreErrorsAt() { m_aIgnoreErrorsAt.clear(); } }; @@ -221,7 +226,7 @@ private: void InitUserDicts(); void UpdateBoxes_Impl(); void Init_Impl(); - void SpellContinue_Impl(bool UseSavedSentence = false); + void SpellContinue_Impl(bool UseSavedSentence = false, bool bIgnoreCurrentError = false ); void LockFocusChanges( bool bLock ) {bFocusLocked = bLock;} void Impl_Restore(); @@ -230,7 +235,7 @@ private: /** Retrieves the next sentence. */ - bool GetNextSentence_Impl(bool bUseSavedSentence); + bool GetNextSentence_Impl(bool bUseSavedSentence, bool bRechek /*for rechecking the curretn sentence*/); /** Corrects all errors that have been selected to be changed always */ bool ApplyChangeAllList_Impl(SpellPortions& rSentence, bool& bHasReplaced); -- cgit v1.2.3 From 8cf1c1b8f9408c9a63ed3e76ea08451a4c312607 Mon Sep 17 00:00:00 2001 From: Niklas Nebel Date: Mon, 10 May 2010 12:31:26 +0200 Subject: calc54: #i111482# use right variable for loop in ApplyLanguageOptions --- cui/source/options/treeopt.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cui/source') diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 3765fde62..1c02830b7 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1823,7 +1823,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) while ( _pViewFrame ) { _pViewFrame->GetDispatcher()->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L); - _pViewFrame = SfxViewFrame::GetNext( *pViewFrame ); + _pViewFrame = SfxViewFrame::GetNext( *_pViewFrame ); } } } -- cgit v1.2.3 From e7f5e03255be4564af1e723f36b3cd33bdec4ca0 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Tue, 11 May 2010 11:52:13 +0200 Subject: cws tl78: #i109634# changes to password to open/modify dialog --- cui/source/dialogs/passwdomdlg.cxx | 79 +++++++++++++++++++++++++++++++++----- cui/source/dialogs/passwdomdlg.hrc | 3 ++ cui/source/dialogs/passwdomdlg.src | 31 +++++++++++---- 3 files changed, 96 insertions(+), 17 deletions(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index a6a75e18a..bb342562f 100755 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -43,6 +43,7 @@ #include #include #include +#include ////////////////////////////////////////////////////////////////////// @@ -67,7 +68,8 @@ public: PasswordReenterEdit_Impl::PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId ) : Edit( pParent, rResId ) { - m_aDefaultTxt = String( CUI_RES( STR_PASSWD_MUST_BE_CONFIRMED ) ); +// currently the spec does not want to display this text anymore... +// m_aDefaultTxt = String( CUI_RES( STR_PASSWD_MUST_BE_CONFIRMED ) ); } @@ -104,7 +106,7 @@ void PasswordReenterEdit_Impl::Paint( const Rectangle& rRect ) struct PasswordToOpenModifyDialog_Impl { - Window * m_pParent; + PasswordToOpenModifyDialog * m_pParent; FixedLine m_aFileEncryptionFL; FixedText m_aPasswdToOpenFT; @@ -125,16 +127,21 @@ struct PasswordToOpenModifyDialog_Impl PasswordReenterEdit_Impl m_aReenterPasswdToModifyED; // FixedImage m_aPasswdToModifyMatchFI; + String m_aOneMismatch; + String m_aTwoMismatch; + String m_aInvalidStateForOkButton; + - DECL_LINK( ModifyHdl, Edit * ); +// DECL_LINK( ModifyHdl, Edit * ); + DECL_LINK( OkBtnClickHdl, OKButton * ); - PasswordToOpenModifyDialog_Impl( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen ); + PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen ); ~PasswordToOpenModifyDialog_Impl(); }; PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( - Window * pParent, + PasswordToOpenModifyDialog * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen ) : m_pParent( pParent ), @@ -154,8 +161,11 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aPasswdToModifyFT ( pParent, CUI_RES( FT_PASSWD_TO_MODIFY ) ), m_aPasswdToModifyED ( pParent, CUI_RES( ED_PASSWD_TO_MODIFY ) ), m_aReenterPasswdToModifyFT ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_MODIFY ) ), - m_aReenterPasswdToModifyED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_MODIFY ) ) + m_aReenterPasswdToModifyED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_MODIFY ) ), // m_aPasswdToModifyMatchFI ( pParent, CUI_RES( FI_PASSWD_TO_MODIFY_MATCH ) ) + m_aOneMismatch( CUI_RES( STR_ONE_PASSWORD_MISMATCH ) ), + m_aTwoMismatch( CUI_RES( STR_TWO_PASSWORDS_MISMATCH ) ), + m_aInvalidStateForOkButton( CUI_RES( STR_INVALID_STATE_FOR_OK_BUTTON ) ) { /* const sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode(); @@ -167,13 +177,17 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aMoreFewerOptionsBTN.SetMoreText( String( CUI_RES( STR_MORE_OPTIONS ) ) ); m_aMoreFewerOptionsBTN.SetLessText( String( CUI_RES( STR_FEWER_OPTIONS ) ) ); +#if 0 Link aModifyLink = LINK( this, PasswordToOpenModifyDialog_Impl, ModifyHdl ); m_aPasswdToOpenED.SetModifyHdl( aModifyLink ); m_aReenterPasswdToOpenED.SetModifyHdl( aModifyLink ); m_aPasswdToModifyED.SetModifyHdl( aModifyLink ); m_aReenterPasswdToModifyED.SetModifyHdl( aModifyLink ); +#endif + + m_aOk.SetClickHdl( LINK( this, PasswordToOpenModifyDialog_Impl, OkBtnClickHdl ) ); - m_aOk.Enable( FALSE ); +// m_aOk.Enable( FALSE ); if (nMaxPasswdLen) { @@ -187,7 +201,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aPasswdToOpenED.GrabFocus(); - ModifyHdl( NULL ); +// ModifyHdl( NULL ); } @@ -195,7 +209,7 @@ PasswordToOpenModifyDialog_Impl::~PasswordToOpenModifyDialog_Impl() { } - +#if 0 IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit*/ ) { // force repaints to get the m_aDefaultTxt displayed again @@ -218,8 +232,55 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit* return 0; } +#endif +IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG /*pBtn*/ ) +{ + bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() && + m_aPasswdToOpenED.GetText().Len() == 0 && + m_aPasswdToModifyED.GetText().Len() == 0; + if (bInvalidState) + { + ErrorBox aErrorBox( m_pParent, WB_OK, m_aInvalidStateForOkButton ); + aErrorBox.Execute(); + } + else // check for mismatched passwords... + { + const bool bToOpenMatch = m_aPasswdToOpenED.GetText() == m_aReenterPasswdToOpenED.GetText(); + const bool bToModifyMatch = m_aPasswdToModifyED.GetText() == m_aReenterPasswdToModifyED.GetText(); + const int nMismatch = (bToOpenMatch? 0 : 1) + (bToModifyMatch? 0 : 1); + if (nMismatch > 0) + { + ErrorBox aErrorBox( m_pParent, WB_OK, nMismatch == 1 ? m_aOneMismatch : m_aTwoMismatch ); + aErrorBox.Execute(); + + Edit &rEdit = !bToOpenMatch? m_aPasswdToOpenED : m_aPasswdToModifyED; + PasswordReenterEdit_Impl &rRepeatEdit = !bToOpenMatch? m_aReenterPasswdToOpenED : m_aReenterPasswdToModifyED; + String aEmpty; + if (nMismatch == 1) + { + rEdit.SetText( aEmpty ); + rRepeatEdit.SetText( aEmpty ); + } + else if (nMismatch == 2) + { + m_aPasswdToOpenED.SetText( aEmpty ); + m_aReenterPasswdToOpenED.SetText( aEmpty ); + m_aPasswdToModifyED.SetText( aEmpty ); + m_aReenterPasswdToModifyED.SetText( aEmpty ); + } + rEdit.GrabFocus(); + } + else + { + m_pParent->EndDialog( RET_OK ); + } + } + + return 0; +} + ////////////////////////////////////////////////////////////////////// diff --git a/cui/source/dialogs/passwdomdlg.hrc b/cui/source/dialogs/passwdomdlg.hrc index 64e560dec..4e27b2a99 100755 --- a/cui/source/dialogs/passwdomdlg.hrc +++ b/cui/source/dialogs/passwdomdlg.hrc @@ -52,6 +52,9 @@ #define STR_MORE_OPTIONS 51 #define STR_FEWER_OPTIONS 52 #define STR_PASSWD_MUST_BE_CONFIRMED 53 +#define STR_ONE_PASSWORD_MISMATCH 54 +#define STR_TWO_PASSWORDS_MISMATCH 55 +#define STR_INVALID_STATE_FOR_OK_BUTTON 56 #endif diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src index 4879e26a8..94cb09dca 100755 --- a/cui/source/dialogs/passwdomdlg.src +++ b/cui/source/dialogs/passwdomdlg.src @@ -44,7 +44,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Pos = MAP_APPFONT( 3, 3 ); Size = MAP_APPFONT( 165, 8 ); - Text [ en-US ] = "File encryption"; + Text [ en-US ] = "File encryption password"; }; FixedText FT_PASSWD_TO_OPEN @@ -67,7 +67,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Pos = MAP_APPFONT( 6, 45 ); Size = MAP_APPFONT( 159, 8 ); - Text [ en-US ] = "~Reenter password to open"; + Text [ en-US ] = "Confirm password"; WordBreak = TRUE; }; @@ -89,9 +89,9 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Pos = MAP_APPFONT( 6, 80 ); Size = MAP_APPFONT( 159, 4*8 ); // some extra space for translation in other languages - Text [ en-US ] = "Note: If you lose or forget the password, it can not be recovered. "\ - "It is advisable to keep passwords in a safe place. Passwords are "\ - "case-sensitive."; + Text [ en-US ] = "Note: After a password has been set, the document will only open with "\ + "the password. Should you lose the password, there will be no way to "\ + "recover the document. Please also note that this password is case-sensitive."; WordBreak = TRUE; }; @@ -127,7 +127,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Pos = MAP_APPFONT( 3, 154 ); Size = MAP_APPFONT( 165, 8 ); - Text [ en-US ] = "File sharing options"; + Text [ en-US ] = "File sharing password"; }; CheckBox CB_OPEN_READONLY @@ -142,7 +142,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Pos = MAP_APPFONT( 6, 186 ); Size = MAP_APPFONT( 159, 8 ); - Text [ en-US ] = "Enter password to modify"; + Text [ en-US ] = "Enter password to allow editing"; WordBreak = TRUE; }; @@ -158,7 +158,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Pos = MAP_APPFONT( 6, 214 ); Size = MAP_APPFONT( 159, 8 ); - Text [ en-US ] = "Reenter password to modify"; + Text [ en-US ] = "Confirm password"; WordBreak = TRUE; }; @@ -191,6 +191,21 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Text [ en-US ] = "Fewer ~Options" ; }; + + String STR_ONE_PASSWORD_MISMATCH + { + Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ; + }; + + String STR_TWO_PASSWORDS_MISMATCH + { + Text [ en-US ] = "The confirmation passwords did not match the original passwords. Set the passwords again." ; + }; + + String STR_INVALID_STATE_FOR_OK_BUTTON + { + Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ; + }; /* Image IMG_PASSWD_MATCH { -- cgit v1.2.3 From bddc062798472dccbf4a2b4db9a7d73dc43d38a4 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 2 Jun 2010 11:00:52 +0200 Subject: CWS mba33issues01: #i78637#: shorten text for conversion options --- cui/source/options/optfltr.src | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cui/source') diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src index 56d7897c9..e24da54e6 100644 --- a/cui/source/options/optfltr.src +++ b/cui/source/options/optfltr.src @@ -147,19 +147,19 @@ TabPage RID_OFAPAGE_MSFILTEROPT2 }; String ST_CHG_MATH { - Text [ en-US ] = "MathType to %PRODUCTNAME Math / %PRODUCTNAME Math to MathType"; + Text [ en-US ] = "MathType to %PRODUCTNAME Math or reverse"; }; String ST_CHG_WRITER { - Text [ en-US ] = "WinWord to %PRODUCTNAME Writer / %PRODUCTNAME Writer to WinWord"; + Text [ en-US ] = "WinWord to %PRODUCTNAME Writer or reverse"; }; String ST_CHG_CALC { - Text [ en-US ] = "Excel to %PRODUCTNAME Calc / %PRODUCTNAME Calc to Excel"; + Text [ en-US ] = "Excel to %PRODUCTNAME Calc or reverse"; }; String ST_CHG_IMPRESS { - Text [ en-US ] = "PowerPoint to %PRODUCTNAME Impress / %PRODUCTNAME Impress to PowerPoint"; + Text [ en-US ] = "PowerPoint to %PRODUCTNAME Impress or reverse"; }; }; -- cgit v1.2.3 From d0d9cfb98d74fec94ff373b864ef0782e71353de Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Fri, 4 Jun 2010 16:19:56 +0200 Subject: fwk143: #i104704# Set unique ID for hyperlink dialog --- cui/source/dialogs/cuihyperdlg.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'cui/source') diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 5f225fa84..5c5926d4c 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -107,6 +107,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) mbReadOnly ( sal_False ), mbIsHTMLDoc ( sal_False ) { + SetUniqueId( SID_HYPERLINK_DIALOG ); mbGrabFocus = sal_True; // insert pages Image aImage; -- cgit v1.2.3 From 63149af3c1a4919cfbb6d00e1e84e0b2be4672a1 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Tue, 8 Jun 2010 19:16:00 +0200 Subject: cws tl78: #i109634# additional dialog parameter --- cui/source/dialogs/passwdomdlg.cxx | 13 +++++++++---- cui/source/factory/dlgfact.cxx | 4 ++-- cui/source/factory/dlgfact.hxx | 2 +- cui/source/inc/passwdomdlg.hxx | 4 +++- 4 files changed, 15 insertions(+), 8 deletions(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index bb342562f..070069b05 100755 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -135,7 +135,8 @@ struct PasswordToOpenModifyDialog_Impl // DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( OkBtnClickHdl, OKButton * ); - PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen ); + PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, + sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); ~PasswordToOpenModifyDialog_Impl(); }; @@ -143,7 +144,8 @@ struct PasswordToOpenModifyDialog_Impl PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, sal_uInt16 nMinPasswdLen, - sal_uInt16 nMaxPasswdLen ) : + sal_uInt16 nMaxPasswdLen, + bool bIsPasswordToModify ) : m_pParent( pParent ), m_aFileEncryptionFL ( pParent, CUI_RES( FL_FILE_ENCRYPTION ) ), m_aPasswdToOpenFT ( pParent, CUI_RES( FT_PASSWD_TO_OPEN ) ), @@ -202,6 +204,8 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aPasswdToOpenED.GrabFocus(); // ModifyHdl( NULL ); + + m_aMoreFewerOptionsBTN.Enable( bIsPasswordToModify ); } @@ -287,11 +291,12 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, - sal_uInt16 nMaxPasswdLen ) : + sal_uInt16 nMaxPasswdLen, + bool bIsPasswordToModify ) : SfxModalDialog( pParent, CUI_RES( RID_DLG_PASSWORD_TO_OPEN_MODIFY ) ) { m_pImpl = std::auto_ptr< PasswordToOpenModifyDialog_Impl >( - new PasswordToOpenModifyDialog_Impl( this, nMinPasswdLen, nMaxPasswdLen ) ); + new PasswordToOpenModifyDialog_Impl( this, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ) ); FreeResource(); } diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index ec919c472..7a5a3a7b0 100755 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1970,9 +1970,9 @@ SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Wind AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog( Window * pParent, - sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen ) + sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) { - PasswordToOpenModifyDialog * pDlg = new PasswordToOpenModifyDialog( pParent, nMinPasswdLen, nMaxPasswdLen ); + 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 b610deab3..41e80068d 100755 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -810,7 +810,7 @@ public: virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ); - virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen ); + virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); }; #endif diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 7a13a7264..7430fb825 100755 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -45,7 +45,9 @@ class PasswordToOpenModifyDialog : public SfxModalDialog PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ); public: - PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */); + PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, + sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */, + bool bIsPasswordToModify ); virtual ~PasswordToOpenModifyDialog(); // AbstractPasswordToOpenModifyDialog -- cgit v1.2.3 From bc60661945e738f691f6bc2c2926c294a3e5cba9 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Thu, 10 Jun 2010 16:06:02 +0200 Subject: cws tl78: #i109634# late changes to the new password dialog --- cui/source/dialogs/passwdomdlg.cxx | 12 +++++-- cui/source/dialogs/passwdomdlg.hrc | 13 ++++---- cui/source/dialogs/passwdomdlg.src | 65 ++++++++++++++++++++------------------ 3 files changed, 52 insertions(+), 38 deletions(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 070069b05..c5a371f97 100755 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -130,6 +130,9 @@ struct PasswordToOpenModifyDialog_Impl String m_aOneMismatch; String m_aTwoMismatch; String m_aInvalidStateForOkButton; + String m_aInvalidStateForOkButton_v2; + + bool m_bIsPasswordToModify; // DECL_LINK( ModifyHdl, Edit * ); @@ -167,7 +170,9 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( // m_aPasswdToModifyMatchFI ( pParent, CUI_RES( FI_PASSWD_TO_MODIFY_MATCH ) ) m_aOneMismatch( CUI_RES( STR_ONE_PASSWORD_MISMATCH ) ), m_aTwoMismatch( CUI_RES( STR_TWO_PASSWORDS_MISMATCH ) ), - m_aInvalidStateForOkButton( CUI_RES( STR_INVALID_STATE_FOR_OK_BUTTON ) ) + m_aInvalidStateForOkButton( CUI_RES( STR_INVALID_STATE_FOR_OK_BUTTON ) ), + m_aInvalidStateForOkButton_v2( CUI_RES( STR_INVALID_STATE_FOR_OK_BUTTON_V2 ) ), + m_bIsPasswordToModify( bIsPasswordToModify ) { /* const sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode(); @@ -206,6 +211,8 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( // ModifyHdl( NULL ); m_aMoreFewerOptionsBTN.Enable( bIsPasswordToModify ); + if (!bIsPasswordToModify) + m_aMoreFewerOptionsBTN.Hide( TRUE ); } @@ -246,7 +253,8 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG m_aPasswdToModifyED.GetText().Len() == 0; if (bInvalidState) { - ErrorBox aErrorBox( m_pParent, WB_OK, m_aInvalidStateForOkButton ); + ErrorBox aErrorBox( m_pParent, WB_OK, + m_bIsPasswordToModify? m_aInvalidStateForOkButton : m_aInvalidStateForOkButton_v2 ); aErrorBox.Execute(); } else // check for mismatched passwords... diff --git a/cui/source/dialogs/passwdomdlg.hrc b/cui/source/dialogs/passwdomdlg.hrc index 4e27b2a99..9ce3dab16 100755 --- a/cui/source/dialogs/passwdomdlg.hrc +++ b/cui/source/dialogs/passwdomdlg.hrc @@ -49,12 +49,13 @@ #define FI_PASSWD_TO_MODIFY_MATCH 28 #define CB_OPEN_READONLY 29 -#define STR_MORE_OPTIONS 51 -#define STR_FEWER_OPTIONS 52 -#define STR_PASSWD_MUST_BE_CONFIRMED 53 -#define STR_ONE_PASSWORD_MISMATCH 54 -#define STR_TWO_PASSWORDS_MISMATCH 55 -#define STR_INVALID_STATE_FOR_OK_BUTTON 56 +#define STR_MORE_OPTIONS 51 +#define STR_FEWER_OPTIONS 52 +#define STR_PASSWD_MUST_BE_CONFIRMED 53 +#define STR_ONE_PASSWORD_MISMATCH 54 +#define STR_TWO_PASSWORDS_MISMATCH 55 +#define STR_INVALID_STATE_FOR_OK_BUTTON 56 +#define STR_INVALID_STATE_FOR_OK_BUTTON_V2 57 #endif diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src index 94cb09dca..45843f262 100755 --- a/cui/source/dialogs/passwdomdlg.src +++ b/cui/source/dialogs/passwdomdlg.src @@ -32,7 +32,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { - Size = MAP_APPFONT( 171, 150 ); + Size = MAP_APPFONT( 200, 155 ); Text [ en-US ] = "Set Password"; // HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY; Border = TRUE ; @@ -43,14 +43,14 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY FixedLine FL_FILE_ENCRYPTION { Pos = MAP_APPFONT( 3, 3 ); - Size = MAP_APPFONT( 165, 8 ); + Size = MAP_APPFONT( 194, 8 ); Text [ en-US ] = "File encryption password"; }; FixedText FT_PASSWD_TO_OPEN { Pos = MAP_APPFONT( 6, 17 ); - Size = MAP_APPFONT( 159, 8 ); + Size = MAP_APPFONT( 188, 8 ); Text [ en-US ] = "~Enter password to open"; WordBreak = TRUE; }; @@ -58,7 +58,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY Edit ED_PASSWD_TO_OPEN { Pos = MAP_APPFONT( 6, 28 ); - Size = MAP_APPFONT( 159, 12 ); + Size = MAP_APPFONT( 188, 12 ); Border = TRUE ; PassWord = TRUE ; }; @@ -66,7 +66,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY FixedText FT_REENTER_PASSWD_TO_OPEN { Pos = MAP_APPFONT( 6, 45 ); - Size = MAP_APPFONT( 159, 8 ); + Size = MAP_APPFONT( 188, 8 ); Text [ en-US ] = "Confirm password"; WordBreak = TRUE; }; @@ -74,7 +74,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY Edit ED_REENTER_PASSWD_TO_OPEN { Pos = MAP_APPFONT( 6, 56 ); - Size = MAP_APPFONT( 159, 12 ); + Size = MAP_APPFONT( 188, 12 ); Border = TRUE ; PassWord = TRUE ; }; @@ -87,8 +87,8 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY */ FixedText FT_PASSWD_NOTE { - Pos = MAP_APPFONT( 6, 80 ); - Size = MAP_APPFONT( 159, 4*8 ); // some extra space for translation in other languages + Pos = MAP_APPFONT( 6, 74 ); + Size = MAP_APPFONT( 188, 5*8 ); // some extra space for translation in other languages Text [ en-US ] = "Note: After a password has been set, the document will only open with "\ "the password. Should you lose the password, there will be no way to "\ "recover the document. Please also note that this password is case-sensitive."; @@ -97,75 +97,75 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY FixedLine FL_BUTTONS { - Pos = MAP_APPFONT( 0, 117 ); - Size = MAP_APPFONT( 171, 8 ); + Pos = MAP_APPFONT( 0, 125 ); + Size = MAP_APPFONT( 200, 8 ); }; MoreButton BTN_MORE_FEWER_OPTIONS { - Pos = MAP_APPFONT( 6 , 130 ) ; - Size = MAP_APPFONT( 50 , 14 ) ; - Delta = 92 ; - MapUnit = MAP_APPFONT ; - State = FALSE ; + Pos = MAP_APPFONT( 6 , 136 ); + Size = MAP_APPFONT( 50 , 14 ); + Delta = 90; + MapUnit = MAP_APPFONT; + State = FALSE; }; OKButton BTN_OK { - Pos = MAP_APPFONT( 62, 130 ); + Pos = MAP_APPFONT( 88, 136 ); Size = MAP_APPFONT( 50, 14 ); DefButton = TRUE ; }; CancelButton BTN_CANCEL { - Pos = MAP_APPFONT( 115, 130 ); + Pos = MAP_APPFONT( 144, 136 ); Size = MAP_APPFONT( 50, 14 ); }; FixedLine FL_FILE_SHARING_OPTIONS { - Pos = MAP_APPFONT( 3, 154 ); - Size = MAP_APPFONT( 165, 8 ); + Pos = MAP_APPFONT( 3, 153 ); + Size = MAP_APPFONT( 194, 8 ); Text [ en-US ] = "File sharing password"; }; CheckBox CB_OPEN_READONLY { - Pos = MAP_APPFONT( 6, 170 ); - Size = MAP_APPFONT( 159, 8 ); + Pos = MAP_APPFONT( 6, 169 ); + Size = MAP_APPFONT( 188, 8 ); Text [ en-US ] = "Open file read-only"; }; FixedText FT_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 6, 186 ); - Size = MAP_APPFONT( 159, 8 ); + Pos = MAP_APPFONT( 6, 187 ); + Size = MAP_APPFONT( 188, 8 ); Text [ en-US ] = "Enter password to allow editing"; WordBreak = TRUE; }; Edit ED_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 6, 196 ); - Size = MAP_APPFONT( 159, 12 ); + Pos = MAP_APPFONT( 6, 197 ); + Size = MAP_APPFONT( 188, 12 ); Border = TRUE ; PassWord = TRUE ; }; FixedText FT_REENTER_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 6, 214 ); - Size = MAP_APPFONT( 159, 8 ); + Pos = MAP_APPFONT( 6, 215 ); + Size = MAP_APPFONT( 188, 8 ); Text [ en-US ] = "Confirm password"; WordBreak = TRUE; }; Edit ED_REENTER_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 6, 224 ); - Size = MAP_APPFONT( 159, 12 ); + Pos = MAP_APPFONT( 6, 225 ); + Size = MAP_APPFONT( 188, 12 ); Border = TRUE ; PassWord = TRUE ; }; @@ -204,7 +204,12 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY String STR_INVALID_STATE_FOR_OK_BUTTON { - Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ; + Text [ en-US ] = "Please enter a password." ; + }; + + String STR_INVALID_STATE_FOR_OK_BUTTON_V2 + { + Text [ en-US ] = "Please enter a password for file encryption." ; }; /* Image IMG_PASSWD_MATCH -- cgit v1.2.3 From 5f03177a5ce1291d8fe7328e6010ff851b9d82dc Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Fri, 11 Jun 2010 15:48:17 +0200 Subject: fwk143: #i104704# Hyperlink dialog needs its own HID to be accessible by the testtool --- cui/source/dialogs/cuihyperdlg.cxx | 2 +- cui/source/inc/helpid.hrc | 4 +++- cui/util/hidother.src | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 5c5926d4c..573819dfe 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -107,7 +107,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) mbReadOnly ( sal_False ), mbIsHTMLDoc ( sal_False ) { - SetUniqueId( SID_HYPERLINK_DIALOG ); + SetUniqueId( HID_HYPERLINK_DIALOG ); mbGrabFocus = sal_True; // insert pages Image aImage; diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index ff033f98a..85feba81c 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -373,6 +373,8 @@ #define HID_THES_LANGUAGE (HID_CUI_START + 338) #define HID_OFAPAGE_QUOTE_SW_CLB (HID_CUI_START + 339) #define HID_OFAPAGE_QUOTE_CLB (HID_CUI_START + 340) +#define HID_HYPERLINK_DIALOG (HID_CUI_START + 341) + // please adjust ACT_SVX_HID_END2 below if you add entries here! @@ -380,7 +382,7 @@ // Overrun check --------------------------------------------------------- // ----------------------------------------------------------------------- -#define ACT_CUI_HID_END HID_CUI_START + 340 +#define ACT_CUI_HID_END HID_CUI_START + 341 #if ACT_CUI_HID_END > HID_CUI_END #error Resource-Ueberlauf in #line, #file diff --git a/cui/util/hidother.src b/cui/util/hidother.src index 79bcbe7f4..c6eaa9f01 100644 --- a/cui/util/hidother.src +++ b/cui/util/hidother.src @@ -127,6 +127,7 @@ hidspecial HID_HANGULDLG_EDIT_NEWWORD { HelpID = HID_HANGULDLG_EDIT_NEWWO hidspecial HID_HANGULDLG_SUGGESTIONS { HelpId = HID_HANGULDLG_SUGGESTIONS; }; hidspecial HID_HANGULDLG_SUGGESTIONS_GRID { HelpId = HID_HANGULDLG_SUGGESTIONS_GRID; }; hidspecial HID_HANGULDLG_SUGGESTIONS_LIST { HelpId = HID_HANGULDLG_SUGGESTIONS_LIST; }; +hidspecial HID_HYPERLINK_DIALOG { HelpID = HID_HYPERLINK_DIALOG ;}; hidspecial HID_HYPERDLG_DOC_PATH { HelpID = HID_HYPERDLG_DOC_PATH ;}; hidspecial HID_HYPERDLG_INET_PATH { HelpID = HID_HYPERDLG_INET_PATH ;}; hidspecial HID_HYPERDLG_MAIL_PATH { HelpID = HID_HYPERDLG_MAIL_PATH ;}; -- cgit v1.2.3 From 952c250d6c03b1c4ab92b2b2dd09db75b43bc02a Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Fri, 11 Jun 2010 16:26:38 +0200 Subject: cws tl78: #i112304# missing help ids added --- cui/source/dialogs/passwdomdlg.src | 74 +++++++++++++++++++------------------- cui/source/inc/helpid.hrc | 10 +++++- 2 files changed, 47 insertions(+), 37 deletions(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src index 45843f262..7c5d58d1b 100755 --- a/cui/source/dialogs/passwdomdlg.src +++ b/cui/source/dialogs/passwdomdlg.src @@ -32,9 +32,9 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { - Size = MAP_APPFONT( 200, 155 ); + Size = MAP_APPFONT( 171, 150 ); Text [ en-US ] = "Set Password"; -// HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY; + HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY; Border = TRUE ; Moveable = TRUE ; OutputSize = TRUE ; @@ -43,22 +43,23 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY FixedLine FL_FILE_ENCRYPTION { Pos = MAP_APPFONT( 3, 3 ); - Size = MAP_APPFONT( 194, 8 ); + Size = MAP_APPFONT( 165, 8 ); Text [ en-US ] = "File encryption password"; }; FixedText FT_PASSWD_TO_OPEN { Pos = MAP_APPFONT( 6, 17 ); - Size = MAP_APPFONT( 188, 8 ); + Size = MAP_APPFONT( 159, 8 ); Text [ en-US ] = "~Enter password to open"; WordBreak = TRUE; }; Edit ED_PASSWD_TO_OPEN { + HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN; Pos = MAP_APPFONT( 6, 28 ); - Size = MAP_APPFONT( 188, 12 ); + Size = MAP_APPFONT( 159, 12 ); Border = TRUE ; PassWord = TRUE ; }; @@ -66,15 +67,16 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY FixedText FT_REENTER_PASSWD_TO_OPEN { Pos = MAP_APPFONT( 6, 45 ); - Size = MAP_APPFONT( 188, 8 ); + Size = MAP_APPFONT( 159, 8 ); Text [ en-US ] = "Confirm password"; WordBreak = TRUE; }; Edit ED_REENTER_PASSWD_TO_OPEN { + HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN; Pos = MAP_APPFONT( 6, 56 ); - Size = MAP_APPFONT( 188, 12 ); + Size = MAP_APPFONT( 159, 12 ); Border = TRUE ; PassWord = TRUE ; }; @@ -87,8 +89,8 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY */ FixedText FT_PASSWD_NOTE { - Pos = MAP_APPFONT( 6, 74 ); - Size = MAP_APPFONT( 188, 5*8 ); // some extra space for translation in other languages + Pos = MAP_APPFONT( 6, 80 ); + Size = MAP_APPFONT( 159, 4*8 ); // some extra space for translation in other languages Text [ en-US ] = "Note: After a password has been set, the document will only open with "\ "the password. Should you lose the password, there will be no way to "\ "recover the document. Please also note that this password is case-sensitive."; @@ -97,75 +99,80 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY FixedLine FL_BUTTONS { - Pos = MAP_APPFONT( 0, 125 ); - Size = MAP_APPFONT( 200, 8 ); + Pos = MAP_APPFONT( 0, 117 ); + Size = MAP_APPFONT( 171, 8 ); }; MoreButton BTN_MORE_FEWER_OPTIONS { - Pos = MAP_APPFONT( 6 , 136 ); - Size = MAP_APPFONT( 50 , 14 ); - Delta = 90; - MapUnit = MAP_APPFONT; - State = FALSE; + HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE; + Pos = MAP_APPFONT( 6 , 130 ) ; + Size = MAP_APPFONT( 50 , 14 ) ; + Delta = 92 ; + MapUnit = MAP_APPFONT ; + State = FALSE ; }; OKButton BTN_OK { - Pos = MAP_APPFONT( 88, 136 ); + Pos = MAP_APPFONT( 62, 130 ); Size = MAP_APPFONT( 50, 14 ); DefButton = TRUE ; }; CancelButton BTN_CANCEL { - Pos = MAP_APPFONT( 144, 136 ); + Pos = MAP_APPFONT( 115, 130 ); Size = MAP_APPFONT( 50, 14 ); }; FixedLine FL_FILE_SHARING_OPTIONS { - Pos = MAP_APPFONT( 3, 153 ); - Size = MAP_APPFONT( 194, 8 ); + Pos = MAP_APPFONT( 3, 154 ); + Size = MAP_APPFONT( 165, 8 ); Text [ en-US ] = "File sharing password"; }; CheckBox CB_OPEN_READONLY { - Pos = MAP_APPFONT( 6, 169 ); - Size = MAP_APPFONT( 188, 8 ); + HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY; + Pos = MAP_APPFONT( 6, 170 ); + Size = MAP_APPFONT( 159, 8 ); Text [ en-US ] = "Open file read-only"; }; FixedText FT_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 6, 187 ); - Size = MAP_APPFONT( 188, 8 ); + HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY; + Pos = MAP_APPFONT( 6, 186 ); + Size = MAP_APPFONT( 159, 8 ); Text [ en-US ] = "Enter password to allow editing"; WordBreak = TRUE; }; Edit ED_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 6, 197 ); - Size = MAP_APPFONT( 188, 12 ); + HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY; + Pos = MAP_APPFONT( 6, 196 ); + Size = MAP_APPFONT( 159, 12 ); Border = TRUE ; PassWord = TRUE ; }; FixedText FT_REENTER_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 6, 215 ); - Size = MAP_APPFONT( 188, 8 ); + Pos = MAP_APPFONT( 6, 214 ); + Size = MAP_APPFONT( 159, 8 ); Text [ en-US ] = "Confirm password"; WordBreak = TRUE; }; Edit ED_REENTER_PASSWD_TO_MODIFY { - Pos = MAP_APPFONT( 6, 225 ); - Size = MAP_APPFONT( 188, 12 ); + HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY; + Pos = MAP_APPFONT( 6, 224 ); + Size = MAP_APPFONT( 159, 12 ); Border = TRUE ; PassWord = TRUE ; }; @@ -204,12 +211,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY String STR_INVALID_STATE_FOR_OK_BUTTON { - Text [ en-US ] = "Please enter a password." ; - }; - - String STR_INVALID_STATE_FOR_OK_BUTTON_V2 - { - Text [ en-US ] = "Please enter a password for file encryption." ; + Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ; }; /* Image IMG_PASSWD_MATCH diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index ff033f98a..32d6b83c2 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -374,13 +374,21 @@ #define HID_OFAPAGE_QUOTE_SW_CLB (HID_CUI_START + 339) #define HID_OFAPAGE_QUOTE_CLB (HID_CUI_START + 340) +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY (HID_CUI_START + 341) +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN (HID_CUI_START + 342) +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN (HID_CUI_START + 343) +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE (HID_CUI_START + 344) +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY (HID_CUI_START + 345) +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY (HID_CUI_START + 346) +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY (HID_CUI_START + 347) + // please adjust ACT_SVX_HID_END2 below if you add entries here! // ----------------------------------------------------------------------- // Overrun check --------------------------------------------------------- // ----------------------------------------------------------------------- -#define ACT_CUI_HID_END HID_CUI_START + 340 +#define ACT_CUI_HID_END HID_CUI_START + 347 #if ACT_CUI_HID_END > HID_CUI_END #error Resource-Ueberlauf in #line, #file -- cgit v1.2.3 From 45135c615ad08542186e2339e8fe9f30f49cb159 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Fri, 11 Jun 2010 16:32:06 +0200 Subject: cws tl78: #i112304# missing help ids added --- cui/source/dialogs/passwdomdlg.src | 1 + 1 file changed, 1 insertion(+) (limited to 'cui/source') diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src index 7c5d58d1b..d974adf59 100755 --- a/cui/source/dialogs/passwdomdlg.src +++ b/cui/source/dialogs/passwdomdlg.src @@ -28,6 +28,7 @@ #include #include "passwdomdlg.hrc" +#include "helpid.hrc" ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY -- cgit v1.2.3 From 1ed972c2c4115352419e036e7d57426063f192e3 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Tue, 15 Jun 2010 12:49:40 +0200 Subject: cws tl78: #i112304# help ids fixed --- cui/source/dialogs/passwdomdlg.src | 1 - 1 file changed, 1 deletion(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src index d974adf59..355051cba 100755 --- a/cui/source/dialogs/passwdomdlg.src +++ b/cui/source/dialogs/passwdomdlg.src @@ -145,7 +145,6 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY FixedText FT_PASSWD_TO_MODIFY { - HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY; Pos = MAP_APPFONT( 6, 186 ); Size = MAP_APPFONT( 159, 8 ); Text [ en-US ] = "Enter password to allow editing"; -- cgit v1.2.3 From ceb017b15acd7b9d56aa3b1c4f194dcfb204cdb4 Mon Sep 17 00:00:00 2001 From: Daniel Rentz Date: Tue, 15 Jun 2010 20:02:53 +0200 Subject: mib16: contributed bugfixes and various new symbols in VBA compatibility implementation --- cui/source/customize/macropg.cxx | 5 +++++ cui/source/customize/macropg.src | 26 ++++++++++++++++++++++++++ cui/source/inc/cuires.hrc | 8 ++++++++ 3 files changed, 39 insertions(+) (limited to 'cui/source') diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 188d1d0b4..cc1f7e3b9 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -296,6 +296,11 @@ void _SvxMacroTabPage::InitResources() aDisplayNames.push_back( EventDisplayName( "OnSubComponentOpened", RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED ) ); aDisplayNames.push_back( EventDisplayName( "OnSubComponentClosed", RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED ) ); // aDisplayNames.push_back( EventDisplayName( "OnLayoutFinished", RID_SVXSTR_EVENT_LAYOUT_FINISHED ) ); + aDisplayNames.push_back( EventDisplayName( "OnSelect", RID_SVXSTR_EVENT_SELECTIONCHANGED ) ); + aDisplayNames.push_back( EventDisplayName( "OnDoubleClick", RID_SVXSTR_EVENT_DOUBLECLICK ) ); + aDisplayNames.push_back( EventDisplayName( "OnRightClick", RID_SVXSTR_EVENT_RIGHTCLICK ) ); + aDisplayNames.push_back( EventDisplayName( "OnCalculate", RID_SVXSTR_EVENT_CALCULATE ) ); + aDisplayNames.push_back( EventDisplayName( "OnChange", RID_SVXSTR_EVENT_CONTENTCHANGED ) ); // the event name to UI string mappings for forms & dialogs // diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src index 120d59047..6402587dc 100644 --- a/cui/source/customize/macropg.src +++ b/cui/source/customize/macropg.src @@ -457,3 +457,29 @@ String RID_SVXSTR_EVENT_LAYOUT_FINISHED { Text [ en-US ] = "Document layout finished" ; }; + +String RID_SVXSTR_EVENT_SELECTIONCHANGED +{ + Text [ en-US ] = "Selection changed" ; +}; + +String RID_SVXSTR_EVENT_DOUBLECLICK +{ + Text [ en-US ] = "Double click" ; +}; + +String RID_SVXSTR_EVENT_RIGHTCLICK +{ + Text [ en-US ] = "Right click" ; +}; + +String RID_SVXSTR_EVENT_CALCULATE +{ + Text [ en-US ] = "Formulas calculated" ; +}; + +String RID_SVXSTR_EVENT_CONTENTCHANGED +{ + Text [ en-US ] = "Content changed" ; +}; + diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index c0f8f051d..fb6a95242 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -428,4 +428,12 @@ #define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED (RID_SVX_START + 1188) #define RID_SVXSTR_EVENT_LAYOUT_FINISHED (RID_SVX_START + 1189) +// For now, keep new IDs unique only within cui. +// Later, cui should perhaps get an own range of IDs. +#define RID_SVXSTR_EVENT_SELECTIONCHANGED (RID_SVX_START + 1190) +#define RID_SVXSTR_EVENT_DOUBLECLICK (RID_SVX_START + 1191) +#define RID_SVXSTR_EVENT_RIGHTCLICK (RID_SVX_START + 1192) +#define RID_SVXSTR_EVENT_CALCULATE (RID_SVX_START + 1193) +#define RID_SVXSTR_EVENT_CONTENTCHANGED (RID_SVX_START + 1194) + #endif -- cgit v1.2.3 From 24944322be8a13a3ab062cb5729a3c7f3eabe74b Mon Sep 17 00:00:00 2001 From: obo Date: Fri, 18 Jun 2010 13:44:31 +0200 Subject: masterfix: #i10000# remove DOS lineends --- cui/source/inc/helpid.hrc | 798 +++++++++++++++++++++++----------------------- 1 file changed, 399 insertions(+), 399 deletions(-) (limited to 'cui/source') diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index bbb5b33b6..96a4e6b59 100755 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -1,399 +1,399 @@ -/************************************************************************* - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _CUI_HELPID_HRC -#define _CUI_HELPID_HRC -// include --------------------------------------------------------------- - -#include - -// Help-Ids -------------------------------------------------------------- - -#define HID_OPTIONS_COLOR (HID_CUI_START + 1) -#define HID_OPTIONS_SAVE (HID_CUI_START + 2) -#define HID_OPTIONS_PATH (HID_CUI_START + 3) -#define HID_OPTIONS_GENERAL (HID_CUI_START + 4) -#define HID_OPTIONS_LINGU (HID_CUI_START + 5) -#define HID_OPTIONS_SPELL (HID_CUI_START + 6) -#define HID_OPTIONS_DICT_NEW (HID_CUI_START + 7) -#define HID_OPTIONS_DICT_EDIT (HID_CUI_START + 8) -#define HID_OPTIONS_INET (HID_CUI_START + 9) -#define HID_OPTIONS_CHART_DEFCOLORS (HID_CUI_START + 10) -#define HID_OPTIONS_CTL (HID_CUI_START + 11) -#define HID_OPTIONS_PROXY (HID_CUI_START + 12) -#define HID_OPTIONS_SEARCH (HID_CUI_START + 13) -#define HID_OPTIONS_MAIL (HID_CUI_START + 14) -#define HID_OPTIONS_ASIAN_LAYOUT (HID_CUI_START + 15) -#define HID_CLB_EDIT_MODULES_DICS (HID_CUI_START + 16) -#define HID_CLB_EDIT_MODULES_MODULES (HID_CUI_START + 17) -#define HID_CLB_LINGU_MODULES (HID_CUI_START + 18) -#define HID_CLB_LINGU_OPTIONS (HID_CUI_START + 19) -#define HID_EDIT_MODULES (HID_CUI_START + 20) -#define HID_LNGDLG_NUM_PREBREAK (HID_CUI_START + 21) -#define HID_OPTIONS_COLORCONFIG (HID_CUI_START + 22) -#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME (HID_CUI_START + 23) -#define HID_OPTIONS_ACCESSIBILITYCONFIG (HID_CUI_START + 24) -#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN (HID_CUI_START + 25) -#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME (HID_CUI_START + 26) -#define HID_OPTIONS_PATHS_SELECTFOLDER (HID_CUI_START + 27) -#define HID_OPTIONS_JAVA (HID_CUI_START + 28) -#define HID_OPTIONS_JAVA_LIST (HID_CUI_START + 29) -#define HID_OPTIONS_JAVA_PARAMETER (HID_CUI_START + 30) -#define HID_OPTIONS_JAVA_CLASSPATH (HID_CUI_START + 31) -#define HID_SVXPAGE_JSEARCH_OPTIONS (HID_CUI_START + 32) -#define HID_SVXDLG_FILTER_WARNING (HID_CUI_START + 33) -#define HID_SVX_OPTIONS_ONLINEUPDATE (HID_CUI_START + 34) -#define HID_DLG_SECURITY_OPTIONS (HID_CUI_START + 35) -#define HID_OFADLG_OPTIONS_TREE (HID_CUI_START + 36) -#define HID_OFA_CONNPOOL_DRIVERLIST (HID_CUI_START + 37) -#define UID_OFA_CONNPOOL_DRIVERLIST_BACK (HID_CUI_START + 38) -#define HID_OFA_FONT_SUBST_CLB (HID_CUI_START + 39) -#define HID_OFA_TP_MISC (HID_CUI_START + 40) -#define HID_OFA_TP_VIEW (HID_CUI_START + 41) -#define HID_OFA_TP_LANGUAGES (HID_CUI_START + 42) -#define HID_OFA_TP_MEMORY (HID_CUI_START + 43) -#define HID_DBPATH_CTL_PATH (HID_CUI_START + 44) -#define HID_DBPATH_HEADERBAR (HID_CUI_START + 45) -#define HID_OFAPAGE_SMARTTAG_OPTIONS (HID_CUI_START + 46) -#define HID_OFAPAGE_MSFLTR2_CLB (HID_CUI_START + 47) -#define HID_OPTPATH_CTL_PATH (HID_CUI_START + 48) -#define HID_OFADLG_TREELISTBOX (HID_CUI_START + 49) -#define HID_DLG_WEBCONNECTION_INFO (HID_CUI_START + 50) -#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST (HID_CUI_START + 51) -#define HID_OPTPATH_HEADERBAR (HID_CUI_START + 52) -#define HID_WARN_NAME_DUPLICATE (HID_CUI_START + 53) -#define HID_COLORPAGE_LISTBOX_START (HID_CUI_START + 54) -#define HID_COLORPAGE_DOCCOLOR_LB (HID_CUI_START + 54) -#define HID_COLORPAGE_DOCBOUNDARIES_LB (HID_CUI_START + 55) -#define HID_COLORPAGE_APPBACKGROUND_LB (HID_CUI_START + 56) -#define HID_COLORPAGE_OBJECTBOUNDARIES_LB (HID_CUI_START + 57) -#define HID_COLORPAGE_TABLEBOUNDARIES_LB (HID_CUI_START + 58) -#define HID_COLORPAGE_FONTCOLOR_LB (HID_CUI_START + 59) -#define HID_COLORPAGE_LINKS_LB (HID_CUI_START + 60) -#define HID_COLORPAGE_LINKSVISITED_LB (HID_CUI_START + 61) -#define HID_COLORPAGE_ANCHOR_LB (HID_CUI_START + 62) -#define HID_COLORPAGE_SPELL_LB (HID_CUI_START + 63) -#define HID_COLORPAGE_WRITERTEXTGRID_LB (HID_CUI_START + 64) -#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB (HID_CUI_START + 65) -#define HID_COLORPAGE_WRITERIDXSHADINGS_LB (HID_CUI_START + 66) -#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB (HID_CUI_START + 67) -#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB (HID_CUI_START + 68) -#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB (HID_CUI_START + 69) -#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB (HID_CUI_START + 70) -#define HID_COLORPAGE_WRITERPAGEBREAKS_LB (HID_CUI_START + 71) -#define HID_COLORPAGE_HTMLSGML_LB (HID_CUI_START + 72) -#define HID_COLORPAGE_HTMLCOMMENT_LB (HID_CUI_START + 73) -#define HID_COLORPAGE_HTMLKEYWORD_LB (HID_CUI_START + 74) -#define HID_COLORPAGE_HTMLUNKNOWN_LB (HID_CUI_START + 75) -#define HID_COLORPAGE_CALCGRID_LB (HID_CUI_START + 76) -#define HID_COLORPAGE_CALCPAGEBREAK_LB (HID_CUI_START + 77) -#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB (HID_CUI_START + 78) -#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB (HID_CUI_START + 79) -#define HID_COLORPAGE_CALCDETECTIVE_LB (HID_CUI_START + 80) -#define HID_COLORPAGE_CALCDETECTIVEERROR_LB (HID_CUI_START + 81) -#define HID_COLORPAGE_CALCREFERENCE_LB (HID_CUI_START + 82) -#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB (HID_CUI_START + 83) -#define HID_COLORPAGE_DRAWGRID_LB (HID_CUI_START + 84) -#define HID_COLORPAGE_DRAWDRAWING_LB (HID_CUI_START + 85) -#define HID_COLORPAGE_DRAWFILL_LB (HID_CUI_START + 86) -#define HID_COLORPAGE_BASICIDENTIFIER_LB (HID_CUI_START + 87) -#define HID_COLORPAGE_BASICCOMMENT_LB (HID_CUI_START + 88) -#define HID_COLORPAGE_BASICNUMBER_LB (HID_CUI_START + 89) -#define HID_COLORPAGE_BASICSTRING_LB (HID_CUI_START + 90) -#define HID_COLORPAGE_BASICOPERATOR_LB (HID_CUI_START + 91) -#define HID_COLORPAGE_BASICKEYWORD_LB (HID_CUI_START + 92) -#define HID_COLORPAGE_BASICERROR_LB (HID_CUI_START + 93) -#define HID_COLORPAGE_CHECKBOX_START (HID_CUI_START + 94) -#define HID_COLORPAGE_DOCCOLOR_CB (HID_CUI_START + 94) -#define HID_COLORPAGE_DOCBOUNDARIES_CB (HID_CUI_START + 95) -#define HID_COLORPAGE_APPBACKGROUND_CB (HID_CUI_START + 96) -#define HID_COLORPAGE_OBJECTBOUNDARIES_CB (HID_CUI_START + 97) -#define HID_COLORPAGE_TABLEBOUNDARIES_CB (HID_CUI_START + 98) -#define HID_COLORPAGE_FONTCOLOR_CB (HID_CUI_START + 99) -#define HID_COLORPAGE_LINKS_CB (HID_CUI_START + 100) -#define HID_COLORPAGE_LINKSVISITED_CB (HID_CUI_START + 101) -#define HID_COLORPAGE_ANCHOR_CB (HID_CUI_START + 102) -#define HID_COLORPAGE_SPELL_CB (HID_CUI_START + 103) -#define HID_COLORPAGE_WRITERTEXTGRID_CB (HID_CUI_START + 104) -#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB (HID_CUI_START + 105) -#define HID_COLORPAGE_WRITERIDXSHADINGS_CB (HID_CUI_START + 106) -#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB (HID_CUI_START + 107) -#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB (HID_CUI_START + 108) -#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB (HID_CUI_START + 109) -#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB (HID_CUI_START + 110) -#define HID_COLORPAGE_WRITERPAGEBREAKS_CB (HID_CUI_START + 111) -#define HID_COLORPAGE_HTMLSGML_CB (HID_CUI_START + 112) -#define HID_COLORPAGE_HTMLCOMMENT_CB (HID_CUI_START + 113) -#define HID_COLORPAGE_HTMLKEYWORD_CB (HID_CUI_START + 114) -#define HID_COLORPAGE_HTMLUNKNOWN_CB (HID_CUI_START + 115) -#define HID_COLORPAGE_CALCGRID_CB (HID_CUI_START + 116) -#define HID_COLORPAGE_CALCPAGEBREAK_CB (HID_CUI_START + 117) -#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB (HID_CUI_START + 118) -#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB (HID_CUI_START + 119) -#define HID_COLORPAGE_CALCDETECTIVE_CB (HID_CUI_START + 120) -#define HID_COLORPAGE_CALCDETECTIVEERROR_CB (HID_CUI_START + 121) -#define HID_COLORPAGE_CALCREFERENCE_CB (HID_CUI_START + 122) -#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB (HID_CUI_START + 123) -#define HID_COLORPAGE_DRAWGRID_CB (HID_CUI_START + 124) -#define HID_COLORPAGE_DRAWDRAWING_CB (HID_CUI_START + 125) -#define HID_COLORPAGE_DRAWFILL_CB (HID_CUI_START + 126) -#define HID_COLORPAGE_BASICIDENTIFIER_CB (HID_CUI_START + 127) -#define HID_COLORPAGE_BASICCOMMENT_CB (HID_CUI_START + 128) -#define HID_COLORPAGE_BASICNUMBER_CB (HID_CUI_START + 129) -#define HID_COLORPAGE_BASICSTRING_CB (HID_CUI_START + 130) -#define HID_COLORPAGE_BASICOPERATOR_CB (HID_CUI_START + 131) -#define HID_COLORPAGE_BASICKEYWORD_CB (HID_CUI_START + 132) -#define HID_COLORPAGE_BASICERROR_CB (HID_CUI_START + 133) -#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE (HID_CUI_START + 134) -#define HID_SVX_MACRO_LB_EVENT (HID_CUI_START + 135) -#define HID_SVX_CONFIG_EVENT (HID_CUI_START + 136) -#define HID_CONFIG_EVENT_OFFICE_BASED (HID_CUI_START + 137) -#define HID_CONFIG_EVENT_DOCUMENT_BASED (HID_CUI_START + 138) -#define HID_SELECTOR_DIALOG (HID_CUI_START + 139) -#define HID_SELECTOR_CATEGORIES (HID_CUI_START + 140) -#define HID_SVX_CONFIG_TOOLBAR (HID_CUI_START + 141) -#define HID_SVX_CONFIG_TOOLBAR_CONTENTS (HID_CUI_START + 142) -#define HID_SELECTOR_COMMANDS (HID_CUI_START + 143) -#define HID_GALLERY_EDIT_MSNAME (HID_CUI_START + 144) -#define HID_SVX_CONFIG_MENU (HID_CUI_START + 145) -#define HID_SVX_CONFIG_MENU_CONTENTS (HID_CUI_START + 146) -#define HID_GALLERY_NEWTHEME_FINDFILES (HID_CUI_START + 147) -#define HID_GALLERY_NEWTHEME_ADDFILES (HID_CUI_START + 148) -#define HID_HANGULDLG_BUTTON_OPTIONS (HID_CUI_START + 149) -#define HID_HANGULDLG_BUTTON_CLOSE (HID_CUI_START + 150) -#define HID_HANGULDLG_BUTTON_IGNORE (HID_CUI_START + 151) -#define HID_HANGULDLG_BUTTON_IGNOREALL (HID_CUI_START + 152) -#define HID_HANGULDLG_BUTTON_CHANGE (HID_CUI_START + 153) -#define HID_HANGULDLG_BUTTON_CHANGEALL (HID_CUI_START + 154) -#define HID_OFA_FONT_SUBSTITUTION (HID_CUI_START + 155) -#define HID_HANGULDLG_EDIT_NEWWORD (HID_CUI_START + 156) -#define HID_OFA_SUBST_APPLY (HID_CUI_START + 157) -#define HID_OFA_SUBST_DELETE (HID_CUI_START + 158) -#define HID_SPLDLG_BUTTON_CLOSE (HID_CUI_START + 159) -#define HID_SPLDLG_BUTTON_IGNORE (HID_CUI_START + 160) -#define HID_SPLDLG_BUTTON_IGNOREALL (HID_CUI_START + 161) -#define HID_SPLDLG_BUTTON_CHANGE (HID_CUI_START + 162) -#define HID_SPLDLG_BUTTON_CHANGEALL (HID_CUI_START + 163) -#define HID_SPLDLG_BUTTON_EXPLAIN (HID_CUI_START + 164) -#define HID_CHARMAP_CTL_SHOWSET (HID_CUI_START + 165) -#define HID_CHARMAP_CTL_SHOWTEXT (HID_CUI_START + 166) -#define HID_CHARMAP_CTL_SHOWCHAR (HID_CUI_START + 167) -#define HID_DLG_NAME (HID_CUI_START + 168) -#define HID_DLG_MESSBOX (HID_CUI_START + 169) -#define HID_HANGULDLG_SUGGESTIONS (HID_CUI_START + 170) -#define HID_HANGULDLG_SUGGESTIONS_GRID (HID_CUI_START + 171) -#define HID_HANGULDLG_SUGGESTIONS_LIST (HID_CUI_START + 172) -#define HID_DLG_OBJECT_NAME (HID_CUI_START + 173) -#define HID_DLG_OBJECT_TITLE_DESC (HID_CUI_START + 174) -#define HID_SVX_CONFIG_MENU_ORGANIZER (HID_CUI_START + 175) -#define HID_SVX_CONFIG_ICON_SELECTOR (HID_CUI_START + 176) -#define HID_SVX_CONFIG_NAME_SUBMENU (HID_CUI_START + 177) -#define HID_SVX_CONFIG_RENAME_MENU (HID_CUI_START + 178) -#define HID_SVX_CONFIG_RENAME_MENU_ITEM (HID_CUI_START + 179) -#define HID_SVX_CONFIG_RENAME_TOOLBAR (HID_CUI_START + 180) -#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM (HID_CUI_START + 181) -#define HID_SVX_NEW_TOOLBAR (HID_CUI_START + 182) -#define HID_SVX_MODIFY_TOOLBAR (HID_CUI_START + 183) -#define HID_SVX_NEW_TOOLBAR_ITEM (HID_CUI_START + 184) -#define HID_SVX_CONFIG_MENU_LISTBOX (HID_CUI_START + 185) -#define HID_SVX_MODIFY_TOOLBAR_ITEM (HID_CUI_START + 186) -#define HID_SVX_SAVE_IN (HID_CUI_START + 187) -#define HID_OPTIONS_MULTIPATH_LIST (HID_CUI_START + 188) -#define HID_FM_DLG_SEARCH (HID_CUI_START + 189) -#define HID_SEARCH_TEXT (HID_CUI_START + 190) -#define HID_SEARCH_ALLFIELDS (HID_CUI_START + 191) -#define HID_GALLERY_PROPERTIES_GENERAL (HID_CUI_START + 192) -#define HID_SEARCH_FIELDSELECTION (HID_CUI_START + 193) -#define HID_SEARCH_POSITION (HID_CUI_START + 194) -#define HID_SEARCH_FORMATTER (HID_CUI_START + 195) -#define HID_SEARCH_CASE (HID_CUI_START + 196) -#define HID_SEARCH_BACKWARD (HID_CUI_START + 197) -#define HID_SEARCH_STARTOVER (HID_CUI_START + 198) -#define HID_SEARCH_WILDCARD (HID_CUI_START + 199) -#define HID_SEARCH_REGULAR (HID_CUI_START + 200) -#define HID_SEARCH_APPROX (HID_CUI_START + 201) -#define HID_SEARCH_APPROXSETTINGS (HID_CUI_START + 202) -#define HID_SEARCH_BTN_SEARCH (HID_CUI_START + 203) -#define HID_SEARCH_BTN_CLOSE (HID_CUI_START + 204) -#define HID_GALLERY_BROWSER (HID_CUI_START + 205) -#define HID_GALLERY_SEARCH (HID_CUI_START + 206) -#define HID_GALLERY_APPLY (HID_CUI_START + 207) -#define HID_SPLDLG_BUTTON_IGNORERULE (HID_CUI_START + 208) -#define HID_CONFIG_ACCEL (HID_CUI_START + 209) -#define HID_ACCELCONFIG_LISTBOX (HID_CUI_START + 210) -#define HID_CONFIGGROUP_ACC_LISTBOX (HID_CUI_START + 211) -#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_CUI_START + 212) -#define HID_MACRO_LB_EVENT (HID_CUI_START + 213) -#define HID_MACRO_GROUP (HID_CUI_START + 214) -#define HID_MACRO_MACROS (HID_CUI_START + 215) -#define HID_DIALOG_HANGULHANJA (HID_CUI_START + 216) -#define HID_HANGULHANJA_OPT_DLG (HID_CUI_START + 217) -#define HID_HANGULHANJA_NEWDICT_DLG (HID_CUI_START + 218) -#define HID_HANGULHANJA_EDIT_DLG (HID_CUI_START + 219) -#define HID_HANGULHANJA_OPT_DICTS_LB (HID_CUI_START + 220) -#define HID_MULTIPATH (HID_CUI_START + 221) -#define HID_SCRIPTORG_DIALOG (HID_CUI_START + 222) -#define HID_SCRIPTSBOX (HID_CUI_START + 223) -#define HID_SPELLCHECK (HID_CUI_START + 224) -#define HID_TPSIZE_CTRL (HID_CUI_START + 225) -#define HID_TPROTATION_CTRL1 (HID_CUI_START + 226) -#define HID_TPROTATION_CTRL2 (HID_CUI_START + 227) -#define HID_TRANS_ANGLE (HID_CUI_START + 228) -#define HID_TPPOSITION_CTRL (HID_CUI_START + 229) -#define HID_NUMBERFORMAT_LB_FORMAT (HID_CUI_START + 230) -#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW (HID_CUI_START + 231) -#define HID_TRANS_SLANT (HID_CUI_START + 232) -#define HID_TPHATCH_CTRL (HID_CUI_START + 233) -#define HID_SEARCHATTR_CTL_ATTR (HID_CUI_START + 234) -#define HID_NUMBERFORMAT_TBI_INFO (HID_CUI_START + 235) -#define HID_SEARCHATTR (HID_CUI_START + 236) -#define HID_ALIGNMENT_CTR_DIAL (HID_CUI_START + 237) -#define HID_ALIGNMENT_CTR_BORDER_LOCK (HID_CUI_START + 238) -#define HID_SEARCHSIMILARITY (HID_CUI_START + 239) -#define UID_SEARCH_RECORDSTATUS (HID_CUI_START + 240) -#define HID_OFAPAGE_AUTOCORR_CLB (HID_CUI_START + 241) -#define HID_AUTOCORR_LANGUAGE (HID_CUI_START + 242) -#define HID_OFAPAGE_AUTOFORMAT_CLB (HID_CUI_START + 243) -#define HID_TPCOLOR_RGB_1 (HID_CUI_START + 244) -#define HID_TPCOLOR_RGB_2 (HID_CUI_START + 245) -#define HID_TPCOLOR_RGB_3 (HID_CUI_START + 246) -#define HID_TPCOLOR_CMYK_1 (HID_CUI_START + 247) -#define HID_TPCOLOR_CMYK_2 (HID_CUI_START + 248) -#define HID_TPCOLOR_CMYK_3 (HID_CUI_START + 249) -#define HID_ALIGNMENT (HID_CUI_START + 250) -#define HID_OFAPAGE_AUTOCORR_OPTIONS (HID_CUI_START + 251) -#define HID_OFAPAGE_AUTOFMT_OPTIONS (HID_CUI_START + 252) -#define HID_OFAPAGE_AUTOCORR_REPLACE (HID_CUI_START + 253) -#define HID_OFACTL_AUTOCORR_REPLACE (HID_CUI_START + 254) -#define HID_OFAPAGE_AUTOCORR_EXCEPT (HID_CUI_START + 255) -#define HID_OFAPAGE_AUTOCORR_QUOTE (HID_CUI_START + 256) -#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS (HID_CUI_START + 257) -#define HID_BACKGROUND (HID_CUI_START + 258) -#define HID_BACKGROUND_CTL_BGDCOLORSET (HID_CUI_START + 259) -#define HID_BACKGROUND_CTL_POSITION (HID_CUI_START + 260) -#define HID_BORDER (HID_CUI_START + 261) -#define HID_BORDER_CTL_PRESETS (HID_CUI_START + 262) -#define HID_BORDER_CTL_SHADOWS (HID_CUI_START + 263) -#define HID_PAGE_CONNECTION (HID_CUI_START + 264) -#define HID_PAGE_CONNECTION_CTL_PREVIEW (HID_CUI_START + 265) -#define HID_PAGE_DISTRIBUTE (HID_CUI_START + 266) -#define HID_SVXPAGE_GRFCROP (HID_CUI_START + 267) -#define HID_CAPTION (HID_CUI_START + 268) -#define HID_CAPTION_CTL_TYPE (HID_CUI_START + 269) -#define HID_PAGE_MEASURE (HID_CUI_START + 270) -#define HID_MEASURE_CTL_POSITION (HID_CUI_START + 271) -#define HID_NUMBERFORMAT (HID_CUI_START + 272) -#define HID_NUMBERFORMAT_TBI_ADD (HID_CUI_START + 273) -#define HID_NUMBERFORMAT_TBI_REMOVE (HID_CUI_START + 274) -#define HID_FORMAT_PAGE (HID_CUI_START + 275) -#define HID_REDLINING_DLG (HID_CUI_START + 276) -#define HID_REDLINING_EDIT (HID_CUI_START + 277) -#define HID_REDLINING_PREV (HID_CUI_START + 278) -#define HID_REDLINING_NEXT (HID_CUI_START + 279) -#define HID_FORMAT_PARAGRAPH_STD (HID_CUI_START + 280) -#define HID_VALUESET_SINGLENUM (HID_CUI_START + 281) -#define HID_VALUESET_BULLET (HID_CUI_START + 282) -#define HID_VALUESET_NUM (HID_CUI_START + 283) -#define HID_VALUESET_NUMBMP (HID_CUI_START + 284) -#define HID_SVXPAGE_PICK_NUM (HID_CUI_START + 285) -#define HID_SVXPAGE_PICK_SINGLE_NUM (HID_CUI_START + 286) -#define HID_SVXPAGE_PICK_BMP (HID_CUI_START + 287) -#define HID_SVXPAGE_PICK_BULLET (HID_CUI_START + 288) -#define HID_SVXPAGE_NUM_OPTIONS (HID_CUI_START + 289) -#define HID_SVXPAGE_NUM_POSITION (HID_CUI_START + 290) -#define HID_MEASURE_CTL_PREVIEW (HID_CUI_START + 291) -#define HID_FORMAT_PARAGRAPH_EXT (HID_CUI_START + 292) -#define HID_FORMAT_PARAGRAPH_ALIGN (HID_CUI_START + 293) -#define HID_SVXPAGE_PARA_ASIAN (HID_CUI_START + 294) -#define HID_SVXPAGE_SWPOSSIZE (HID_CUI_START + 295) -#define HID_AREA_TRANSPARENCE (HID_CUI_START + 296) -#define HID_AREA_AREA (HID_CUI_START + 297) -#define HID_AREA_SHADOW (HID_CUI_START + 298) -#define HID_AREA_HATCH (HID_CUI_START + 299) -#define HID_AREA_BITMAP (HID_CUI_START + 300) -#define HID_TPSHADOW_CTRL (HID_CUI_START + 301) -#define HID_AREA_GRADIENT (HID_CUI_START + 302) -#define HID_LINE_ENDDEF (HID_CUI_START + 303) -#define HID_LINE_LINE (HID_CUI_START + 304) -#define HID_LINE_DEF (HID_CUI_START + 305) -#define HID_SPELLDLG_SETWORD (HID_CUI_START + 306) -#define HID_TABULATOR (HID_CUI_START + 307) -#define HID_PAGE_TEXTATTR (HID_CUI_START + 308) -#define HID_TEXTATTR_CTL_POSITION (HID_CUI_START + 309) -#define HID_TRANS_POSITION_SIZE (HID_CUI_START + 310) -#define HID_HYPHENATE (HID_CUI_START + 311) -#define HID_SVXPAGE_CHAR_NAME (HID_CUI_START + 312) -#define HID_SVXPAGE_CHAR_EFFECTS (HID_CUI_START + 313) -#define HID_SVXPAGE_CHAR_POSITION (HID_CUI_START + 314) -#define HID_HYPERLINK_INTERNET (HID_CUI_START + 315) -#define HID_HYPERLINK_MAIL (HID_CUI_START + 316) -#define HID_HYPERLINK_DOCUMENT (HID_CUI_START + 317) -#define HID_HYPERLINK_NEWDOCUMENT (HID_CUI_START + 318) -#define HID_HYPERLINK_MARKWND (HID_CUI_START + 319) -#define HID_ICCDIALOG_RESET_BTN (HID_CUI_START + 320) -#define HID_ICCDIALOG_CHOICECTRL (HID_CUI_START + 321) -#define HID_HYPERDLG_INET_PATH (HID_CUI_START + 322) -#define HID_HYPERDLG_MAIL_PATH (HID_CUI_START + 323) -#define HID_HYPERDLG_DOC_PATH (HID_CUI_START + 324) -#define HID_ICCDIALOG_OK_BTN (HID_CUI_START + 325) -#define HID_ICCDIALOG_CANCEL_BTN (HID_CUI_START + 326) -#define HID_HYPERLINK_MARKWND_APPLY (HID_CUI_START + 327) -#define HID_HYPERLINK_MARKWND_CLOSE (HID_CUI_START + 328) -#define HID_HYPERLINK_MARKWND_TREE (HID_CUI_START + 329) -#define HID_SVXPAGE_CHAR_TWOLINES (HID_CUI_START + 330) -#define HID_GRFFILTER_EMBOSS_LIGHT (HID_CUI_START + 331) -#define HID_PASTE_DLG (HID_CUI_START + 333) -#define HID_LINKDLG_TABLB (HID_CUI_START + 334) -#define HID_MACRO_HEADERTABLISTBOX (HID_CUI_START + 335) -#define HID_GALLERY_ENTER_TITLE (HID_CUI_START + 336) -#define HID_GALLERY_TITLE_EDIT (HID_CUI_START + 337) -#define HID_THES_LANGUAGE (HID_CUI_START + 338) -#define HID_OFAPAGE_QUOTE_SW_CLB (HID_CUI_START + 339) -#define HID_OFAPAGE_QUOTE_CLB (HID_CUI_START + 340) -#define HID_CT_THES_ALTERNATIVES (HID_CUI_START + 341) - -#define HID_DLG_PASSWORD_TO_OPEN_MODIFY (HID_CUI_START + 342) -#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN (HID_CUI_START + 343) -#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN (HID_CUI_START + 344) -#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE (HID_CUI_START + 345) -#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY (HID_CUI_START + 346) -#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY (HID_CUI_START + 347) -#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY (HID_CUI_START + 348) - -// please adjust ACT_SVX_HID_END2 below if you add entries here! - -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_CUI_HID_END (HID_CUI_START + 348) - -#if ACT_CUI_HID_END > HID_CUI_END -#error Resource-Ueberlauf in #line, #file -#endif - -#endif - +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _CUI_HELPID_HRC +#define _CUI_HELPID_HRC +// include --------------------------------------------------------------- + +#include + +// Help-Ids -------------------------------------------------------------- + +#define HID_OPTIONS_COLOR (HID_CUI_START + 1) +#define HID_OPTIONS_SAVE (HID_CUI_START + 2) +#define HID_OPTIONS_PATH (HID_CUI_START + 3) +#define HID_OPTIONS_GENERAL (HID_CUI_START + 4) +#define HID_OPTIONS_LINGU (HID_CUI_START + 5) +#define HID_OPTIONS_SPELL (HID_CUI_START + 6) +#define HID_OPTIONS_DICT_NEW (HID_CUI_START + 7) +#define HID_OPTIONS_DICT_EDIT (HID_CUI_START + 8) +#define HID_OPTIONS_INET (HID_CUI_START + 9) +#define HID_OPTIONS_CHART_DEFCOLORS (HID_CUI_START + 10) +#define HID_OPTIONS_CTL (HID_CUI_START + 11) +#define HID_OPTIONS_PROXY (HID_CUI_START + 12) +#define HID_OPTIONS_SEARCH (HID_CUI_START + 13) +#define HID_OPTIONS_MAIL (HID_CUI_START + 14) +#define HID_OPTIONS_ASIAN_LAYOUT (HID_CUI_START + 15) +#define HID_CLB_EDIT_MODULES_DICS (HID_CUI_START + 16) +#define HID_CLB_EDIT_MODULES_MODULES (HID_CUI_START + 17) +#define HID_CLB_LINGU_MODULES (HID_CUI_START + 18) +#define HID_CLB_LINGU_OPTIONS (HID_CUI_START + 19) +#define HID_EDIT_MODULES (HID_CUI_START + 20) +#define HID_LNGDLG_NUM_PREBREAK (HID_CUI_START + 21) +#define HID_OPTIONS_COLORCONFIG (HID_CUI_START + 22) +#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME (HID_CUI_START + 23) +#define HID_OPTIONS_ACCESSIBILITYCONFIG (HID_CUI_START + 24) +#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN (HID_CUI_START + 25) +#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME (HID_CUI_START + 26) +#define HID_OPTIONS_PATHS_SELECTFOLDER (HID_CUI_START + 27) +#define HID_OPTIONS_JAVA (HID_CUI_START + 28) +#define HID_OPTIONS_JAVA_LIST (HID_CUI_START + 29) +#define HID_OPTIONS_JAVA_PARAMETER (HID_CUI_START + 30) +#define HID_OPTIONS_JAVA_CLASSPATH (HID_CUI_START + 31) +#define HID_SVXPAGE_JSEARCH_OPTIONS (HID_CUI_START + 32) +#define HID_SVXDLG_FILTER_WARNING (HID_CUI_START + 33) +#define HID_SVX_OPTIONS_ONLINEUPDATE (HID_CUI_START + 34) +#define HID_DLG_SECURITY_OPTIONS (HID_CUI_START + 35) +#define HID_OFADLG_OPTIONS_TREE (HID_CUI_START + 36) +#define HID_OFA_CONNPOOL_DRIVERLIST (HID_CUI_START + 37) +#define UID_OFA_CONNPOOL_DRIVERLIST_BACK (HID_CUI_START + 38) +#define HID_OFA_FONT_SUBST_CLB (HID_CUI_START + 39) +#define HID_OFA_TP_MISC (HID_CUI_START + 40) +#define HID_OFA_TP_VIEW (HID_CUI_START + 41) +#define HID_OFA_TP_LANGUAGES (HID_CUI_START + 42) +#define HID_OFA_TP_MEMORY (HID_CUI_START + 43) +#define HID_DBPATH_CTL_PATH (HID_CUI_START + 44) +#define HID_DBPATH_HEADERBAR (HID_CUI_START + 45) +#define HID_OFAPAGE_SMARTTAG_OPTIONS (HID_CUI_START + 46) +#define HID_OFAPAGE_MSFLTR2_CLB (HID_CUI_START + 47) +#define HID_OPTPATH_CTL_PATH (HID_CUI_START + 48) +#define HID_OFADLG_TREELISTBOX (HID_CUI_START + 49) +#define HID_DLG_WEBCONNECTION_INFO (HID_CUI_START + 50) +#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST (HID_CUI_START + 51) +#define HID_OPTPATH_HEADERBAR (HID_CUI_START + 52) +#define HID_WARN_NAME_DUPLICATE (HID_CUI_START + 53) +#define HID_COLORPAGE_LISTBOX_START (HID_CUI_START + 54) +#define HID_COLORPAGE_DOCCOLOR_LB (HID_CUI_START + 54) +#define HID_COLORPAGE_DOCBOUNDARIES_LB (HID_CUI_START + 55) +#define HID_COLORPAGE_APPBACKGROUND_LB (HID_CUI_START + 56) +#define HID_COLORPAGE_OBJECTBOUNDARIES_LB (HID_CUI_START + 57) +#define HID_COLORPAGE_TABLEBOUNDARIES_LB (HID_CUI_START + 58) +#define HID_COLORPAGE_FONTCOLOR_LB (HID_CUI_START + 59) +#define HID_COLORPAGE_LINKS_LB (HID_CUI_START + 60) +#define HID_COLORPAGE_LINKSVISITED_LB (HID_CUI_START + 61) +#define HID_COLORPAGE_ANCHOR_LB (HID_CUI_START + 62) +#define HID_COLORPAGE_SPELL_LB (HID_CUI_START + 63) +#define HID_COLORPAGE_WRITERTEXTGRID_LB (HID_CUI_START + 64) +#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB (HID_CUI_START + 65) +#define HID_COLORPAGE_WRITERIDXSHADINGS_LB (HID_CUI_START + 66) +#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB (HID_CUI_START + 67) +#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB (HID_CUI_START + 68) +#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB (HID_CUI_START + 69) +#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB (HID_CUI_START + 70) +#define HID_COLORPAGE_WRITERPAGEBREAKS_LB (HID_CUI_START + 71) +#define HID_COLORPAGE_HTMLSGML_LB (HID_CUI_START + 72) +#define HID_COLORPAGE_HTMLCOMMENT_LB (HID_CUI_START + 73) +#define HID_COLORPAGE_HTMLKEYWORD_LB (HID_CUI_START + 74) +#define HID_COLORPAGE_HTMLUNKNOWN_LB (HID_CUI_START + 75) +#define HID_COLORPAGE_CALCGRID_LB (HID_CUI_START + 76) +#define HID_COLORPAGE_CALCPAGEBREAK_LB (HID_CUI_START + 77) +#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB (HID_CUI_START + 78) +#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB (HID_CUI_START + 79) +#define HID_COLORPAGE_CALCDETECTIVE_LB (HID_CUI_START + 80) +#define HID_COLORPAGE_CALCDETECTIVEERROR_LB (HID_CUI_START + 81) +#define HID_COLORPAGE_CALCREFERENCE_LB (HID_CUI_START + 82) +#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB (HID_CUI_START + 83) +#define HID_COLORPAGE_DRAWGRID_LB (HID_CUI_START + 84) +#define HID_COLORPAGE_DRAWDRAWING_LB (HID_CUI_START + 85) +#define HID_COLORPAGE_DRAWFILL_LB (HID_CUI_START + 86) +#define HID_COLORPAGE_BASICIDENTIFIER_LB (HID_CUI_START + 87) +#define HID_COLORPAGE_BASICCOMMENT_LB (HID_CUI_START + 88) +#define HID_COLORPAGE_BASICNUMBER_LB (HID_CUI_START + 89) +#define HID_COLORPAGE_BASICSTRING_LB (HID_CUI_START + 90) +#define HID_COLORPAGE_BASICOPERATOR_LB (HID_CUI_START + 91) +#define HID_COLORPAGE_BASICKEYWORD_LB (HID_CUI_START + 92) +#define HID_COLORPAGE_BASICERROR_LB (HID_CUI_START + 93) +#define HID_COLORPAGE_CHECKBOX_START (HID_CUI_START + 94) +#define HID_COLORPAGE_DOCCOLOR_CB (HID_CUI_START + 94) +#define HID_COLORPAGE_DOCBOUNDARIES_CB (HID_CUI_START + 95) +#define HID_COLORPAGE_APPBACKGROUND_CB (HID_CUI_START + 96) +#define HID_COLORPAGE_OBJECTBOUNDARIES_CB (HID_CUI_START + 97) +#define HID_COLORPAGE_TABLEBOUNDARIES_CB (HID_CUI_START + 98) +#define HID_COLORPAGE_FONTCOLOR_CB (HID_CUI_START + 99) +#define HID_COLORPAGE_LINKS_CB (HID_CUI_START + 100) +#define HID_COLORPAGE_LINKSVISITED_CB (HID_CUI_START + 101) +#define HID_COLORPAGE_ANCHOR_CB (HID_CUI_START + 102) +#define HID_COLORPAGE_SPELL_CB (HID_CUI_START + 103) +#define HID_COLORPAGE_WRITERTEXTGRID_CB (HID_CUI_START + 104) +#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB (HID_CUI_START + 105) +#define HID_COLORPAGE_WRITERIDXSHADINGS_CB (HID_CUI_START + 106) +#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB (HID_CUI_START + 107) +#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB (HID_CUI_START + 108) +#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB (HID_CUI_START + 109) +#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB (HID_CUI_START + 110) +#define HID_COLORPAGE_WRITERPAGEBREAKS_CB (HID_CUI_START + 111) +#define HID_COLORPAGE_HTMLSGML_CB (HID_CUI_START + 112) +#define HID_COLORPAGE_HTMLCOMMENT_CB (HID_CUI_START + 113) +#define HID_COLORPAGE_HTMLKEYWORD_CB (HID_CUI_START + 114) +#define HID_COLORPAGE_HTMLUNKNOWN_CB (HID_CUI_START + 115) +#define HID_COLORPAGE_CALCGRID_CB (HID_CUI_START + 116) +#define HID_COLORPAGE_CALCPAGEBREAK_CB (HID_CUI_START + 117) +#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB (HID_CUI_START + 118) +#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB (HID_CUI_START + 119) +#define HID_COLORPAGE_CALCDETECTIVE_CB (HID_CUI_START + 120) +#define HID_COLORPAGE_CALCDETECTIVEERROR_CB (HID_CUI_START + 121) +#define HID_COLORPAGE_CALCREFERENCE_CB (HID_CUI_START + 122) +#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB (HID_CUI_START + 123) +#define HID_COLORPAGE_DRAWGRID_CB (HID_CUI_START + 124) +#define HID_COLORPAGE_DRAWDRAWING_CB (HID_CUI_START + 125) +#define HID_COLORPAGE_DRAWFILL_CB (HID_CUI_START + 126) +#define HID_COLORPAGE_BASICIDENTIFIER_CB (HID_CUI_START + 127) +#define HID_COLORPAGE_BASICCOMMENT_CB (HID_CUI_START + 128) +#define HID_COLORPAGE_BASICNUMBER_CB (HID_CUI_START + 129) +#define HID_COLORPAGE_BASICSTRING_CB (HID_CUI_START + 130) +#define HID_COLORPAGE_BASICOPERATOR_CB (HID_CUI_START + 131) +#define HID_COLORPAGE_BASICKEYWORD_CB (HID_CUI_START + 132) +#define HID_COLORPAGE_BASICERROR_CB (HID_CUI_START + 133) +#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE (HID_CUI_START + 134) +#define HID_SVX_MACRO_LB_EVENT (HID_CUI_START + 135) +#define HID_SVX_CONFIG_EVENT (HID_CUI_START + 136) +#define HID_CONFIG_EVENT_OFFICE_BASED (HID_CUI_START + 137) +#define HID_CONFIG_EVENT_DOCUMENT_BASED (HID_CUI_START + 138) +#define HID_SELECTOR_DIALOG (HID_CUI_START + 139) +#define HID_SELECTOR_CATEGORIES (HID_CUI_START + 140) +#define HID_SVX_CONFIG_TOOLBAR (HID_CUI_START + 141) +#define HID_SVX_CONFIG_TOOLBAR_CONTENTS (HID_CUI_START + 142) +#define HID_SELECTOR_COMMANDS (HID_CUI_START + 143) +#define HID_GALLERY_EDIT_MSNAME (HID_CUI_START + 144) +#define HID_SVX_CONFIG_MENU (HID_CUI_START + 145) +#define HID_SVX_CONFIG_MENU_CONTENTS (HID_CUI_START + 146) +#define HID_GALLERY_NEWTHEME_FINDFILES (HID_CUI_START + 147) +#define HID_GALLERY_NEWTHEME_ADDFILES (HID_CUI_START + 148) +#define HID_HANGULDLG_BUTTON_OPTIONS (HID_CUI_START + 149) +#define HID_HANGULDLG_BUTTON_CLOSE (HID_CUI_START + 150) +#define HID_HANGULDLG_BUTTON_IGNORE (HID_CUI_START + 151) +#define HID_HANGULDLG_BUTTON_IGNOREALL (HID_CUI_START + 152) +#define HID_HANGULDLG_BUTTON_CHANGE (HID_CUI_START + 153) +#define HID_HANGULDLG_BUTTON_CHANGEALL (HID_CUI_START + 154) +#define HID_OFA_FONT_SUBSTITUTION (HID_CUI_START + 155) +#define HID_HANGULDLG_EDIT_NEWWORD (HID_CUI_START + 156) +#define HID_OFA_SUBST_APPLY (HID_CUI_START + 157) +#define HID_OFA_SUBST_DELETE (HID_CUI_START + 158) +#define HID_SPLDLG_BUTTON_CLOSE (HID_CUI_START + 159) +#define HID_SPLDLG_BUTTON_IGNORE (HID_CUI_START + 160) +#define HID_SPLDLG_BUTTON_IGNOREALL (HID_CUI_START + 161) +#define HID_SPLDLG_BUTTON_CHANGE (HID_CUI_START + 162) +#define HID_SPLDLG_BUTTON_CHANGEALL (HID_CUI_START + 163) +#define HID_SPLDLG_BUTTON_EXPLAIN (HID_CUI_START + 164) +#define HID_CHARMAP_CTL_SHOWSET (HID_CUI_START + 165) +#define HID_CHARMAP_CTL_SHOWTEXT (HID_CUI_START + 166) +#define HID_CHARMAP_CTL_SHOWCHAR (HID_CUI_START + 167) +#define HID_DLG_NAME (HID_CUI_START + 168) +#define HID_DLG_MESSBOX (HID_CUI_START + 169) +#define HID_HANGULDLG_SUGGESTIONS (HID_CUI_START + 170) +#define HID_HANGULDLG_SUGGESTIONS_GRID (HID_CUI_START + 171) +#define HID_HANGULDLG_SUGGESTIONS_LIST (HID_CUI_START + 172) +#define HID_DLG_OBJECT_NAME (HID_CUI_START + 173) +#define HID_DLG_OBJECT_TITLE_DESC (HID_CUI_START + 174) +#define HID_SVX_CONFIG_MENU_ORGANIZER (HID_CUI_START + 175) +#define HID_SVX_CONFIG_ICON_SELECTOR (HID_CUI_START + 176) +#define HID_SVX_CONFIG_NAME_SUBMENU (HID_CUI_START + 177) +#define HID_SVX_CONFIG_RENAME_MENU (HID_CUI_START + 178) +#define HID_SVX_CONFIG_RENAME_MENU_ITEM (HID_CUI_START + 179) +#define HID_SVX_CONFIG_RENAME_TOOLBAR (HID_CUI_START + 180) +#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM (HID_CUI_START + 181) +#define HID_SVX_NEW_TOOLBAR (HID_CUI_START + 182) +#define HID_SVX_MODIFY_TOOLBAR (HID_CUI_START + 183) +#define HID_SVX_NEW_TOOLBAR_ITEM (HID_CUI_START + 184) +#define HID_SVX_CONFIG_MENU_LISTBOX (HID_CUI_START + 185) +#define HID_SVX_MODIFY_TOOLBAR_ITEM (HID_CUI_START + 186) +#define HID_SVX_SAVE_IN (HID_CUI_START + 187) +#define HID_OPTIONS_MULTIPATH_LIST (HID_CUI_START + 188) +#define HID_FM_DLG_SEARCH (HID_CUI_START + 189) +#define HID_SEARCH_TEXT (HID_CUI_START + 190) +#define HID_SEARCH_ALLFIELDS (HID_CUI_START + 191) +#define HID_GALLERY_PROPERTIES_GENERAL (HID_CUI_START + 192) +#define HID_SEARCH_FIELDSELECTION (HID_CUI_START + 193) +#define HID_SEARCH_POSITION (HID_CUI_START + 194) +#define HID_SEARCH_FORMATTER (HID_CUI_START + 195) +#define HID_SEARCH_CASE (HID_CUI_START + 196) +#define HID_SEARCH_BACKWARD (HID_CUI_START + 197) +#define HID_SEARCH_STARTOVER (HID_CUI_START + 198) +#define HID_SEARCH_WILDCARD (HID_CUI_START + 199) +#define HID_SEARCH_REGULAR (HID_CUI_START + 200) +#define HID_SEARCH_APPROX (HID_CUI_START + 201) +#define HID_SEARCH_APPROXSETTINGS (HID_CUI_START + 202) +#define HID_SEARCH_BTN_SEARCH (HID_CUI_START + 203) +#define HID_SEARCH_BTN_CLOSE (HID_CUI_START + 204) +#define HID_GALLERY_BROWSER (HID_CUI_START + 205) +#define HID_GALLERY_SEARCH (HID_CUI_START + 206) +#define HID_GALLERY_APPLY (HID_CUI_START + 207) +#define HID_SPLDLG_BUTTON_IGNORERULE (HID_CUI_START + 208) +#define HID_CONFIG_ACCEL (HID_CUI_START + 209) +#define HID_ACCELCONFIG_LISTBOX (HID_CUI_START + 210) +#define HID_CONFIGGROUP_ACC_LISTBOX (HID_CUI_START + 211) +#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_CUI_START + 212) +#define HID_MACRO_LB_EVENT (HID_CUI_START + 213) +#define HID_MACRO_GROUP (HID_CUI_START + 214) +#define HID_MACRO_MACROS (HID_CUI_START + 215) +#define HID_DIALOG_HANGULHANJA (HID_CUI_START + 216) +#define HID_HANGULHANJA_OPT_DLG (HID_CUI_START + 217) +#define HID_HANGULHANJA_NEWDICT_DLG (HID_CUI_START + 218) +#define HID_HANGULHANJA_EDIT_DLG (HID_CUI_START + 219) +#define HID_HANGULHANJA_OPT_DICTS_LB (HID_CUI_START + 220) +#define HID_MULTIPATH (HID_CUI_START + 221) +#define HID_SCRIPTORG_DIALOG (HID_CUI_START + 222) +#define HID_SCRIPTSBOX (HID_CUI_START + 223) +#define HID_SPELLCHECK (HID_CUI_START + 224) +#define HID_TPSIZE_CTRL (HID_CUI_START + 225) +#define HID_TPROTATION_CTRL1 (HID_CUI_START + 226) +#define HID_TPROTATION_CTRL2 (HID_CUI_START + 227) +#define HID_TRANS_ANGLE (HID_CUI_START + 228) +#define HID_TPPOSITION_CTRL (HID_CUI_START + 229) +#define HID_NUMBERFORMAT_LB_FORMAT (HID_CUI_START + 230) +#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW (HID_CUI_START + 231) +#define HID_TRANS_SLANT (HID_CUI_START + 232) +#define HID_TPHATCH_CTRL (HID_CUI_START + 233) +#define HID_SEARCHATTR_CTL_ATTR (HID_CUI_START + 234) +#define HID_NUMBERFORMAT_TBI_INFO (HID_CUI_START + 235) +#define HID_SEARCHATTR (HID_CUI_START + 236) +#define HID_ALIGNMENT_CTR_DIAL (HID_CUI_START + 237) +#define HID_ALIGNMENT_CTR_BORDER_LOCK (HID_CUI_START + 238) +#define HID_SEARCHSIMILARITY (HID_CUI_START + 239) +#define UID_SEARCH_RECORDSTATUS (HID_CUI_START + 240) +#define HID_OFAPAGE_AUTOCORR_CLB (HID_CUI_START + 241) +#define HID_AUTOCORR_LANGUAGE (HID_CUI_START + 242) +#define HID_OFAPAGE_AUTOFORMAT_CLB (HID_CUI_START + 243) +#define HID_TPCOLOR_RGB_1 (HID_CUI_START + 244) +#define HID_TPCOLOR_RGB_2 (HID_CUI_START + 245) +#define HID_TPCOLOR_RGB_3 (HID_CUI_START + 246) +#define HID_TPCOLOR_CMYK_1 (HID_CUI_START + 247) +#define HID_TPCOLOR_CMYK_2 (HID_CUI_START + 248) +#define HID_TPCOLOR_CMYK_3 (HID_CUI_START + 249) +#define HID_ALIGNMENT (HID_CUI_START + 250) +#define HID_OFAPAGE_AUTOCORR_OPTIONS (HID_CUI_START + 251) +#define HID_OFAPAGE_AUTOFMT_OPTIONS (HID_CUI_START + 252) +#define HID_OFAPAGE_AUTOCORR_REPLACE (HID_CUI_START + 253) +#define HID_OFACTL_AUTOCORR_REPLACE (HID_CUI_START + 254) +#define HID_OFAPAGE_AUTOCORR_EXCEPT (HID_CUI_START + 255) +#define HID_OFAPAGE_AUTOCORR_QUOTE (HID_CUI_START + 256) +#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS (HID_CUI_START + 257) +#define HID_BACKGROUND (HID_CUI_START + 258) +#define HID_BACKGROUND_CTL_BGDCOLORSET (HID_CUI_START + 259) +#define HID_BACKGROUND_CTL_POSITION (HID_CUI_START + 260) +#define HID_BORDER (HID_CUI_START + 261) +#define HID_BORDER_CTL_PRESETS (HID_CUI_START + 262) +#define HID_BORDER_CTL_SHADOWS (HID_CUI_START + 263) +#define HID_PAGE_CONNECTION (HID_CUI_START + 264) +#define HID_PAGE_CONNECTION_CTL_PREVIEW (HID_CUI_START + 265) +#define HID_PAGE_DISTRIBUTE (HID_CUI_START + 266) +#define HID_SVXPAGE_GRFCROP (HID_CUI_START + 267) +#define HID_CAPTION (HID_CUI_START + 268) +#define HID_CAPTION_CTL_TYPE (HID_CUI_START + 269) +#define HID_PAGE_MEASURE (HID_CUI_START + 270) +#define HID_MEASURE_CTL_POSITION (HID_CUI_START + 271) +#define HID_NUMBERFORMAT (HID_CUI_START + 272) +#define HID_NUMBERFORMAT_TBI_ADD (HID_CUI_START + 273) +#define HID_NUMBERFORMAT_TBI_REMOVE (HID_CUI_START + 274) +#define HID_FORMAT_PAGE (HID_CUI_START + 275) +#define HID_REDLINING_DLG (HID_CUI_START + 276) +#define HID_REDLINING_EDIT (HID_CUI_START + 277) +#define HID_REDLINING_PREV (HID_CUI_START + 278) +#define HID_REDLINING_NEXT (HID_CUI_START + 279) +#define HID_FORMAT_PARAGRAPH_STD (HID_CUI_START + 280) +#define HID_VALUESET_SINGLENUM (HID_CUI_START + 281) +#define HID_VALUESET_BULLET (HID_CUI_START + 282) +#define HID_VALUESET_NUM (HID_CUI_START + 283) +#define HID_VALUESET_NUMBMP (HID_CUI_START + 284) +#define HID_SVXPAGE_PICK_NUM (HID_CUI_START + 285) +#define HID_SVXPAGE_PICK_SINGLE_NUM (HID_CUI_START + 286) +#define HID_SVXPAGE_PICK_BMP (HID_CUI_START + 287) +#define HID_SVXPAGE_PICK_BULLET (HID_CUI_START + 288) +#define HID_SVXPAGE_NUM_OPTIONS (HID_CUI_START + 289) +#define HID_SVXPAGE_NUM_POSITION (HID_CUI_START + 290) +#define HID_MEASURE_CTL_PREVIEW (HID_CUI_START + 291) +#define HID_FORMAT_PARAGRAPH_EXT (HID_CUI_START + 292) +#define HID_FORMAT_PARAGRAPH_ALIGN (HID_CUI_START + 293) +#define HID_SVXPAGE_PARA_ASIAN (HID_CUI_START + 294) +#define HID_SVXPAGE_SWPOSSIZE (HID_CUI_START + 295) +#define HID_AREA_TRANSPARENCE (HID_CUI_START + 296) +#define HID_AREA_AREA (HID_CUI_START + 297) +#define HID_AREA_SHADOW (HID_CUI_START + 298) +#define HID_AREA_HATCH (HID_CUI_START + 299) +#define HID_AREA_BITMAP (HID_CUI_START + 300) +#define HID_TPSHADOW_CTRL (HID_CUI_START + 301) +#define HID_AREA_GRADIENT (HID_CUI_START + 302) +#define HID_LINE_ENDDEF (HID_CUI_START + 303) +#define HID_LINE_LINE (HID_CUI_START + 304) +#define HID_LINE_DEF (HID_CUI_START + 305) +#define HID_SPELLDLG_SETWORD (HID_CUI_START + 306) +#define HID_TABULATOR (HID_CUI_START + 307) +#define HID_PAGE_TEXTATTR (HID_CUI_START + 308) +#define HID_TEXTATTR_CTL_POSITION (HID_CUI_START + 309) +#define HID_TRANS_POSITION_SIZE (HID_CUI_START + 310) +#define HID_HYPHENATE (HID_CUI_START + 311) +#define HID_SVXPAGE_CHAR_NAME (HID_CUI_START + 312) +#define HID_SVXPAGE_CHAR_EFFECTS (HID_CUI_START + 313) +#define HID_SVXPAGE_CHAR_POSITION (HID_CUI_START + 314) +#define HID_HYPERLINK_INTERNET (HID_CUI_START + 315) +#define HID_HYPERLINK_MAIL (HID_CUI_START + 316) +#define HID_HYPERLINK_DOCUMENT (HID_CUI_START + 317) +#define HID_HYPERLINK_NEWDOCUMENT (HID_CUI_START + 318) +#define HID_HYPERLINK_MARKWND (HID_CUI_START + 319) +#define HID_ICCDIALOG_RESET_BTN (HID_CUI_START + 320) +#define HID_ICCDIALOG_CHOICECTRL (HID_CUI_START + 321) +#define HID_HYPERDLG_INET_PATH (HID_CUI_START + 322) +#define HID_HYPERDLG_MAIL_PATH (HID_CUI_START + 323) +#define HID_HYPERDLG_DOC_PATH (HID_CUI_START + 324) +#define HID_ICCDIALOG_OK_BTN (HID_CUI_START + 325) +#define HID_ICCDIALOG_CANCEL_BTN (HID_CUI_START + 326) +#define HID_HYPERLINK_MARKWND_APPLY (HID_CUI_START + 327) +#define HID_HYPERLINK_MARKWND_CLOSE (HID_CUI_START + 328) +#define HID_HYPERLINK_MARKWND_TREE (HID_CUI_START + 329) +#define HID_SVXPAGE_CHAR_TWOLINES (HID_CUI_START + 330) +#define HID_GRFFILTER_EMBOSS_LIGHT (HID_CUI_START + 331) +#define HID_PASTE_DLG (HID_CUI_START + 333) +#define HID_LINKDLG_TABLB (HID_CUI_START + 334) +#define HID_MACRO_HEADERTABLISTBOX (HID_CUI_START + 335) +#define HID_GALLERY_ENTER_TITLE (HID_CUI_START + 336) +#define HID_GALLERY_TITLE_EDIT (HID_CUI_START + 337) +#define HID_THES_LANGUAGE (HID_CUI_START + 338) +#define HID_OFAPAGE_QUOTE_SW_CLB (HID_CUI_START + 339) +#define HID_OFAPAGE_QUOTE_CLB (HID_CUI_START + 340) +#define HID_CT_THES_ALTERNATIVES (HID_CUI_START + 341) + +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY (HID_CUI_START + 342) +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN (HID_CUI_START + 343) +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN (HID_CUI_START + 344) +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE (HID_CUI_START + 345) +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY (HID_CUI_START + 346) +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY (HID_CUI_START + 347) +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY (HID_CUI_START + 348) + +// please adjust ACT_SVX_HID_END2 below if you add entries here! + +// ----------------------------------------------------------------------- +// Overrun check --------------------------------------------------------- +// ----------------------------------------------------------------------- + +#define ACT_CUI_HID_END (HID_CUI_START + 348) + +#if ACT_CUI_HID_END > HID_CUI_END +#error Resource-Ueberlauf in #line, #file +#endif + +#endif + -- cgit v1.2.3