diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:31:10 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:31:10 +0000 |
| commit | d5781ecfe983bee9d043136d2679f8d832eb9d6f (patch) | |
| tree | 4fb80506bf0489802628e5321478f3388a4b7bc5 /svx/source/dialog | |
| parent | 56f9d5b37c57d72b8a1f3cb50de640b18c2d7e86 (diff) | |
INTEGRATION: CWS sb59 (1.24.62); FILE MERGED
2006/08/21 15:39:34 sb 1.24.62.2: #i67487# Made code compile (warning-free) again after resync to SRC680m182.
2006/08/18 12:02:52 sb 1.24.62.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/tplnedef.cxx | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/svx/source/dialog/tplnedef.cxx b/svx/source/dialog/tplnedef.cxx index 404100c6803a..2a12c736844a 100644 --- a/svx/source/dialog/tplnedef.cxx +++ b/svx/source/dialog/tplnedef.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tplnedef.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: obo $ $Date: 2006-09-17 04:45:08 $ + * last change: $Author: obo $ $Date: 2006-10-12 12:31:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -63,6 +63,7 @@ #ifndef _FILEDLGHELPER_HXX #include <sfx2/filedlghelper.hxx> #endif +#include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #define _SVX_TPLNEDEF_CXX @@ -695,7 +696,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) { - int nPos = aLbLineStyles.GetSelectEntryPos(); + USHORT nPos = aLbLineStyles.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -770,9 +771,9 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) IMPL_LINK( SvxLineDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG ) { - int nPos = aLbLineStyles.GetSelectEntryPos(); + USHORT nPos = aLbLineStyles.GetSelectEntryPos(); - if ( nPos >= 0 ) + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ), //! SVX_RES( RID_SVXSTR_DEL_LINESTYLE ), @@ -822,7 +823,9 @@ IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) if ( nReturn != RET_CANCEL ) { - ::sfx2::FileDialogHelper aDlg( ::sfx2::FILEOPEN_SIMPLE, 0 ); + ::sfx2::FileDialogHelper aDlg( + com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, + 0 ); String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.sod" ) ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); INetURLObject aFile( SvtPathOptions().GetPalettePath() ); @@ -905,7 +908,8 @@ IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) { - ::sfx2::FileDialogHelper aDlg( ::sfx2::FILESAVE_SIMPLE, 0 ); + ::sfx2::FileDialogHelper aDlg( + com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.sod" ) ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); |