summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
Diffstat (limited to 'cui')
-rw-r--r--cui/source/tabpages/backgrnd.cxx2
-rw-r--r--cui/source/tabpages/tpbitmap.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index d4bd7501b56a..5524c260aa3b 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1234,7 +1234,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl, Button*, void)
pImportDlg->SetPath( aBgdGraphicPath, m_pBtnLink->IsChecked() );
pPageImpl->bIsImportDlgInExecute = true;
- short nErr = pImportDlg->Execute();
+ ErrCode nErr = pImportDlg->Execute();
pPageImpl->bIsImportDlgInExecute = false;
if( !nErr )
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 3151ddc8b076..5ea3afe39b2f 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -768,7 +768,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void)
Graphic aGraphic;
EnterWait();
- int nError = aDlg.GetGraphic( aGraphic );
+ ErrCode nError = aDlg.GetGraphic( aGraphic );
LeaveWait();
if( !nError )
@@ -783,7 +783,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void)
DBG_ASSERT(pFact, "Dialog creation failed!");
ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aURL.GetName().getToken( 0, '.' ), aDesc ));
DBG_ASSERT(pDlg, "Dialog creation failed!");
- nError = 1;
+ nError = ErrCode(1);
while( pDlg->Execute() == RET_OK )
{