summaryrefslogtreecommitdiff
path: root/cui/source/tabpages/numpages.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/tabpages/numpages.cxx')
-rw-r--r--cui/source/tabpages/numpages.cxx42
1 files changed, 1 insertions, 41 deletions
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 203e7ea1f585..66288342415b 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_cui.hxx"
-
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/RelOrientation.hpp>
@@ -328,7 +325,7 @@ int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
-// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
+
//im Draw gibt es das Item als WhichId, im Writer nur als SlotId
SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
if(eState != SFX_ITEM_SET)
@@ -402,11 +399,6 @@ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
return 0;
}
-/**************************************************************************/
-/* */
-/* */
-/**************************************************************************/
-
SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent,
const SfxItemSet& rSet) :
@@ -514,8 +506,6 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet )
delete pSaveNum;
pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
-// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
-
if(!pActNum)
pActNum = new SvxNumRule(*pSaveNum);
else if(*pSaveNum != *pActNum)
@@ -573,11 +563,6 @@ void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet)
}
-/**************************************************************************/
-/* */
-/* */
-/**************************************************************************/
-
SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent,
const SfxItemSet& rSet) :
@@ -721,7 +706,6 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet )
delete pSaveNum;
pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
-// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
if(!pActNum)
pActNum = new SvxNumRule(*pSaveNum);
else if(*pSaveNum != *pActNum)
@@ -850,10 +834,6 @@ void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType,
}
}
-/**************************************************************************/
-/* */
-/* */
-/**************************************************************************/
SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent,
const SfxItemSet& rSet) :
@@ -877,7 +857,6 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent,
aLinkedCB.SetClickHdl(LINK(this, SvxBitmapPickTabPage, LinkBmpHdl_Impl));
// Grafiknamen ermitteln
-
GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames);
pExamplesVS->SetHelpId(HID_VALUESET_NUMBMP );
for(USHORT i = 0; i < aGrfNames.Count(); i++)
@@ -925,7 +904,6 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet)
const SfxPoolItem* pItem;
bPreset = FALSE;
BOOL bIsPreset = FALSE;
-// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet();
if(pExampleSet)
{
@@ -967,8 +945,6 @@ BOOL SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet )
{
if ( !aGrfNames.Count() )
{
-// das ist im SfxItemSet leider nicht zulaessig #52134#
-// rSet.DisableItem(SID_ATTR_NUMBERING_RULE);
return FALSE;
}
if( (bPreset || bModified) && pActNum)
@@ -1356,7 +1332,6 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
else
aLevelLB.SelectEntryPos(aLevelLB.GetEntryCount() - 1);
-// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
USHORT nMask = 1;
aLevelLB.SetUpdateMode(FALSE);
aLevelLB.SetNoSelection();
@@ -1636,12 +1611,6 @@ void SvxNumOptionsTabPage::InitControls()
aStartED.SetText(aEmptyStr);
break;
case SHOW_BULLET:
- {
-// const Font* pFnt = aNumFmtArr[Lvl]->GetBulletFont();
-// if(pFnt)
-// ChgTxtFont(aBulletFT, *pFnt);
-// aBulletFT.SetText(String((char)aNumFmtArr[nLvl]->GetBulletChar()));
- }
break;
case SHOW_BITMAP:
break;
@@ -1817,7 +1786,6 @@ IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox )
IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
{
String sSelectStyle;
- sal_Int16 eOldType;
BOOL bShowOrient = FALSE;
BOOL bBmp = FALSE;
String aEmptyStr;
@@ -1827,7 +1795,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
if(nActNumLvl & nMask)
{
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
- eOldType = aNumFmt.GetNumberingType();
// PAGEDESC gibt es nicht
USHORT nNumType = (USHORT)(ULONG)pBox->GetEntryData(pBox->GetSelectEntryPos());
aNumFmt.SetNumberingType((sal_Int16)nNumType);
@@ -1855,8 +1822,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
aNumFmt.SetBulletChar( SVX_DEF_BULLET );
pActNum->SetLevel(i, aNumFmt);
SwitchNumberType(SHOW_BULLET);
- //ChgTxtFont(aBulletFT, *aNumFmt.GetBulletFont());
- //aBulletFT.SetText( aNumFmt.GetBulletChar() );
// Zuweisung der Zeichenvorlage automatisch
if(bAutomaticCharStyles)
{
@@ -1867,7 +1832,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
{
aNumFmt.SetPrefix( aPrefixED.GetText() );
aNumFmt.SetSuffix( aSuffixED.GetText() );
-// aNumFmt.SetBulletFont(0);
SwitchNumberType(SHOW_NUMBERING);
pActNum->SetLevel(i, aNumFmt);
CheckForStartValue_Impl(nNumberingType);
@@ -1897,7 +1861,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
{
aCharFmtLB.SelectEntry(sSelectStyle);
CharFmtHdl_Impl(&aCharFmtLB);
- // bAutomaticCharStyles wird im CharFmtHdl_Impl zurueckgesetzt
bAutomaticCharStyles = TRUE;
}
return 0;
@@ -2005,7 +1968,6 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
Size aSize;
sal_Bool bSucc(sal_False);
SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) );
-// aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE );
if(MN_GALLERY_ENTRY <= nItemId )
{
@@ -2436,7 +2398,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
aStdFont.SetColor(aTextColor);
aStdFont.SetFillColor(aBackColor);
- //
USHORT nFontHeight = nYStep * 6 / 10;
if(bPosition)
nFontHeight = nYStep * 15 / 10;
@@ -3040,7 +3001,6 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet)
if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, FALSE, &pItem))
nTmpNumLvl = ((const SfxUInt16Item*)pItem)->GetValue();
}
- //
if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, FALSE, &pItem))
{
delete pSaveNum;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 04:42:13 +0000