summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cui/source/customize/macropg.cxx11
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx5
-rw-r--r--cui/source/dialogs/iconcdlg.cxx5
-rw-r--r--cui/source/inc/headertablistbox.hxx2
-rw-r--r--cui/source/tabpages/tparea.cxx3
5 files changed, 16 insertions, 10 deletions
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index acad203e47cc..28804948ea21 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -146,12 +146,15 @@ long _HeaderTabListBox::Notify( NotifyEvent& rNEvt )
return nRet;
}
-_HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) :
- Control( pParent, rId ),
- maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ),
- maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
+_HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId )
+ : Control( pParent, rId )
+ , maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
+ , maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP )
{
maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX );
+
+ // enable the cell focus to show visible focus
+ maListBox.EnableCellFocus();
}
_HeaderTabListBox::~_HeaderTabListBox()
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 4d34a685a7a3..0b6da15e29b9 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -311,8 +311,6 @@ GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rG
maCbxInvert.Check( bInvert );
maCbxInvert.SetToggleHdl( GetModifyHdl() );
-
- maMtrThreshold.GrabFocus();
}
// -----------------------------------------------------------------------------
@@ -371,8 +369,6 @@ GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic
maMtrSepia.SetValue( nSepiaPercent );
maMtrSepia.SetModifyHdl( GetModifyHdl() );
-
- maMtrSepia.GrabFocus();
}
// -----------------------------------------------------------------------------
@@ -423,7 +419,6 @@ GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraph
maNumPoster.SetLast( rGraphic.GetBitmapEx().GetBitCount() );
maNumPoster.SetValue( nPosterCount );
maNumPoster.SetModifyHdl( GetModifyHdl() );
- maNumPoster.GrabFocus();
}
// -----------------------------------------------------------------------------
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 18ffc57cc35b..37689118b68c 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -412,6 +412,11 @@ void IconChoiceDialog::ShowPage( sal_uInt16 nId )
ActivatePageImpl( );
if(bInvalidate)
Invalidate();
+
+ // IA2 CWS. MT: I guess we want the event now, and not in Paint()?
+ IconChoicePageData* pData = GetPageData ( mnCurrentPageId );
+ if(pData)
+ ShowPageImpl ( pData );
}
/**********************************************************************
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index cd80bf84d714..0be8ebe0b20f 100644
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -27,8 +27,8 @@
class _HeaderTabListBox : public Control
{
private:
- SvHeaderTabListBox maListBox;
HeaderBar maHeaderBar;
+ SvHeaderTabListBox maListBox;
protected:
DECL_LINK( HeaderEndDrag_Impl, HeaderBar* );
virtual long Notify( NotifyEvent& rNEvt );
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 462b410c57a6..790c0f332ed4 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -2036,6 +2036,9 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl()
m_pFlPosition->Enable();
m_pFlOffset->Enable();
+ if (!m_pRbtRow->IsChecked() && !m_pRbtColumn->IsChecked())
+ m_pRbtRow->Check();
+
// Controls for Hatch-Background
m_pFlHatchBckgrd->Hide();