summaryrefslogtreecommitdiff
path: root/cui/source/tabpages/paragrph.cxx
diff options
context:
space:
mode:
authorAlan Du <alan_du22@yahoo.com>2010-10-11 20:11:42 -0400
committerKohei Yoshida <kyoshida@novell.com>2010-10-11 20:11:42 -0400
commitf25d7371795d963369cec5eafe30f436f83f2dd2 (patch)
tree8218d41989ad07304442fb8bb663462a0f933323 /cui/source/tabpages/paragrph.cxx
parent4ad9f8a96576a15f613eebe39f18cc9c9b5c7bae (diff)
Removed a lot of the //CHINA001 comments.
Diffstat (limited to 'cui/source/tabpages/paragrph.cxx')
-rw-r--r--cui/source/tabpages/paragrph.cxx72
1 files changed, 9 insertions, 63 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index bd7e890462cd..be0cfb6f6128 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -60,9 +60,9 @@
#include <dialmgr.hxx>
#include "svx/htmlmode.hxx"
#include <editeng/paravertalignitem.hxx>
-#include <svl/eitem.hxx> //add CHINA001
-#include <sfx2/request.hxx> //add CHINA001
-#include <svl/intitem.hxx> //add CHINA001
+#include <svl/eitem.hxx>
+#include <sfx2/request.hxx>
+#include <svl/intitem.hxx>
// static ----------------------------------------------------------------
@@ -962,9 +962,6 @@ void SvxStdParagraphTabPage::EnableRegisterMode()
aRegisterFL.Show();
}
-/*-----------------16.01.97 19.54-------------------
-
---------------------------------------------------*/
IMPL_LINK( SvxStdParagraphTabPage, AutoHdl_Impl, CheckBox*, pBox )
{
BOOL bEnable = !pBox->IsChecked();
@@ -973,43 +970,34 @@ IMPL_LINK( SvxStdParagraphTabPage, AutoHdl_Impl, CheckBox*, pBox )
return 0;
}
-/*-----------------16.01.97 18.00-------------------
-
---------------------------------------------------*/
void SvxStdParagraphTabPage::SetPageWidth( USHORT nPageWidth )
{
nWidth = nPageWidth;
}
-/*-----------------16.01.97 18.01-------------------
---------------------------------------------------*/
void SvxStdParagraphTabPage::SetMaxDistance( USHORT nMaxDist )
{
nAbst = nMaxDist;
}
-/*-----------------17.01.97 08.11-------------------
---------------------------------------------------*/
void SvxStdParagraphTabPage::EnableAutoFirstLine()
{
aAutoCB.Show();
}
-/*-----------------11.06.97 11.48-------------------
- absoluter Zeilenabstand
---------------------------------------------------*/
+
void SvxStdParagraphTabPage::EnableAbsLineDist(long nMinTwip)
{
aLineDist.InsertEntry(sAbsDist);
nMinFixDist = nMinTwip;
}
-//addd CHINA001 begin
+
void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet)
{
-/* CHINA001 different bit represent call to different method of SvxStdParagraphTabPage
+/* different bit represent call to different method of SvxStdParagraphTabPage
0x0001 --->EnableRelativeMode()
0x0002 --->EnableRegisterMode()
0x0004 --->EnableAutoFirstLine()
@@ -1044,7 +1032,7 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet)
EnableNegativeMode();
}
-//end of CHINA001
+
#define LASTLINEPOS_DEFAULT 0
#define LASTLINEPOS_LEFT 1
@@ -1054,9 +1042,6 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet)
// class SvxParaAlignTabPage ------------------------------------------------
-/*-----------------16.01.97 19.34-------------------
-
---------------------------------------------------*/
SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet )
: SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ALIGN_PARAGRAPH ),rSet),
aAlignFrm ( this, CUI_RES( FL_ALIGN ) ),
@@ -1125,16 +1110,10 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSe
}
}
-/*-----------------16.01.97 19.33-------------------
-
---------------------------------------------------*/
SvxParaAlignTabPage::~SvxParaAlignTabPage()
{
}
-/*-----------------16.01.97 19.33-------------------
-
---------------------------------------------------*/
int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
@@ -1142,26 +1121,17 @@ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
return LEAVE_PAGE;
}
-/*-----------------16.01.97 19.33-------------------
-
---------------------------------------------------*/
SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet& rSet )
{
return new SvxParaAlignTabPage(pParent, rSet);
}
-/*-----------------16.01.97 19.33-------------------
-
---------------------------------------------------*/
USHORT* SvxParaAlignTabPage::GetRanges()
{
return pAlignRanges;
}
-/*-----------------16.01.97 19.33-------------------
-
---------------------------------------------------*/
BOOL SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet )
{
BOOL bModified = FALSE;
@@ -1253,9 +1223,6 @@ BOOL SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet )
return bModified;
}
-/*-----------------16.01.97 19.33-------------------
-
---------------------------------------------------*/
void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet )
{
USHORT _nWhich = GetWhich( SID_ATTR_PARA_ADJUST );
@@ -1354,9 +1321,6 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet )
UpdateExample_Impl(TRUE);
}
-/*-----------------17.01.97 08.06-------------------
-
---------------------------------------------------*/
IMPL_LINK( SvxParaAlignTabPage, AlignHdl_Impl, RadioButton*, EMPTYARG )
{
BOOL bJustify = aJustify.IsChecked();
@@ -1391,9 +1355,6 @@ IMPL_LINK( SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox*, EMPTYARG )
return 0;
}
-/*-----------------16.01.97 19.34-------------------
-
---------------------------------------------------*/
void SvxParaAlignTabPage::UpdateExample_Impl( BOOL bAll )
{
if ( aLeft.IsChecked() )
@@ -1429,7 +1390,7 @@ void SvxParaAlignTabPage::EnableJustifyExt()
aSnapToGridCB.Show();
}
-//add CHINA001 begin
+
void SvxParaAlignTabPage::PageCreated (SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pBoolItem,SfxBoolItem,SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_False);
@@ -1437,8 +1398,6 @@ void SvxParaAlignTabPage::PageCreated (SfxAllItemSet aSet)
if(pBoolItem->GetValue())
EnableJustifyExt();
}
-//end of CHINA001
-// class SvxExtParagraphTabPage ------------------------------------------
SfxTabPage* SvxExtParagraphTabPage::Create( Window* pParent,
const SfxItemSet& rSet )
@@ -2256,7 +2215,7 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox *, pListBox )
PageBreakPosHdl_Impl( &aBreakPositionLB );
return 0;
}
-//Add CHINA001 begin
+
void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet)
{
@@ -2269,10 +2228,7 @@ void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet)
}
-//end of Add CHINA001
-/*-- 29.11.00 11:36:24---------------------------------------------------
- -----------------------------------------------------------------------*/
SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_PARA_ASIAN ), rSet),
aOptionsFL( this, CUI_RES(FL_AS_OPTIONS )),
@@ -2289,22 +2245,16 @@ SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) :
aForbiddenRulesCB.SetClickHdl( aLink );
}
-/*-- 29.11.00 11:36:24---------------------------------------------------
- -----------------------------------------------------------------------*/
SvxAsianTabPage::~SvxAsianTabPage()
{
}
-/*-- 29.11.00 11:36:24---------------------------------------------------
- -----------------------------------------------------------------------*/
SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet& rSet )
{
return new SvxAsianTabPage(pParent, rSet);
}
-/*-- 29.11.00 11:36:24---------------------------------------------------
- -----------------------------------------------------------------------*/
USHORT* SvxAsianTabPage::GetRanges()
{
static USHORT pRanges[] =
@@ -2314,9 +2264,7 @@ USHORT* SvxAsianTabPage::GetRanges()
};
return pRanges;
}
-/*-- 29.11.00 11:36:24---------------------------------------------------
- -----------------------------------------------------------------------*/
BOOL SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
{
BOOL bRet = FALSE;
@@ -2350,9 +2298,7 @@ BOOL SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
}
return bRet;
}
-/*-- 29.11.00 11:36:25---------------------------------------------------
- -----------------------------------------------------------------------*/
void lcl_SetBox(const SfxItemSet& rSet, USHORT nSlotId, TriStateBox& rBox)
{
USHORT _nWhich = rSet.GetPool()->GetWhich(nSlotId);