Kaydet (Commit) 7367aa7d authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien

INTEGRATION: CWS apps61beta2 (1.35.150); FILE MERGED

2003/04/15 16:39:53 bm 1.35.150.2: RESYNC: (1.35-1.36); FILE MERGED
2003/04/11 07:25:57 pb 1.35.150.1: fix: #106637# set alignment when textdirection changes
üst 95963b0f
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: paragrph.cxx,v $ * $RCSfile: paragrph.cxx,v $
* *
* $Revision: 1.36 $ * $Revision: 1.37 $
* *
* last change: $Author: hr $ $Date: 2003-04-04 18:01:52 $ * last change: $Author: hr $ $Date: 2003-04-28 15:27:18 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -1102,6 +1102,7 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSe ...@@ -1102,6 +1102,7 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSe
aCenter.SetClickHdl( aLink ); aCenter.SetClickHdl( aLink );
aJustify.SetClickHdl( aLink ); aJustify.SetClickHdl( aLink );
aLastLineLB.SetSelectHdl( LINK( this, SvxParaAlignTabPage, LastLineHdl_Impl ) ); aLastLineLB.SetSelectHdl( LINK( this, SvxParaAlignTabPage, LastLineHdl_Impl ) );
aTextDirectionLB.SetSelectHdl( LINK( this, SvxParaAlignTabPage, TextDirectionHdl_Impl ) );
USHORT nHtmlMode = GetHtmlMode_Impl(rSet); USHORT nHtmlMode = GetHtmlMode_Impl(rSet);
if(!(nHtmlMode & HTMLMODE_ON) || (0 != (nHtmlMode & HTMLMODE_SOME_STYLES)) ) if(!(nHtmlMode & HTMLMODE_ON) || (0 != (nHtmlMode & HTMLMODE_SOME_STYLES)) )
...@@ -1363,12 +1364,30 @@ IMPL_LINK( SvxParaAlignTabPage, AlignHdl_Impl, RadioButton*, pBtn ) ...@@ -1363,12 +1364,30 @@ IMPL_LINK( SvxParaAlignTabPage, AlignHdl_Impl, RadioButton*, pBtn )
return 0; return 0;
} }
IMPL_LINK( SvxParaAlignTabPage, LastLineHdl_Impl, ListBox*, pListBox ) IMPL_LINK( SvxParaAlignTabPage, LastLineHdl_Impl, ListBox*, EMPTYARG )
{ {
UpdateExample_Impl(FALSE); UpdateExample_Impl(FALSE);
return 0; return 0;
} }
IMPL_LINK( SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox*, EMPTYARG )
{
SvxFrameDirection eDir = aTextDirectionLB.GetSelectEntryValue();
switch ( eDir )
{
// check the default alignment for this text direction
case FRMDIR_HORI_LEFT_TOP : aLeft.Check( TRUE ); break;
case FRMDIR_HORI_RIGHT_TOP : aRight.Check( TRUE ); break;
case FRMDIR_ENVIRONMENT : /* do nothing */ break;
default:
{
DBG_ERRORFILE( "SvxParaAlignTabPage::TextDirectionHdl_Impl(): other directions not supported" );
}
}
return 0;
}
/*-----------------16.01.97 19.34------------------- /*-----------------16.01.97 19.34-------------------
--------------------------------------------------*/ --------------------------------------------------*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment