summaryrefslogtreecommitdiff
path: root/sc/source/ui/miscdlgs/instbdlg.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/miscdlgs/instbdlg.cxx')
-rw-r--r--sc/source/ui/miscdlgs/instbdlg.cxx17
1 files changed, 9 insertions, 8 deletions
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 06d4f23389c0..be425ee51bec 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -69,9 +69,10 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nT
: ModalDialog ( pParent, ScResId( RID_SCDLG_INSERT_TABLE ) ),
//
+ aFlPos ( this, ScResId( FL_POSITION ) ),
aBtnBefore ( this, ScResId( RB_BEFORE ) ),
aBtnBehind ( this, ScResId( RB_BEHIND ) ),
- aFlPos ( this, ScResId( FL_POSITION ) ),
+ aFlTable ( this, ScResId( FL_TABLE ) ),
aBtnNew ( this, ScResId( RB_NEW ) ),
aBtnFromFile ( this, ScResId( RB_FROMFILE ) ),
aFtCount ( this, ScResId( FT_COUNT ) ),
@@ -82,7 +83,6 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nT
aFtPath ( this, ScResId( FT_PATH ) ),
aBtnBrowse ( this, ScResId( BTN_BROWSE ) ),
aBtnLink ( this, ScResId( CB_LINK ) ),
- aFlTable ( this, ScResId( FL_TABLE ) ),
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ),
@@ -100,6 +100,7 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nT
#endif /* ENABLE_LAYOUT */
Init_Impl( bFromFile );
FreeResource();
+ aLbTables.SetAccessibleName(aBtnFromFile.GetText());
}
//------------------------------------------------------------------------
@@ -225,7 +226,7 @@ void ScInsertTableDlg::SetFromTo_Impl()
void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc )
{
- aLbTables.SetUpdateMode( FALSE );
+ aLbTables.SetUpdateMode( sal_False );
aLbTables.Clear();
if ( pSrcDoc )
@@ -240,7 +241,7 @@ void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc )
}
}
- aLbTables.SetUpdateMode( TRUE );
+ aLbTables.SetUpdateMode( sal_True );
if(aLbTables.GetEntryCount()==1)
aLbTables.SelectEntryPos(0);
@@ -248,7 +249,7 @@ void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc )
//------------------------------------------------------------------------
-const String* ScInsertTableDlg::GetFirstTable( USHORT* pN )
+const String* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN )
{
const String* pStr = NULL;
@@ -271,7 +272,7 @@ const String* ScInsertTableDlg::GetFirstTable( USHORT* pN )
//------------------------------------------------------------------------
-const String* ScInsertTableDlg::GetNextTable( USHORT* pN )
+const String* ScInsertTableDlg::GetNextTable( sal_uInt16* pN )
{
const String* pStr = NULL;
@@ -392,7 +393,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg
if ( pDocShTables )
pDocShTables->DoClose(); // delete passiert beim Zuweisen auf die Ref
- pMed->UseInteractionHandler( TRUE ); // to enable the filter options dialog
+ pMed->UseInteractionHandler( sal_True ); // to enable the filter options dialog
pDocShTables = new ScDocShell;
aDocShTablesRef = pDocShTables;
@@ -402,7 +403,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg
pDocShTables->DoLoad( pMed );
SetPointer( aOldPtr );
- ULONG nErr = pDocShTables->GetErrorCode();
+ sal_uLong nErr = pDocShTables->GetErrorCode();
if ( nErr )
ErrorHandler::HandleError( nErr ); // auch Warnings