From 57d9cc8bae84156f7e6a73e96d6531227b0a4f4c Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Wed, 7 Jan 2009 11:57:24 +0000
Subject: CWS-TOOLING: integrate CWS outlinelevel 2008-12-19 10:32:51 +0100 od
r265718 : #i70748# method - correction for
custom to outline style assigned paragraph styles 2008-12-19
09:24:41 +0100 od r265715 : #i70748# method
- retrieve former applied list style before potential reset of
empty list style due to set outline level 2008-12-17 15:33:57 +0100 hde
r265608 : #i97013# 2008-12-17 14:43:42 +0100 od r265603 : #i70748# adjust
fix i44177 - adjustment of to outline style assigned paragraph styles only
for OOo-Templates. 2008-12-17 12:59:42 +0100 od r265598 : #i70748# method
- special handling of OOo 2.x
document regarding outline numbering of headings. 2008-12-17 12:45:53
+0100 od r265597 : #i70748# method -
correct determination of new and former applied list style 2008-12-17
10:18:41 +0100 od r265581 : #i97312# method
- check, if numbering rules instance contains any numbering rule. 2008-12-16
14:34:22 +0100 hde r265542 : #i97013 2008-12-16 14:20:24 +0100 od r265541 :
#i70748# adjust documentation of "Which"-ID numbers 2008-12-16 14:19:49 +0100
od r265539 : #i70748# Adjust Attribute-Function-Mapping table due to new
attribute 2008-12-16 14:06:24 +0100 od r265538 : #i70748# - Correct handling
of to outline style assigned paragraph styles on reset of all paragraph
style attributes - WW8 import: Consider refactoring of paragraph
style's outline level attribute - NO_NUMBERING define no longer
exsits. 2008-12-16 10:37:19 +0100 od r265530 : #i70478# Correction on moving
outline paragraph up respectively down in its outline level: -
Check also outline paragraph, which are not an outline via a to
outline style assigned paragraph style, if action is applicable. 2008-12-16
09:10:13 +0100 hde r265523 : #i97277 2008-12-16 09:09:30 +0100 hde r265522
: #i97277 2008-12-16 09:07:40 +0100 hde r265521 : Added control and purged
obsolete id's 2008-12-10 13:09:36 +0100 od r265174 : #i70748# correction of
previous fix due to warning-free code 2008-12-10 13:03:30 +0100 od r265172 :
#i70748# method - Due to
performance issues avoid retrieving outline level value from paragraph's
paragraph style for each paragraph. Instead retrieve current outline
level value from paragraph, which is the inherited value from its
paragraph style, and only when it is needed. 2008-12-09 16:50:36 +0100 ufi
r265117 : help 2008-12-09 16:49:50 +0100 ufi r265116 : help 2008-12-09
15:45:05 +0100 od r265107 : #i70748# method
- some minor rework and check
access to paragraph styles 2008-12-09 15:42:04 +0100 od r265106 : #i70748#
adjust name of local variable to avoid hiding of class variable 2008-12-09
15:40:51 +0100 od r265105 : #i70748# correct initialization order 2008-12-09
15:35:07 +0100 od r265101 : #i70748# remove duplicate entry in certain
property map 2008-12-09 15:33:39 +0100 od r265100 : #i70748# add end of file
token 2008-12-07 15:11:54 +0100 zhaojianwei r264952 : conflicts left not to
be resolved when cws rebase 2008-12-04 14:52:21 +0100 zhaojianwei r264846 :
CWS-TOOLING: rebase CWS outlinelevel to trunk@264325 (milestone: DEV300:m36)
2008-11-28 03:42:09 +0100 zhaojianwei r264525 : #i70748#: migrate CWS
outlinelevel to SVN 2008-11-28 03:41:39 +0100 zhaojianwei r264524 :
#i70748#: migrate CWS outlinelevel to SVN 2008-11-28 03:41:11 +0100
zhaojianwei r264523 : #i70748#: migrate CWS outlinelevel to SVN
---
sw/source/ui/index/cnttab.cxx | 106 ++++++++++++++++++++++--------------------
sw/source/ui/index/cnttab.src | 4 +-
2 files changed, 59 insertions(+), 51 deletions(-)
(limited to 'sw/source/ui/index')
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 680220b96be0..9eeaa42ccaa4 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -643,12 +643,14 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox )
sal_Bool SwMultiTOXTabDialog::IsNoNum(SwWrtShell& rSh, const String& rName)
{
SwTxtFmtColl* pColl = rSh.GetParaStyle(rName);
- if(pColl && pColl->GetOutlineLevel() == NO_NUMBERING)
+ //if(pColl && pColl->GetOutlineLevel() == NO_NUMBERING) //#outline level,zhaojianwei
+ if(pColl && ! pColl->IsAssignedToListLevelOfOutlineStyle()) //<-end,zhaojianwei
return sal_True;
sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
if(nId != USHRT_MAX &&
- rSh.GetTxtCollFromPool(nId)->GetOutlineLevel() == NO_NUMBERING)
+ //rSh.GetTxtCollFromPool(nId)->GetOutlineLevel() == NO_NUMBERING) //#outline level,zhaojianwei
+ ! rSh.GetTxtCollFromPool(nId)->IsAssignedToListLevelOfOutlineStyle()) //<-end,zhaojianwei
return sal_True;
return sal_False;
@@ -966,7 +968,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS
aCreateFromFL( this, SW_RES(FL_CREATEFROM )),
aFromHeadingsCB( this, SW_RES(CB_FROMHEADINGS )),
- aChapterDlgPB( this, SW_RES(PB_CHAPTERDLG )),
+// aChapterDlgPB( this, SW_RES(PB_CHAPTERDLG )),//#outline level,removed by zhaojianwei
aAddStylesCB( this, SW_RES(CB_ADDSTYLES )),
aAddStylesPB( this, SW_RES(PB_ADDSTYLES )),
@@ -1043,7 +1045,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS
aTypeLB.SetSelectHdl(LINK(this, SwTOXSelectTabPage, TOXTypeHdl));
aAddStylesPB.SetClickHdl(LINK(this, SwTOXSelectTabPage, AddStylesHdl));
- aChapterDlgPB.SetClickHdl(LINK(this, SwTOXSelectTabPage, ChapterHdl));
+ //aChapterDlgPB.SetClickHdl(LINK(this, SwTOXSelectTabPage, ChapterHdl));//#outline level,removed by zhaojianwei
PopupMenu* pMenu = aAutoMarkPB.GetPopupMenu();
pMenu->SetActivateHdl(LINK(this, SwTOXSelectTabPage, MenuEnableHdl));
@@ -1221,7 +1223,7 @@ void SwTOXSelectTabPage::ApplyTOXDescription()
if(TOX_CONTENT == aCurType.eType)
{
aFromHeadingsCB.Check( 0 != (nCreateType & nsSwTOXElement::TOX_OUTLINELEVEL) );
- aChapterDlgPB.Enable(aFromHeadingsCB.IsChecked());
+ //aChapterDlgPB.Enable(aFromHeadingsCB.IsChecked());//#outline level,removed by zhaojianwei
aAddStylesCB.SetText(sAddStyleContent);
aAddStylesPB.Enable(aAddStylesCB.IsChecked());
}
@@ -1485,7 +1487,7 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
aAreaFL.Show( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_INDEX|TO_TABLE|TO_OBJECT)) );
aFromHeadingsCB.Show( 0 != (nType & (TO_CONTENT)) );
- aChapterDlgPB.Show( 0 != (nType & (TO_CONTENT)) );
+ // aChapterDlgPB.Show( 0 != (nType & (TO_CONTENT)) );//#outline level,removed by zhaojianwei
aAddStylesCB.Show( 0 != (nType & (TO_CONTENT|TO_USER)) );
aAddStylesPB.Show( 0 != (nType & (TO_CONTENT|TO_USER)) );
@@ -1517,13 +1519,14 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
aSortAlgorithmFT.Show(bEnableSortLanguage);
aSortAlgorithmLB.Show(bEnableSortLanguage);
- if(nType & TO_CONTENT)
- {
- Point aPos(aAddStylesPB.GetPosPixel());
- aPos.X() = aChapterDlgPB.GetPosPixel().X();
- aAddStylesPB.SetPosPixel(aPos);
- }
- else if( nType & TO_ILLUSTRATION )
+ //if(nType & TO_CONTENT) //#outline level,removed by zhaojianwei
+ //{
+ //Point aPos(aAddStylesPB.GetPosPixel());
+ //aPos.X() = aChapterDlgPB.GetPosPixel().X();
+ //aAddStylesPB.SetPosPixel(aPos);
+ //}
+ //else if( nType & TO_ILLUSTRATION )//<-removed end.
+ if( nType & TO_ILLUSTRATION ) //add by zhaojianwei
aCaptionSequenceLB.SelectEntry( SwStyleNameMapper::GetUIName(
RES_POOLCOLL_LABEL_ABB, aEmptyStr ));
else if( nType & TO_TABLE )
@@ -1534,7 +1537,7 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
aAddStylesCB.SetText(sAddStyleUser);
// move left!
Point aPos(aAddStylesPB.GetPosPixel());
- aPos.X() = aChapterDlgPB.GetPosPixel().X();
+ // aPos.X() = aChapterDlgPB.GetPosPixel().X();
aPos.X() -= 2 * aAddStylesPB.GetSizePixel().Width();
aAddStylesPB.SetPosPixel(aPos);
}
@@ -1598,7 +1601,7 @@ IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox )
pBox->Check(sal_True);
}
aAddStylesPB.Enable(aAddStylesCB.IsChecked());
- aChapterDlgPB.Enable(aFromHeadingsCB.IsChecked());
+ //aChapterDlgPB.Enable(aFromHeadingsCB.IsChecked());//#outline level,removed by zhaojianwei
}
if(TOX_USER == aCurType.eType)
{
@@ -1681,42 +1684,45 @@ IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl, ListBox*, pBox)
}
return 0;
}
-/* -----------------14.06.99 13:10-------------------
-
- --------------------------------------------------*/
-IMPL_LINK(SwTOXSelectTabPage, ChapterHdl, PushButton*, pButton)
-{
- SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
- SwWrtShell& rSh = pTOXDlg->GetWrtShell();
-
- SfxItemSet aTmp(rSh.GetView().GetPool(), FN_PARAM_1, FN_PARAM_1);
- SwOutlineTabDialog* pDlg = new SwOutlineTabDialog(pButton, &aTmp, rSh);
- if(RET_OK == pDlg->Execute())
- {
- CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
- SwForm* pForm = ((SwMultiTOXTabDialog*)GetTabDialog())->GetForm(aCurType);
- // jetzt muss ueberprueft werden, ob dem sdbcx::Index Ueberschriftenvorlagen
- // zugewiesen wurden
- String sStr;
- for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
- {
- sal_Bool bNum = !SwMultiTOXTabDialog::IsNoNum(rSh, pForm->GetTemplate( i + 1 ));
- if(bNum)
- {
- //es gibt getrennte Resourcebereiche fuer die Inhaltsverzeichnisse
- if(i < 5)
- SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(RES_POOLCOLL_TOX_CNTNT1 + i), sStr );
- else
- SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(RES_POOLCOLL_TOX_CNTNT6 + i - 5), sStr );
- pForm->SetTemplate( i + 1, sStr );
- }
- }
-
- }
- delete pDlg;
- return 0;
-}
+//#outline level, removed by zhaojianwei
+//It is no longer used!
+///* -----------------14.06.99 13:10-------------------
+//
+// --------------------------------------------------*/
+//IMPL_LINK(SwTOXSelectTabPage, ChapterHdl, PushButton*, pButton)
+//{
+// SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+// SwWrtShell& rSh = pTOXDlg->GetWrtShell();
+//
+// SfxItemSet aTmp(rSh.GetView().GetPool(), FN_PARAM_1, FN_PARAM_1);
+// SwOutlineTabDialog* pDlg = new SwOutlineTabDialog(pButton, &aTmp, rSh);
+//
+// if(RET_OK == pDlg->Execute())
+// {
+// CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
+// SwForm* pForm = ((SwMultiTOXTabDialog*)GetTabDialog())->GetForm(aCurType);
+// // jetzt muss ueberprueft werden, ob dem sdbcx::Index Ueberschriftenvorlagen
+// // zugewiesen wurden
+// String sStr;
+// for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
+// {
+// sal_Bool bNum = !SwMultiTOXTabDialog::IsNoNum(rSh, pForm->GetTemplate( i + 1 ));
+// if(bNum)
+// {
+// //es gibt getrennte Resourcebereiche fuer die Inhaltsverzeichnisse
+// if(i < 5)
+// SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(RES_POOLCOLL_TOX_CNTNT1 + i), sStr );
+// else
+// SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(RES_POOLCOLL_TOX_CNTNT6 + i - 5), sStr );
+// pForm->SetTemplate( i + 1, sStr );
+// }
+// }
+//
+// }
+// delete pDlg;
+// return 0;
+//}
/* -----------------14.06.99 13:10-------------------
--------------------------------------------------*/
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index f921ad182daf..1bccc6c27765 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -226,13 +226,15 @@ TabPage TP_TOX_SELECT
Check = TRUE;
Text [ en-US ] = "Outline";
};
- PushButton PB_CHAPTERDLG
+// #outline level,removed by zhaojianwei
+/* PushButton PB_CHAPTERDLG
{
Pos = MAP_APPFONT ( 115 , 98 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
Text = "~..." ;
TabStop = TRUE ;
};
+*/
CheckBox CB_ADDSTYLES
{
Pos = MAP_APPFONT ( 12 , 115 ) ;
--
cgit