diff options
Diffstat (limited to 'sw/source/ui/index')
-rw-r--r-- | sw/source/ui/index/cntex.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 498 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.hrc | 236 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.src | 88 | ||||
-rw-r--r-- | sw/source/ui/index/idxmrk.cxx | 14 | ||||
-rw-r--r-- | sw/source/ui/index/idxmrk.hrc | 102 | ||||
-rw-r--r-- | sw/source/ui/index/idxmrk.src | 166 | ||||
-rw-r--r-- | sw/source/ui/index/multmrk.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/index/multmrk.hrc | 12 | ||||
-rw-r--r-- | sw/source/ui/index/multmrk.src | 2 | ||||
-rw-r--r-- | sw/source/ui/index/swuiidxmrk.cxx | 192 | ||||
-rw-r--r-- | sw/source/ui/index/toxmgr.cxx | 14 |
12 files changed, 671 insertions, 671 deletions
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 9c232d4c128e..f4157fa0049f 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -297,18 +297,18 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( String aTmpName( SwStyleNameMapper::GetSpecialExtraProgName( rDesc.GetSequenceName() ) ); lcl_SetProp(xInfo, xIdxProps, UNO_NAME_LABEL_CATEGORY, aTmpName ); - lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_LABELS, !rDesc.IsCreateFromObjectNames()); + lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_LABELS, !rDesc.IsCreateFromObjectNames()); sal_Int16 nSet = text::ChapterFormat::NAME_NUMBER; switch (rDesc.GetCaptionDisplay()) { case CAPTION_COMPLETE: nSet = text::ChapterFormat::NAME_NUMBER;break; - case CAPTION_NUMBER : nSet = text::ChapterFormat::NUMBER; break; + case CAPTION_NUMBER : nSet = text::ChapterFormat::NUMBER; break; case CAPTION_TEXT : nSet = text::ChapterFormat::NAME; break; } lcl_SetProp(xInfo, xIdxProps, UNO_NAME_LABEL_DISPLAY_TYPE, nSet); - sal_uInt16 nOLEOptions = rDesc.GetOLEOptions(); + sal_uInt16 nOLEOptions = rDesc.GetOLEOptions(); lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_STAR_MATH, 0 != (nsSwTOOElements::TOO_MATH &nOLEOptions )); lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_STAR_CHART, 0 != (nsSwTOOElements::TOO_CHART &nOLEOptions )); lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_STAR_CALC, 0 != (nsSwTOOElements::TOO_CALC &nOLEOptions )); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 7444f76e1285..ed51110f53dc 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,12 +101,12 @@ using namespace ::sfx2; #include <svtools/editbrowsebox.hxx> static const sal_Unicode aDeliStart = '['; //fuer die form -static const sal_Unicode aDeliEnd = ']'; //fuer die form +static const sal_Unicode aDeliEnd = ']'; //fuer die form -#define POS_GRF 0 -#define POS_OLE 1 -#define POS_TABLE 2 -#define POS_FRAME 3 +#define POS_GRF 0 +#define POS_OLE 1 +#define POS_TABLE 2 +#define POS_FRAME 3 #define IDX_FILE_EXTENSION String::CreateFromAscii( \ RTL_CONSTASCII_STRINGPARAM( "*.sdi" )) @@ -151,8 +151,8 @@ struct AutoMarkEntry String sPrimKey; String sSecKey; String sComment; - sal_Bool bCase; - sal_Bool bWord; + sal_Bool bCase; + sal_Bool bWord; AutoMarkEntry() : bCase(sal_False), @@ -165,63 +165,63 @@ SV_IMPL_PTRARR(AutoMarkEntryArr, AutoMarkEntryPtr); typedef ::svt::EditBrowseBox SwEntryBrowseBox_Base; class SwEntryBrowseBox : public SwEntryBrowseBox_Base { - Edit aCellEdit; - ::svt::CheckBoxControl aCellCheckBox; + Edit aCellEdit; + ::svt::CheckBoxControl aCellCheckBox; - String sSearch; - String sAlternative; - String sPrimKey; - String sSecKey; - String sComment; - String sCaseSensitive; - String sWordOnly; - String sYes; - String sNo; + String sSearch; + String sAlternative; + String sPrimKey; + String sSecKey; + String sComment; + String sCaseSensitive; + String sWordOnly; + String sYes; + String sNo; - AutoMarkEntryArr aEntryArr; + AutoMarkEntryArr aEntryArr; - ::svt::CellControllerRef xController; - ::svt::CellControllerRef xCheckController; + ::svt::CellControllerRef xController; + ::svt::CellControllerRef xCheckController; - long nCurrentRow; - sal_Bool bModified; + long nCurrentRow; + sal_Bool bModified; - void SetModified() {bModified = sal_True;} + void SetModified() {bModified = sal_True;} protected: - virtual sal_Bool SeekRow( long nRow ); -// virtual void PaintField( OutputDevice& rDev, const awt::Rectangle& rRect, -// sal_uInt16 nColumnId ) const; - virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const; - virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol); - virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol); - virtual sal_Bool SaveModified(); + virtual sal_Bool SeekRow( long nRow ); +// virtual void PaintField( OutputDevice& rDev, const awt::Rectangle& rRect, +// sal_uInt16 nColumnId ) const; + virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const; + virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol); + virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol); + virtual sal_Bool SaveModified(); public: SwEntryBrowseBox(Window* pParent, const ResId& rId, BrowserMode nMode = 0 ); - void ReadEntries(SvStream& rInStr); - void WriteEntries(SvStream& rOutStr); + void ReadEntries(SvStream& rInStr); + void WriteEntries(SvStream& rOutStr); - sal_Bool IsModified()const; + sal_Bool IsModified()const; virtual String GetCellText( long nRow, USHORT nColumn ) const; }; class SwAutoMarkDlg_Impl : public ModalDialog { - OKButton aOKPB; - CancelButton aCancelPB; - HelpButton aHelpPB; + OKButton aOKPB; + CancelButton aCancelPB; + HelpButton aHelpPB; - SwEntryBrowseBox aEntriesBB; + SwEntryBrowseBox aEntriesBB; FixedLine aEntriesFL; - String sAutoMarkURL; - const String sAutoMarkType; + String sAutoMarkURL; + const String sAutoMarkType; - sal_Bool bCreateMode; + sal_Bool bCreateMode; DECL_LINK(OkHdl, OKButton*); public: @@ -247,7 +247,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType, sal_Bool bGlobal) : - SfxTabDialog( pParent, SW_RES(DLG_MULTI_TOX), &rSet), + SfxTabDialog( pParent, SW_RES(DLG_MULTI_TOX), &rSet), aExampleContainerWIN(this, SW_RES(WIN_EXAMPLE)), aExampleWIN( &aExampleContainerWIN, 0 ), aShowExampleCB( this, SW_RES(CB_SHOWEXAMPLE)), @@ -331,9 +331,9 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet OSL_ENSURE(pFact, "Dialogdiet fail!"); AddTabPage(TP_TOX_SELECT, SwTOXSelectTabPage::Create, 0); AddTabPage(TP_TOX_STYLES, SwTOXStylesTabPage::Create, 0); - AddTabPage(TP_COLUMN, SwColumnPage::Create, 0); + AddTabPage(TP_COLUMN, SwColumnPage::Create, 0); AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); - AddTabPage(TP_TOX_ENTRY, SwTOXEntryTabPage::Create, 0); + AddTabPage(TP_TOX_ENTRY, SwTOXEntryTabPage::Create, 0); if(!pCurTOX) SetCurPageId(TP_TOX_SELECT); @@ -372,7 +372,7 @@ SwMultiTOXTabDialog::~SwMultiTOXTabDialog() delete pExampleFrame; } -void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) +void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { if( TP_BACKGROUND == nId ) { @@ -396,7 +396,7 @@ void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } } -short SwMultiTOXTabDialog::Ok() +short SwMultiTOXTabDialog::Ok() { short nRet = SfxTabDialog::Ok(); SwTOXDescription& rDesc = GetTOXDescription(eCurrentTOXType); @@ -435,7 +435,7 @@ SwForm* SwMultiTOXTabDialog::GetForm(CurTOXType eType) return pFormArr[nIndex]; } -SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType) +SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType) { sal_uInt16 nIndex = eType.GetFlatIndex(); if(!pDescArr[nIndex]) @@ -586,14 +586,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) //#outline level,zhaojianwei - if(pColl && ! pColl->IsAssignedToListLevelOfOutlineStyle()) //<-end,zhaojianwei + //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) //#outline level,zhaojianwei - ! rSh.GetTxtCollFromPool(nId)->IsAssignedToListLevelOfOutlineStyle()) //<-end,zhaojianwei + //rSh.GetTxtCollFromPool(nId)->GetOutlineLevel() == NO_NUMBERING) //#outline level,zhaojianwei + ! rSh.GetTxtCollFromPool(nId)->IsAssignedToListLevelOfOutlineStyle()) //<-end,zhaojianwei return sal_True; return sal_False; @@ -606,9 +606,9 @@ public: SwIndexTreeLB(Window* pWin, const ResId& rResId) : SvTreeListBox(pWin, rResId), pHeaderBar(0){} - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); - void SetHeaderBar(const HeaderBar* pHB) {pHeaderBar = pHB;} + void SetHeaderBar(const HeaderBar* pHB) {pHeaderBar = pHB;} }; long SwIndexTreeLB::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) @@ -625,7 +625,7 @@ long SwIndexTreeLB::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) return nData; } -void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt ) +void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt ) { SvLBoxEntry* pEntry = FirstSelected(); KeyCode aCode = rKEvt.GetKeyCode(); @@ -661,16 +661,16 @@ void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt ) class SwHeaderTree : public Control { - HeaderBar aStylesHB; - SwIndexTreeLB aStylesTLB; + HeaderBar aStylesHB; + SwIndexTreeLB aStylesTLB; public: SwHeaderTree(Window* pParent, const ResId rResId); - HeaderBar& GetHeaderBar() {return aStylesHB;} - SwIndexTreeLB& GetTreeListBox() { return aStylesTLB;} + HeaderBar& GetHeaderBar() {return aStylesHB;} + SwIndexTreeLB& GetTreeListBox() { return aStylesTLB;} - virtual void GetFocus(); + virtual void GetFocus(); }; SwHeaderTree::SwHeaderTree(Window* pParent, const ResId rResId) : @@ -690,7 +690,7 @@ SwHeaderTree::SwHeaderTree(Window* pParent, const ResId rResId) : aStylesTLB.SetHeaderBar(&aStylesHB); } -void SwHeaderTree::GetFocus() +void SwHeaderTree::GetFocus() { Control::GetFocus(); aStylesTLB.GrabFocus(); @@ -698,17 +698,17 @@ void SwHeaderTree::GetFocus() class SwAddStylesDlg_Impl : public SfxModalDialog { - OKButton aOk; - CancelButton aCancel; - HelpButton aHelp; + OKButton aOk; + CancelButton aCancel; + HelpButton aHelp; FixedLine aStylesFL; - SwHeaderTree aHeaderTree; + SwHeaderTree aHeaderTree; ImageButton aLeftPB; ImageButton aRightPB; - String sHBFirst; - String* pStyleArr; + String sHBFirst; + String* pStyleArr; DECL_LINK(OkHdl, OKButton*); DECL_LINK(LeftRightHdl, PushButton*); @@ -751,7 +751,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent, nWidth /= 14; nWidth--; - rHB.InsertItem( 100, sHBFirst, 4 * nWidth ); + rHB.InsertItem( 100, sHBFirst, 4 * nWidth ); for( i = 1; i <= MAXLEVEL; i++) rHB.InsertItem( 100 + i, String::CreateFromInt32(i), nWidth ); rHB.Show(); @@ -772,7 +772,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent, } // now the other styles // - const SwTxtFmtColl *pColl = 0; + const SwTxtFmtColl *pColl = 0; const sal_uInt16 nSz = rWrtSh.GetTxtFmtCollCount(); for ( sal_uInt16 j = 0;j < nSz; ++j ) @@ -961,20 +961,20 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS aAddStylesPB.SetClickHdl(LINK(this, SwTOXSelectTabPage, AddStylesHdl)); //aChapterDlgPB.SetClickHdl(LINK(this, SwTOXSelectTabPage, ChapterHdl));//#outline level,removed by zhaojianwei - PopupMenu* pMenu = aAutoMarkPB.GetPopupMenu(); + PopupMenu* pMenu = aAutoMarkPB.GetPopupMenu(); pMenu->SetActivateHdl(LINK(this, SwTOXSelectTabPage, MenuEnableHdl)); pMenu->SetSelectHdl(LINK(this, SwTOXSelectTabPage, MenuExecuteHdl)); Link aLk = LINK(this, SwTOXSelectTabPage, CheckBoxHdl); - aAddStylesCB .SetClickHdl(aLk); + aAddStylesCB .SetClickHdl(aLk); aFromHeadingsCB .SetClickHdl(aLk); aTOXMarksCB .SetClickHdl(aLk); aFromFileCB .SetClickHdl(aLk); - aCollectSameCB .SetClickHdl(aLk); - aUseFFCB .SetClickHdl(aLk); - aUseDashCB .SetClickHdl(aLk); - aInitialCapsCB .SetClickHdl(aLk); - aKeyAsEntryCB .SetClickHdl(aLk); + aCollectSameCB .SetClickHdl(aLk); + aUseFFCB .SetClickHdl(aLk); + aUseDashCB .SetClickHdl(aLk); + aInitialCapsCB .SetClickHdl(aLk); + aKeyAsEntryCB .SetClickHdl(aLk); Link aModifyLk = LINK(this, SwTOXSelectTabPage, ModifyHdl); aTitleED.SetModifyHdl(aModifyLk); @@ -1025,17 +1025,17 @@ long lcl_TOXTypesToUserData(CurTOXType eType) sal_uInt16 nRet = TOX_INDEX; switch(eType.eType) { - case TOX_INDEX : nRet = TO_INDEX; break; + case TOX_INDEX : nRet = TO_INDEX; break; case TOX_USER : { nRet = eType.nIndex << 8; nRet |= TO_USER; } break; - case TOX_CONTENT : nRet = TO_CONTENT; break; + case TOX_CONTENT : nRet = TO_CONTENT; break; case TOX_ILLUSTRATIONS:nRet = TO_ILLUSTRATION; break; - case TOX_OBJECTS : nRet = TO_OBJECT; break; - case TOX_TABLES : nRet = TO_TABLE; break; + case TOX_OBJECTS : nRet = TO_OBJECT; break; + case TOX_TABLES : nRet = TO_TABLE; break; case TOX_AUTHORITIES : nRet = TO_AUTHORITIES; break; } return nRet; @@ -1058,24 +1058,24 @@ CurTOXType lcl_UserData2TOXTypes(sal_uInt16 nData) switch(nData&0xff) { - case TO_INDEX : eRet.eType = TOX_INDEX; break; - case TO_USER : + case TO_INDEX : eRet.eType = TOX_INDEX; break; + case TO_USER : { eRet.eType = TOX_USER; eRet.nIndex = (nData&0xff00) >> 8; } break; - case TO_CONTENT : eRet.eType = TOX_CONTENT; break; + case TO_CONTENT : eRet.eType = TOX_CONTENT; break; case TO_ILLUSTRATION: eRet.eType = TOX_ILLUSTRATIONS; break; - case TO_OBJECT : eRet.eType = TOX_OBJECTS; break; - case TO_TABLE : eRet.eType = TOX_TABLES; break; - case TO_AUTHORITIES : eRet.eType = TOX_AUTHORITIES; break; + case TO_OBJECT : eRet.eType = TOX_OBJECTS; break; + case TO_TABLE : eRet.eType = TOX_TABLES; break; + case TO_AUTHORITIES : eRet.eType = TOX_AUTHORITIES; break; default: OSL_ENSURE(false, "what a type?"); } return eRet; } -void SwTOXSelectTabPage::ApplyTOXDescription() +void SwTOXSelectTabPage::ApplyTOXDescription() { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType(); @@ -1275,7 +1275,7 @@ void SwTOXSelectTabPage::FillTOXDescription() break; } - rDesc.SetLevelFromChapter( aLevelFromChapterCB.IsVisible() && + rDesc.SetLevelFromChapter( aLevelFromChapterCB.IsVisible() && aLevelFromChapterCB.IsChecked()); if(aTOXMarksCB.IsChecked() && aTOXMarksCB.IsVisible()) nContentOptions |= nsSwTOXElement::TOX_MARK; @@ -1348,12 +1348,12 @@ int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SfxTabPage* SwTOXSelectTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) +SfxTabPage* SwTOXSelectTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwTOXSelectTabPage(pParent, rAttrSet); } -IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox) +IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); if(!bFirstCall) @@ -1407,14 +1407,14 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox) aSortAlgorithmFT.Show(bEnableSortLanguage); aSortAlgorithmLB.Show(bEnableSortLanguage); - //if(nType & TO_CONTENT) //#outline level,removed by zhaojianwei + //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 + if( nType & TO_ILLUSTRATION ) //add by zhaojianwei aCaptionSequenceLB.SelectEntry( SwStyleNameMapper::GetUIName( RES_POOLCOLL_LABEL_ABB, aEmptyStr )); else if( nType & TO_TABLE ) @@ -1425,7 +1425,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); } @@ -1438,8 +1438,8 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox) aKeyAsEntryCB.Show( 0 != (nType & TO_INDEX) ); aFromFileCB.Show( 0 != (nType & TO_INDEX) ); aAutoMarkPB.Show( 0 != (nType & TO_INDEX) ); -// aCreateAutoMarkPB.Show(nType &TO_INDEX); -// aEditAutoMarkPB.Show(nType & TO_INDEX); +// aCreateAutoMarkPB.Show(nType &TO_INDEX); +// aEditAutoMarkPB.Show(nType & TO_INDEX); aIdxOptionsFL.Show( 0 != (nType & TO_INDEX) ); @@ -1472,7 +1472,7 @@ IMPL_LINK(SwTOXSelectTabPage, ModifyHdl, void*, EMPTYARG) return 0; } -IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox ) +IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox ) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType(); @@ -1552,13 +1552,13 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox) return 0; }; -IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl, ListBox*, pBox) +IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl, ListBox*, pBox) { OSL_ENSURE(false, "not implemented"); switch((long)pBox->GetEntryData( pBox->GetSelectEntryPos() )) { case AREA_DOCUMENT : break; - case AREA_CHAPTER : break; + case AREA_CHAPTER : break; } return 0; } @@ -1568,38 +1568,38 @@ IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl, ListBox*, pBox) ///* -----------------14.06.99 13:10------------------- // // --------------------------------------------------*/ -//IMPL_LINK(SwTOXSelectTabPage, ChapterHdl, PushButton*, pButton) +//IMPL_LINK(SwTOXSelectTabPage, ChapterHdl, PushButton*, pButton) //{ -// SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); -// SwWrtShell& rSh = pTOXDlg->GetWrtShell(); +// 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); +// 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) +// 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 +// else // SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(RES_POOLCOLL_TOX_CNTNT6 + i - 5), sStr ); -// pForm->SetTemplate( i + 1, sStr ); -// } -// } +// pForm->SetTemplate( i + 1, sStr ); +// } +// } // -// } -// delete pDlg; -// return 0; +// } +// delete pDlg; +// return 0; //} IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, PushButton*, pButton) @@ -1652,9 +1652,9 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu) class SwTOXEdit : public Edit { - SwFormToken aFormToken; - Link aPrevNextControlLink; - sal_Bool bNextControl; + SwFormToken aFormToken; + Link aPrevNextControlLink; + sal_Bool bNextControl; SwTokenWindow* m_pParent; public: SwTOXEdit( Window* pParent, SwTokenWindow* pTokenWin, @@ -1667,34 +1667,34 @@ public: SetHelpId( HID_TOX_ENTRY_EDIT ); } - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); - sal_Bool IsNextControl() const {return bNextControl;} - void SetPrevNextLink( const Link& rLink ) {aPrevNextControlLink = rLink;} + sal_Bool IsNextControl() const {return bNextControl;} + void SetPrevNextLink( const Link& rLink ) {aPrevNextControlLink = rLink;} - const SwFormToken& GetFormToken() + const SwFormToken& GetFormToken() { aFormToken.sText = GetText(); return aFormToken; } - void SetCharStyleName(const String& rSet, sal_uInt16 nPoolId) + void SetCharStyleName(const String& rSet, sal_uInt16 nPoolId) { aFormToken.sCharStyleName = rSet; aFormToken.nPoolId = nPoolId; } - void AdjustSize(); + void AdjustSize(); }; -void SwTOXEdit::RequestHelp( const HelpEvent& rHEvt ) +void SwTOXEdit::RequestHelp( const HelpEvent& rHEvt ) { if(!m_pParent->CreateQuickHelp(this, aFormToken, rHEvt)) Edit::RequestHelp(rHEvt); } -void SwTOXEdit::KeyInput( const KeyEvent& rKEvt ) +void SwTOXEdit::KeyInput( const KeyEvent& rKEvt ) { const Selection& rSel = GetSelection(); sal_uInt16 nTextLen = GetText().Len(); @@ -1732,9 +1732,9 @@ void SwTOXEdit::AdjustSize() class SwTOXButton : public PushButton { - SwFormToken aFormToken; - Link aPrevNextControlLink; - sal_Bool bNextControl; + SwFormToken aFormToken; + Link aPrevNextControlLink; + sal_Bool bNextControl; SwTokenWindow* m_pParent; public: SwTOXButton( Window* pParent, SwTokenWindow* pTokenWin, @@ -1747,12 +1747,12 @@ public: SetHelpId(HID_TOX_ENTRY_BUTTON); } - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); - sal_Bool IsNextControl() const {return bNextControl;} + sal_Bool IsNextControl() const {return bNextControl;} void SetPrevNextLink(const Link& rLink) {aPrevNextControlLink = rLink;} - const SwFormToken& GetFormToken() const {return aFormToken;} + const SwFormToken& GetFormToken() const {return aFormToken;} void SetCharStyleName(const String& rSet, sal_uInt16 nPoolId) { @@ -1767,7 +1767,7 @@ public: { aFormToken.cTabFillChar = cSet; } void SetTabAlign(SvxTabAdjust eAlign) - { aFormToken.eTabAlign = eAlign;} + { aFormToken.eTabAlign = eAlign;} //---> i89791 //used for entry number format, in TOC only @@ -1824,7 +1824,7 @@ public: } }; -void SwTOXButton::KeyInput( const KeyEvent& rKEvt ) +void SwTOXButton::KeyInput( const KeyEvent& rKEvt ) { sal_Bool bCall = sal_False; KeyCode aCode = rKEvt.GetKeyCode(); @@ -1850,7 +1850,7 @@ void SwTOXButton::KeyInput( const KeyEvent& rKEvt ) PushButton::KeyInput(rKEvt); } -void SwTOXButton::RequestHelp( const HelpEvent& rHEvt ) +void SwTOXButton::RequestHelp( const HelpEvent& rHEvt ) { if(!m_pParent->CreateQuickHelp(this, aFormToken, rHEvt)) Button::RequestHelp(rHEvt); @@ -1927,8 +1927,8 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet aChapterEntryFT(this, SW_RES(FT_CHAPTERENTRY )), aChapterEntryLB(this, SW_RES(LB_CHAPTERENTRY )), - aNumberFormatFT(this, SW_RES(FT_ENTRY_NO )),//i53420 - aNumberFormatLB(this, SW_RES(LB_ENTRY_NO )), + aNumberFormatFT(this, SW_RES(FT_ENTRY_NO )),//i53420 + aNumberFormatLB(this, SW_RES(LB_ENTRY_NO )), aEntryOutlineLevelFT(this, SW_RES(FT_LEVEL_OL )),//i53420 aEntryOutlineLevelNF(this, SW_RES(NF_LEVEL_OL )), @@ -1990,7 +1990,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet aLevelLB.SetWindowBits( WB_HSCROLL ); aLevelLB.SetSpaceBetweenEntries(0); aLevelLB.SetSelectionMode( SINGLE_SELECTION ); - aLevelLB.SetHighlightRange(); // select full width + aLevelLB.SetHighlightRange(); // select full width aLevelLB.SetHelpId(HID_INSERT_INDEX_ENTRY_LEVEL_LB); aLevelLB.Show(); @@ -2111,7 +2111,7 @@ SwTOXEntryTabPage::~SwTOXEntryTabPage() { } -sal_Bool SwTOXEntryTabPage::FillItemSet( SfxItemSet& ) +sal_Bool SwTOXEntryTabPage::FillItemSet( SfxItemSet& ) { // nothing to do return sal_True; @@ -2247,20 +2247,20 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) lcl_ChgXPos(aCharStyleFT, nDiff); lcl_ChgXPos(aCharStyleLB, nDiff); lcl_ChgWidth(aCharStyleLB, -nDiff); - // lcl_ChgXPos(aEditStylePB, -nDiff); + // lcl_ChgXPos(aEditStylePB, -nDiff); lcl_ChgXPos(aFillCharFT, nDiff); lcl_ChgXPos(aFillCharCB, nDiff); - lcl_ChgXPos(aTabPosFT, nDiff); - lcl_ChgXPos(aTabPosMF, nDiff); + lcl_ChgXPos(aTabPosFT, nDiff); + lcl_ChgXPos(aTabPosMF, nDiff); lcl_ChgXPos(aAutoRightCB, nDiff); - lcl_ChgXPos(aAuthFieldsLB, nDiff); - lcl_ChgXPos(aAuthInsertPB, nDiff); - lcl_ChgXPos(aAuthRemovePB, nDiff); + lcl_ChgXPos(aAuthFieldsLB, nDiff); + lcl_ChgXPos(aAuthInsertPB, nDiff); + lcl_ChgXPos(aAuthRemovePB, nDiff); lcl_ChgXPos(aTokenFT, nDiff); lcl_ChgXPos(aTokenWIN, nDiff); lcl_ChgWidth(aTokenWIN, -nDiff); - lcl_ChgXPos(aSortDocPosRB, nDiff); - lcl_ChgXPos(aSortContentRB, nDiff); + lcl_ChgXPos(aSortDocPosRB, nDiff); + lcl_ChgXPos(aSortContentRB, nDiff); lcl_ChgXPos(aFormatFL, nDiff); lcl_ChgWidth(aFormatFL, -nDiff); lcl_ChgXPos(aSortingFL, nDiff); @@ -2300,42 +2300,42 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) aHyperLinkPB.SetPosPixel(aButtonPositions[4]); //show or hide controls - aEntryNoPB.Show( bToxIsContent ); - aHyperLinkPB.Show( bToxIsContent ); - aRelToStyleCB.Show( !bToxIsAuthorities ); + aEntryNoPB.Show( bToxIsContent ); + aHyperLinkPB.Show( bToxIsContent ); + aRelToStyleCB.Show( !bToxIsAuthorities ); aChapterInfoPB.Show( !bToxIsContent && !bToxIsAuthorities); - aEntryPB.Show( !bToxIsAuthorities ); - aPageNoPB.Show( !bToxIsAuthorities ); - aAuthFieldsLB.Show( bToxIsAuthorities ); - aAuthInsertPB.Show( bToxIsAuthorities ); - aAuthRemovePB.Show( bToxIsAuthorities ); + aEntryPB.Show( !bToxIsAuthorities ); + aPageNoPB.Show( !bToxIsAuthorities ); + aAuthFieldsLB.Show( bToxIsAuthorities ); + aAuthInsertPB.Show( bToxIsAuthorities ); + aAuthRemovePB.Show( bToxIsAuthorities ); aFormatFL.Show( !bToxIsAuthorities ); - aSortDocPosRB.Show( bToxIsAuthorities ); - aSortContentRB.Show( bToxIsAuthorities ); + aSortDocPosRB.Show( bToxIsAuthorities ); + aSortContentRB.Show( bToxIsAuthorities ); aSortingFL.Show( bToxIsAuthorities ); - aFirstKeyFT.Show( bToxIsAuthorities ); - aFirstKeyLB.Show( bToxIsAuthorities ); - aSecondKeyFT.Show( bToxIsAuthorities ); - aSecondKeyLB.Show( bToxIsAuthorities ); - aThirdKeyFT.Show( bToxIsAuthorities ); - aThirdKeyLB.Show( bToxIsAuthorities ); + aFirstKeyFT.Show( bToxIsAuthorities ); + aFirstKeyLB.Show( bToxIsAuthorities ); + aSecondKeyFT.Show( bToxIsAuthorities ); + aSecondKeyLB.Show( bToxIsAuthorities ); + aThirdKeyFT.Show( bToxIsAuthorities ); + aThirdKeyLB.Show( bToxIsAuthorities ); aSortKeyFL.Show( bToxIsAuthorities ); - aFirstSortUpRB.Show( bToxIsAuthorities ); - aFirstSortDownRB.Show( bToxIsAuthorities ); - aSecondSortUpRB.Show( bToxIsAuthorities ); - aSecondSortDownRB.Show( bToxIsAuthorities ); - aThirdSortUpRB.Show( bToxIsAuthorities ); - aThirdSortDownRB.Show( bToxIsAuthorities ); + aFirstSortUpRB.Show( bToxIsAuthorities ); + aFirstSortDownRB.Show( bToxIsAuthorities ); + aSecondSortUpRB.Show( bToxIsAuthorities ); + aSecondSortDownRB.Show( bToxIsAuthorities ); + aThirdSortUpRB.Show( bToxIsAuthorities ); + aThirdSortDownRB.Show( bToxIsAuthorities ); aRelToStyleCB.SetPosPixel( bToxIsIndex ? aRelToStyleIdxPos : aRelToStylePos ); -// aRecalcTabCB.Show( aCurType.eType == TOX_CONTENT); +// aRecalcTabCB.Show( aCurType.eType == TOX_CONTENT); - aMainEntryStyleFT.Show( bToxIsIndex ); - aMainEntryStyleLB.Show( bToxIsIndex ); - aAlphaDelimCB.Show( bToxIsIndex ); - aCommaSeparatedCB.Show( bToxIsIndex ); + aMainEntryStyleFT.Show( bToxIsIndex ); + aMainEntryStyleLB.Show( bToxIsIndex ); + aAlphaDelimCB.Show( bToxIsIndex ); + aCommaSeparatedCB.Show( bToxIsIndex ); } aLastTOXType = aCurType; @@ -2375,7 +2375,7 @@ void SwTOXEntryTabPage::UpdateDescriptor() rDesc.SetSortKeys(aKey1, aKey2, aKey3); } - SwForm* pCurrentForm = pTOXDlg->GetForm(aLastTOXType); + SwForm* pCurrentForm = pTOXDlg->GetForm(aLastTOXType); if(aRelToStyleCB.IsVisible()) { pCurrentForm->SetRelTabPos(aRelToStyleCB.IsChecked()); @@ -2390,7 +2390,7 @@ int SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/) return LEAVE_PAGE; } -SfxTabPage* SwTOXEntryTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) +SfxTabPage* SwTOXEntryTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwTOXEntryTabPage(pParent, rAttrSet); } @@ -2402,7 +2402,7 @@ IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn) SfxStringItem aStyle(SID_STYLE_EDIT, aCharStyleLB.GetSelectEntry()); SfxUInt16Item aFamily(SID_STYLE_FAMILY, SFX_STYLE_FAMILY_CHAR); // TODO: WrtShell? -// SwPtrItem aShell(FN_PARAM_WRTSHELL, pWrtShell); +// SwPtrItem aShell(FN_PARAM_WRTSHELL, pWrtShell); Window* pDefDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( pBtn ); ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell(). @@ -2568,7 +2568,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox) if(TOKEN_AUTHORITY == aToken.eTokenType) { sal_uInt32 nSearch = aToken.nAuthorityField; - sal_uInt16 nLstBoxPos = aAuthFieldsLB.GetEntryPos( (void*) nSearch ); + sal_uInt16 nLstBoxPos = aAuthFieldsLB.GetEntryPos( (void*) nSearch ); OSL_ENSURE(LISTBOX_ENTRY_NOTFOUND != nLstBoxPos, "Entry not found?"); aAuthFieldsLB.RemoveEntry(nLstBoxPos); } @@ -2872,7 +2872,7 @@ void SwTOXEntryTabPage::SetWrtShell(SwWrtShell& rSh) RES_POOLCHR_IDX_MAIN_ENTRY, aEmptyStr )); } -String SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const +String SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const { String sRet; SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); @@ -2891,7 +2891,7 @@ String SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const SwTokenWindow::SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId) : Window( pParent, rResId ), - aLeftScrollWin(this, ResId(WIN_LEFT_SCROLL, *rResId.GetResMgr() )), + aLeftScrollWin(this, ResId(WIN_LEFT_SCROLL, *rResId.GetResMgr() )), aCtrlParentWin(this, ResId(WIN_CTRL_PARENT, *rResId.GetResMgr() )), aRightScrollWin(this, ResId(WIN_RIGHT_SCROLL, *rResId.GetResMgr() )), pForm(0), @@ -2925,8 +2925,8 @@ SwTokenWindow::SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId) : SwTokenWindow::~SwTokenWindow() { -// for(sal_uInt16 i = GetItemCount(); i ; i--) -// RemoveItem(i - 1); +// for(sal_uInt16 i = GetItemCount(); i ; i--) +// RemoveItem(i - 1); for( sal_uInt32 n = 0; n < aControlList.Count(); ++n ) { @@ -2942,7 +2942,7 @@ SwTokenWindow::~SwTokenWindow() } } -void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) +void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) { SetActiveControl(0); bValid = sal_True; @@ -2993,7 +2993,7 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) const sal_Char* pTmp = 0; switch( aToken.eTokenType ) { - case TOKEN_ENTRY_NO: pTmp = SwForm::aFormEntryNum; break; + case TOKEN_ENTRY_NO: pTmp = SwForm::aFormEntryNum; break; case TOKEN_ENTRY_TEXT: pTmp = SwForm::aFormEntryTxt; break; case TOKEN_ENTRY: pTmp = SwForm::aFormEntry; break; case TOKEN_TAB_STOP: pTmp = SwForm::aFormTab; break; @@ -3046,7 +3046,7 @@ void SwTokenWindow::SetActiveControl(Control* pSet) } } -Control* SwTokenWindow::InsertItem(const String& rText, const SwFormToken& rToken) +Control* SwTokenWindow::InsertItem(const String& rText, const SwFormToken& rToken) { Control* pRet = 0; Control* pLast = aControlList.Last(); @@ -3100,7 +3100,7 @@ Control* SwTokenWindow::InsertItem(const String& rText, const SwFormToken& rT return pRet; } -void SwTokenWindow::InsertAtSelection( +void SwTokenWindow::InsertAtSelection( const String& rText, const SwFormToken& rToken) { @@ -3186,7 +3186,7 @@ void SwTokenWindow::InsertAtSelection( if(bPreStartLinkFound) { aToInsertToken.eTokenType = TOKEN_LINK_END; - aToInsertToken.sText = aButtonTexts[TOKEN_LINK_END]; + aToInsertToken.sText = aButtonTexts[TOKEN_LINK_END]; } if(bPostLinkStartFound) @@ -3463,7 +3463,7 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn ) return 0; } -String SwTokenWindow::GetPattern() const +String SwTokenWindow::GetPattern() const { String sRet; const Control* pControl = ((SwTokenWindow*)this)->aControlList.First(); @@ -3525,8 +3525,8 @@ BOOL SwTokenWindow::CreateQuickHelp(Control* pCtrl, Rectangle aItemRect( aPos, pCtrl->GetSizePixel() ); if(rToken.eTokenType == TOKEN_TAB_STOP ) { -// sEntry += '\n'; -// sEntry += rToken.nTabStopPosition; +// sEntry += '\n'; +// sEntry += rToken.nTabStopPosition; } else { @@ -3666,13 +3666,13 @@ void SwTokenWindow::GetFocus() SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet ) : SfxTabPage(pParent, SW_RES(TP_TOX_STYLES), rAttrSet), - aLevelFT2(this, SW_RES(FT_LEVEL )), - aLevelLB(this, SW_RES(LB_LEVEL )), - aTemplateFT(this, SW_RES(FT_TEMPLATE)), - aParaLayLB(this, SW_RES(LB_PARALAY )), - aStdBT(this, SW_RES(BT_STD )), - aAssignBT(this, SW_RES(BT_ASSIGN )), - aEditStyleBT(this, SW_RES(BT_EDIT_STYLE )), + aLevelFT2(this, SW_RES(FT_LEVEL )), + aLevelLB(this, SW_RES(LB_LEVEL )), + aTemplateFT(this, SW_RES(FT_TEMPLATE)), + aParaLayLB(this, SW_RES(LB_PARALAY )), + aStdBT(this, SW_RES(BT_STD )), + aAssignBT(this, SW_RES(BT_ASSIGN )), + aEditStyleBT(this, SW_RES(BT_EDIT_STYLE )), aFormatFL(this, SW_RES(FL_FORMAT )), m_pCurrentForm(0) { @@ -3681,12 +3681,12 @@ SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrS aAssignBT.SetModeImage( Image( SW_RES( IMG_ONE_LEFT_HC ) ), BMP_COLOR_HIGHCONTRAST ); - aEditStyleBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, EditStyleHdl)); - aAssignBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, AssignHdl)); - aStdBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, StdHdl)); - aParaLayLB.SetSelectHdl (LINK( this, SwTOXStylesTabPage, EnableSelectHdl)); - aLevelLB.SetSelectHdl (LINK( this, SwTOXStylesTabPage, EnableSelectHdl)); - aParaLayLB.SetDoubleClickHdl(LINK( this, SwTOXStylesTabPage, DoubleClickHdl)); + aEditStyleBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, EditStyleHdl)); + aAssignBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, AssignHdl)); + aStdBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, StdHdl)); + aParaLayLB.SetSelectHdl (LINK( this, SwTOXStylesTabPage, EnableSelectHdl)); + aLevelLB.SetSelectHdl (LINK( this, SwTOXStylesTabPage, EnableSelectHdl)); + aParaLayLB.SetDoubleClickHdl(LINK( this, SwTOXStylesTabPage, DoubleClickHdl)); } SwTOXStylesTabPage::~SwTOXStylesTabPage() @@ -3694,17 +3694,17 @@ SwTOXStylesTabPage::~SwTOXStylesTabPage() delete m_pCurrentForm; } -sal_Bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& ) +sal_Bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& ) { return sal_True; } -void SwTOXStylesTabPage::Reset( const SfxItemSet& rSet ) +void SwTOXStylesTabPage::Reset( const SfxItemSet& rSet ) { ActivatePage(rSet); } -void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& ) +void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& ) { m_pCurrentForm = new SwForm(GetForm()); aParaLayLB.Clear(); @@ -3716,7 +3716,7 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& ) // form-Pattern anzeigen ohne Titel - //1. TemplateEntry anzeigen + //1. TemplateEntry anzeigen String aStr( SW_RES( STR_TITLE )); if( m_pCurrentForm->GetTemplate( 0 ).Len() ) { @@ -3777,7 +3777,7 @@ int SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return LEAVE_PAGE; } -SfxTabPage* SwTOXStylesTabPage::Create( Window* pParent, +SfxTabPage* SwTOXStylesTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwTOXStylesTabPage(pParent, rAttrSet); @@ -3789,7 +3789,7 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn ) { SfxStringItem aStyle(SID_STYLE_EDIT, aParaLayLB.GetSelectEntry()); SfxUInt16Item aFamily(SID_STYLE_FAMILY, SFX_STYLE_FAMILY_PARA); -// SwPtrItem aShell(FN_PARAM_WRTSHELL, pWrtShell); +// SwPtrItem aShell(FN_PARAM_WRTSHELL, pWrtShell); Window* pDefDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( pBtn ); SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell(); @@ -3805,9 +3805,9 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn ) --------------------------------------------------------------------*/ IMPL_LINK( SwTOXStylesTabPage, AssignHdl, Button *, EMPTYARG ) { - sal_uInt16 nLevPos = aLevelLB.GetSelectEntryPos(); + sal_uInt16 nLevPos = aLevelLB.GetSelectEntryPos(); sal_uInt16 nTemplPos = aParaLayLB.GetSelectEntryPos(); - if(nLevPos != LISTBOX_ENTRY_NOTFOUND && + if(nLevPos != LISTBOX_ENTRY_NOTFOUND && nTemplPos != LISTBOX_ENTRY_NOTFOUND) { String aStr(aLevelLB.GetEntry(nLevPos)); @@ -3834,7 +3834,7 @@ IMPL_LINK( SwTOXStylesTabPage, StdHdl, Button *, EMPTYARG ) { sal_uInt16 nPos = aLevelLB.GetSelectEntryPos(); if(nPos != LISTBOX_ENTRY_NOTFOUND) - { String aStr(aLevelLB.GetEntry(nPos)); + { String aStr(aLevelLB.GetEntry(nPos)); sal_uInt16 nDelPos = aStr.Search(aDeliStart); if(nDelPos != STRING_NOTFOUND) aStr.Erase(nDelPos-1); @@ -3887,12 +3887,12 @@ IMPL_LINK(SwTOXStylesTabPage, ModifyHdl, void*, EMPTYARG) return 0; } -#define ITEM_SEARCH 1 +#define ITEM_SEARCH 1 #define ITEM_ALTERNATIVE 2 #define ITEM_PRIM_KEY 3 #define ITEM_SEC_KEY 4 #define ITEM_COMMENT 5 -#define ITEM_CASE 6 +#define ITEM_CASE 6 #define ITEM_WORDONLY 7 @@ -3906,7 +3906,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, const ResId& rId, BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_AUTO_VSCROLL| - BROWSER_HIDECURSOR ), + BROWSER_HIDECURSOR ), aCellEdit(&GetDataWindow(), 0), aCellCheckBox(&GetDataWindow()), @@ -3970,19 +3970,19 @@ String SwEntryBrowseBox::GetCellText(long nRow, USHORT nColumn) const AutoMarkEntry* pEntry = aEntryArr[ static_cast< USHORT >(nRow) ]; switch(nColumn) { - case ITEM_SEARCH :pRet = &pEntry->sSearch; break; + case ITEM_SEARCH :pRet = &pEntry->sSearch; break; case ITEM_ALTERNATIVE :pRet = &pEntry->sAlternative; break; - case ITEM_PRIM_KEY :pRet = &pEntry->sPrimKey ; break; - case ITEM_SEC_KEY :pRet = &pEntry->sSecKey ; break; - case ITEM_COMMENT :pRet = &pEntry->sComment ; break; - case ITEM_CASE :pRet = pEntry->bCase ? &sYes : &sNo; break; - case ITEM_WORDONLY :pRet = pEntry->bWord ? &sYes : &sNo; break; + case ITEM_PRIM_KEY :pRet = &pEntry->sPrimKey ; break; + case ITEM_SEC_KEY :pRet = &pEntry->sSecKey ; break; + case ITEM_COMMENT :pRet = &pEntry->sComment ; break; + case ITEM_CASE :pRet = pEntry->bCase ? &sYes : &sNo; break; + case ITEM_WORDONLY :pRet = pEntry->bWord ? &sYes : &sNo; break; } } return *pRet; } -void SwEntryBrowseBox::PaintCell(OutputDevice& rDev, +void SwEntryBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const { String sPaint = GetCellText( nCurrentRow, nColumnId ); @@ -4018,13 +4018,13 @@ sal_Bool SwEntryBrowseBox::SaveModified() : aEntryArr[nRow]; switch(nCol) { - case ITEM_SEARCH : pEntry->sSearch = sNew; break; + case ITEM_SEARCH : pEntry->sSearch = sNew; break; case ITEM_ALTERNATIVE : pEntry->sAlternative = sNew; break; - case ITEM_PRIM_KEY : pEntry->sPrimKey = sNew; break; - case ITEM_SEC_KEY : pEntry->sSecKey = sNew; break; - case ITEM_COMMENT : pEntry->sComment = sNew; break; - case ITEM_CASE : pEntry->bCase = bVal; break; - case ITEM_WORDONLY : pEntry->bWord = bVal; break; + case ITEM_PRIM_KEY : pEntry->sPrimKey = sNew; break; + case ITEM_SEC_KEY : pEntry->sSecKey = sNew; break; + case ITEM_COMMENT : pEntry->sComment = sNew; break; + case ITEM_CASE : pEntry->bCase = bVal; break; + case ITEM_WORDONLY : pEntry->bWord = bVal; break; } if(nRow >= aEntryArr.Count()) { @@ -4039,7 +4039,7 @@ sal_Bool SwEntryBrowseBox::SaveModified() return sal_True; } -void SwEntryBrowseBox::InitController( +void SwEntryBrowseBox::InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) { String rTxt = GetCellText( nRow, nCol ); @@ -4058,7 +4058,7 @@ void SwEntryBrowseBox::InitController( } } -void SwEntryBrowseBox::ReadEntries(SvStream& rInStr) +void SwEntryBrowseBox::ReadEntries(SvStream& rInStr) { AutoMarkEntry* pToInsert = 0; const String sZero('0'); @@ -4082,10 +4082,10 @@ void SwEntryBrowseBox::ReadEntries(SvStream& rInStr) pToInsert = new AutoMarkEntry; USHORT nSttPos = 0; - pToInsert->sSearch = sLine.GetToken(0, ';', nSttPos ); + pToInsert->sSearch = sLine.GetToken(0, ';', nSttPos ); pToInsert->sAlternative = sLine.GetToken(0, ';', nSttPos ); - pToInsert->sPrimKey = sLine.GetToken(0, ';', nSttPos ); - pToInsert->sSecKey = sLine.GetToken(0, ';', nSttPos ); + pToInsert->sPrimKey = sLine.GetToken(0, ';', nSttPos ); + pToInsert->sSecKey = sLine.GetToken(0, ';', nSttPos ); String sStr = sLine.GetToken(0, ';', nSttPos ); pToInsert->bCase = sStr.Len() && sStr != sZero; @@ -4111,7 +4111,7 @@ void SwEntryBrowseBox::ReadEntries(SvStream& rInStr) RowInserted(0, aEntryArr.Count() + 1, sal_True); } -void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr) +void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr) { //check if the current controller is modified sal_uInt16 nCol = GetCurColumnId(); @@ -4170,10 +4170,10 @@ sal_Bool SwEntryBrowseBox::IsModified()const SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(Window* pParent, const String& rAutoMarkURL, const String& rAutoMarkType, sal_Bool bCreate) : ModalDialog(pParent, SW_RES(DLG_CREATE_AUTOMARK)), - aOKPB( this, SW_RES(PB_OK )), - aCancelPB( this, SW_RES(PB_CANCEL )), - aHelpPB( this, SW_RES(PB_HELP )), - aEntriesBB( this, SW_RES(BB_ENTRIES )), + aOKPB( this, SW_RES(PB_OK )), + aCancelPB( this, SW_RES(PB_CANCEL )), + aHelpPB( this, SW_RES(PB_HELP )), + aEntriesBB( this, SW_RES(BB_ENTRIES )), aEntriesFL( this, SW_RES(FL_ENTRIES )), sAutoMarkURL(rAutoMarkURL), sAutoMarkType(rAutoMarkType), diff --git a/sw/source/ui/index/cnttab.hrc b/sw/source/ui/index/cnttab.hrc index c544be2c7a2e..5b80e4342b52 100644 --- a/sw/source/ui/index/cnttab.hrc +++ b/sw/source/ui/index/cnttab.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #define BT_ENTRY_NUMBER 23 #define BT_ENTRY_TEXT 24 #define BT_TAB 25 -#define BT_STD 26 +#define BT_STD 26 #define BT_PAGE 27 #define FL_ENTRY 28 //#define FT_LEVEL 28 @@ -52,101 +52,101 @@ #define LB_PARALAY 31 #define BT_ASSIGN 32 #define FL_FORMAT 33 -#define BT_ENTRY 34 +#define BT_ENTRY 34 //#define BT_EDIT 34 -#define BT_JUMP 35 -#define CB_RECALC_TABS 36 +#define BT_JUMP 35 +#define CB_RECALC_TABS 36 #define CB_FIRST_TAB_POS 37 #define MF_FIRST_TAB_POS 38 -#define CB_REL_TO_TEXT 39 -#define BT_EDIT_STYLE 40 -#define CB_SAME 41 -#define CB_FF 42 -#define CB_CASE 43 -#define CB_SEC 44 -#define CB_ALPHA 45 +#define CB_REL_TO_TEXT 39 +#define BT_EDIT_STYLE 40 +#define CB_SAME 41 +#define CB_FF 42 +#define CB_CASE 43 +#define CB_SEC 44 +#define CB_ALPHA 45 #define FL_OPT 46 #define CB_MAKRS 47 -#define DLB_TOD 48 +#define DLB_TOD 48 #define CB_TEMPL 49 #define DLB_LAYOUT 50 #define CB_OBJECT 51 #define DLB_OBJECT 52 #define FL_SOURCE 53 -#define CB_USER_MARKS 54 +#define CB_USER_MARKS 54 #define BT_ALL_LEVEL 55 #define FT_MAIN_ENTRY_STYLE 56 #define LB_MAIN_ENTRY_STYLE 57 //restart numbering -#define FT_TYPE 1 -#define LB_TYPE 2 -#define CB_READONLY 3 -#define FT_TITLE 4 +#define FT_TYPE 1 +#define LB_TYPE 2 +#define CB_READONLY 3 +#define FT_TITLE 4 #define FL_TYPETITLE 6 -#define LB_AREA 7 +#define LB_AREA 7 -#define NF_LEVEL 9 +#define NF_LEVEL 9 #define FL_AREA 10 -#define CB_FROMHEADINGS 11 -#define PB_CHAPTERDLG 12 -#define CB_ADDSTYLES 13 -#define PB_ADDSTYLES 14 +#define CB_FROMHEADINGS 11 +#define PB_CHAPTERDLG 12 +#define CB_ADDSTYLES 13 +#define PB_ADDSTYLES 14 -#define CB_FROMOLE 17 -#define CB_LEVELFROMCHAPTER 18 -#define RB_FROMCAPTIONS 19 -#define RB_FROMOBJECTNAMES 20 -#define CB_TOXMARKS 21 +#define CB_FROMOLE 17 +#define CB_LEVELFROMCHAPTER 18 +#define RB_FROMCAPTIONS 19 +#define RB_FROMOBJECTNAMES 20 +#define CB_TOXMARKS 21 #define FL_CREATEFROM 22 -#define CB_COLLECTSAME 23 -#define CB_USEFF 24 -#define CB_CASESENSITIVE 25 -#define CB_INITIALCAPS 26 -#define CB_KEYASENTRY 27 -#define CB_FROMFILE 28 +#define CB_COLLECTSAME 23 +#define CB_USEFF 24 +#define CB_CASESENSITIVE 25 +#define CB_INITIALCAPS 26 +#define CB_KEYASENTRY 27 +#define CB_FROMFILE 28 -#define MB_AUTOMARK 29 +#define MB_AUTOMARK 29 #define FL_IDXOPTIONS 30 #define FT_TOKEN 32 #define CB_USE_DASH 33 #define FL_LEVEL 34 -#define WIN_TOKEN 35 -#define PB_ENTRYNO 36 -#define PB_ENTRY 37 -#define PB_CHAPTERINFO 38 -#define PB_PAGENO 39 -#define PB_TAB 40 -#define PB_HYPERLINK 41 -#define FT_CHARSTYLE 42 -#define LB_CHARSTYLE 43 -#define PB_EDITSTYLE 44 -#define FT_FILLCHAR 45 -#define CB_FILLCHAR 46 -#define FT_CHAPTERENTRY 47 -#define LB_CHAPTERENTRY 48 -#define FT_SORTING 49 -#define LB_SORTING 50 -#define FT_TABPOS 51 -#define MF_TABPOS 52 -#define CB_AUTORIGHT 53 -#define CB_RELTOSTYLE 54 -#define CB_RECALCTAB 56 -#define CB_NUMSTYLEFROMPDESC 57 -#define CB_ALPHADELIM 58 -#define CB_COMMASEPARATED 59 +#define WIN_TOKEN 35 +#define PB_ENTRYNO 36 +#define PB_ENTRY 37 +#define PB_CHAPTERINFO 38 +#define PB_PAGENO 39 +#define PB_TAB 40 +#define PB_HYPERLINK 41 +#define FT_CHARSTYLE 42 +#define LB_CHARSTYLE 43 +#define PB_EDITSTYLE 44 +#define FT_FILLCHAR 45 +#define CB_FILLCHAR 46 +#define FT_CHAPTERENTRY 47 +#define LB_CHAPTERENTRY 48 +#define FT_SORTING 49 +#define LB_SORTING 50 +#define FT_TABPOS 51 +#define MF_TABPOS 52 +#define CB_AUTORIGHT 53 +#define CB_RELTOSTYLE 54 +#define CB_RECALCTAB 56 +#define CB_NUMSTYLEFROMPDESC 57 +#define CB_ALPHADELIM 58 +#define CB_COMMASEPARATED 59 -#define STR_NO_CHAR_STYLE 61 -#define CLB_FROMOBJ 62 +#define STR_NO_CHAR_STYLE 61 +#define CLB_FROMOBJ 62 #define FL_FROMOBJ 63 -#define RES_SRCTYPES 64 -#define WIN_LEFT_SCROLL 65 -#define WIN_CTRL_PARENT 66 +#define RES_SRCTYPES 64 +#define WIN_LEFT_SCROLL 65 +#define WIN_CTRL_PARENT 66 #define WIN_RIGHT_SCROLL 67 -#define PB_ALL_LEVELS 68 +#define PB_ALL_LEVELS 68 #define FT_AREA 69 #define STR_BUTTON_TEXT_START 70 #define STR_TOKEN_ENTRY_NO (STR_BUTTON_TEXT_START) @@ -160,7 +160,7 @@ #define STR_TOKEN_LINK_END (STR_BUTTON_TEXT_START + 8) #define STR_TOKEN_AUTHORITY (STR_BUTTON_TEXT_START + 9) -#define STR_BUTTON_HELP_TEXT_START (STR_TOKEN_AUTHORITY + 1) +#define STR_BUTTON_HELP_TEXT_START (STR_TOKEN_AUTHORITY + 1) #define STR_TOKEN_HELP_ENTRY_NO (STR_BUTTON_HELP_TEXT_START) #define STR_TOKEN_HELP_ENTRY_TEXT (STR_BUTTON_HELP_TEXT_START + 1) #define STR_TOKEN_HELP_ENTRY (STR_BUTTON_HELP_TEXT_START + 2) @@ -172,58 +172,58 @@ #define STR_TOKEN_HELP_LINK_END (STR_BUTTON_HELP_TEXT_START + 8) #define STR_TOKEN_HELP_AUTHORITY (STR_BUTTON_HELP_TEXT_START + 9) -#define STR_CHARSTYLE (STR_TOKEN_HELP_AUTHORITY + 1) -#define TLB_STYLES 100 +#define STR_CHARSTYLE (STR_TOKEN_HELP_AUTHORITY + 1) +#define TLB_STYLES 100 #define FL_STYLES 101 -#define PB_OK 102 -#define PB_CANCEL 103 -#define PB_HELP 104 +#define PB_OK 102 +#define PB_CANCEL 103 +#define PB_HELP 104 #define FT_CAPTIONSEQUENCE 105 #define LB_CAPTIONSEQUENCE 106 #define FT_DISPLAYTYPE 107 #define LB_DISPLAYTYPE 108 -#define TR_HEADER 109 -#define PB_LEFT 110 +#define TR_HEADER 109 +#define PB_LEFT 110 #define PB_RIGHT 111 -#define HB_STYLES 112 +#define HB_STYLES 112 #define ST_HB_FIRST 113 -#define CB_FROMTABLES 114 -#define CB_FROMFRAMES 115 +#define CB_FROMTABLES 114 +#define CB_FROMFRAMES 115 #define CB_FROMGRAPHICS 116 -#define ST_USER_ADDSTYLE 117 -#define ST_AUTOMARK_TYPE 118 -#define LB_AUTHFIELD 119 -#define PB_AUTHINSERT 120 -#define PB_AUTHREMOVE 121 -#define CB_SEQUENCE 122 -#define FT_BRACKET 123 -#define LB_BRACKET 124 +#define ST_USER_ADDSTYLE 117 +#define ST_AUTOMARK_TYPE 118 +#define LB_AUTHFIELD 119 +#define PB_AUTHINSERT 120 +#define PB_AUTHREMOVE 121 +#define CB_SEQUENCE 122 +#define FT_BRACKET 123 +#define LB_BRACKET 124 #define FL_AUTHORITY 125 -#define RB_DOCPOS 126 +#define RB_DOCPOS 126 #define RB_SORTCONTENT 127 -#define FT_FIRSTKEY 128 -#define LB_FIRSTKEY 129 -#define FT_SECONDKEY 130 -#define LB_SECONDKEY 131 -#define FT_THIRDDKEY 132 +#define FT_FIRSTKEY 128 +#define LB_FIRSTKEY 129 +#define FT_SECONDKEY 130 +#define LB_SECONDKEY 131 +#define FT_THIRDDKEY 132 #define LB_THIRDKEY 133 #define FL_SORTKEY 134 #define FL_SORTING 135 -#define STR_NOSORTKEY 136 -#define RB_SORTUP1 137 +#define STR_NOSORTKEY 136 +#define RB_SORTUP1 137 #define RB_SORTUP2 138 #define RB_SORTUP3 139 #define RB_SORTDOWN1 140 #define RB_SORTDOWN2 141 #define RB_SORTDOWN3 142 -#define STR_DELIM 143 +#define STR_DELIM 143 #define FL_SORTOPTIONS 144 #define FT_LANGUAGE 145 #define LB_LANGUAGE 146 #define FT_SORTALG 147 #define LB_SORTALG 148 -#define IMG_SORTUP_HC 149 -#define IMG_SORTDOWN_HC 150 +#define IMG_SORTUP_HC 149 +#define IMG_SORTDOWN_HC 150 #define ST_NO_BRACKET 151 #define FT_LEVEL_OL 152 @@ -231,20 +231,20 @@ #define FT_ENTRY_NO 154 #define LB_ENTRY_NO 155 -#define TO_CONTENT 1 -#define TO_INDEX 2 +#define TO_CONTENT 1 +#define TO_INDEX 2 #define TO_ILLUSTRATION 4 -#define TO_TABLE 8 -#define TO_USER 16 -#define TO_OBJECT 32 +#define TO_TABLE 8 +#define TO_USER 16 +#define TO_OBJECT 32 #define TO_AUTHORITIES 64 -#define AREA_DOCUMENT 1 -#define AREA_CHAPTER 2 +#define AREA_DOCUMENT 1 +#define AREA_CHAPTER 2 //TabDialog -#define WIN_EXAMPLE 1 -#define RES_EXAMPLE_TEXT 2 +#define WIN_EXAMPLE 1 +#define RES_EXAMPLE_TEXT 2 #define ST_HEADING_1 4 #define ST_TEXT_1 5 @@ -252,31 +252,31 @@ #define ST_TEXT_1_1 7 #define ST_HEADING_1_2 8 #define ST_TEXT_1_2 9 -#define ST_TABLE_LABEL 10 +#define ST_TABLE_LABEL 10 #define ST_FRAME_LABEL 11 #define ST_GRAPHIC_LABEL 12 -#define ST_USERDEFINEDINDEX 13 -#define CB_SHOWEXAMPLE 14 +#define ST_USERDEFINEDINDEX 13 +#define CB_SHOWEXAMPLE 14 // AutoMark dialog -#define BB_ENTRIES 1 +#define BB_ENTRIES 1 #define FL_ENTRIES 2 -#define ST_SEARCH 10 +#define ST_SEARCH 10 #define ST_ALTERNATIVE 11 -#define ST_PRIMKEY 12 -#define ST_SECKEY 13 -#define ST_COMMENT 14 -#define ST_CASESENSITIVE 15 -#define ST_WORDONLY 16 -#define ST_TRUE 17 +#define ST_PRIMKEY 12 +#define ST_SECKEY 13 +#define ST_COMMENT 14 +#define ST_CASESENSITIVE 15 +#define ST_WORDONLY 16 +#define ST_TRUE 17 #define ST_FALSE 18 //ButtonMenu -#define MN_AUTOMARK_OPEN 1 -#define MN_AUTOMARK_NEW 2 +#define MN_AUTOMARK_OPEN 1 +#define MN_AUTOMARK_NEW 2 #define MN_AUTOMARK_EDIT 3 diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src index 68f008b8d5ff..8220ed42ba2d 100644 --- a/sw/source/ui/index/cnttab.src +++ b/sw/source/ui/index/cnttab.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,25 +124,25 @@ TabPage TP_TOX_SELECT Size = MAP_APPFONT ( 248, 8 ) ; Text [ en-US ] = "Type and title"; }; - FixedText FT_TITLE + FixedText FT_TITLE { Pos = MAP_APPFONT ( 12 , 16 ) ; Size = MAP_APPFONT ( 30 ,10 ) ; Text [ en-US ] = "~Title"; }; - Edit ED_TITLE + Edit ED_TITLE { Pos = MAP_APPFONT ( 45 , 14 ) ; Size = MAP_APPFONT ( 203 , 12 ) ; Border = TRUE; }; - FixedText FT_TYPE + FixedText FT_TYPE { Pos = MAP_APPFONT ( 12 , 32 ) ; Size = MAP_APPFONT ( 30, 10 ) ; Text [ en-US ] = "Type"; }; - ListBox LB_TYPE + ListBox LB_TYPE { Pos = MAP_APPFONT ( 45 , 30 ) ; Size = MAP_APPFONT ( 80 , 80 ) ; @@ -150,16 +150,16 @@ TabPage TP_TOX_SELECT DropDown = TRUE ; StringList [ en-US ] = { - < "Table of Contents" ; TO_CONTENT ;> ; - < "Alphabetical Index" ; TO_INDEX ;> ; + < "Table of Contents" ; TO_CONTENT ;> ; + < "Alphabetical Index" ; TO_INDEX ;> ; < "Illustration Index" ; TO_ILLUSTRATION ;> ; - < "Index of Tables" ; TO_TABLE ;> ; - < "User-Defined" ; TO_USER ;> ; - < "Table of Objects" ; TO_OBJECT ;> ; - < "Bibliography" ; TO_AUTHORITIES ;> ; + < "Index of Tables" ; TO_TABLE ;> ; + < "User-Defined" ; TO_USER ;> ; + < "Table of Objects" ; TO_OBJECT ;> ; + < "Bibliography" ; TO_AUTHORITIES ;> ; }; }; - CheckBox CB_READONLY + CheckBox CB_READONLY { Pos = MAP_APPFONT ( 51 , 46 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; @@ -186,8 +186,8 @@ TabPage TP_TOX_SELECT DropDown = TRUE ; StringList [ en-US ] = { - < "Entire document" ; AREA_DOCUMENT ;> ; - < "Chapter" ; AREA_CHAPTER ;> ; + < "Entire document" ; AREA_DOCUMENT ;> ; + < "Chapter" ; AREA_CHAPTER ;> ; }; }; FixedText FT_LEVEL @@ -216,7 +216,7 @@ TabPage TP_TOX_SELECT Size = MAP_APPFONT ( 248, 8 ) ; Text [ en-US ] = "Create from"; }; - CheckBox CB_FROMHEADINGS + CheckBox CB_FROMHEADINGS { Pos = MAP_APPFONT ( 12 , 99 ) ; Size = MAP_APPFONT ( 95 , 10 ) ; @@ -224,14 +224,14 @@ TabPage TP_TOX_SELECT Text [ en-US ] = "Outline"; }; // #outline level,removed by zhaojianwei -/* PushButton PB_CHAPTERDLG +/* PushButton PB_CHAPTERDLG { Pos = MAP_APPFONT ( 115 , 98 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; Text = "~..." ; TabStop = TRUE ; }; -*/ +*/ CheckBox CB_ADDSTYLES { Pos = MAP_APPFONT ( 12 , 115 ) ; @@ -242,21 +242,21 @@ TabPage TP_TOX_SELECT { Text [ en-US ] = "Styl~es"; }; - PushButton PB_ADDSTYLES + PushButton PB_ADDSTYLES { Pos = MAP_APPFONT ( 115 , 114 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; Text = "..." ; TabStop = TRUE ; }; - CheckBox CB_TOXMARKS + CheckBox CB_TOXMARKS { Pos = MAP_APPFONT ( 12 , 131 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "Inde~x marks"; }; - RadioButton RB_FROMCAPTIONS + RadioButton RB_FROMCAPTIONS { Pos = MAP_APPFONT ( 12 , 98 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; @@ -300,13 +300,13 @@ TabPage TP_TOX_SELECT Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "Object names"; }; - CheckBox CB_COLLECTSAME + CheckBox CB_COLLECTSAME { Pos = MAP_APPFONT ( 12 , 98 ) ; Size = MAP_APPFONT ( 121 , 10 ) ; Text [ en-US ] = "Combine identical entries"; }; - CheckBox CB_USEFF + CheckBox CB_USEFF { Pos = MAP_APPFONT ( 18 , 111 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; @@ -318,31 +318,31 @@ TabPage TP_TOX_SELECT Size = MAP_APPFONT ( 115 , 10 ) ; Text [ en-US ] = "Combine with -"; }; - CheckBox CB_CASESENSITIVE + CheckBox CB_CASESENSITIVE { Pos = MAP_APPFONT ( 18 , 137 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; Text [ en-US ] = "Case sensitive"; }; - CheckBox CB_INITIALCAPS + CheckBox CB_INITIALCAPS { Pos = MAP_APPFONT ( 136 , 98 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; Text [ en-US ] = "AutoCapitalize entries"; }; - CheckBox CB_KEYASENTRY + CheckBox CB_KEYASENTRY { Pos = MAP_APPFONT ( 136, 111 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; Text [ en-US ] = "Keys as separate entries"; }; - CheckBox CB_FROMFILE + CheckBox CB_FROMFILE { Pos = MAP_APPFONT ( 136 , 124 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; Text [ en-US ] = "~Concordance file"; }; - MenuButton MB_AUTOMARK + MenuButton MB_AUTOMARK { Pos = MAP_APPFONT ( 136 , 137 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -370,31 +370,31 @@ TabPage TP_TOX_SELECT }; Text [ en-US ] = "~File"; }; - CheckBox CB_FROMTABLES + CheckBox CB_FROMTABLES { Pos = MAP_APPFONT ( 112 , 99 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; Text [ en-US ] = "Tables"; }; - CheckBox CB_FROMFRAMES + CheckBox CB_FROMFRAMES { Pos = MAP_APPFONT ( 182 , 99 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; Text [ en-US ] = "Te~xt frames"; }; - CheckBox CB_FROMGRAPHICS + CheckBox CB_FROMGRAPHICS { Pos = MAP_APPFONT ( 112 , 113 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; Text [ en-US ] = "Graphics"; }; - CheckBox CB_FROMOLE + CheckBox CB_FROMOLE { Pos = MAP_APPFONT ( 182 , 113 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; Text [ en-US ] = "OLE objects"; }; - CheckBox CB_LEVELFROMCHAPTER + CheckBox CB_LEVELFROMCHAPTER { Pos = MAP_APPFONT ( 118 , 127 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; @@ -417,21 +417,21 @@ TabPage TP_TOX_SELECT { StringArray 1 { -/* ids from tox.hxx - TOO_MATH = 0x01, - TOO_CHART = 0x02, - TOO_IMAGE = 0x04, - TOO_CALC = 0x08, +/* ids from tox.hxx + TOO_MATH = 0x01, + TOO_CHART = 0x02, + TOO_IMAGE = 0x04, + TOO_CALC = 0x08, TOO_DRAW_IMPRESS= 0x10, - TOO_OTHER = 0x80*/ + TOO_OTHER = 0x80*/ ItemList [ en-US ] = { - < "%PRODUCTNAME Math" ; 1;> ; - < "%PRODUCTNAME Chart" ; 2;> ; - < "%PRODUCTNAME Calc" ; 8;> ; - < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ; 16;> ; - < "Other OLE Objects"; 128;> ; + < "%PRODUCTNAME Math" ; 1;> ; + < "%PRODUCTNAME Chart" ; 2;> ; + < "%PRODUCTNAME Calc" ; 8;> ; + < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ; 16;> ; + < "Other OLE Objects"; 128;> ; }; }; }; @@ -1187,7 +1187,7 @@ ModalDialog DLG_ADD_IDX_STYLES Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - String ST_HB_FIRST + String ST_HB_FIRST { Text [ en-US ] = "Not applied"; }; diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx index 5884f12b67aa..66a407d1d895 100644 --- a/sw/source/ui/index/idxmrk.cxx +++ b/sw/source/ui/index/idxmrk.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ #include <wrtsh.hxx> #include <view.hxx> #include <multmrk.hxx> -#include <swundo.hxx> // fuer Undo-Ids +#include <swundo.hxx> // fuer Undo-Ids #include <cmdid.h> #include <index.hrc> #include <idxmrk.hrc> @@ -70,7 +70,7 @@ SFX_IMPL_CHILDWINDOW(SwInsertIdxMarkWrapper, FN_INSERT_IDX_ENTRY_DLG) -SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( Window *pParentWindow, +SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -81,7 +81,7 @@ SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( Window *pParentWindow, pAbstDlg = pFact->CreateIndexMarkFloatDlg( DLG_INSIDXMARK , pBindings, this, pParentWindow, pInfo ); OSL_ENSURE(pAbstDlg, "Dialogdiet fail!"); pWindow = pAbstDlg->GetWindow(); - pWindow->Show(); // at this point,because before pSh has to be initialized in ReInitDlg() + pWindow->Show(); // at this point,because before pSh has to be initialized in ReInitDlg() // -> Show() will invoke StateChanged() and save pos eChildAlignment = SFX_ALIGN_NOALIGNMENT; } @@ -93,14 +93,14 @@ SfxChildWinInfo SwInsertIdxMarkWrapper::GetInfo() const return aInfo; } -void SwInsertIdxMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell) +void SwInsertIdxMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell) { pAbstDlg->ReInitDlg(rWrtShell); } SFX_IMPL_CHILDWINDOW(SwInsertAuthMarkWrapper, FN_INSERT_AUTH_ENTRY_DLG) -SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper( Window *pParentWindow, +SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper( Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -121,7 +121,7 @@ SfxChildWinInfo SwInsertAuthMarkWrapper::GetInfo() const return aInfo; } -void SwInsertAuthMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell) +void SwInsertAuthMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell) { pAbstDlg->ReInitDlg(rWrtShell); } diff --git a/sw/source/ui/index/idxmrk.hrc b/sw/source/ui/index/idxmrk.hrc index 859aeb25b3fa..263da88f935d 100644 --- a/sw/source/ui/index/idxmrk.hrc +++ b/sw/source/ui/index/idxmrk.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,79 +24,79 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define BT_OK 100 -#define BT_CANCEL 101 -#define BT_NXT 102 -#define BT_NXTSAME 103 -#define BT_PREV 104 +#define BT_OK 100 +#define BT_CANCEL 101 +#define BT_NXT 102 +#define BT_NXTSAME 103 +#define BT_PREV 104 #define BT_PREVSAME 105 -#define BT_DEL 106 -#define BT_HELP 107 -#define LBL_INDEX 1 -#define DCB_INDEX 2 -#define LBL_ENTRY 3 -#define SL_ENTRY 4 -#define LBL_KEY 5 -#define DCB_KEY 6 -#define LBL_LEVEL 7 -#define SL_LEVEL 8 +#define BT_DEL 106 +#define BT_HELP 107 +#define LBL_INDEX 1 +#define DCB_INDEX 2 +#define LBL_ENTRY 3 +#define SL_ENTRY 4 +#define LBL_KEY 5 +#define DCB_KEY 6 +#define LBL_LEVEL 7 +#define SL_LEVEL 8 #define FL_INDEX 10 -#define LBL_KEY2 11 -#define DCB_KEY2 12 +#define LBL_KEY2 11 +#define DCB_KEY2 12 #define CB_APPLY_TO_ALL 13 -#define CB_MAIN_ENTRY 14 -#define FT_ENTRY 20 -#define ED_ENTRY 21 -#define PB_OK 22 +#define CB_MAIN_ENTRY 14 +#define FT_ENTRY 20 +#define ED_ENTRY 21 +#define PB_OK 22 #define PB_CANCEL 23 -#define PB_HELP 24 +#define PB_HELP 24 #define FL_ENTRIES 25 #define PB_CREATEENTRY 26 #define FL_ENTRY 27 -#define FT_TITLE 28 +#define FT_TITLE 28 #define FI_TITLE 29 #define FT_AUTHOR 30 #define FI_AUTHOR 31 -#define ST_CHANGE 32 -#define WIN_DLG 33 -#define BT_NEW 34 +#define ST_CHANGE 32 +#define WIN_DLG 33 +#define BT_NEW 34 #define FL_NAME 37 #define FT_NAME 38 #define ED_NAME 39 -#define LB_ENTRY 40 -#define RB_FROMCOMPONENT 41 +#define LB_ENTRY 40 +#define RB_FROMCOMPONENT 41 #define RB_FROMDOCCONTENT 42 -#define PB_EDITENTRY 43 -#define CB_CASESENSITIVE 44 -#define CB_WORDONLY 45 -#define FT_PHONETIC_1 46 -#define FT_PHONETIC_2 47 -#define FT_PHONETIC_3 48 -#define ED_PHONETIC_1 48 -#define ED_PHONETIC_2 49 -#define ED_PHONETIC_3 50 +#define PB_EDITENTRY 43 +#define CB_CASESENSITIVE 44 +#define CB_WORDONLY 45 +#define FT_PHONETIC_1 46 +#define FT_PHONETIC_2 47 +#define FT_PHONETIC_3 48 +#define ED_PHONETIC_1 48 +#define ED_PHONETIC_2 49 +#define ED_PHONETIC_3 50 //------------------------------------------------------ // defines for positions and sizes for IDX_DIALOG_WINDOW -#define IDX_COL1 12 -#define IDX_COL2 56 +#define IDX_COL1 12 +#define IDX_COL2 56 -#define IDX_COL2_FULLEND 150 -#define IDX_NEWIMAGE_WIDTH 12 -#define IDX_NEWIMAGE_XPOS (IDX_COL2_FULLEND-1-IDX_NEWIMAGE_WIDTH) +#define IDX_COL2_FULLEND 150 +#define IDX_NEWIMAGE_WIDTH 12 +#define IDX_NEWIMAGE_XPOS (IDX_COL2_FULLEND-1-IDX_NEWIMAGE_WIDTH) -#define IDX_PHONETIC_EDIT_WIDTH 62 -#define IDX_PHONETIC_TEXT_WIDTH 62 +#define IDX_PHONETIC_EDIT_WIDTH 62 +#define IDX_PHONETIC_TEXT_WIDTH 62 -#define IDX_COL_PHONETIC_TEXT (IDX_COL2+IDX_PHONETIC_EDIT_WIDTH+8) -#define IDX_COL_PHONETIC_EDIT (IDX_COL_PHONETIC_TEXT+IDX_PHONETIC_TEXT_WIDTH+1) +#define IDX_COL_PHONETIC_TEXT (IDX_COL2+IDX_PHONETIC_EDIT_WIDTH+8) +#define IDX_COL_PHONETIC_EDIT (IDX_COL_PHONETIC_TEXT+IDX_PHONETIC_TEXT_WIDTH+1) -#define IDX_COL_BUTTONS_NORMAL 162 -#define IDX_COL_BUTTONS_CJK (IDX_COL_PHONETIC_EDIT+IDX_PHONETIC_EDIT_WIDTH+14) +#define IDX_COL_BUTTONS_NORMAL 162 +#define IDX_COL_BUTTONS_CJK (IDX_COL_PHONETIC_EDIT+IDX_PHONETIC_EDIT_WIDTH+14) -#define IDX_WIN_WIDTH_NORMAL 218 -#define IDX_WIN_WIDTH_CJK (IDX_WIN_WIDTH_NORMAL+IDX_COL_BUTTONS_CJK-IDX_COL_BUTTONS_NORMAL) +#define IDX_WIN_WIDTH_NORMAL 218 +#define IDX_WIN_WIDTH_CJK (IDX_WIN_WIDTH_NORMAL+IDX_COL_BUTTONS_CJK-IDX_COL_BUTTONS_NORMAL) #define IDX_ROW_2_TEXT 31 #define IDX_ROW_2_LIST (IDX_ROW_2_TEXT-2) diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src index 483485bf1b4b..6a4ce1934d8b 100644 --- a/sw/source/ui/index/idxmrk.src +++ b/sw/source/ui/index/idxmrk.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,11 +31,11 @@ #include "helpid.h" #include "cmdid.h" -#define IDX_PHONETIC_LISTBOX_DESCRIPTION \ -Text [ en-US ] = "Phonetic reading"; \ +#define IDX_PHONETIC_LISTBOX_DESCRIPTION \ +Text [ en-US ] = "Phonetic reading"; \ #define IDX_DIALOG_WINDOW \ - Window WIN_DLG \ + Window WIN_DLG \ { \ Pos = MAP_APPFONT ( 0 , 0 ) ; \ Size = MAP_APPFONT ( IDX_WIN_WIDTH , WINDOW_HEIGHT ) ; \ @@ -65,19 +65,19 @@ Text [ en-US ] = "Phonetic reading"; \ Text [ en-US ] = "~Delete" ; \ TabStop = TRUE ; \ }; \ - ListBox DCB_INDEX \ - { \ - Pos = MAP_APPFONT ( IDX_COL2 , 14) ; \ - Size = MAP_APPFONT ( DCB_INDEX_WIDTH , 56 ) ; \ - TabStop = TRUE ; \ - DropDown = TRUE ; \ - }; \ - ImageButton BT_NEW \ - { \ + ListBox DCB_INDEX \ + { \ + Pos = MAP_APPFONT ( IDX_COL2 , 14) ; \ + Size = MAP_APPFONT ( DCB_INDEX_WIDTH , 56 ) ; \ + TabStop = TRUE ; \ + DropDown = TRUE ; \ + }; \ + ImageButton BT_NEW \ + { \ Pos = MAP_APPFONT ( IDX_NEWIMAGE_XPOS , 13 ) ; \ Size = MAP_APPFONT ( IDX_NEWIMAGE_WIDTH , 15 ) ; \ QuickHelpText [ en-US ] = "New User-defined Index";\ - }; \ + }; \ ImageButton BT_PREVSAME \ { \ Hide = TRUE ; \ @@ -169,55 +169,55 @@ Text [ en-US ] = "Phonetic reading"; \ Size = MAP_APPFONT ( LIST_WIDTH , 56 ) ; \ TabStop = TRUE ; \ DropDown = TRUE ; \ - }; \ - FixedText FT_PHONETIC_1 \ - { \ + }; \ + FixedText FT_PHONETIC_1 \ + { \ Pos = MAP_APPFONT ( IDX_COL_PHONETIC_TEXT , IDX_ROW_2_TEXT ) ; \ Size = MAP_APPFONT ( IDX_PHONETIC_TEXT_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; \ - Hide = PHONETIC_HIDDEN; \ - IDX_PHONETIC_LISTBOX_DESCRIPTION \ - }; \ - Edit ED_PHONETIC_1 \ - { \ + Hide = PHONETIC_HIDDEN; \ + IDX_PHONETIC_LISTBOX_DESCRIPTION \ + }; \ + Edit ED_PHONETIC_1 \ + { \ Border = TRUE ; \ Pos = MAP_APPFONT ( IDX_COL_PHONETIC_EDIT , IDX_ROW_2_LIST ) ; \ - Size = MAP_APPFONT ( IDX_PHONETIC_EDIT_WIDTH , 12 ) ; \ - Hide = PHONETIC_HIDDEN; \ - TabStop = TRUE ; \ + Size = MAP_APPFONT ( IDX_PHONETIC_EDIT_WIDTH , 12 ) ; \ + Hide = PHONETIC_HIDDEN; \ + TabStop = TRUE ; \ Left = TRUE ; \ - }; \ - FixedText FT_PHONETIC_2 \ - { \ + }; \ + FixedText FT_PHONETIC_2 \ + { \ Pos = MAP_APPFONT ( IDX_COL_PHONETIC_TEXT , IDX_ROW_3_TEXT ) ; \ Size = MAP_APPFONT ( IDX_PHONETIC_TEXT_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; \ - Hide = PHONETIC_HIDDEN; \ - IDX_PHONETIC_LISTBOX_DESCRIPTION \ - }; \ - Edit ED_PHONETIC_2 \ - { \ + Hide = PHONETIC_HIDDEN; \ + IDX_PHONETIC_LISTBOX_DESCRIPTION \ + }; \ + Edit ED_PHONETIC_2 \ + { \ Border = TRUE ; \ Pos = MAP_APPFONT ( IDX_COL_PHONETIC_EDIT , IDX_ROW_3_LIST ) ; \ - Size = MAP_APPFONT ( IDX_PHONETIC_EDIT_WIDTH , 12 ) ; \ - Hide = PHONETIC_HIDDEN; \ - TabStop = TRUE ; \ + Size = MAP_APPFONT ( IDX_PHONETIC_EDIT_WIDTH , 12 ) ; \ + Hide = PHONETIC_HIDDEN; \ + TabStop = TRUE ; \ Left = TRUE ; \ - }; \ - FixedText FT_PHONETIC_3 \ - { \ + }; \ + FixedText FT_PHONETIC_3 \ + { \ Pos = MAP_APPFONT ( IDX_COL_PHONETIC_TEXT , IDX_ROW_4_TEXT ) ; \ Size = MAP_APPFONT ( IDX_PHONETIC_TEXT_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; \ Hide = PHONETIC_HIDDEN; \ - IDX_PHONETIC_LISTBOX_DESCRIPTION \ - }; \ - Edit ED_PHONETIC_3 \ - { \ + IDX_PHONETIC_LISTBOX_DESCRIPTION \ + }; \ + Edit ED_PHONETIC_3 \ + { \ Border = TRUE ; \ Pos = MAP_APPFONT ( IDX_COL_PHONETIC_EDIT , IDX_ROW_4_LIST ) ; \ - Size = MAP_APPFONT ( IDX_PHONETIC_EDIT_WIDTH , 12 ) ; \ - Hide = PHONETIC_HIDDEN; \ - TabStop = TRUE ; \ + Size = MAP_APPFONT ( IDX_PHONETIC_EDIT_WIDTH , 12 ) ; \ + Hide = PHONETIC_HIDDEN; \ + TabStop = TRUE ; \ Left = TRUE ; \ - }; \ + }; \ FixedText LBL_LEVEL \ { \ Pos = MAP_APPFONT ( IDX_COL1 , 76 ) ; \ @@ -241,7 +241,7 @@ Text [ en-US ] = "Phonetic reading"; \ SpinSize = 1 ; \ }; \ CheckBox CB_MAIN_ENTRY \ - { \ + { \ Pos = MAP_APPFONT ( IDX_COL1 , 76 ) ; \ Size = MAP_APPFONT ( 100 , 8 ) ; \ Text [ en-US ] = "~Main entry";\ @@ -277,15 +277,15 @@ ModalDialog DLG_EDIT_IDXMARK Sizeable = FALSE ; HelpID = FN_EDIT_IDX_ENTRY_DLG; SVLook = TRUE ; - #define IDX_WIN_WIDTH IDX_WIN_WIDTH_NORMAL + #define IDX_WIN_WIDTH IDX_WIN_WIDTH_NORMAL Size = MAP_APPFONT ( IDX_WIN_WIDTH , 118 ) ; #define GB_HEIGHT 109 #define DCB_INDEX_WIDTH 94 #define PHONETIC_HIDDEN TRUE - #define LIST_WIDTH 94 - #define COL_BUTTONS IDX_COL_BUTTONS_NORMAL - #define COL_BUTTONS_2 (COL_BUTTONS+26) - #define WINDOW_HEIGHT 118 + #define LIST_WIDTH 94 + #define COL_BUTTONS IDX_COL_BUTTONS_NORMAL + #define COL_BUTTONS_2 (COL_BUTTONS+26) + #define WINDOW_HEIGHT 118 IDX_DIALOG_WINDOW }; ModalDialog DLG_EDIT_IDXMARK_CJK @@ -301,10 +301,10 @@ ModalDialog DLG_EDIT_IDXMARK_CJK #define GB_HEIGHT 109 #define DCB_INDEX_WIDTH 94 #define PHONETIC_HIDDEN FALSE - #define LIST_WIDTH IDX_PHONETIC_EDIT_WIDTH - #define COL_BUTTONS IDX_COL_BUTTONS_CJK - #define COL_BUTTONS_2 (COL_BUTTONS+26) - #define WINDOW_HEIGHT 118 + #define LIST_WIDTH IDX_PHONETIC_EDIT_WIDTH + #define COL_BUTTONS IDX_COL_BUTTONS_CJK + #define COL_BUTTONS_2 (COL_BUTTONS+26) + #define WINDOW_HEIGHT 118 IDX_DIALOG_WINDOW }; ModelessDialog DLG_INSIDXMARK @@ -314,19 +314,19 @@ ModelessDialog DLG_INSIDXMARK Closeable = TRUE; Sizeable = FALSE ; Hide = TRUE ; -// Zoomable = TRUE ; +// Zoomable = TRUE ; HelpID = FN_INSERT_IDX_ENTRY_DLG; SVLook = TRUE ; - #define IDX_WIN_WIDTH IDX_WIN_WIDTH_NORMAL + #define IDX_WIN_WIDTH IDX_WIN_WIDTH_NORMAL Size = MAP_APPFONT ( IDX_WIN_WIDTH , 138) ; -// Moveable = TRUE ; +// Moveable = TRUE ; #define GB_HEIGHT 129 #define DCB_INDEX_WIDTH 79 #define PHONETIC_HIDDEN TRUE - #define LIST_WIDTH 94 - #define COL_BUTTONS IDX_COL_BUTTONS_NORMAL - #define COL_BUTTONS_2 (COL_BUTTONS+26) - #define WINDOW_HEIGHT 138 + #define LIST_WIDTH 94 + #define COL_BUTTONS IDX_COL_BUTTONS_NORMAL + #define COL_BUTTONS_2 (COL_BUTTONS+26) + #define WINDOW_HEIGHT 138 IDX_DIALOG_WINDOW }; ModelessDialog DLG_INSIDXMARK_CJK @@ -335,19 +335,19 @@ ModelessDialog DLG_INSIDXMARK_CJK Moveable = TRUE ; Closeable = TRUE; Sizeable = FALSE ; -// Zoomable = TRUE ; +// Zoomable = TRUE ; HelpID = FN_INSERT_IDX_ENTRY_DLG; SVLook = TRUE ; #define IDX_WIN_WIDTH IDX_WIN_WIDTH_CJK Size = MAP_APPFONT ( IDX_WIN_WIDTH , 138) ; -// Moveable = TRUE ; +// Moveable = TRUE ; #define GB_HEIGHT 129 #define DCB_INDEX_WIDTH 79 #define PHONETIC_HIDDEN FALSE - #define LIST_WIDTH IDX_PHONETIC_EDIT_WIDTH - #define COL_BUTTONS IDX_COL_BUTTONS_CJK - #define COL_BUTTONS_2 (COL_BUTTONS+26) - #define WINDOW_HEIGHT 138 + #define LIST_WIDTH IDX_PHONETIC_EDIT_WIDTH + #define COL_BUTTONS IDX_COL_BUTTONS_CJK + #define COL_BUTTONS_2 (COL_BUTTONS+26) + #define WINDOW_HEIGHT 138 IDX_DIALOG_WINDOW }; ModalDialog DLG_NEW_USER_IDX @@ -411,30 +411,30 @@ String STR_IDXMRK_INSERT Text [ en-US ] = "Insert Index Entry" ; }; -#define AUTH_DIALOG_WINDOW \ - Window WIN_DLG \ +#define AUTH_DIALOG_WINDOW \ + Window WIN_DLG \ { \ - Pos = MAP_APPFONT ( 0 , 0 ) ; \ + Pos = MAP_APPFONT ( 0 , 0 ) ; \ Size = MAP_APPFONT ( 218 , 118 + RADIO_BUTTON_HEIGHT) ; \ - RadioButton RB_FROMCOMPONENT \ + RadioButton RB_FROMCOMPONENT \ { \ - Pos = MAP_APPFONT ( 12 , 14 ) ; \ - Size = MAP_APPFONT ( 147 , 12 ) ; \ + Pos = MAP_APPFONT ( 12 , 14 ) ; \ + Size = MAP_APPFONT ( 147 , 12 ) ; \ Text [ en-US ] = "From bibliography ~database";\ - }; \ + }; \ RadioButton RB_FROMDOCCONTENT \ { \ - Pos = MAP_APPFONT ( 12, 29 ) ; \ + Pos = MAP_APPFONT ( 12, 29 ) ; \ Size = MAP_APPFONT ( 147 , 12 ) ; \ Text [ en-US ] = "~From document content";\ - }; \ + }; \ FixedText FT_AUTHOR \ { \ Pos = MAP_APPFONT ( 12 , 14 + RADIO_BUTTON_HEIGHT) ; \ Size = MAP_APPFONT ( 60 , 8 ) ; \ Text [ en-US ] = "Author";\ }; \ - FixedText FI_AUTHOR \ + FixedText FI_AUTHOR \ { \ Pos = MAP_APPFONT ( 12 , 25 + RADIO_BUTTON_HEIGHT) ; \ Size = MAP_APPFONT ( 140, 8 ) ; \ @@ -446,7 +446,7 @@ String STR_IDXMRK_INSERT Size = MAP_APPFONT ( 60 , 8 ) ; \ Text [ en-US ] = "Title";\ }; \ - FixedText FI_TITLE \ + FixedText FI_TITLE \ { \ Pos = MAP_APPFONT ( 12 , 48 + RADIO_BUTTON_HEIGHT) ; \ Size = MAP_APPFONT ( 140, 8 ) ; \ @@ -535,12 +535,12 @@ ModelessDialog DLG_INSAUTHMARK Moveable = TRUE ; Closeable = TRUE ; Sizeable = FALSE ; -// Zoomable = TRUE ; +// Zoomable = TRUE ; HelpID = FN_INSERT_AUTH_ENTRY_DLG; SVLook = TRUE ; #define RADIO_BUTTON_HEIGHT 30 Size = MAP_APPFONT ( 218 , 118 + RADIO_BUTTON_HEIGHT) ; -// Moveable = TRUE ; +// Moveable = TRUE ; AUTH_DIALOG_WINDOW }; ModalDialog DLG_CREATE_AUTH_ENTRY diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index 979ab2a4b9f9..9b9e1513605d 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,9 +49,9 @@ SwMultiTOXMarkDlg::SwMultiTOXMarkDlg( Window* pParent, SwTOXMgr& rTOXMgr ) : SvxStandardDialog(pParent, SW_RES(DLG_MULTMRK)), aTOXFL(this, SW_RES(FL_TOX)), - aEntryFT(this, SW_RES(FT_ENTRY)), - aTextFT(this, SW_RES(FT_TEXT)), - aTOXFT(this, SW_RES(FT_TOX)), + aEntryFT(this, SW_RES(FT_ENTRY)), + aTextFT(this, SW_RES(FT_TEXT)), + aTOXFT(this, SW_RES(FT_TOX)), aTOXLB(this, SW_RES(LB_TOX)), aOkBT(this, SW_RES(OK_BT)), aCancelBT(this, SW_RES(CANCEL_BT)), @@ -74,7 +74,7 @@ SwMultiTOXMarkDlg::SwMultiTOXMarkDlg( Window* pParent, SwTOXMgr& rTOXMgr ) : IMPL_LINK_INLINE_START( SwMultiTOXMarkDlg, SelectHdl, ListBox *, pBox ) { if(pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) - { SwTOXMark* pMark = rMgr.GetTOXMark(pBox->GetSelectEntryPos()); + { SwTOXMark* pMark = rMgr.GetTOXMark(pBox->GetSelectEntryPos()); aTextFT.SetText(pMark->GetTOXType()->GetTypeName()); nPos = pBox->GetSelectEntryPos(); } diff --git a/sw/source/ui/index/multmrk.hrc b/sw/source/ui/index/multmrk.hrc index 8a24f9c0336d..d46f37359852 100644 --- a/sw/source/ui/index/multmrk.hrc +++ b/sw/source/ui/index/multmrk.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,11 +24,11 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FT_ENTRY 1 -#define FT_TOX 2 -#define OK_BT 3 -#define LB_TOX 4 +#define FT_ENTRY 1 +#define FT_TOX 2 +#define OK_BT 3 +#define LB_TOX 4 #define FT_TEXT 5 #define FL_TOX 6 -#define CANCEL_BT 7 +#define CANCEL_BT 7 diff --git a/sw/source/ui/index/multmrk.src b/sw/source/ui/index/multmrk.src index be7b47d836d4..83db407d1a3f 100644 --- a/sw/source/ui/index/multmrk.src +++ b/sw/source/ui/index/multmrk.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index a49272f481bf..1ec95e7aea8c 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ #include <wrtsh.hxx> #include <view.hxx> #include <multmrk.hxx> -#include <swundo.hxx> // fuer Undo-Ids +#include <swundo.hxx> // fuer Undo-Ids #include <cmdid.h> #include <index.hrc> #include <idxmrk.hrc> @@ -97,7 +97,7 @@ using namespace ::comphelper; using namespace ::com::sun::star; /*-------------------------------------------------------------------- - Beschreibung: Dialog zum Einfuegen einer Verzeichnismarkierung + Beschreibung: Dialog zum Einfuegen einer Verzeichnismarkierung --------------------------------------------------------------------*/ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent, sal_Bool bNewDlg, @@ -106,7 +106,7 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent, Window(pParent, rResId), aTypeFT (this, SW_RES(LBL_INDEX )), aTypeDCB(this, SW_RES(DCB_INDEX )), - aNewBT(this, SW_RES(BT_NEW )), + aNewBT(this, SW_RES(BT_NEW )), aEntryFT(this, SW_RES(LBL_ENTRY )), aEntryED(this, SW_RES(SL_ENTRY )), @@ -168,43 +168,43 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent, SetStyle(GetStyle()|WB_DIALOGCONTROL); FreeResource(); - aOKBT .SetHelpId(HID_INSERT_IDX_MRK_OK ); - aCancelBT .SetHelpId(HID_INSERT_IDX_MRK_CLOSE ); - aDelBT .SetHelpId(HID_INSERT_IDX_MRK_DELETE ); - aNewBT .SetHelpId(HID_INSERT_IDX_MRK_NEW ); - aPrevBT .SetHelpId(HID_INSERT_IDX_MRK_PREV ); - aPrevSameBT .SetHelpId(HID_INSERT_IDX_MRK_PREV_SAME ); - aNextBT .SetHelpId(HID_INSERT_IDX_MRK_NEXT ); - aNextSameBT .SetHelpId(HID_INSERT_IDX_MRK_NEXT_SAME ); - aTypeDCB .SetHelpId(HID_INSERT_IDX_MRK_TYPE ); - aEntryED .SetHelpId(HID_INSERT_IDX_MRK_ENTRY ); - aKeyDCB .SetHelpId(HID_INSERT_IDX_MRK_PRIM_KEY ); - aKey2DCB .SetHelpId(HID_INSERT_IDX_MRK_SEC_KEY ); - aLevelED .SetHelpId(HID_INSERT_IDX_MRK_LEVEL ); - aMainEntryCB .SetHelpId(HID_INSERT_IDX_MRK_MAIN_ENTRY); - aApplyToAllCB .SetHelpId(HID_INSERT_IDX_MRK_APPLY_ALL ); - aPhoneticED0 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING ); - aPhoneticED1 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING ); - aPhoneticED2 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING ); - - aSearchCaseSensitiveCB.SetHelpId( HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE ); - aSearchCaseWordOnlyCB.SetHelpId( HID_INSERT_IDX_MRK_SRCH_WORDONLY ); + aOKBT .SetHelpId(HID_INSERT_IDX_MRK_OK ); + aCancelBT .SetHelpId(HID_INSERT_IDX_MRK_CLOSE ); + aDelBT .SetHelpId(HID_INSERT_IDX_MRK_DELETE ); + aNewBT .SetHelpId(HID_INSERT_IDX_MRK_NEW ); + aPrevBT .SetHelpId(HID_INSERT_IDX_MRK_PREV ); + aPrevSameBT .SetHelpId(HID_INSERT_IDX_MRK_PREV_SAME ); + aNextBT .SetHelpId(HID_INSERT_IDX_MRK_NEXT ); + aNextSameBT .SetHelpId(HID_INSERT_IDX_MRK_NEXT_SAME ); + aTypeDCB .SetHelpId(HID_INSERT_IDX_MRK_TYPE ); + aEntryED .SetHelpId(HID_INSERT_IDX_MRK_ENTRY ); + aKeyDCB .SetHelpId(HID_INSERT_IDX_MRK_PRIM_KEY ); + aKey2DCB .SetHelpId(HID_INSERT_IDX_MRK_SEC_KEY ); + aLevelED .SetHelpId(HID_INSERT_IDX_MRK_LEVEL ); + aMainEntryCB .SetHelpId(HID_INSERT_IDX_MRK_MAIN_ENTRY); + aApplyToAllCB .SetHelpId(HID_INSERT_IDX_MRK_APPLY_ALL ); + aPhoneticED0 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING ); + aPhoneticED1 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING ); + aPhoneticED2 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING ); + + aSearchCaseSensitiveCB.SetHelpId( HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE ); + aSearchCaseWordOnlyCB.SetHelpId( HID_INSERT_IDX_MRK_SRCH_WORDONLY ); GetParent()->SetText( SW_RESSTR( bNewMark ? STR_IDXMRK_INSERT : STR_IDXMRK_EDIT)); - aDelBT.SetClickHdl(LINK(this,SwIndexMarkDlg, DelHdl)); - aPrevBT.SetClickHdl(LINK(this,SwIndexMarkDlg, PrevHdl)); - aPrevSameBT.SetClickHdl(LINK(this,SwIndexMarkDlg, PrevSameHdl)); - aNextBT.SetClickHdl(LINK(this,SwIndexMarkDlg, NextHdl)); - aNextSameBT.SetClickHdl(LINK(this,SwIndexMarkDlg, NextSameHdl)); - //aTypeDCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, ModifyHdl)); - aTypeDCB.SetSelectHdl(LINK(this,SwIndexMarkDlg, ModifyHdl)); - aKeyDCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, KeyDCBModifyHdl)); - aKey2DCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, KeyDCBModifyHdl)); - aOKBT.SetClickHdl(LINK(this,SwIndexMarkDlg, InsertHdl)); - aCancelBT.SetClickHdl(LINK(this,SwIndexMarkDlg, CloseHdl)); - aEntryED.SetModifyHdl(LINK(this,SwIndexMarkDlg, ModifyHdl)); + aDelBT.SetClickHdl(LINK(this,SwIndexMarkDlg, DelHdl)); + aPrevBT.SetClickHdl(LINK(this,SwIndexMarkDlg, PrevHdl)); + aPrevSameBT.SetClickHdl(LINK(this,SwIndexMarkDlg, PrevSameHdl)); + aNextBT.SetClickHdl(LINK(this,SwIndexMarkDlg, NextHdl)); + aNextSameBT.SetClickHdl(LINK(this,SwIndexMarkDlg, NextSameHdl)); + //aTypeDCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, ModifyHdl)); + aTypeDCB.SetSelectHdl(LINK(this,SwIndexMarkDlg, ModifyHdl)); + aKeyDCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, KeyDCBModifyHdl)); + aKey2DCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, KeyDCBModifyHdl)); + aOKBT.SetClickHdl(LINK(this,SwIndexMarkDlg, InsertHdl)); + aCancelBT.SetClickHdl(LINK(this,SwIndexMarkDlg, CloseHdl)); + aEntryED.SetModifyHdl(LINK(this,SwIndexMarkDlg, ModifyHdl)); aNewBT.SetClickHdl(LINK(this, SwIndexMarkDlg, NewUserIdxHdl)); aApplyToAllCB.SetClickHdl(LINK(this, SwIndexMarkDlg, SearchTypeHdl)); aPhoneticED0.SetModifyHdl(LINK(this,SwIndexMarkDlg, PhoneticEDModifyHdl)); @@ -236,7 +236,7 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent, } /*-------------------------------------------------------------------- - Beschreibung: Controls neu initialisieren mit der aktuellen + Beschreibung: Controls neu initialisieren mit der aktuellen Markierung --------------------------------------------------------------------*/ void SwIndexMarkDlg::InitControls() @@ -326,7 +326,7 @@ void SwIndexMarkDlg::InitControls() UpdateDialog(); } else - { // aktuelle Selektion (1.Element) anzeigen ???? + { // aktuelle Selektion (1.Element) anzeigen ???? sal_uInt16 nCnt = pSh->GetCrsrCnt(); if (nCnt < 2) { @@ -346,7 +346,7 @@ void SwIndexMarkDlg::InitControls() } // Verzeichnistyp ist default - if( sTmpTypeSelection.Len() && + if( sTmpTypeSelection.Len() && LISTBOX_ENTRY_NOTFOUND != aTypeDCB.GetEntryPos( sTmpTypeSelection ) ) aTypeDCB.SelectEntry(sTmpTypeSelection); else @@ -355,7 +355,7 @@ void SwIndexMarkDlg::InitControls() } } -void SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading() +void SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading() { //no phonetic reading if no global cjk support if( !xExtendedIndexEntrySupplier.is() ) @@ -411,7 +411,7 @@ void SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading() */ } -String SwIndexMarkDlg::GetDefaultPhoneticReading( const String& rText ) +String SwIndexMarkDlg::GetDefaultPhoneticReading( const String& rText ) { if( !bIsPhoneticReadingEnabled ) return aEmptyStr; @@ -423,7 +423,7 @@ String SwIndexMarkDlg::GetDefaultPhoneticReading( const String& rText ) /* -----------------07.09.99 10:43------------------- Change the content of aEntryED if text is selected --------------------------------------------------*/ -void SwIndexMarkDlg::Activate() +void SwIndexMarkDlg::Activate() { // aktuelle Selektion (1.Element) anzeigen ???? if(bNewMark) @@ -450,7 +450,7 @@ void SwIndexMarkDlg::Activate() } /*-------------------------------------------------------------------- - Beschreibung: Ok-Button auswerten + Beschreibung: Ok-Button auswerten --------------------------------------------------------------------*/ void SwIndexMarkDlg::Apply() { @@ -499,7 +499,7 @@ void SwIndexMarkDlg::InsertUpdate() } /*-------------------------------------------------------------------- - Beschreibung: Marke einfuegen + Beschreibung: Marke einfuegen --------------------------------------------------------------------*/ static void lcl_SelectSameStrings(SwWrtShell& rSh, BOOL bWordOnly, BOOL bCaseSensitive) { @@ -537,7 +537,7 @@ void SwIndexMarkDlg::InsertMark() switch(nPos) { case POS_CONTENT : break; - case POS_INDEX: // Stichwortverzeichnismarke + case POS_INDEX: // Stichwortverzeichnismarke { UpdateKeyBoxes(); String aPrim(aKeyDCB.GetText()); @@ -579,11 +579,11 @@ void SwIndexMarkDlg::InsertMark() } /*-------------------------------------------------------------------- - Beschreibung: Marke Updaten + Beschreibung: Marke Updaten --------------------------------------------------------------------*/ void SwIndexMarkDlg::UpdateMark() { - String aAltText(aEntryED.GetText()); + String aAltText(aEntryED.GetText()); String* pAltText = aOrgStr != aEntryED.GetText() ? &aAltText : 0; //empty alternative texts are not allowed if(pAltText && !pAltText->Len()) @@ -629,7 +629,7 @@ void SwIndexMarkDlg::UpdateKeyBoxes() sal_uInt16 nPos = aKeyDCB.GetEntryPos(aKey); if(nPos == LISTBOX_ENTRY_NOTFOUND && aKey.Len() > 0) - { // neuen Key erzeugen + { // neuen Key erzeugen aKeyDCB.InsertEntry(aKey); } @@ -637,21 +637,21 @@ void SwIndexMarkDlg::UpdateKeyBoxes() nPos = aKey2DCB.GetEntryPos(aKey); if(nPos == LISTBOX_ENTRY_NOTFOUND && aKey.Len() > 0) - { // neuen Key erzeugen + { // neuen Key erzeugen aKey2DCB.InsertEntry(aKey); } } class SwNewUserIdxDlg : public ModalDialog { - OKButton aOKPB; - CancelButton aCancelPB; - HelpButton aHelpPB; + OKButton aOKPB; + CancelButton aCancelPB; + HelpButton aHelpPB; FixedLine aNameFL; - FixedText aNameFT; - Edit aNameED; + FixedText aNameFT; + Edit aNameED; - SwIndexMarkDlg* pDlg; + SwIndexMarkDlg* pDlg; DECL_LINK( ModifyHdl, Edit*); @@ -672,8 +672,8 @@ class SwNewUserIdxDlg : public ModalDialog aNameED.GrabFocus(); } - virtual void Apply(); - String GetName(){return aNameED.GetText();} + virtual void Apply(); + String GetName(){return aNameED.GetText();} }; void SwNewUserIdxDlg::Apply() { @@ -731,7 +731,7 @@ IMPL_LINK( SwIndexMarkDlg, CloseHdl, Button *, EMPTYARG ) } /*-------------------------------------------------------------------- - Beschreibung: VerzeichnisTyp auswaehlen nur bei Einfuegen + Beschreibung: VerzeichnisTyp auswaehlen nur bei Einfuegen --------------------------------------------------------------------*/ IMPL_LINK( SwIndexMarkDlg, ModifyHdl, ListBox *, pBox ) { @@ -740,12 +740,12 @@ IMPL_LINK( SwIndexMarkDlg, ModifyHdl, ListBox *, pBox ) // Verzeichnistyp setzen sal_uInt16 nPos = aTypeDCB.GetEntryPos(aTypeDCB.GetSelectEntry()); sal_Bool bLevelEnable = sal_False, - bKeyEnable = sal_False, - bSetKey2 = sal_False, + bKeyEnable = sal_False, + bSetKey2 = sal_False, bKey2Enable = sal_False, - bEntryHasText = sal_False, - bKey1HasText = sal_False, - bKey2HasText = sal_False; + bEntryHasText = sal_False, + bKey1HasText = sal_False, + bKey2HasText = sal_False; if(nPos == POS_INDEX) { if(aEntryED.GetText().Len()) @@ -881,9 +881,9 @@ void SwIndexMarkDlg::UpdateDialog() sal_Bool bLevelEnable = sal_True, bKeyEnable = sal_False, bKey2Enable = sal_False, - bEntryHasText = sal_False, - bKey1HasText = sal_False, - bKey2HasText = sal_False; + bEntryHasText = sal_False, + bKey1HasText = sal_False, + bKey2HasText = sal_False; TOXTypes eCurType = pMark->GetTOXType()->GetType(); if(TOX_INDEX == eCurType) @@ -1032,8 +1032,8 @@ IMPL_LINK( SwIndexMarkDlg, KeyDCBModifyHdl, ComboBox *, pBox ) aPhoneticED2.SetText(GetDefaultPhoneticReading(pBox->GetText())); } } - sal_Bool bKey1HasText = (0 != aKeyDCB.GetText().Len()); - sal_Bool bKey2HasText = (0 != aKey2DCB.GetText().Len()); + sal_Bool bKey1HasText = (0 != aKeyDCB.GetText().Len()); + sal_Bool bKey2HasText = (0 != aKey2DCB.GetText().Len()); aPhoneticFT1.Enable(bKey1HasText&&bIsPhoneticReadingEnabled); aPhoneticED1.Enable(bKey1HasText&bIsPhoneticReadingEnabled); @@ -1082,7 +1082,7 @@ SfxModelessDialog(_pBindings, pChild, pParent, SvtCJKOptions().IsCJKFontEnabled( Initialize(pInfo); } -void SwIndexMarkFloatDlg::Activate() +void SwIndexMarkFloatDlg::Activate() { SfxModelessDialog::Activate(); aDlg.Activate(); @@ -1101,7 +1101,7 @@ SvxStandardDialog(pParent, SvtCJKOptions().IsCJKFontEnabled()?SW_RES(DLG_EDIT_ID aDlg.ReInitDlg(rSh, pCurTOXMark); } -void SwIndexMarkModalDlg::Apply() +void SwIndexMarkModalDlg::Apply() { aDlg.Apply(); } @@ -1110,21 +1110,21 @@ class SwCreateAuthEntryDlg_Impl : public ModalDialog { FixedLine aEntriesFL; - FixedText* pFixedTexts[AUTH_FIELD_END]; - ListBox* pTypeListBox; - ComboBox* pIdentifierBox; - Edit* pEdits[AUTH_FIELD_END]; + FixedText* pFixedTexts[AUTH_FIELD_END]; + ListBox* pTypeListBox; + ComboBox* pIdentifierBox; + Edit* pEdits[AUTH_FIELD_END]; OKButton aOKBT; - CancelButton aCancelBT; - HelpButton aHelpBT; + CancelButton aCancelBT; + HelpButton aHelpBT; - Link aShortNameCheckLink; + Link aShortNameCheckLink; - SwWrtShell& rWrtSh; + SwWrtShell& rWrtSh; - sal_Bool m_bNewEntryMode; - sal_Bool m_bNameAllowed; + sal_Bool m_bNewEntryMode; + sal_Bool m_bNameAllowed; DECL_LINK(IdentifierHdl, ComboBox*); DECL_LINK(ShortNameHdl, Edit*); @@ -1138,9 +1138,9 @@ public: sal_Bool bCreate); ~SwCreateAuthEntryDlg_Impl(); - String GetEntryText(ToxAuthorityField eField) const; + String GetEntryText(ToxAuthorityField eField) const; - void SetCheckNameHdl(const Link& rLink) {aShortNameCheckLink = rLink;} + void SetCheckNameHdl(const Link& rLink) {aShortNameCheckLink = rLink;} }; @@ -1229,11 +1229,11 @@ SwAuthMarkDlg::SwAuthMarkDlg( Window *pParent, aFromComponentRB.Check(bIsFromComponent); aFromDocContentRB.Check(!bIsFromComponent); - aOKBT .SetHelpId(HID_INSERT_AUTH_MRK_OK ); - aCancelBT .SetHelpId(HID_INSERT_AUTH_MRK_CLOSE); - aEntryED .SetHelpId(HID_INSERT_AUTH_MRK_ENTRY ); - aCreateEntryPB .SetHelpId(HID_INSERT_AUTH_MRK_CREATE_ENTRY ); - aEditEntryPB .SetHelpId(HID_INSERT_AUTH_MRK_EDIT_ENTRY ); + aOKBT .SetHelpId(HID_INSERT_AUTH_MRK_OK ); + aCancelBT .SetHelpId(HID_INSERT_AUTH_MRK_CLOSE); + aEntryED .SetHelpId(HID_INSERT_AUTH_MRK_ENTRY ); + aCreateEntryPB .SetHelpId(HID_INSERT_AUTH_MRK_CREATE_ENTRY ); + aEditEntryPB .SetHelpId(HID_INSERT_AUTH_MRK_EDIT_ENTRY ); aOKBT.SetClickHdl(LINK(this,SwAuthMarkDlg, InsertHdl)); aCancelBT.SetClickHdl(LINK(this,SwAuthMarkDlg, CloseHdl)); @@ -1261,7 +1261,7 @@ SwAuthMarkDlg::~SwAuthMarkDlg() { } -void SwAuthMarkDlg::ReInitDlg(SwWrtShell& rWrtShell) +void SwAuthMarkDlg::ReInitDlg(SwWrtShell& rWrtShell) { pSh = &rWrtShell; InitControls(); @@ -1329,7 +1329,7 @@ IMPL_LINK( SwAuthMarkDlg, CompEntryHdl, ListBox*, pBox) { const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) pSh->GetFldType(RES_AUTHORITY, aEmptyStr); - const SwAuthEntry* pEntry = pFType ? pFType->GetEntryByIdentifier(sEntry) : 0; + const SwAuthEntry* pEntry = pFType ? pFType->GetEntryByIdentifier(sEntry) : 0; for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++) m_sFields[i] = pEntry ? pEntry->GetAuthorField((ToxAuthorityField)i) : aEmptyStr; @@ -1356,7 +1356,7 @@ IMPL_LINK( SwAuthMarkDlg, InsertHdl, PushButton *, EMPTYARG ) //check if the entry already exists with different content const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) pSh->GetFldType(RES_AUTHORITY, aEmptyStr); - const SwAuthEntry* pEntry = pFType ? + const SwAuthEntry* pEntry = pFType ? pFType->GetEntryByIdentifier( m_sFields[AUTH_FIELD_IDENTIFIER]) : 0; if(pEntry) @@ -1497,7 +1497,7 @@ IMPL_LINK(SwAuthMarkDlg, ChangeSourceHdl, RadioButton*, pButton) if(pFType) { SvStringsDtor aIds; - pFType->GetAllEntryIdentifiers( aIds ); + pFType->GetAllEntryIdentifiers( aIds ); for(sal_uInt16 n = 0; n < aIds.Count(); n++) aEntryLB.InsertEntry(*aIds.GetObject(n)); } @@ -1676,7 +1676,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, if(pFType) { SvStringsDtor aIds; - pFType->GetAllEntryIdentifiers( aIds ); + pFType->GetAllEntryIdentifiers( aIds ); for(sal_uInt16 n = 0; n < aIds.Count(); n++) pIdentifierBox->InsertEntry(*aIds.GetObject(n)); } @@ -1744,7 +1744,7 @@ SwCreateAuthEntryDlg_Impl::~SwCreateAuthEntryDlg_Impl() delete pIdentifierBox; } -String SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) const +String SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) const { String sRet; if( AUTH_FIELD_AUTHORITY_TYPE == eField ) @@ -1830,7 +1830,7 @@ SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* _pBindings, aDlg.ReInitDlg(*pWrtShell); } -void SwAuthMarkFloatDlg::Activate() +void SwAuthMarkFloatDlg::Activate() { SfxModelessDialog::Activate(); aDlg.Activate(); @@ -1849,7 +1849,7 @@ SwAuthMarkModalDlg::SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh) : aDlg.ReInitDlg(rSh); } -void SwAuthMarkModalDlg::Apply() +void SwAuthMarkModalDlg::Apply() { aDlg.InsertHdl(0); } diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx index 642bdad7e5a2..4d45c1913005 100644 --- a/sw/source/ui/index/toxmgr.cxx +++ b/sw/source/ui/index/toxmgr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ void SwTOXMgr::DeleteTOXMark() pCurTOXMark = pNext; } -void SwTOXMgr::InsertTOXMark(const SwTOXMarkDescription& rDesc) +void SwTOXMgr::InsertTOXMark(const SwTOXMarkDescription& rDesc) { SwTOXMark* pMark = 0; switch(rDesc.GetTOXType()) @@ -197,7 +197,7 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc) if(rDesc.GetAltStr()) { // JP 26.08.96: Bug 30344 - entweder der Text aus dem Doc oder - // ein Alternativ-Text, beides gibts nicht! + // ein Alternativ-Text, beides gibts nicht! BOOL bReplace = pCurTOXMark->IsAlternativeText(); if( bReplace ) pCurTOXMark->SetAlternativeText( *rDesc.GetAltStr() ); @@ -224,7 +224,7 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc) /*-------------------------------------------------------------------- - Beschreibung: UserTypeID ermitteln + Beschreibung: UserTypeID ermitteln --------------------------------------------------------------------*/ @@ -339,9 +339,9 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc, USHORT nPos = 0; USHORT nSize = pSh->GetTOXTypeCount(eCurTOXType); for(USHORT i=0; rDesc.GetTOUName() && i < nSize; ++i) - { const SwTOXType* pType = pSh->GetTOXType(TOX_USER, i); + { const SwTOXType* pType = pSh->GetTOXType(TOX_USER, i); if(pType->GetTypeName() == *rDesc.GetTOUName()) - { nPos = i; + { nPos = i; break; } } @@ -400,7 +400,7 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc, pSh->DelRight(); pNewTOX = (SwTOXBase*)pCurTOX; } -// pTOX->SetOptions(rDesc.GetIndexOptions()); +// pTOX->SetOptions(rDesc.GetIndexOptions()); pNewTOX->SetFromObjectNames(rDesc.IsCreateFromObjectNames()); pNewTOX->SetOLEOptions(rDesc.GetOLEOptions()); } |