summaryrefslogtreecommitdiff
path: root/cui/source/dialogs
diff options
context:
space:
mode:
authorSteve Yin <steve_y@apache.org>2013-11-26 12:02:05 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-11-26 12:03:58 +0000
commitabbe6ce54c1ad96b1c12f019825916e078a02cb3 (patch)
treee2b2a2ac82d86218513e5439712240813f5216c4 /cui/source/dialogs
parent968a76817340cafaeb239b71164974e3c0c43f04 (diff)
Integrate branch of IAccessible2
Change-Id: Ic7d66abbfe8d88bfad66b1dbc8dd5bd103419714
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx5
-rw-r--r--cui/source/dialogs/iconcdlg.cxx5
2 files changed, 5 insertions, 5 deletions
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 );
}
/**********************************************************************