diff options
Diffstat (limited to 'sw/source/ui')
811 files changed, 12951 insertions, 12488 deletions
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index e1a3d314d572..4794e789f4b1 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.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 @@ -60,13 +60,13 @@ String STR_PAGE_COUNT_MACRO // folder in default_images. This list is now only used for special toolboxes that are // used in floating windows. -#define IMAGELIST_AND_COUNT \ - IdList = { \ - FN_FORMULA_CALC ;\ - FN_FORMULA_CANCEL ;\ - FN_FORMULA_APPLY ;\ - }; \ - IdCount = { \ +#define IMAGELIST_AND_COUNT \ + IdList = { \ + FN_FORMULA_CALC ;\ + FN_FORMULA_CANCEL ;\ + FN_FORMULA_APPLY ;\ + }; \ + IdCount = { \ 3; \ }; @@ -174,12 +174,12 @@ SfxStyleFamilies DLG_STYLE_DESIGNER }; }; - ImageList 1 // == BMP_COLOR_NORMAL + 1 + ImageList 1 // == BMP_COLOR_NORMAL + 1 { Prefix = "sf"; STYLE_IMAGE_LISTEF }; - ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1 + ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1 { Prefix = "sfh"; STYLE_IMAGE_LISTEF @@ -470,8 +470,8 @@ String STR_FDLG_TEMPLATE_BUTTON String STR_FDLG_TEMPLATE_NAME { - //Text [ en-US ] = "Styles: " ; //#outline level,removed by zhaojianwei - Text [ en-US ] = "separated by: " ; //<-end,add by zhaojianwei + //Text [ en-US ] = "Styles: " ; //#outline level,removed by zhaojianwei + Text [ en-US ] = "separated by: " ; //<-end,add by zhaojianwei }; //#outline level,add by zhaojianwei String STR_FDLG_OUTLINE_LEVEL @@ -481,7 +481,7 @@ String STR_FDLG_OUTLINE_LEVEL String STR_FDLG_STYLE { - Text [ en-US ] = "Style: "; + Text [ en-US ] = "Style: "; }; //<-end diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index ce06c22cfc88..3896cbbe0d72 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -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 @@ -88,16 +88,16 @@ #include "envelp.hrc" #include "envimg.hxx" -#define ENV_NEWDOC RET_OK -#define ENV_INSERT RET_USER -#define ENV_CANCEL SHRT_MAX +#define ENV_NEWDOC RET_OK +#define ENV_INSERT RET_USER +#define ENV_CANCEL SHRT_MAX // -------------------------------------------------------------------------- // Funktion wird fuer Etiketten und Briefumschlaege benutzt! -// im applab.cxx und appenv.cxx +// im applab.cxx und appenv.cxx String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText ) { String sRet; @@ -119,7 +119,7 @@ String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText { sTmpText = aLine.Copy( 0, nPos ); aLine.Erase( 0, nPos ); -// sTmpText = aLine.Cut( 0, nPos ); +// sTmpText = aLine.Cut( 0, nPos ); } else { @@ -128,13 +128,13 @@ String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText { sTmpText = aLine; aLine.Erase(); -// sTmpText = aLine.Cut(); +// sTmpText = aLine.Cut(); } else { sTmpText = aLine.Copy( 0, nPos + 1); aLine.Erase( 0, nPos + 1); -// sTmpText = aLine.Cut( 0, nPos + 1 ); +// sTmpText = aLine.Cut( 0, nPos + 1 ); // Datenbankfelder muesen mind. 3 Punkte beinhalten! String sDBName( sTmpText.Copy( 1, sTmpText.Len() - 2)); @@ -154,7 +154,7 @@ String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText } rSh.InsertLineBreak(); } - rSh.DelLeft(); // Letzten Linebreak wieder l???schen + rSh.DelLeft(); // Letzten Linebreak wieder l???schen return sRet; } @@ -178,15 +178,15 @@ void SwModule::InsertEnv( SfxRequest& rReq ) { static USHORT nTitleNo = 0; - SwDocShell *pMyDocSh; - SfxViewFrame *pFrame; + SwDocShell *pMyDocSh; + SfxViewFrame *pFrame; SwView *pNewView; - SwWrtShell *pOldSh, + SwWrtShell *pOldSh, *pSh; //aktuelle Shell besorgen pMyDocSh = (SwDocShell*) SfxObjectShell::Current(); - pOldSh = pMyDocSh ? pMyDocSh->GetWrtShell() : 0; + pOldSh = pMyDocSh ? pMyDocSh->GetWrtShell() : 0; // Neues Dokument erzeugen (kein Show!) SfxObjectShellRef xDocSh( new SwDocShell( SFX_CREATE_MODE_STANDARD ) ); @@ -358,7 +358,7 @@ static USHORT nTitleNo = 0; } SET_CURR_SHELL(pSh); - pSh->SetNewDoc(); // Performanceprobleme vermeiden + pSh->SetNewDoc(); // Performanceprobleme vermeiden // Flys dieser Seite merken SvPtrarr aFlyArr(0, 5); @@ -528,7 +528,7 @@ static USHORT nTitleNo = 0; rReq.Done(); } - else //Abbruch + else //Abbruch { rReq.Ignore(); diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 653208aaf250..f61b6434f1cc 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -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 @@ -72,7 +72,7 @@ #include <wrtsh.hxx> #include <docsh.hxx> #ifndef _CMDID_H -#include <cmdid.h> // Funktion-Ids +#include <cmdid.h> // Funktion-Ids #endif #include <initui.hxx> #include <uitool.hxx> @@ -86,7 +86,7 @@ #include <cfgitems.hxx> #include <prtopt.hxx> #include <modcfg.hxx> -#include <globals.h> // globale Konstanten z.B. +#include <globals.h> // globale Konstanten z.B. #ifndef _APP_HRC #include <app.hrc> #endif @@ -263,7 +263,7 @@ SwView* lcl_LoadDoc(SwView* pView, const String& rURL) return pNewView; } /*-------------------------------------------------------------------- - Beschreibung: Felddialog starten + Beschreibung: Felddialog starten --------------------------------------------------------------------*/ void NewXForms( SfxRequest& rReq ); // implementation: below @@ -273,10 +273,10 @@ namespace class SwMailMergeWizardExecutor : public salhelper::SimpleReferenceObject { - SwView* m_pView; // never owner + SwView* m_pView; // never owner SwView* m_pView2Close; // never owner - SwMailMergeConfigItem* m_pMMConfig; // sometimes owner - AbstractMailMergeWizard* m_pWizard; // always owner + SwMailMergeConfigItem* m_pMMConfig; // sometimes owner + AbstractMailMergeWizard* m_pWizard; // always owner DECL_LINK( EndDialogHdl, AbstractMailMergeWizard* ); DECL_LINK( DestroyDialogHdl, AbstractMailMergeWizard* ); @@ -740,7 +740,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } else if(rHint.ISA(SfxItemSetHint)) { - if( SFX_ITEM_SET == ((SfxItemSetHint&)rHint).GetItemSet().GetItemState(SID_ATTR_PATHNAME)) + if( SFX_ITEM_SET == ((SfxItemSetHint&)rHint).GetItemSet().GetItemState(SID_ATTR_PATHNAME)) { ::GetGlossaries()->UpdateGlosPath( sal_False ); SwGlossaryList* pList = ::GetGlossaryList(); @@ -875,7 +875,7 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal /* -----------------------------20.02.01 12:43-------------------------------- ---------------------------------------------------------------------------*/ -SwDBConfig* SwModule::GetDBConfig() +SwDBConfig* SwModule::GetDBConfig() { if(!pDBConfig) pDBConfig = new SwDBConfig; diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index 41f055f86050..e597547d890f 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -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 @@ -117,10 +117,10 @@ const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem, aSet.Put(SwFmtVertOrient(rItem.lUpper + nRow * rItem.lVDist, text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME )); } - const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Fly einfuegen + const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Fly einfuegen ASSERT( pFmt, "Fly not inserted" ); - rSh.UnSelectFrm(); //Rahmen wurde automatisch selektiert + rSh.UnSelectFrm(); //Rahmen wurde automatisch selektiert rSh.SetTxtFmtColl( rSh.GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) ); @@ -157,10 +157,10 @@ const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rItem, aSet.Put(SwFmtVertOrient(rItem.lUpper + nRow * rItem.lVDist, text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME )); } - const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Fly einfuegen + const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Fly einfuegen ASSERT( pFmt, "Fly not inserted" ); - rSh.UnSelectFrm(); //Rahmen wurde automatisch selektiert + rSh.UnSelectFrm(); //Rahmen wurde automatisch selektiert rSh.SetTxtFmtColl( rSh.GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) ); @@ -245,7 +245,7 @@ static sal_uInt16 nBCTitleNo = 0; SwWrtShell *pSh = pNewView->GetWrtShellPtr(); ASSERT( pSh, "missing WrtShell" ); - { // block for locks the dispatcher!! + { // block for locks the dispatcher!! SwWait aWait( (SwDocShell&)*xDocSh, sal_True ); @@ -254,7 +254,7 @@ static sal_uInt16 nBCTitleNo = 0; pSh->DoUndo( sal_False ); pSh->StartAllAction(); - pSh->SetNewDoc(); // Performanceprobleme vermeiden + pSh->SetNewDoc(); // Performanceprobleme vermeiden SwPageDesc aDesc = pSh->GetPageDesc( 0 ); SwFrmFmt& rFmt = aDesc.GetMaster(); @@ -276,7 +276,7 @@ static sal_uInt16 nBCTitleNo = 0; aDesc.ChgFooterShare(sal_False); - aDesc.SetUseOn(nsUseOnPage::PD_ALL); // Seitennumerierung + aDesc.SetUseOn(nsUseOnPage::PD_ALL); // Seitennumerierung // Einstellen der Seitengroesse rFmt.SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE, @@ -305,7 +305,7 @@ static sal_uInt16 nBCTitleNo = 0; pSh->ChgPageDesc( 0, aDesc ); // Rahmen einfuegen - SwFldMgr* pFldMgr = new SwFldMgr; + SwFldMgr* pFldMgr = new SwFldMgr; pFldMgr->SetEvalExpFlds(sal_False); //fix(24446): Damit der Text der Ettiketten nicht im unbedruckbaren @@ -327,17 +327,17 @@ static sal_uInt16 nBCTitleNo = 0; // Rahmenvorlage vorbereiten SwFrmFmt* pFmt = pSh->GetFrmFmtFromPool( RES_POOLFRM_LABEL ); - SwFmtFrmSize aFrmSize( ATT_FIX_SIZE, + SwFmtFrmSize aFrmSize( ATT_FIX_SIZE, rItem.lHDist - (rItem.lHDist-rItem.lWidth), rItem.lVDist - (rItem.lVDist-rItem.lHeight)); pFmt->SetFmtAttr(aFrmSize); - SvxLRSpaceItem aFrmLRSpace( 0, (sal_uInt16)(rItem.lHDist - rItem.lWidth), + SvxLRSpaceItem aFrmLRSpace( 0, (sal_uInt16)(rItem.lHDist - rItem.lWidth), 0, 0, RES_LR_SPACE); pFmt->SetFmtAttr(aFrmLRSpace); - SvxULSpaceItem aFrmULSpace( 0, (sal_uInt16)(rItem.lVDist - rItem.lHeight), + SvxULSpaceItem aFrmULSpace( 0, (sal_uInt16)(rItem.lVDist - rItem.lHeight), RES_UL_SPACE); pFmt->SetFmtAttr(aFrmULSpace); @@ -373,10 +373,10 @@ static sal_uInt16 nBCTitleNo = 0; pSh->Pop( bInFly ); if( bInFly ) - pSh->EndDoc(sal_True); // select all content + pSh->EndDoc(sal_True); // select all content // in the fly else - pSh->SetMark(); // set only the mark + pSh->SetMark(); // set only the mark SwSectionData aSect(CONTENT_SECTION, String::CreateFromAscii(MASTER_LABEL)); @@ -392,9 +392,9 @@ static sal_uInt16 nBCTitleNo = 0; sLinkName += String::CreateFromAscii(MASTER_LABEL); aSect.SetLinkFileName(sLinkName); aSect.SetProtectFlag(true); - pSh->Insert(aDotStr); // Dummytext zum Zuweisen der Section + pSh->Insert(aDotStr); // Dummytext zum Zuweisen der Section pSh->SttDoc(); - pSh->EndDoc(sal_True); // Alles im Rahmen selektieren + pSh->EndDoc(sal_True); // Alles im Rahmen selektieren pSh->InsertSection(aSect); } pSh->Pop( sal_False ); diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index c6e2527ba0c8..9f3008cf91d8 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -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 @@ -29,7 +29,7 @@ #include "precompiled_sw.hxx" #include <hintids.hxx> #ifndef _CMDID_H -#include <cmdid.h> // Funktion-Ids +#include <cmdid.h> // Funktion-Ids #endif #include <com/sun/star/i18n/ScriptType.hpp> @@ -67,8 +67,8 @@ #include <IDocumentDeviceAccess.hxx> #endif #include <uitool.hxx> -#include <initui.hxx> // fuer ::GetGlossaries() -#include <fldbas.hxx> //fuer UpdateFields +#include <initui.hxx> // fuer ::GetGlossaries() +#include <fldbas.hxx> //fuer UpdateFields #ifndef _WVIEW_HXX #include <wview.hxx> #endif @@ -90,7 +90,7 @@ #ifndef _GLOBALS_HRC #include <globals.hrc> #endif -#include <globals.h> // globale Konstanten z.B. +#include <globals.h> // globale Konstanten z.B. #include <svl/slstitm.hxx> #include "swabstdlg.hxx" #include <swwrtshitem.hxx> @@ -104,7 +104,7 @@ using namespace ::com::sun::star::lang; * * --------------------------------------------------*/ -SfxItemSet* SwModule::CreateItemSet( USHORT nId ) +SfxItemSet* SwModule::CreateItemSet( USHORT nId ) { BOOL bTextDialog = (nId == SID_SW_EDITOPTIONS) ? TRUE : FALSE; @@ -128,28 +128,29 @@ SfxItemSet* SwModule::CreateItemSet( USHORT nId ) } /********************************************************************/ - /* */ - /* Optionen/Bearbeiten */ - /* */ + /* */ + /* Optionen/Bearbeiten */ + /* */ /********************************************************************/ - SfxItemSet* pRet = new SfxItemSet (GetPool(), FN_PARAM_DOCDISP, FN_PARAM_ELEM, - SID_PRINTPREVIEW, SID_PRINTPREVIEW, - SID_ATTR_GRID_OPTIONS, SID_ATTR_GRID_OPTIONS, - FN_PARAM_PRINTER, FN_PARAM_STDFONTS, - FN_PARAM_WRTSHELL, FN_PARAM_WRTSHELL, - FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER, - SID_ATTR_METRIC, SID_ATTR_METRIC, - SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP, - RES_BACKGROUND, RES_BACKGROUND, - SID_HTML_MODE, SID_HTML_MODE, - FN_PARAM_SHADOWCURSOR, FN_PARAM_SHADOWCURSOR, + SfxItemSet* pRet = new SfxItemSet (GetPool(), FN_PARAM_DOCDISP, FN_PARAM_ELEM, + SID_PRINTPREVIEW, SID_PRINTPREVIEW, + SID_ATTR_GRID_OPTIONS, SID_ATTR_GRID_OPTIONS, + FN_PARAM_PRINTER, FN_PARAM_STDFONTS, + FN_PARAM_WRTSHELL, FN_PARAM_WRTSHELL, + FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER, + SID_ATTR_METRIC, SID_ATTR_METRIC, + SID_ATTR_APPLYCHARUNIT, SID_ATTR_APPLYCHARUNIT, + SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP, + RES_BACKGROUND, RES_BACKGROUND, + SID_HTML_MODE, SID_HTML_MODE, + FN_PARAM_SHADOWCURSOR, FN_PARAM_SHADOWCURSOR, FN_PARAM_CRSR_IN_PROTECTED, FN_PARAM_CRSR_IN_PROTECTED, FN_HSCROLL_METRIC, FN_VSCROLL_METRIC, SID_ATTR_LANGUAGE, SID_ATTR_LANGUAGE, SID_ATTR_CHAR_CJK_LANGUAGE, SID_ATTR_CHAR_CJK_LANGUAGE, SID_ATTR_CHAR_CTL_LANGUAGE, SID_ATTR_CHAR_CTL_LANGUAGE, #ifdef DBG_UTIL - FN_PARAM_SWTEST, FN_PARAM_SWTEST, + FN_PARAM_SWTEST, FN_PARAM_SWTEST, #endif 0); @@ -181,8 +182,8 @@ SfxItemSet* SwModule::CreateItemSet( USHORT nId ) } else { -/* Der Drucker wird jetzt von der TabPage erzeugt und auch geloescht - * SfxItemSet* pSet = new SfxItemSet( SFX_APP()->GetPool(), +/* Der Drucker wird jetzt von der TabPage erzeugt und auch geloescht + * SfxItemSet* pSet = new SfxItemSet( SFX_APP()->GetPool(), SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, 0 ); @@ -229,6 +230,7 @@ SfxItemSet* SwModule::CreateItemSet( USHORT nId ) pAppView->GetVLinealMetric(eUnit); pRet->Put(SfxUInt16Item( FN_VSCROLL_METRIC, static_cast< UINT16 >(eUnit) )); pRet->Put(SfxUInt16Item( SID_ATTR_METRIC, static_cast< UINT16 >(pPref->GetMetric()) )); + pRet->Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, pPref->IsApplyCharUnit())); if(bTextDialog) { if(pAppView) @@ -304,7 +306,7 @@ SfxItemSet* SwModule::CreateItemSet( USHORT nId ) --------------------------------------------------*/ if(!bTextDialog) pRet->Put(SfxUInt16Item(SID_HTML_MODE, HTMLMODE_ON)); -// delete pPrt; +// delete pPrt; return pRet; } /* -----------------12.02.99 12:28------------------- @@ -341,7 +343,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet ) if(!aViewOpt.IsViewMetaChars()) { - if( (!aViewOpt.IsTab( TRUE ) && pDocDispItem->bTab) || + if( (!aViewOpt.IsTab( TRUE ) && pDocDispItem->bTab) || (!aViewOpt.IsBlank( TRUE ) && pDocDispItem->bSpace) || (!aViewOpt.IsParagraph( TRUE ) && pDocDispItem->bParagraphEnd) || (!aViewOpt.IsLineBreak( TRUE ) && pDocDispItem->bManualBreak) ) @@ -379,6 +381,15 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet ) const SfxUInt16Item* pMetricItem = (const SfxUInt16Item*)pItem; ::SetDfltMetric((FieldUnit)pMetricItem->GetValue(), !bTextDialog); } + + if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_APPLYCHARUNIT, + FALSE, &pItem ) ) + { + SFX_APP()->SetOptions(rSet); + const SfxBoolItem* pCharItem = (const SfxBoolItem*)pItem; + ::SetApplyCharUnit(pCharItem->GetValue(), !bTextDialog); + } + if( SFX_ITEM_SET == rSet.GetItemState(FN_HSCROLL_METRIC, FALSE, &pItem ) ) { @@ -455,7 +466,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet ) } //-------------------------------------------------------------------------- - // Writer Drucker Zusatzeinstellungen auswerten + // Writer Drucker Zusatzeinstellungen auswerten //---------------------------------------------------------------------------- if( SFX_ITEM_SET == rSet.GetItemState( diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 3c14ed6c46f0..5a1b8601f785 100755 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -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 @@ -67,18 +67,18 @@ #include <swwait.hxx> #include <swprtopt.hxx> #include <frmatr.hxx> -#include <view.hxx> // fuer die aktuelle Sicht +#include <view.hxx> // fuer die aktuelle Sicht #include <edtwin.hxx> #include <PostItMgr.hxx> -#include <wrtsh.hxx> // Verbindung zur Core -#include <docsh.hxx> // Dokumenterzeugung +#include <wrtsh.hxx> // Verbindung zur Core +#include <docsh.hxx> // Dokumenterzeugung #include <basesh.hxx> #include <viewopt.hxx> #include <wdocsh.hxx> #include <swmodule.hxx> #include <globdoc.hxx> #include <usrpref.hxx> -#include <shellio.hxx> // I/O +#include <shellio.hxx> // I/O #include <docstyle.hxx> #include <doc.hxx> #include <docstat.hxx> @@ -97,7 +97,7 @@ #include <fldbas.hxx> #include <docary.hxx> // <-- -#include <swerror.h> // Fehlermeldungen +#include <swerror.h> // Fehlermeldungen #include <helpid.h> #include <cmdid.h> #include <globals.hrc> @@ -329,7 +329,7 @@ BOOL SwDocShell::Save() pView->GetEditWin().StopQuickHelp(); SwWait aWait( *this, TRUE ); - CalcLayoutForOLEObjects(); // format for OLE objets + CalcLayoutForOLEObjects(); // format for OLE objets // --> OD 2006-03-17 #i62875# // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible if ( pWrtShell && pDoc && @@ -460,7 +460,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium ) } } - CalcLayoutForOLEObjects(); // format for OLE objets + CalcLayoutForOLEObjects(); // format for OLE objets // --> OD 2006-03-17 #i62875# // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible if ( pWrtShell && pDoc && @@ -567,7 +567,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium ) WriterRef xWriter; SwReaderWriter::GetWriter( pFlt->GetUserData(), rMedium.GetBaseURL( true ), xWriter ); if( !xWriter.Is() ) - { // Der Filter ist nicht vorhanden + { // Der Filter ist nicht vorhanden InfoBox( 0, SW_RESSTR(STR_DLLNOTFOUND) ).Execute(); return FALSE; @@ -640,7 +640,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium ) SwDocStat aDocStat( pDoc->GetDocStat() );; pDoc->UpdateDocStat( aDocStat ); // <-- - CalcLayoutForOLEObjects(); // format for OLE objets + CalcLayoutForOLEObjects(); // format for OLE objets // --> OD 2006-03-17 #i62875# // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible if ( pWrtShell && pDoc && @@ -779,7 +779,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium ) SwWriter aWrt( rMedium, *pWrtShell, TRUE ); nErrno = aWrt.Write( xWriter, &aFileName ); //JP 16.05.97: falls der SFX uns die View waehrend des speicherns - // entzieht + // entzieht if( pWrtShell ) { pWrtShell->Pop(FALSE); @@ -814,7 +814,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium ) } /*-------------------------------------------------------------------- - Beschreibung: Haende weg + Beschreibung: Haende weg --------------------------------------------------------------------*/ @@ -882,7 +882,7 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup, if ( rSetup.GetPrinterName().Len() && ASPECT_THUMBNAIL != nAspect ) { pOrig = const_cast<JobSetup*>(pDoc->getJobsetup()); - if( pOrig ) // dann kopieren wir uns den + if( pOrig ) // dann kopieren wir uns den pOrig = new JobSetup( *pOrig ); pDoc->setJobsetup( rSetup ); } @@ -1042,7 +1042,7 @@ sal_uInt16 SwDocShell::GetHiddenInformationState( sal_uInt16 nStates ) void SwDocShell::GetState(SfxItemSet& rSet) { SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + USHORT nWhich = aIter.FirstWhich(); while (nWhich) { @@ -1051,11 +1051,11 @@ void SwDocShell::GetState(SfxItemSet& rSet) // MT: MakroChosser immer enablen, weil Neu moeglich // case SID_BASICCHOOSER: // { - // StarBASIC* pBasic = GetBasic(); - // StarBASIC* pAppBasic = SFX_APP()->GetBasic(); - // if ( !(pBasic->GetModules()->Count() || - // pAppBasic->GetModules()->Count()) ) - // rSet.DisableItem(nWhich); + // StarBASIC* pBasic = GetBasic(); + // StarBASIC* pAppBasic = SFX_APP()->GetBasic(); + // if ( !(pBasic->GetModules()->Count() || + // pAppBasic->GetModules()->Count()) ) + // rSet.DisableItem(nWhich); // } // break; case SID_PRINTPREVIEW: @@ -1064,7 +1064,7 @@ void SwDocShell::GetState(SfxItemSet& rSet) if ( !bDisable ) { SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this); - while (pTmpFrm) // Preview suchen + while (pTmpFrm) // Preview suchen { if ( PTR_CAST(SwView, pTmpFrm->GetViewShell()) && ((SwView*)pTmpFrm->GetViewShell())->GetWrtShell().getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE)) @@ -1156,15 +1156,15 @@ void SwDocShell::GetState(SfxItemSet& rSet) } /*-------------------------------------------------------------------- - Beschreibung: OLE-Hdls + Beschreibung: OLE-Hdls --------------------------------------------------------------------*/ IMPL_LINK( SwDocShell, Ole2ModifiedHdl, void *, p ) { // vom Doc wird der Status mitgegeben (siehe doc.cxx) - // Bit 0: -> alter Zustand - // Bit 1: -> neuer Zustand + // Bit 0: -> alter Zustand + // Bit 1: -> neuer Zustand long nStatus = (long)p; if( IsEnableSetModified() ) SetModified( (nStatus & 2) ? TRUE : FALSE ); @@ -1172,11 +1172,11 @@ IMPL_LINK( SwDocShell, Ole2ModifiedHdl, void *, p ) } /*-------------------------------------------------------------------- - Beschreibung: Pool returnen Hier weil virtuelll + Beschreibung: Pool returnen Hier weil virtuelll --------------------------------------------------------------------*/ -SfxStyleSheetBasePool* SwDocShell::GetStyleSheetPool() +SfxStyleSheetBasePool* SwDocShell::GetStyleSheetPool() { return mxBasePool.get(); } @@ -1339,7 +1339,7 @@ static const char* pEventNames[] = "OnLayoutFinished" }; -Sequence< OUString > SwDocShell::GetEventNames() +Sequence< OUString > SwDocShell::GetEventNames() { Sequence< OUString > aRet = SfxObjectShell::GetEventNames(); sal_Int32 nLen = aRet.getLength(); @@ -1375,13 +1375,13 @@ bool SwDocShell::IsChangeRecording() const return (pWrtShell->GetRedlineMode() & nsRedlineMode_t::REDLINE_ON) != 0; } - + bool SwDocShell::HasChangeRecordProtection() const { return pWrtShell->getIDocumentRedlineAccess()->GetRedlinePassword().getLength() > 0; } - + void SwDocShell::SetChangeRecording( bool bActivate ) { USHORT nOn = bActivate ? nsRedlineMode_t::REDLINE_ON : 0; @@ -1389,13 +1389,13 @@ void SwDocShell::SetChangeRecording( bool bActivate ) pWrtShell->SetRedlineModeAndCheckInsMode( (nMode & ~nsRedlineMode_t::REDLINE_ON) | nOn); } - + bool SwDocShell::SetProtectionPassword( const String &rNewPassword ) { const SfxAllItemSet aSet( GetPool() ); const SfxItemSet* pArgs = &aSet; const SfxPoolItem* pItem = NULL; - + IDocumentRedlineAccess* pIDRA = pWrtShell->getIDocumentRedlineAccess(); Sequence< sal_Int8 > aPasswd = pIDRA->GetRedlinePassword(); if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_REDLINE_PROTECT, FALSE, &pItem ) @@ -1403,12 +1403,12 @@ bool SwDocShell::SetProtectionPassword( const String &rNewPassword ) return false; bool bRes = false; - + if (rNewPassword.Len()) { // when password protection is applied change tracking must always be active SetChangeRecording( true ); - + Sequence< sal_Int8 > aNewPasswd; SvPasswordHelper::GetHashPassword( aNewPasswd, rNewPassword ); pIDRA->SetRedlinePassword( aNewPasswd ); @@ -1423,7 +1423,7 @@ bool SwDocShell::SetProtectionPassword( const String &rNewPassword ) return bRes; } - + bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) { bool bRes = false; @@ -1431,7 +1431,7 @@ bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal const SfxAllItemSet aSet( GetPool() ); const SfxItemSet* pArgs = &aSet; const SfxPoolItem* pItem = NULL; - + IDocumentRedlineAccess* pIDRA = pWrtShell->getIDocumentRedlineAccess(); Sequence< sal_Int8 > aPasswdHash( pIDRA->GetRedlinePassword() ); if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_REDLINE_PROTECT, FALSE, &pItem ) @@ -1441,6 +1441,6 @@ bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal bRes = true; return bRes; -} - +} + diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index c84a0eb2d035..b0ae69370f74 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -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 @@ -76,8 +76,8 @@ #include <swunodef.hxx> #include <fmtcol.hxx> #include <swevent.hxx> -#include <view.hxx> // fuer die aktuelle Sicht -#include <docsh.hxx> // Dokumenterzeugung +#include <view.hxx> // fuer die aktuelle Sicht +#include <docsh.hxx> // Dokumenterzeugung #include <wrtsh.hxx> #include <fldbas.hxx> #include <viewopt.hxx> @@ -132,7 +132,7 @@ #include "dialog.hrc" #include "swabstdlg.hxx" -#include <ndtxt.hxx> //#outline level,add by zhaojianwei +#include <ndtxt.hxx> //#outline level,add by zhaojianwei using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::lang; @@ -143,7 +143,7 @@ using namespace ::sfx2; extern BOOL FindPhyStyle( SwDoc& , const String& , SfxStyleFamily ); /*-------------------------------------------------------------------- - Beschreibung: DocInfo kreieren (virtuell) + Beschreibung: DocInfo kreieren (virtuell) --------------------------------------------------------------------*/ SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog( @@ -176,7 +176,7 @@ void SwDocShell::DoFlushDocInfo() bool bUnlockView(true); if ( pWrtShell ) { bUnlockView = !pWrtShell->IsViewLocked(); - pWrtShell->LockView( TRUE ); // lock visible section + pWrtShell->LockView( TRUE ); // lock visible section pWrtShell->StartAllAction(); } @@ -212,7 +212,7 @@ void lcl_processCompatibleSfxHint( const uno::Reference< script::vba::XVBAEventP #endif /*-------------------------------------------------------------------- - Beschreibung: Benachrichtigung bei geaenderter DocInfo + Beschreibung: Benachrichtigung bei geaenderter DocInfo --------------------------------------------------------------------*/ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) @@ -220,7 +220,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if( !pDoc ) { //MA: Kommt bei der OLE-Registration vor! -// ASSERT( !this, "DocShell ist nicht richtig initialisiert!" ); +// ASSERT( !this, "DocShell ist nicht richtig initialisiert!" ); return ; } @@ -256,7 +256,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if( pWrtShell ) { bUnlockView = !pWrtShell->IsViewLocked(); - pWrtShell->LockView( TRUE ); //lock visible section + pWrtShell->LockView( TRUE ); //lock visible section pWrtShell->StartAllAction(); } switch( nAction ) @@ -301,7 +301,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) } /*-------------------------------------------------------------------- - Beschreibung: Benachrichtigung Doc schliessen + Beschreibung: Benachrichtigung Doc schliessen --------------------------------------------------------------------*/ USHORT SwDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing ) @@ -320,24 +320,24 @@ USHORT SwDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing ) using namespace com::sun::star::script::vba::VBAEventId; uno::Sequence< uno::Any > aArgs; xVbaEvents->processVbaEvent( DOCUMENT_CLOSE, aArgs ); - } - } + } + } #endif return nRet; } /*-------------------------------------------------------------------- - Beschreibung: Organizer + Beschreibung: Organizer --------------------------------------------------------------------*/ BOOL SwDocShell::Insert( SfxObjectShell &rSource, - USHORT nSourceIdx1, // SourcePool: oberste Inhaltsebene (Vorlagen/Makros) - USHORT nSourceIdx2, // Index in den Inhalt - USHORT nSourceIdx3, // Index in die Inhaltsebene - USHORT &rIdx1, // und das gleiche fuer den DestinationPool - USHORT &rIdx2, // "" - USHORT &rIdx3, // "" - USHORT &rRemovedIdx ) // falls doppelte geloescht werden, Pos zurueck + USHORT nSourceIdx1, // SourcePool: oberste Inhaltsebene (Vorlagen/Makros) + USHORT nSourceIdx2, // Index in den Inhalt + USHORT nSourceIdx3, // Index in die Inhaltsebene + USHORT &rIdx1, // und das gleiche fuer den DestinationPool + USHORT &rIdx2, // "" + USHORT &rIdx3, // "" + USHORT &rRemovedIdx ) // falls doppelte geloescht werden, Pos zurueck { // --> OD 2005-05-10 #i48949# - actions aren't undoable. Thus, allow no undo // actions @@ -357,7 +357,7 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource, SwDocStyleSheetPool* pMyPool = (SwDocStyleSheetPool*)GetStyleSheetPool(); - // wir koennen nicht in uns selbst hin und her moven + // wir koennen nicht in uns selbst hin und her moven if( pHisPool == pMyPool ) return FALSE; @@ -433,7 +433,7 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource, pMyPool->SetSearchMask( SFX_STYLE_FAMILY_ALL, nMySrchMask ); - if( xNewSheet->IsUserDefined() || xNewSheet->IsUsed() ) + if( xNewSheet->IsUserDefined() || xNewSheet->IsUsed() ) { // Benutzte und Benutzer-definierte Vorlagen werden angezeigt. // Dshalb muss hier der Index der neuen Vorlage im Pool @@ -458,7 +458,7 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource, rIdx1 = rIdx2 = INDEX_IGNORE; } -/* pMyPool->Count(); //interne Liste neu fuellen lassen!!!!! +/* pMyPool->Count(); //interne Liste neu fuellen lassen!!!!! // suchen, um die richige Insert-Position returnen zu koennen pMyPool->Find( rOldName, SFX_STYLE_FAMILY_ALL, nMySrchMask ); @@ -472,14 +472,14 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource, while (pTestSheet) { if (pTestSheet->GetFamily() == eOldFamily && - pTestSheet->HasParentSupport() && + pTestSheet->HasParentSupport() && pTestSheet->GetParent() == rOldName) { pTestSheet->SetParent(rOldName); // Verknuepfung neu aufbauen } if (pTestSheet->GetFamily() == eOldFamily && - pTestSheet->HasFollowSupport() && + pTestSheet->HasFollowSupport() && pTestSheet->GetFollow() == rOldName) { pTestSheet->SetFollow(rOldName); // Verknuepfung neu aufbauen @@ -553,10 +553,10 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource, } /*-------------------------------------------------------------------- - Beschreibung: Vorlagen Remove + Beschreibung: Vorlagen Remove --------------------------------------------------------------------*/ -BOOL SwDocShell::Remove(USHORT nIdx1, // siehe Insert +BOOL SwDocShell::Remove(USHORT nIdx1, // siehe Insert USHORT nIdx2, USHORT nIdx3) { @@ -566,7 +566,7 @@ BOOL SwDocShell::Remove(USHORT nIdx1, // siehe Insert { SwDocStyleSheetPool* pMyPool = (SwDocStyleSheetPool*)GetStyleSheetPool(); - pMyPool->First(); // vorm Zugriff Pool aktualisieren!! + pMyPool->First(); // vorm Zugriff Pool aktualisieren!! SfxStyleSheetBase* pMySheet = (*pMyPool)[nIdx2]; String aName( pMySheet->GetName() ); @@ -590,14 +590,14 @@ BOOL SwDocShell::Remove(USHORT nIdx1, // siehe Insert while (pTestSheet) { if (pTestSheet->GetFamily() == eFamily && - pTestSheet->HasParentSupport() && + pTestSheet->HasParentSupport() && pTestSheet->GetParent() == aName) { pTestSheet->SetParent( aEmptyStr ); // Verknuepfung aufloesen } if (pTestSheet->GetFamily() == eFamily && - pTestSheet->HasFollowSupport() && + pTestSheet->HasFollowSupport() && pTestSheet->GetFollow() == aName) { pTestSheet->SetFollow( aEmptyStr ); // Verknuepfung aufloesen @@ -610,7 +610,7 @@ BOOL SwDocShell::Remove(USHORT nIdx1, // siehe Insert bRet = TRUE; } else - bRet = SfxObjectShell::Remove( nIdx1, + bRet = SfxObjectShell::Remove( nIdx1, nIdx2, nIdx3 ); @@ -710,7 +710,7 @@ void SwDocShell::Execute(SfxRequest& rReq) SwView* pCurrView = dynamic_cast< SwView *> ( pViewShell ); BOOL bCurrent = IS_TYPE( SwPagePreView, pViewShell ); - while( pTmpFrm ) // search PreView + while( pTmpFrm ) // search PreView { if( IS_TYPE( SwView, pTmpFrm->GetViewShell()) ) bOnly = FALSE; @@ -731,7 +731,7 @@ void SwDocShell::Execute(SfxRequest& rReq) bSet = !bCurrent; USHORT nSlotId = 0; - if( bSet && !bFound ) // Keine gefunden, daher neue Preview anlegen + if( bSet && !bFound ) // Keine gefunden, daher neue Preview anlegen { //Keine neue anlegen fuer BrowseView! if( !GetDoc()->get(IDocumentSettingAccess::BROWSE_MODE) ) @@ -743,7 +743,7 @@ void SwDocShell::Execute(SfxRequest& rReq) if( nSlotId ) { //JP 23.8.2001: Bug 91360 - PagePreView in the WebDocShell - // is found under Id ViewShell2. + // is found under Id ViewShell2. if( ISA(SwWebDocShell) && SID_VIEWSHELL1 == nSlotId ) nSlotId = SID_VIEWSHELL2; @@ -951,7 +951,7 @@ void SwDocShell::Execute(SfxRequest& rReq) SvxMacro aMac(aEmptyStr, aEmptyStr, STARBASIC); pEvent->ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_OPENDOC ), aMac, this); pEvent->ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_PREPARECLOSEDOC ), aMac, this); - pEvent->ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_ACTIVATEDOC ), aMac, this); + pEvent->ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_ACTIVATEDOC ), aMac, this); pEvent->ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_DEACTIVATEDOC ), aMac, this); ReloadFromHtml(aTempFile.GetURL(), pSrcView); nSlot = 0; @@ -961,7 +961,7 @@ void SwDocShell::Execute(SfxRequest& rReq) nSlot = SID_VIEWSHELL0; } } -/* OS 10.04.97 14.20: Im Web-Writer gibt es keinen Unterschied zwischen +/* OS 10.04.97 14.20: Im Web-Writer gibt es keinen Unterschied zwischen Export in den SourceMode und dem Speichern des Docs else if(IsModified()) { @@ -1156,7 +1156,7 @@ void SwDocShell::Execute(SfxRequest& rReq) break; case SID_BROWSER_MODE: - case FN_PRINT_LAYOUT: //Fuer Web, genau umgekehrt zum BrowserMode + case FN_PRINT_LAYOUT: //Fuer Web, genau umgekehrt zum BrowserMode { int eState = STATE_TOGGLE; BOOL bSet = sal_True; @@ -1184,16 +1184,16 @@ void SwDocShell::Execute(SfxRequest& rReq) SID_HTML_MODE, SID_RULER_PROTECT, SID_AUTOSPELL_CHECK, - FN_RULER, /*20211*/ + FN_RULER, /*20211*/ FN_VIEW_GRAPHIC, /*20213*/ - FN_VIEW_BOUNDS, /**/ + FN_VIEW_BOUNDS, /**/ FN_VIEW_FIELDS, /*20215*/ FN_VLINEAL, /*20216*/ FN_VSCROLLBAR, /*20217*/ FN_HSCROLLBAR, /*20218*/ FN_VIEW_META_CHARS, /**/ - FN_VIEW_MARKS, /**/ - FN_VIEW_FIELDNAME, /**/ + FN_VIEW_MARKS, /**/ + FN_VIEW_FIELDNAME, /**/ FN_VIEW_TABLEGRID, /*20227*/ FN_PRINT_LAYOUT, /*20237*/ FN_QRY_MERGE, /*20364*/ @@ -1225,8 +1225,8 @@ void SwDocShell::Execute(SfxRequest& rReq) bDone = FALSE; BOOL bCreateHtml = FN_NEW_HTML_DOC == nWhich; - BOOL bCreateByOutlineLevel = false; //#outline level,add by zhaojianwei - sal_Int32 nTemplateOutlineLevel = 0 ; //#outline level,add by zhaojianwei + BOOL bCreateByOutlineLevel = false; //#outline level,add by zhaojianwei + sal_Int32 nTemplateOutlineLevel = 0 ; //#outline level,add by zhaojianwei String aFileName, aTemplateName; if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich, FALSE, &pItem ) ) @@ -1317,8 +1317,8 @@ void SwDocShell::Execute(SfxRequest& rReq) // *pDoc->GetTxtFmtColls()->GetObject( i ); // if( !rTxtColl.IsDefault() && rTxtColl.IsAtDocNodeSet() ) // { - // //if( MAXLEVEL >= rTxtColl.GetOutlineLevel() && ( !pFnd || //#outline level,zhaojianwei - //if( rTxtColl.IsAssignedToListLevelOfOutlineStyle() && ( !pFnd || //<-end,zhaojianwei + // //if( MAXLEVEL >= rTxtColl.GetOutlineLevel() && ( !pFnd || //#outline level,zhaojianwei + //if( rTxtColl.IsAssignedToListLevelOfOutlineStyle() && ( !pFnd || //<-end,zhaojianwei // pFnd->GetAssignedOutlineStyleLevel() > rTxtColl.GetAssignedOutlineStyleLevel() )) // { // nSelect = (sal_Int16)nIdx; @@ -1327,8 +1327,8 @@ void SwDocShell::Execute(SfxRequest& rReq) // } // else if( !pAny ) // pAny = &rTxtColl; - // //pEntries[nIdx++] = rTxtColl.GetName(); //#outline level,remove by zhaojianwei - // pEntries[nIdx++] = sStyles + rTxtColl.GetName(); //#outline level,add by zhaojianwei + // //pEntries[nIdx++] = rTxtColl.GetName(); //#outline level,remove by zhaojianwei + // pEntries[nIdx++] = sStyles + rTxtColl.GetName(); //#outline level,add by zhaojianwei // } // } // if(!sStartTemplate.getLength() && pAny) @@ -1340,7 +1340,7 @@ void SwDocShell::Execute(SfxRequest& rReq) //#outline level,add by zhaojianwei ///////////////////////////////////////////////////////////////////// - bool bOutline[MAXLEVEL] = {false}; + bool bOutline[MAXLEVEL] = {false}; const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds(); if( rOutlNds.Count() ) { @@ -1356,16 +1356,16 @@ void SwDocShell::Execute(SfxRequest& rReq) const USHORT nStyleCount = pDoc->GetTxtFmtColls()->Count(); Sequence<OUString> aListBoxEntries( MAXLEVEL + nStyleCount); OUString* pEntries = aListBoxEntries.getArray(); - sal_Int32 nIdx = 0 ; + sal_Int32 nIdx = 0 ; - OUString sOutline( SW_RESSTR(STR_FDLG_OUTLINE_LEVEL) ); + OUString sOutline( SW_RESSTR(STR_FDLG_OUTLINE_LEVEL) ); for( USHORT i = 0; i < MAXLEVEL; ++i ) { if( bOutline[i] ) pEntries[nIdx++] = sOutline + String::CreateFromInt32( i+1 ); } - OUString sStyle( SW_RESSTR(STR_FDLG_STYLE) ); + OUString sStyle( SW_RESSTR(STR_FDLG_STYLE) ); for(USHORT i = 0; i < nStyleCount; ++i) { SwTxtFmtColl &rTxtColl = @@ -1409,18 +1409,18 @@ void SwDocShell::Execute(SfxRequest& rReq) ListboxControlActions::GET_SELECTED_ITEM ); OUString sTmpl; aTemplateValue >>= sTmpl; - //aTemplateName = sTmpl; //#outline level,removed by zhaojianwei + //aTemplateName = sTmpl; //#outline level,removed by zhaojianwei //#outline level,add by zhaojianwei sal_Int32 nColonPos = sTmpl.indexOf( sal_Unicode(':') ); OUString sPrefix = sTmpl.copy( 0L, nColonPos ); if( sPrefix.equalsAscii("Style")) { - aTemplateName = sTmpl.copy( 7L ); //get string behind "Style: " + aTemplateName = sTmpl.copy( 7L ); //get string behind "Style: " } else if( sPrefix.equalsAscii("Outline")) { - nTemplateOutlineLevel = ( sTmpl.copy( 15L )).toInt32(); //get string behind "Outline: Leve "; + nTemplateOutlineLevel = ( sTmpl.copy( 15L )).toInt32(); //get string behind "Outline: Leve "; bCreateByOutlineLevel = true; } //<-end,zhaojianwei @@ -1435,7 +1435,7 @@ void SwDocShell::Execute(SfxRequest& rReq) } } - //const SwTxtFmtColl* pSplitColl = 0; //#outline level,removed by zhaojianwei + //const SwTxtFmtColl* pSplitColl = 0; //#outline level,removed by zhaojianwei // if ( aTemplateName.Len() ) // pSplitColl = pDoc->FindTxtFmtCollByName(aTemplateName); //<-end,zhaojianwei @@ -1445,12 +1445,12 @@ void SwDocShell::Execute(SfxRequest& rReq) { SwWait aWait( *this, TRUE ); - //bDone = bCreateHtml //#outline level,removed by zhaojianwei - // ? pDoc->GenerateHTMLDoc( aFileName, pSplitColl ) - // : pDoc->GenerateGlobalDoc( aFileName, pSplitColl ); - if ( bCreateByOutlineLevel ) //add by zhaojianwei + //bDone = bCreateHtml //#outline level,removed by zhaojianwei + // ? pDoc->GenerateHTMLDoc( aFileName, pSplitColl ) + // : pDoc->GenerateGlobalDoc( aFileName, pSplitColl ); + if ( bCreateByOutlineLevel ) //add by zhaojianwei { - bDone = bCreateHtml //#outline level,removed by zhaojianwei + bDone = bCreateHtml //#outline level,removed by zhaojianwei ? pDoc->GenerateHTMLDoc( aFileName, nTemplateOutlineLevel ) : pDoc->GenerateGlobalDoc( aFileName, nTemplateOutlineLevel ); } @@ -1459,7 +1459,7 @@ void SwDocShell::Execute(SfxRequest& rReq) const SwTxtFmtColl* pSplitColl = 0; if ( aTemplateName.Len() ) pSplitColl = pDoc->FindTxtFmtCollByName(aTemplateName); - bDone = bCreateHtml //#outline level,removed by zhaojianwei + bDone = bCreateHtml //#outline level,removed by zhaojianwei ? pDoc->GenerateHTMLDoc( aFileName, pSplitColl ) : pDoc->GenerateGlobalDoc( aFileName, pSplitColl ); } @@ -1577,14 +1577,14 @@ void SwDocShell::FillClass( SvGlobalName * pClassName, { if (nVersion == SOFFICE_FILEFORMAT_60) { - *pClassName = SvGlobalName( SO3_SW_CLASSID_60 ); - *pClipFormat = SOT_FORMATSTR_ID_STARWRITER_60; + *pClassName = SvGlobalName( SO3_SW_CLASSID_60 ); + *pClipFormat = SOT_FORMATSTR_ID_STARWRITER_60; *pLongUserName = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE); } else if (nVersion == SOFFICE_FILEFORMAT_8) { - *pClassName = SvGlobalName( SO3_SW_CLASSID_60 ); - *pClipFormat = bTemplate ? SOT_FORMATSTR_ID_STARWRITER_8_TEMPLATE : SOT_FORMATSTR_ID_STARWRITER_8; + *pClassName = SvGlobalName( SO3_SW_CLASSID_60 ); + *pClipFormat = bTemplate ? SOT_FORMATSTR_ID_STARWRITER_8_TEMPLATE : SOT_FORMATSTR_ID_STARWRITER_8; *pLongUserName = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE); } @@ -1674,8 +1674,8 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView // geladen wurde. SvxHtmlOptions* pHtmlOptions = SvxHtmlOptions::Get(); //#59620# HasBasic() zeigt an, dass es schon einen BasicManager an der DocShell - // gibt. Der wurde im HTML-Import immer angelegt, wenn Macros im Quelltext - // vorhanden sind. + // gibt. Der wurde im HTML-Import immer angelegt, wenn Macros im Quelltext + // vorhanden sind. if( pHtmlOptions && pHtmlOptions->IsStarBasic() && HasBasic()) { BasicManager *pBasicMan = GetBasicManager(); @@ -1726,7 +1726,7 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView const String& rMedname = GetMedium()->GetName(); // fix #51032#: Die HTML-Vorlage muss noch gesetzt werden - SetHTMLTemplate( *GetDoc() ); //Styles aus HTML.vor + SetHTMLTemplate( *GetDoc() ); //Styles aus HTML.vor SfxViewShell* pViewShell = GetView() ? (SfxViewShell*)GetView() : SfxViewShell::Current(); diff --git a/sw/source/ui/app/docshdrw.cxx b/sw/source/ui/app/docshdrw.cxx index cd6d2aee296d..fcca30ab44a1 100644 --- a/sw/source/ui/app/docshdrw.cxx +++ b/sw/source/ui/app/docshdrw.cxx @@ -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/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index c201109ca1cb..4b0e3575a63d 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -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,13 +124,13 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) sal_Bool bHTMLTemplSet = sal_False; if( bRet ) { - AddLink(); // pDoc / pIo ggf. anlegen + AddLink(); // pDoc / pIo ggf. anlegen sal_Bool bWeb = ISA( SwWebDocShell ); if ( bWeb ) bHTMLTemplSet = SetHTMLTemplate( *GetDoc() );//Styles aus HTML.vor else if( ISA( SwGlobalDocShell ) ) - GetDoc()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); // Globaldokument + GetDoc()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); // Globaldokument /* @@ -368,7 +368,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) } /*-------------------------------------------------------------------- - Beschreibung: Ctor mit SfxCreateMode ????? + Beschreibung: Ctor mit SfxCreateMode ????? --------------------------------------------------------------------*/ @@ -425,7 +425,7 @@ SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ): } /*-------------------------------------------------------------------- - Beschreibung: Dtor + Beschreibung: Dtor --------------------------------------------------------------------*/ @@ -490,7 +490,7 @@ void SwDocShell::AddLink() } else pDoc->acquire(); - pDoc->SetDocShell( this ); // am Doc den DocShell-Pointer setzen + pDoc->SetDocShell( this ); // am Doc den DocShell-Pointer setzen uno::Reference< text::XTextDocument > xDoc(GetBaseModel(), uno::UNO_QUERY); ((SwXTextDocument*)xDoc.get())->Reactivate(this); @@ -501,7 +501,7 @@ void SwDocShell::AddLink() } /*-------------------------------------------------------------------- - Beschreibung: neue FontList erzeugen Aenderung Drucker + Beschreibung: neue FontList erzeugen Aenderung Drucker --------------------------------------------------------------------*/ @@ -591,9 +591,9 @@ sal_Bool SwDocShell::Load( SfxMedium& rMedium ) sal_uInt32 nErr = ERR_SWG_READ_ERROR; switch( GetCreateMode() ) { -// case SFX_CREATE_MODE_INTERNAL: -// nErr = 0; -// break; +// case SFX_CREATE_MODE_INTERNAL: +// nErr = 0; +// break; case SFX_CREATE_MODE_ORGANIZER: { @@ -693,9 +693,9 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium ) if( pDoc ) RemoveLink(); - AddLink(); // Link setzen und Daten updaten !! + AddLink(); // Link setzen und Daten updaten !! - do { // middle check loop + do { // middle check loop sal_uInt32 nErr = ERR_SWG_READ_ERROR; //const String& rNm = pStor->GetName(); String aStreamName; @@ -763,7 +763,7 @@ void SwDocShell::SubInitNew() sal_Bool bWeb = ISA(SwWebDocShell); - sal_uInt16 nRange[] = { + sal_uInt16 nRange[] = { RES_PARATR_ADJUST, RES_PARATR_ADJUST, RES_CHRATR_COLOR, RES_CHRATR_COLOR, RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE, diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index d06ab31b7478..487d83b6f074 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -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 @@ -71,7 +71,7 @@ #include "docstyle.hxx" #include "uiitems.hxx" #include "fmtcol.hxx" -#include "frmmgr.hxx" //SwFrmValid +#include "frmmgr.hxx" //SwFrmValid #include "swevent.hxx" #include "edtwin.hxx" #include "unochart.hxx" @@ -83,7 +83,7 @@ #include <list.hxx> // <-- -#include <paratr.hxx> //#outline level,add by zhaojianwei +#include <paratr.hxx> //#outline level,add by zhaojianwei using namespace ::com::sun::star; @@ -95,7 +95,7 @@ using namespace ::com::sun::star; void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) { SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + USHORT nWhich = aIter.FirstWhich(); USHORT nActualFamily = USHRT_MAX; SwWrtShell* pShell = pSh ? pSh : GetWrtShell(); @@ -170,12 +170,12 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) { const int nSelection = pShell->GetFrmType(0,TRUE); if(pShell->GetCurTOX()) - nMask = SWSTYLEBIT_IDX ; - else if(nSelection & FRMTYPE_HEADER || - nSelection & FRMTYPE_FOOTER || - nSelection & FRMTYPE_TABLE || - nSelection & FRMTYPE_FLY_ANY || - nSelection & FRMTYPE_FOOTNOTE || + nMask = SWSTYLEBIT_IDX ; + else if(nSelection & FRMTYPE_HEADER || + nSelection & FRMTYPE_FOOTER || + nSelection & FRMTYPE_TABLE || + nSelection & FRMTYPE_FLY_ANY || + nSelection & FRMTYPE_FOOTNOTE || nSelection & FRMTYPE_FTNPAGE) nMask = SWSTYLEBIT_EXTRA; else @@ -265,14 +265,14 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) /*-------------------------------------------------------------------- - Beschreibung: StyleSheet-Requeste auswerten + Beschreibung: StyleSheet-Requeste auswerten --------------------------------------------------------------------*/ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) { - USHORT nSlot = rReq.GetSlot(); - USHORT nRet = 0xffff; + USHORT nSlot = rReq.GetSlot(); + USHORT nRet = 0xffff; const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; @@ -506,7 +506,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) } /*-------------------------------------------------------------------- - Beschreibung: Edit + Beschreibung: Edit --------------------------------------------------------------------*/ @@ -635,7 +635,7 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam xTmp->MergeIndentAttrsOfListStyle( rSet ); // <-- } -/* else if( SFX_STYLE_FAMILY_FRAME == nFamily ) +/* else if( SFX_STYLE_FAMILY_FRAME == nFamily ) { // Auskommentiert wegen Bug #45776 (per default keine Breite&Groesse in Rahmenvorlagen) SfxItemSet& rSet = aTmp.GetItemSet(); @@ -750,7 +750,7 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam delete pDlg; pDoc->SetModified(); - if( !bModified ) // Bug 57028 + if( !bModified ) // Bug 57028 pDoc->SetUndoNoResetModified(); GetWrtShell()->EndAllAction(); @@ -813,7 +813,7 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam mxBasePool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CREATED, *xTmp.get() ) ); pDoc->SetModified(); - if( !bModified ) // Bug 57028 + if( !bModified ) // Bug 57028 pDoc->SetUndoNoResetModified(); GetWrtShell()->EndAllAction(); } @@ -822,7 +822,7 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam } /*-------------------------------------------------------------------- - Beschreibung: Delete + Beschreibung: Delete --------------------------------------------------------------------*/ @@ -844,7 +844,7 @@ USHORT SwDocShell::Delete(const String &rName, USHORT nFamily) } /*-------------------------------------------------------------------- - Beschreibung: Vorlage anwenden + Beschreibung: Vorlage anwenden --------------------------------------------------------------------*/ @@ -914,7 +914,7 @@ USHORT SwDocShell::ApplyStyles(const String &rName, USHORT nFamily, } /*-------------------------------------------------------------------- - Beschreibung: Giesskanne starten + Beschreibung: Giesskanne starten --------------------------------------------------------------------*/ @@ -971,7 +971,7 @@ USHORT SwDocShell::DoWaterCan(const String &rName, USHORT nFamily) } /*-------------------------------------------------------------------- - Beschreibung: Vorlage Updaten + Beschreibung: Vorlage Updaten --------------------------------------------------------------------*/ @@ -1065,7 +1065,7 @@ USHORT SwDocShell::UpdateStyle(const String &rName, USHORT nFamily, SwWrtShell* } /*-------------------------------------------------------------------- - Beschreibung: NewByExample + Beschreibung: NewByExample --------------------------------------------------------------------*/ @@ -1078,7 +1078,7 @@ USHORT SwDocShell::MakeByExample( const String &rName, USHORT nFamily, if(!pStyle) { // JP 07.07.95: behalte die akt. Maske vom PI bei, dadurch werden - // neue sofort in den sichtbaren Bereich einsortiert + // neue sofort in den sichtbaren Bereich einsortiert if( SFXSTYLEBIT_ALL == nMask || SFXSTYLEBIT_USED == nMask ) nMask = SFXSTYLEBIT_USERDEF; else @@ -1145,7 +1145,7 @@ USHORT SwDocShell::MakeByExample( const String &rName, USHORT nFamily, pFrm->SetDerivedFrom( pFFmt ); // JP 10.06.98: nur automatische Orientierungen uebernehmen -/* #61359# jetzt auch wieder alle Orientierungen +/* #61359# jetzt auch wieder alle Orientierungen const SfxPoolItem* pItem; if( SFX_ITEM_SET == aSet.GetItemState( RES_VERT_ORIENT, FALSE, &pItem ) && @@ -1241,7 +1241,7 @@ void SwDocShell::LoadStyles( SfxObjectShell& rSource ) --------------------------------------------------*/ void SwDocShell::_LoadStyles( SfxObjectShell& rSource, BOOL bPreserveCurrentDocument ) { -/* [Beschreibung] +/* [Beschreibung] Diese Methode wird vom SFx gerufen, wenn aus einer Dokument-Vorlage Styles nachgeladen werden sollen. Bestehende Styles soll dabei @@ -1256,8 +1256,8 @@ void SwDocShell::_LoadStyles( SfxObjectShell& rSource, BOOL bPreserveCurrentDocu if( rSource.ISA( SwDocShell )) { //JP 28.05.99: damit die Kopf-/Fusszeilen nicht den fixen Inhalt - // der Vorlage erhalten, einmal alle FixFelder der - // Source aktualisieren + // der Vorlage erhalten, einmal alle FixFelder der + // Source aktualisieren if(!bPreserveCurrentDocument) ((SwDocShell&)rSource).pDoc->SetFixFields(false, NULL); if( pWrtShell ) @@ -1283,7 +1283,7 @@ void SwDocShell::_LoadStyles( SfxObjectShell& rSource, BOOL bPreserveCurrentDocu } -void SwDocShell::FormatPage( const String& rPage, BOOL bColumn, SwWrtShell* pActShell ) +void SwDocShell::FormatPage( const String& rPage, BOOL bColumn, SwWrtShell* pActShell ) { Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, FALSE, bColumn, pActShell); } diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index b0b81c5df6e4..b368f2fce65f 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -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 @@ -74,11 +74,11 @@ // MD 06.02.95: Die Formatnamen in der Liste aller Namen haben als // erstes Zeichen die Familie: -#define cCHAR (sal_Unicode)'c' -#define cPARA (sal_Unicode)'p' -#define cFRAME (sal_Unicode)'f' -#define cPAGE (sal_Unicode)'g' -#define cNUMRULE (sal_Unicode)'n' +#define cCHAR (sal_Unicode)'c' +#define cPARA (sal_Unicode)'p' +#define cFRAME (sal_Unicode)'f' +#define cPAGE (sal_Unicode)'g' +#define cNUMRULE (sal_Unicode)'n' // Dieses Zeichen wird bei der Herausgabe der Namen wieder entfernt und // die Familie wird neu generiert. @@ -122,16 +122,16 @@ SwImplShellAction::~SwImplShellAction() } /*-------------------------------------------------------------------- - Beschreibung: SwCharFormate finden/anlegen + Beschreibung: SwCharFormate finden/anlegen evtl. Style fuellen --------------------------------------------------------------------*/ -SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc, +SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc, const String& rName, SwDocStyleSheet* pStyle = 0, BOOL bCreate = TRUE ) { - SwCharFmt* pFmt = 0; + SwCharFmt* pFmt = 0; if( rName.Len() ) { pFmt = rDoc.FindCharFmtByName( rName ); @@ -143,7 +143,7 @@ SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc, } if( !pFmt && bCreate ) - { // Pool abklappern + { // Pool abklappern const USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT); if(nId != USHRT_MAX) pFmt = rDoc.GetCharFmtFromPool(nId); @@ -168,22 +168,22 @@ SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc, /*-------------------------------------------------------------------- - Beschreibung: ParaFormate finden/erzeugen + Beschreibung: ParaFormate finden/erzeugen Style fuellen --------------------------------------------------------------------*/ -SwTxtFmtColl* lcl_FindParaFmt( SwDoc& rDoc, +SwTxtFmtColl* lcl_FindParaFmt( SwDoc& rDoc, const String& rName, SwDocStyleSheet* pStyle = 0, BOOL bCreate = TRUE ) { - SwTxtFmtColl* pColl = 0; + SwTxtFmtColl* pColl = 0; if( rName.Len() ) { pColl = rDoc.FindTxtFmtCollByName( rName ); if( !pColl && bCreate ) - { // Pool abklappern + { // Pool abklappern const USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL); if(nId != USHRT_MAX) pColl = rDoc.GetTxtCollFromPool(nId); @@ -211,11 +211,11 @@ SwTxtFmtColl* lcl_FindParaFmt( SwDoc& rDoc, /*-------------------------------------------------------------------- - Beschreibung: Rahmenformate + Beschreibung: Rahmenformate --------------------------------------------------------------------*/ -SwFrmFmt* lcl_FindFrmFmt( SwDoc& rDoc, +SwFrmFmt* lcl_FindFrmFmt( SwDoc& rDoc, const String& rName, SwDocStyleSheet* pStyle = 0, BOOL bCreate = TRUE ) @@ -225,7 +225,7 @@ SwFrmFmt* lcl_FindFrmFmt( SwDoc& rDoc, { pFmt = rDoc.FindFrmFmtByName( rName ); if( !pFmt && bCreate ) - { // Pool abklappern + { // Pool abklappern const USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_FRMFMT); if(nId != USHRT_MAX) pFmt = rDoc.GetFrmFmtFromPool(nId); @@ -249,12 +249,12 @@ SwFrmFmt* lcl_FindFrmFmt( SwDoc& rDoc, } /*-------------------------------------------------------------------- - Beschreibung: Seitendescriptoren + Beschreibung: Seitendescriptoren --------------------------------------------------------------------*/ -const SwPageDesc* lcl_FindPageDesc( SwDoc& rDoc, - const String& rName, +const SwPageDesc* lcl_FindPageDesc( SwDoc& rDoc, + const String& rName, SwDocStyleSheet* pStyle = 0, BOOL bCreate = TRUE ) { @@ -287,8 +287,8 @@ const SwPageDesc* lcl_FindPageDesc( SwDoc& rDoc, return pDesc; } -const SwNumRule* lcl_FindNumRule( SwDoc& rDoc, - const String& rName, +const SwNumRule* lcl_FindNumRule( SwDoc& rDoc, + const String& rName, SwDocStyleSheet* pStyle = 0, BOOL bCreate = TRUE ) { @@ -328,11 +328,11 @@ USHORT lcl_FindName( const SwPoolFmtList& rLst, SfxStyleFamily eFam, String sSrch( ' ' ); switch( eFam ) { - case SFX_STYLE_FAMILY_CHAR: sSrch = cCHAR; break; - case SFX_STYLE_FAMILY_PARA: sSrch = cPARA; break; - case SFX_STYLE_FAMILY_FRAME: sSrch = cFRAME; break; - case SFX_STYLE_FAMILY_PAGE: sSrch = cPAGE; break; - case SFX_STYLE_FAMILY_PSEUDO: sSrch = cNUMRULE; break; + case SFX_STYLE_FAMILY_CHAR: sSrch = cCHAR; break; + case SFX_STYLE_FAMILY_PARA: sSrch = cPARA; break; + case SFX_STYLE_FAMILY_FRAME: sSrch = cFRAME; break; + case SFX_STYLE_FAMILY_PAGE: sSrch = cPAGE; break; + case SFX_STYLE_FAMILY_PSEUDO: sSrch = cNUMRULE; break; default:; //prevent warning } sSrch += rName; @@ -364,7 +364,7 @@ BOOL FindPhyStyle( SwDoc& rDoc, const String& rName, SfxStyleFamily eFam ) /*-------------------------------------------------------------------- - Beschreibung: Einfuegen von Strings in die Liste der Vorlagen + Beschreibung: Einfuegen von Strings in die Liste der Vorlagen --------------------------------------------------------------------*/ @@ -384,7 +384,7 @@ void SwPoolFmtList::Append( char cChar, const String& rStr ) } /*-------------------------------------------------------------------- - Beschreibung: Liste kompletti loeschen + Beschreibung: Liste kompletti loeschen --------------------------------------------------------------------*/ @@ -400,10 +400,10 @@ void SwPoolFmtList::Erase() greift auf die Core-Engine zu --------------------------------------------------------------------*/ -SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument, - const String& rName, +SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument, + const String& rName, SwDocStyleSheetPool& _rPool, - SfxStyleFamily eFam, + SfxStyleFamily eFam, USHORT _nMask) : SfxStyleSheetBase( rName, _rPool, eFam, _nMask ), @@ -415,26 +415,26 @@ SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument, rDoc(rDocument), aCoreSet(GetPool().GetPool(), - RES_CHRATR_BEGIN, RES_CHRATR_END - 1, + RES_CHRATR_BEGIN, RES_CHRATR_END - 1, RES_PARATR_BEGIN, RES_PARATR_END - 1, // --> OD 2008-02-25 #refactorlists# RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END - 1, // <-- - RES_FRMATR_BEGIN, RES_FRMATR_END - 1, - RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, - SID_ATTR_PAGE, SID_ATTR_PAGE_EXT1, + RES_FRMATR_BEGIN, RES_FRMATR_END - 1, + RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, + SID_ATTR_PAGE, SID_ATTR_PAGE_EXT1, SID_ATTR_PAGE_HEADERSET,SID_ATTR_PAGE_FOOTERSET, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, - FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO, - SID_ATTR_PARA_MODEL, SID_ATTR_PARA_MODEL, + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, + FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO, + SID_ATTR_PARA_MODEL, SID_ATTR_PARA_MODEL, SID_ATTR_PARA_PAGENUM, SID_ATTR_PARA_PAGENUM, SID_SWREGISTER_MODE, SID_SWREGISTER_MODE, SID_SWREGISTER_COLLECTION, SID_SWREGISTER_COLLECTION, - FN_COND_COLL, FN_COND_COLL, - SID_ATTR_AUTO_STYLE_UPDATE, SID_ATTR_AUTO_STYLE_UPDATE, - SID_ATTR_NUMBERING_RULE, SID_ATTR_NUMBERING_RULE, - SID_PARA_BACKGRND_DESTINATION, SID_ATTR_BRUSH_CHAR, - SID_ATTR_NUMBERING_RULE, SID_ATTR_NUMBERING_RULE, + FN_COND_COLL, FN_COND_COLL, + SID_ATTR_AUTO_STYLE_UPDATE, SID_ATTR_AUTO_STYLE_UPDATE, + SID_ATTR_NUMBERING_RULE, SID_ATTR_NUMBERING_RULE, + SID_PARA_BACKGRND_DESTINATION, SID_ATTR_BRUSH_CHAR, + SID_ATTR_NUMBERING_RULE, SID_ATTR_NUMBERING_RULE, 0), bPhysical(FALSE) { @@ -461,7 +461,7 @@ SwDocStyleSheet::SwDocStyleSheet( const SwDocStyleSheet& rOrg) : } /*-------------------------------------------------------------------- - Beschreibung: Zuruecksetzen + Beschreibung: Zuruecksetzen --------------------------------------------------------------------*/ @@ -474,7 +474,7 @@ void SwDocStyleSheet::Reset() } /*-------------------------------------------------------------------- - Beschreibung: virtuelle Methoden + Beschreibung: virtuelle Methoden --------------------------------------------------------------------*/ @@ -505,11 +505,11 @@ const String& SwDocStyleSheet::GetParent() const case SFX_STYLE_FAMILY_PAGE: case SFX_STYLE_FAMILY_PSEUDO: default: - return aEmptyStr; // es gibt keinen Parent + return aEmptyStr; // es gibt keinen Parent } String sTmp; - if( !pFmt ) // noch nicht vorhanden, also dflt. Parent + if( !pFmt ) // noch nicht vorhanden, also dflt. Parent { USHORT i = SwStyleNameMapper::GetPoolIdFromUIName( aName, eGetType ); i = ::GetPoolParent( i ); @@ -529,7 +529,7 @@ const String& SwDocStyleSheet::GetParent() const } /*-------------------------------------------------------------------- - Beschreibung: Nachfolger + Beschreibung: Nachfolger --------------------------------------------------------------------*/ @@ -544,7 +544,7 @@ const String& SwDocStyleSheet::GetFollow() const } /*-------------------------------------------------------------------- - Beschreibung: Welche Verkettung ist moeglich + Beschreibung: Welche Verkettung ist moeglich --------------------------------------------------------------------*/ @@ -564,7 +564,7 @@ BOOL SwDocStyleSheet::HasFollowSupport() const } /*-------------------------------------------------------------------- - Beschreibung: Parent ? + Beschreibung: Parent ? --------------------------------------------------------------------*/ @@ -596,7 +596,7 @@ BOOL SwDocStyleSheet::HasClearParentSupport() const } /*-------------------------------------------------------------------- - Beschreibung: textuelle Beschreibung ermitteln + Beschreibung: textuelle Beschreibung ermitteln --------------------------------------------------------------------*/ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) { @@ -758,8 +758,8 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) } else if( SFX_STYLE_FAMILY_PSEUDO == nFamily ) { -// if( pNumRule ) -// return pNumRule->GetName(); +// if( pNumRule ) +// return pNumRule->GetName(); //os: was sollte man bei Numerierungen schon anzeigen? return aEmptyStr; } @@ -774,7 +774,7 @@ String SwDocStyleSheet::GetDescription() } /*-------------------------------------------------------------------- - Beschreibung: Namen setzen + Beschreibung: Namen setzen --------------------------------------------------------------------*/ @@ -894,7 +894,7 @@ BOOL SwDocStyleSheet::SetName( const String& rStr) if( bChg ) { - rPool.First(); // interne Liste muss geupdatet werden + rPool.First(); // interne Liste muss geupdatet werden rPool.Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) ); SwEditShell* pSh = rDoc.GetEditShell(); if( pSh ) @@ -904,7 +904,7 @@ BOOL SwDocStyleSheet::SetName( const String& rStr) } /*-------------------------------------------------------------------- - Beschreibung: Ableitungshirachie + Beschreibung: Ableitungshirachie --------------------------------------------------------------------*/ @@ -959,7 +959,7 @@ BOOL SwDocStyleSheet::SetParent( const String& rStr) } /*-------------------------------------------------------------------- - Beschreibung: Nachfolger detzen + Beschreibung: Nachfolger detzen --------------------------------------------------------------------*/ @@ -1016,7 +1016,7 @@ BOOL SwDocStyleSheet::SetFollow( const String& rStr) } /*-------------------------------------------------------------------- - Beschreibung: ueber Name und Family, Mask den ItemSet rausholen + Beschreibung: ueber Name und Family, Mask den ItemSet rausholen --------------------------------------------------------------------*/ SfxItemSet& SwDocStyleSheet::GetItemSet() @@ -1039,7 +1039,7 @@ SfxItemSet& SwDocStyleSheet::GetItemSet() { SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER ); aBoxInfo.SetTable( FALSE ); - aBoxInfo.SetDist( TRUE); // Abstandsfeld immer anzeigen + aBoxInfo.SetDist( TRUE); // Abstandsfeld immer anzeigen aBoxInfo.SetMinDist( TRUE );// Minimalgroesse in Tabellen und Absaetzen setzen aBoxInfo.SetDefDist( MIN_BORDER_DIST );// Default-Abstand immer setzen // Einzelne Linien koennen nur in Tabellen DontCare-Status haben @@ -1123,7 +1123,7 @@ void SwDocStyleSheet::MergeIndentAttrsOfListStyle( SfxItemSet& rSet ) // <-- /*-------------------------------------------------------------------- - Beschreibung: ItemSet setzen + Beschreibung: ItemSet setzen --------------------------------------------------------------------*/ // --> OD 2008-02-12 #newlistlevelattrs# @@ -1210,7 +1210,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, pCColl->AssignToListLevelOfOutlineStyle(pColl->GetAssignedOutlineStyleLevel()); else pCColl->DeleteAssignmentToListLevelOfOutlineStyle();//<--end,zhaojianwei - + SwTxtFmtColl* pFindFmt; @@ -1368,7 +1368,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, const SfxPoolItem* pItem = aIter.GetCurItem(); while( TRUE ) { - if( IsInvalidItem( pItem ) ) // Clearen + if( IsInvalidItem( pItem ) ) // Clearen { // --> OD 2008-02-12 #newlistlevelattrs# // use method <SwDoc::ResetAttrAtFormat(..)> in order to @@ -1396,12 +1396,12 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, delete pNewDsc; } else - rDoc.ChgFmt(*pFmt, aSet); // alles gesetzten Putten + rDoc.ChgFmt(*pFmt, aSet); // alles gesetzten Putten } else { aCoreSet.ClearItem(); - if( pNewDsc ) // den muessen wir noch vernichten!! + if( pNewDsc ) // den muessen wir noch vernichten!! { rDoc.PreDelPageDesc(pNewDsc); // #i7983# delete pNewDsc; @@ -1559,7 +1559,7 @@ void lcl_DeleteInfoStyles( USHORT nFamily, SvPtrarr& rArr, SwDoc& rDoc ) } /*-------------------------------------------------------------------- - Beschreibung: Das Format ermitteln + Beschreibung: Das Format ermitteln --------------------------------------------------------------------*/ BOOL SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) @@ -1748,7 +1748,7 @@ BOOL SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) } /*-------------------------------------------------------------------- - Beschreibung: Neues Format in der Core anlegen + Beschreibung: Neues Format in der Core anlegen --------------------------------------------------------------------*/ @@ -1825,7 +1825,7 @@ void SwDocStyleSheet::Create() } /*-------------------------------------------------------------------- - Beschreibung: Konkrete Formate rausholen + Beschreibung: Konkrete Formate rausholen --------------------------------------------------------------------*/ @@ -1873,18 +1873,18 @@ void SwDocStyleSheet::PresetNameAndFamily(const String& rName) { switch( rName.GetChar(0) ) { - case cPARA: nFamily = SFX_STYLE_FAMILY_PARA; break; - case cFRAME: nFamily = SFX_STYLE_FAMILY_FRAME; break; - case cPAGE: nFamily = SFX_STYLE_FAMILY_PAGE; break; - case cNUMRULE: nFamily = SFX_STYLE_FAMILY_PSEUDO; break; - default: nFamily = SFX_STYLE_FAMILY_CHAR; break; + case cPARA: nFamily = SFX_STYLE_FAMILY_PARA; break; + case cFRAME: nFamily = SFX_STYLE_FAMILY_FRAME; break; + case cPAGE: nFamily = SFX_STYLE_FAMILY_PAGE; break; + case cNUMRULE: nFamily = SFX_STYLE_FAMILY_PSEUDO; break; + default: nFamily = SFX_STYLE_FAMILY_CHAR; break; } aName = rName; aName.Erase( 0, 1 ); } /*-------------------------------------------------------------------- - Beschreibung: Ist das Format physikalisch schon vorhanden + Beschreibung: Ist das Format physikalisch schon vorhanden --------------------------------------------------------------------*/ @@ -1895,9 +1895,9 @@ void SwDocStyleSheet::SetPhysical(BOOL bPhys) if(!bPhys) { pCharFmt = 0; - pColl = 0; + pColl = 0; pFrmFmt = 0; - pDesc = 0; + pDesc = 0; } } @@ -1924,10 +1924,10 @@ BOOL SwDocStyleSheet::IsUsed() const const SwModify* pMod; switch( nFamily ) { - case SFX_STYLE_FAMILY_CHAR : pMod = pCharFmt; break; - case SFX_STYLE_FAMILY_PARA : pMod = pColl; break; - case SFX_STYLE_FAMILY_FRAME: pMod = pFrmFmt; break; - case SFX_STYLE_FAMILY_PAGE : pMod = pDesc; break; + case SFX_STYLE_FAMILY_CHAR : pMod = pCharFmt; break; + case SFX_STYLE_FAMILY_PARA : pMod = pColl; break; + case SFX_STYLE_FAMILY_FRAME: pMod = pFrmFmt; break; + case SFX_STYLE_FAMILY_PAGE : pMod = pDesc; break; case SFX_STYLE_FAMILY_PSEUDO: return pNumRule ? rDoc.IsUsed( *pNumRule ) : FALSE; @@ -2026,7 +2026,7 @@ static String sTemplateHelpFile = String::CreateFromAscii("swrhlppi.hlp"); const String *pTemplate = rDoc.GetDocPattern( nFileId ); if( pTemplate ) { -// const String aHelpPath(MakeHelpPath(*pTemplate)); +// const String aHelpPath(MakeHelpPath(*pTemplate)); rFile = *pTemplate; } } @@ -2037,7 +2037,7 @@ static String sTemplateHelpFile = String::CreateFromAscii("swrhlppi.hlp"); // weil sich der SFX so anstellt mit der HilfeId: if( USHRT_MAX == nId ) - nId = 0; // entsp. keine Hilfe anzeigen + nId = 0; // entsp. keine Hilfe anzeigen return nId; } @@ -2051,9 +2051,9 @@ void SwDocStyleSheet::SetHelpId( const String& r, ULONG nId ) SwFmt* pTmpFmt = 0; switch( nFamily ) { - case SFX_STYLE_FAMILY_CHAR : pTmpFmt = pCharFmt; break; - case SFX_STYLE_FAMILY_PARA : pTmpFmt = pColl; break; - case SFX_STYLE_FAMILY_FRAME: pTmpFmt = pFrmFmt; break; + case SFX_STYLE_FAMILY_CHAR : pTmpFmt = pCharFmt; break; + case SFX_STYLE_FAMILY_PARA : pTmpFmt = pColl; break; + case SFX_STYLE_FAMILY_FRAME: pTmpFmt = pFrmFmt; break; case SFX_STYLE_FAMILY_PAGE : ((SwPageDesc*)pDesc)->SetPoolHelpId( nHId ); ((SwPageDesc*)pDesc)->SetPoolHlpFileId( nFileId ); @@ -2079,7 +2079,7 @@ void SwDocStyleSheet::SetHelpId( const String& r, ULONG nId ) /* */ /*-------------------------------------------------------------------- - Beschreibung: Methoden fuer den DocStyleSheetPool + Beschreibung: Methoden fuer den DocStyleSheetPool --------------------------------------------------------------------*/ SwDocStyleSheetPool::SwDocStyleSheetPool( SwDoc& rDocument, BOOL bOrg ) @@ -2104,9 +2104,9 @@ void SAL_CALL SwDocStyleSheetPool::release( ) throw () comphelper::OWeakTypeObject::release(); } -SfxStyleSheetBase& SwDocStyleSheetPool::Make( - const String& rName, - SfxStyleFamily eFam, +SfxStyleSheetBase& SwDocStyleSheetPool::Make( + const String& rName, + SfxStyleFamily eFam, USHORT _nMask, USHORT /*nPos*/ ) { @@ -2129,7 +2129,7 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Create( const SfxStyleSheetBase& /*rOr } -SfxStyleSheetBase* SwDocStyleSheetPool::Create( const String &, +SfxStyleSheetBase* SwDocStyleSheetPool::Create( const String &, SfxStyleFamily, USHORT ) { ASSERT( !this, "Create im SW-Stylesheet-Pool geht nicht" ); @@ -2618,18 +2618,18 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() BOOL bWeiter = TRUE; switch( nId ) { - case RES_POOLCOLL_SENDADRESS: // --> ADDRESS - case RES_POOLCOLL_TABLE_HDLN: // --> TH - case RES_POOLCOLL_TABLE: // --> TD - case RES_POOLCOLL_TEXT: // --> P - case RES_POOLCOLL_HEADLINE_BASE:// --> H - case RES_POOLCOLL_HEADLINE1: // --> H1 - case RES_POOLCOLL_HEADLINE2: // --> H2 - case RES_POOLCOLL_HEADLINE3: // --> H3 - case RES_POOLCOLL_HEADLINE4: // --> H4 - case RES_POOLCOLL_HEADLINE5: // --> H5 - case RES_POOLCOLL_HEADLINE6: // --> H6 - case RES_POOLCOLL_STANDARD: // --> P + case RES_POOLCOLL_SENDADRESS: // --> ADDRESS + case RES_POOLCOLL_TABLE_HDLN: // --> TH + case RES_POOLCOLL_TABLE: // --> TD + case RES_POOLCOLL_TEXT: // --> P + case RES_POOLCOLL_HEADLINE_BASE:// --> H + case RES_POOLCOLL_HEADLINE1: // --> H1 + case RES_POOLCOLL_HEADLINE2: // --> H2 + case RES_POOLCOLL_HEADLINE3: // --> H3 + case RES_POOLCOLL_HEADLINE4: // --> H4 + case RES_POOLCOLL_HEADLINE5: // --> H5 + case RES_POOLCOLL_HEADLINE6: // --> H6 + case RES_POOLCOLL_STANDARD: // --> P case RES_POOLCOLL_FOOTNOTE: case RES_POOLCOLL_ENDNOTE: bWeiter = FALSE; @@ -2685,18 +2685,18 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() { // dann auch die, die wir mappen: static USHORT aPoolIds[] = { - RES_POOLCOLL_SENDADRESS, // --> ADDRESS - RES_POOLCOLL_TABLE_HDLN, // --> TH - RES_POOLCOLL_TABLE, // --> TD - RES_POOLCOLL_STANDARD, // --> P - RES_POOLCOLL_TEXT, // --> P - RES_POOLCOLL_HEADLINE_BASE, // --> H - RES_POOLCOLL_HEADLINE1, // --> H1 - RES_POOLCOLL_HEADLINE2, // --> H2 - RES_POOLCOLL_HEADLINE3, // --> H3 - RES_POOLCOLL_HEADLINE4, // --> H4 - RES_POOLCOLL_HEADLINE5, // --> H5 - RES_POOLCOLL_HEADLINE6, // --> H6 + RES_POOLCOLL_SENDADRESS, // --> ADDRESS + RES_POOLCOLL_TABLE_HDLN, // --> TH + RES_POOLCOLL_TABLE, // --> TD + RES_POOLCOLL_STANDARD, // --> P + RES_POOLCOLL_TEXT, // --> P + RES_POOLCOLL_HEADLINE_BASE, // --> H + RES_POOLCOLL_HEADLINE1, // --> H1 + RES_POOLCOLL_HEADLINE2, // --> H2 + RES_POOLCOLL_HEADLINE3, // --> H3 + RES_POOLCOLL_HEADLINE4, // --> H4 + RES_POOLCOLL_HEADLINE5, // --> H5 + RES_POOLCOLL_HEADLINE6, // --> H6 RES_POOLCOLL_FOOTNOTE, RES_POOLCOLL_ENDNOTE, 0 @@ -2852,7 +2852,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::Find( const UniString& rName ) } void SwStyleSheetIterator::AppendStyleList(const SvStringsDtor& rList, - BOOL bTestUsed, + BOOL bTestUsed, USHORT nSection, char cType ) { if( bTestUsed ) diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src index 30b9bc7c0e35..fa130483575b 100644 --- a/sw/source/ui/app/error.src +++ b/sw/source/ui/app/error.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 "globals.hrc" #include "app.hrc" #include "swerror.h" -#include "comcore.hrc" // MS: Warum gibst auf der Core-Seite - // jetzt Resourcen +#include "comcore.hrc" // MS: Warum gibst auf der Core-Seite + // jetzt Resourcen /*-------------------------------------------------------------------- - Beschreibung: Strings + Beschreibung: Strings --------------------------------------------------------------------*/ String STR_COMCORE_READERROR @@ -47,7 +47,7 @@ String STR_COMCORE_CANT_SHOW Text [ en-US ] = "Graphic cannot be displayed." ; }; /*-------------------------------------------------------------------- - Beschreibung: Boxes + Beschreibung: Boxes --------------------------------------------------------------------*/ InfoBox ERR_CLPBRD_WRITE { @@ -59,8 +59,8 @@ InfoBox ERR_CLPBRD_READ }; -#define ERR_CODE( class, err ) (class | (err - ERROR_SW_BASE)) -#define WARN_CODE( class, err ) (class | ( err - WARN_SW_BASE)) +#define ERR_CODE( class, err ) (class | (err - ERROR_SW_BASE)) +#define WARN_CODE( class, err ) (class | ( err - WARN_SW_BASE)) Resource RID_SW_ERRHDL { diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx index e6085a4a8662..052be9d6d8ca 100644 --- a/sw/source/ui/app/mainwn.cxx +++ b/sw/source/ui/app/mainwn.cxx @@ -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 @@ -132,7 +132,7 @@ void EndProgress( SwDocShell *pDocShell ) pProgressContainer->Remove( i ); delete pProgress->pProgress; delete pProgress; - //#112337# it may happen that the container has been removed + //#112337# it may happen that the container has been removed //while rescheduling if ( pProgressContainer && !pProgressContainer->Count() ) delete pProgressContainer, pProgressContainer = 0; diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index 16e20f5725a2..aeb8fca52dba 100644 --- a/sw/source/ui/app/mn.src +++ b/sw/source/ui/app/mn.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 @@ -461,7 +461,7 @@ };\ MenuItem\ {\ - Identifier = FN_HIDE_NOTE_AUTHOR ;\ + Identifier = FN_HIDE_NOTE_AUTHOR ;\ HelpID = FN_HIDE_NOTE_AUTHOR ;\ Text [ en-US ] = "Hide ~author" ;\ };\ @@ -509,7 +509,7 @@ Menu MN_TAB_POPUPMENU MN_TAB1 MN_TAB2 MN_FRM_CAPTION_ITEM - // SEPARATOR; + // SEPARATOR; MenuItem { Identifier = FN_VIEW_TABLEGRID ; diff --git a/sw/source/ui/app/swdll.cxx b/sw/source/ui/app/swdll.cxx index 71409e4dedf3..c97d18514f53 100644 --- a/sw/source/ui/app/swdll.cxx +++ b/sw/source/ui/app/swdll.cxx @@ -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/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx index 2b3a5df1391b..1927c66a847b 100644 --- a/sw/source/ui/app/swmodul1.cxx +++ b/sw/source/ui/app/swmodul1.cxx @@ -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 @@ -37,7 +37,7 @@ #include <cppuhelper/weak.hxx> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <cppuhelper/implbase1.hxx> // helper for implementations +#include <cppuhelper/implbase1.hxx> // helper for implementations #include <svx/dataaccessdescriptor.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> @@ -47,6 +47,7 @@ #include <editeng/colritem.hxx> #include <editeng/brshitem.hxx> #include <vcl/msgbox.hxx> +#include <svl/cjkoptions.hxx> #include <swmodule.hxx> #include <swtypes.hxx> #include <usrpref.hxx> @@ -58,7 +59,7 @@ #include <docsh.hxx> #include <dbmgr.hxx> #include <uinums.hxx> -#include <prtopt.hxx> // fuer PrintOptions +#include <prtopt.hxx> // fuer PrintOptions #include <navicfg.hxx> #include <doc.hxx> #include <cmdid.h> @@ -121,11 +122,11 @@ void lcl_SetUIPrefs(const SwViewOption* pPref, SwView* pView, ViewShell* pSh ) } /*-------------------------------------------------------------------- - Beschreibung: Aktuelle SwWrtShell + Beschreibung: Aktuelle SwWrtShell --------------------------------------------------------------------*/ -SwWrtShell* GetActiveWrtShell() +SwWrtShell* GetActiveWrtShell() { SwView *pActive = ::GetActiveView(); if( pActive ) @@ -134,7 +135,7 @@ SwWrtShell* GetActiveWrtShell() } /*-------------------------------------------------------------------- - Beschreibung: Pointer auf die aktuelle Sicht + Beschreibung: Pointer auf die aktuelle Sicht --------------------------------------------------------------------*/ @@ -144,7 +145,7 @@ SwView* GetActiveView() return PTR_CAST( SwView, pView ); } /*-------------------------------------------------------------------- - Beschreibung: Ueber Views iterieren - static + Beschreibung: Ueber Views iterieren - static --------------------------------------------------------------------*/ SwView* SwModule::GetFirstView() @@ -165,7 +166,7 @@ SwView* SwModule::GetNextView(SwView* pView) } /*------------------------------------------------------------------------ - Beschreibung: Neuer Master fuer die Einstellungen wird gesetzt; + Beschreibung: Neuer Master fuer die Einstellungen wird gesetzt; dieser wirkt sich auf die aktuelle Sicht und alle folgenden aus. ------------------------------------------------------------------------*/ @@ -308,6 +309,70 @@ void SwModule::ApplyRulerMetric( FieldUnit eMetric, BOOL bHorizontal, BOOL bWeb pTmpView = SwModule::GetNextView(pTmpView); } } + +/*------------------------------------------------- +set the usrpref 's char unit attribute and set ruler +'s unit as char if the "apply char unit" is checked +--------------------------------------------------*/ +void SwModule::ApplyUserCharUnit(BOOL bApplyChar, BOOL bWeb) +{ + SwMasterUsrPref* pPref; + if(bWeb) + { + if(!pWebUsrPref) + GetUsrPref(sal_True); + pPref = pWebUsrPref; + } + else + { + if(!pUsrPref) + GetUsrPref(sal_False); + pPref = pUsrPref; + } + BOOL bOldApplyCharUnit = pPref->IsApplyCharUnit(); + BOOL bHasChanged = FALSE; + if(bOldApplyCharUnit != bApplyChar) + { + pPref->SetApplyCharUnit(bApplyChar); + bHasChanged = TRUE; + } + + if( !bHasChanged ) + return; + + FieldUnit eHScrollMetric = pPref->IsHScrollMetric() ? pPref->GetHScrollMetric() : pPref->GetMetric(); + FieldUnit eVScrollMetric = pPref->IsVScrollMetric() ? pPref->GetVScrollMetric() : pPref->GetMetric(); + if(bApplyChar) + { + eHScrollMetric = FUNIT_CHAR; + eVScrollMetric = FUNIT_LINE; + } + else + { + SvtCJKOptions aCJKOptions; + if ( !aCJKOptions.IsAsianTypographyEnabled() && ( eHScrollMetric == FUNIT_CHAR )) + eHScrollMetric = FUNIT_INCH; + else if ( eHScrollMetric == FUNIT_CHAR ) + eHScrollMetric = FUNIT_CM; + if ( !aCJKOptions.IsAsianTypographyEnabled() && ( eVScrollMetric == FUNIT_LINE )) + eVScrollMetric = FUNIT_INCH; + else if ( eVScrollMetric == FUNIT_LINE ) + eVScrollMetric = FUNIT_CM; + } + SwView* pTmpView = SwModule::GetFirstView(); + // fuer alle MDI-Fenster das Lineal umschalten + while(pTmpView) + { + if(bWeb == (0 != PTR_CAST(SwWebView, pTmpView))) + { + pTmpView->ChangeVLinealMetric(eVScrollMetric); + pTmpView->ChangeTabMetric(eHScrollMetric); + } + + pTmpView = SwModule::GetNextView(pTmpView); + } +} + /*-----------------13.11.96 11.57------------------- --------------------------------------------------*/ @@ -325,7 +390,7 @@ SwNavigationConfig* SwModule::GetNavigationConfig() --------------------------------------------------*/ -SwPrintOptions* SwModule::GetPrtOptions(sal_Bool bWeb) +SwPrintOptions* SwModule::GetPrtOptions(sal_Bool bWeb) { if(bWeb && !pWebPrtOpt) { @@ -342,7 +407,7 @@ SwPrintOptions* SwModule::GetPrtOptions(sal_Bool bWeb) /*-----------------26.06.97 07.52------------------- --------------------------------------------------*/ -SwChapterNumRules* SwModule::GetChapterNumRules() +SwChapterNumRules* SwModule::GetChapterNumRules() { if(!pChapterNumRules) pChapterNumRules = new SwChapterNumRules; @@ -439,9 +504,9 @@ void lcl_FillAuthorAttr( sal_uInt16 nAuthor, SfxItemSet &rSet, if( COL_TRANSPARENT == rAttr.nColor ) { static const ColorData aColArr[] = { - COL_AUTHOR1_DARK, COL_AUTHOR2_DARK, COL_AUTHOR3_DARK, - COL_AUTHOR4_DARK, COL_AUTHOR5_DARK, COL_AUTHOR6_DARK, - COL_AUTHOR7_DARK, COL_AUTHOR8_DARK, COL_AUTHOR9_DARK }; + COL_AUTHOR1_DARK, COL_AUTHOR2_DARK, COL_AUTHOR3_DARK, + COL_AUTHOR4_DARK, COL_AUTHOR5_DARK, COL_AUTHOR6_DARK, + COL_AUTHOR7_DARK, COL_AUTHOR8_DARK, COL_AUTHOR9_DARK }; aCol.SetColor( aColArr[ nAuthor % (sizeof( aColArr ) / sizeof( aColArr[0] )) ] ); @@ -569,7 +634,7 @@ const Color &SwModule::GetRedlineMarkColor() /*-----------------03.03.98 16:47------------------- --------------------------------------------------*/ -const SwViewOption* SwModule::GetViewOption(sal_Bool bWeb) +const SwViewOption* SwModule::GetViewOption(sal_Bool bWeb) { return GetUsrPref( bWeb ); } @@ -662,8 +727,8 @@ void SwModule::CheckSpellChanges( sal_Bool bOnlineSpelling, pViewShell->GetWin()->Invalidate(); } } -// pSpell->SetSpellWrongAgain( sal_False ); -// pSpell->SetSpellAllAgain( sal_False ); +// pSpell->SetSpellWrongAgain( sal_False ); +// pSpell->SetSpellAllAgain( sal_False ); } } diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx index 3f1c4665c6e3..b918edc3af5a 100644 --- a/sw/source/ui/app/swmodule.cxx +++ b/sw/source/ui/app/swmodule.cxx @@ -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 @@ -45,7 +45,7 @@ #include <svx/insctrl.hxx> #include <svx/selctrl.hxx> #include <svx/linectrl.hxx> -#include <svx/tbxctl.hxx> //z-Zt falscher includeschutz! +#include <svx/tbxctl.hxx> //z-Zt falscher includeschutz! #include <svx/fillctrl.hxx> #include <svx/tbcontrl.hxx> #include <svx/verttexttbxctrl.hxx> @@ -164,7 +164,7 @@ #include <app.hrc> #include <svx/xmlsecctrl.hxx> ResMgr *pSwResMgr = 0; -sal_Bool bNoInterrupt = sal_False; +sal_Bool bNoInterrupt = sal_False; #include <sfx2/app.hxx> @@ -226,10 +226,10 @@ SwModule::SwModule( SfxObjectFactory* pWebFact, pStdFontConfig = new SwStdFontConfig; - pAuthorNames = new SvStringsDtor(5, 1); // Alle Redlining-Autoren + pAuthorNames = new SvStringsDtor(5, 1); // Alle Redlining-Autoren //JP 18.10.96: SvxAutocorrect gegen die SwAutocorrect austauschen - SvxAutoCorrCfg* pACfg = SvxAutoCorrCfg::Get(); + SvxAutoCorrCfg* pACfg = SvxAutoCorrCfg::Get(); if( pACfg ) { const SvxAutoCorrect* pOld = pACfg->GetAutoCorrect(); @@ -309,7 +309,7 @@ void SwDLL::RegisterFactories() if ( SvtModuleOptions().IsWriter() ) SwView::RegisterFactory ( 2 ); - SwWebView::RegisterFactory ( 5 ); + SwWebView::RegisterFactory ( 5 ); if ( SvtModuleOptions().IsWriter() ) { @@ -393,7 +393,7 @@ void SwDLL::RegisterControls() SvxLineEndToolBoxControl::RegisterControl(SID_ATTR_LINEEND_STYLE, pMod ); SvxFontNameToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONT, pMod ); -// SvxFontHeightToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod ); +// SvxFontHeightToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod ); SvxFontColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR, pMod ); SvxFontColorExtToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR2, pMod ); SvxFontColorExtToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR_BACKGROUND, pMod ); @@ -482,7 +482,7 @@ void SwDLL::RegisterControls() /* -----------------20.04.99 10:46------------------- * * --------------------------------------------------*/ -void SwModule::InitAttrPool() +void SwModule::InitAttrPool() { DBG_ASSERT(!pAttrPool, "Pool ist schon da!"); pAttrPool = new SwAttrPool(0); @@ -491,7 +491,7 @@ void SwModule::InitAttrPool() /* -----------------20.04.99 10:46------------------- * * --------------------------------------------------*/ -void SwModule::RemoveAttrPool() +void SwModule::RemoveAttrPool() { SetPool(0); SfxItemPool::Free(pAttrPool); diff --git a/sw/source/ui/app/swwait.cxx b/sw/source/ui/app/swwait.cxx index 4392bdea04ac..2f484b8eb401 100644 --- a/sw/source/ui/app/swwait.cxx +++ b/sw/source/ui/app/swwait.cxx @@ -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/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx index 967505a5f96d..d9d813f9189a 100644 --- a/sw/source/ui/cctrl/actctrl.cxx +++ b/sw/source/ui/cctrl/actctrl.cxx @@ -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 @@ -65,7 +65,7 @@ long NumEditAction::Notify( NotifyEvent& rNEvt ) } /*------------------------------------------------------------------------ - Beschreibung: KeyInput fuer ShortName - Edits ohne Spaces + Beschreibung: KeyInput fuer ShortName - Edits ohne Spaces ------------------------------------------------------------------------*/ NoSpaceEdit::NoSpaceEdit( Window* pParent, const ResId& rResId) @@ -84,7 +84,7 @@ void NoSpaceEdit::KeyInput(const KeyEvent& rEvt) if(rEvt.GetCharCode()) { String sKey = rEvt.GetCharCode(); - if( STRING_NOTFOUND != sForbiddenChars.Search(sKey)) + if( STRING_NOTFOUND != sForbiddenChars.Search(sKey)) bCallParent = FALSE; } if(bCallParent) @@ -117,7 +117,7 @@ void NoSpaceEdit::Modify() --------------------------------------------------*/ ReturnActionEdit::~ReturnActionEdit() { -} +} /* -----------------25.06.2003 15:58----------------- --------------------------------------------------*/ @@ -130,9 +130,9 @@ void ReturnActionEdit::KeyInput( const KeyEvent& rEvt) { if(aReturnActionLink.IsSet()) aReturnActionLink.Call(this); - } - else + } + else Edit::KeyInput(rEvt); -} +} diff --git a/sw/source/ui/cctrl/popbox.cxx b/sw/source/ui/cctrl/popbox.cxx index 9b99a41b3e64..2d4ff3cfc383 100644 --- a/sw/source/ui/cctrl/popbox.cxx +++ b/sw/source/ui/cctrl/popbox.cxx @@ -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/cctrl/swlbox.cxx b/sw/source/ui/cctrl/swlbox.cxx index a6a50a01f851..d43fd46df57c 100644 --- a/sw/source/ui/cctrl/swlbox.cxx +++ b/sw/source/ui/cctrl/swlbox.cxx @@ -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 @@ -93,8 +93,8 @@ SwComboBox::SwComboBox(Window* pParent, const ResId& rId, USHORT nStyleBits ): SwComboBox::~SwComboBox() { // das erledigen die Listen doch schon selbst im DTOR! -// aEntryLst.DeleteAndDestroy(0, aEntryLst.Count()); -// aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count()); +// aEntryLst.DeleteAndDestroy(0, aEntryLst.Count()); +// aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count()); } /*-------------------------------------------------------------------- diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index cc1f208950dc..fbc2e0cd8cee 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -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 @@ -92,7 +92,7 @@ IMPL_LINK_INLINE_START( SwBreakDlg, ClickHdl, void *, EMPTYARG ) IMPL_LINK_INLINE_END( SwBreakDlg, ClickHdl, void *, EMPTYARG ) /*------------------------------------------------------------------------ - Beschreibung: Handler fuer Aendern Seitenummer + Beschreibung: Handler fuer Aendern Seitenummer ------------------------------------------------------------------------*/ IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox ) @@ -104,7 +104,7 @@ IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox ) IMPL_LINK_INLINE_END( SwBreakDlg, PageNumHdl, CheckBox *, pBox ) /*------------------------------------------------------------------------ - Beschreibung: Durch Aendern der Seitennummer wird die Checkbox gecheckt. + Beschreibung: Durch Aendern der Seitennummer wird die Checkbox gecheckt. ------------------------------------------------------------------------*/ IMPL_LINK_INLINE_START( SwBreakDlg, PageNumModifyHdl, Edit *, EMPTYARG ) @@ -115,7 +115,7 @@ IMPL_LINK_INLINE_START( SwBreakDlg, PageNumModifyHdl, Edit *, EMPTYARG ) IMPL_LINK_INLINE_END( SwBreakDlg, PageNumModifyHdl, Edit *, EMPTYARG ) /*------------------------------------------------------------------------ - Beschreibung: Ok-Handler; + Beschreibung: Ok-Handler; prueft, ob die Seitenummer nPage eine legale Seitennummer ist (linke Seiten mit geraden Nummern etc. bei einer Seitenvorlage mit wechselnden Seiten) @@ -219,7 +219,7 @@ void SwBreakDlg::CheckEnable() BOOL bEnable = TRUE; if ( bHtmlMode ) { - aColumnBtn .Enable(FALSE); + aColumnBtn .Enable(FALSE); aPageCollBox.Enable(FALSE); bEnable = FALSE; } @@ -243,7 +243,7 @@ void SwBreakDlg::CheckEnable() if ( 0 == nPos || LISTBOX_ENTRY_NOTFOUND == nPos ) bEnable = FALSE; } - aPageNumBox .Enable(bEnable); + aPageNumBox .Enable(bEnable); aPageNumEdit.Enable(bEnable); } diff --git a/sw/source/ui/chrdlg/break.hrc b/sw/source/ui/chrdlg/break.hrc index 7667a4a9f3b6..c1da83565e9c 100644 --- a/sw/source/ui/chrdlg/break.hrc +++ b/sw/source/ui/chrdlg/break.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 @@ -25,17 +25,17 @@ * ************************************************************************/ -#define RB_PAGE 1 -#define RB_LINE 2 -#define RB_COL 3 -#define FT_COLL 4 -#define LB_COLL 5 +#define RB_PAGE 1 +#define RB_LINE 2 +#define RB_COL 3 +#define FT_COLL 4 +#define LB_COLL 5 #define FL_BREAK 6 -#define CB_PAGENUM 7 -#define ED_PAGENUM 8 +#define CB_PAGENUM 7 +#define ED_PAGENUM 8 -#define BT_OK 100 -#define BT_CANCEL 101 +#define BT_OK 100 +#define BT_CANCEL 101 #define BT_HELP 102 diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx index 44b144d28f4b..7ac0680cbb29 100644 --- a/sw/source/ui/chrdlg/ccoll.cxx +++ b/sw/source/ui/chrdlg/ccoll.cxx @@ -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 @@ -118,34 +118,34 @@ rtl::OUString GetCommandContextByIndex( sal_Int16 nIndex ) CommandStruct SwCondCollItem::aCmds[] = { - { PARA_IN_TABLEHEAD, 0 }, - { PARA_IN_TABLEBODY, 0 }, - { PARA_IN_FRAME, 0 }, - { PARA_IN_SECTION, 0 }, - { PARA_IN_FOOTENOTE, 0 }, - { PARA_IN_ENDNOTE, 0 }, - { PARA_IN_HEADER, 0 }, - { PARA_IN_FOOTER, 0 }, - { PARA_IN_OUTLINE, 0 }, - { PARA_IN_OUTLINE, 1 }, - { PARA_IN_OUTLINE, 2 }, - { PARA_IN_OUTLINE, 3 }, - { PARA_IN_OUTLINE, 4 }, - { PARA_IN_OUTLINE, 5 }, - { PARA_IN_OUTLINE, 6 }, - { PARA_IN_OUTLINE, 7 }, - { PARA_IN_OUTLINE, 8 }, - { PARA_IN_OUTLINE, 9 }, - { PARA_IN_LIST, 0 }, - { PARA_IN_LIST, 1 }, - { PARA_IN_LIST, 2 }, - { PARA_IN_LIST, 3 }, - { PARA_IN_LIST, 4 }, - { PARA_IN_LIST, 5 }, - { PARA_IN_LIST, 6 }, - { PARA_IN_LIST, 7 }, - { PARA_IN_LIST, 8 }, - { PARA_IN_LIST, 9 } + { PARA_IN_TABLEHEAD, 0 }, + { PARA_IN_TABLEBODY, 0 }, + { PARA_IN_FRAME, 0 }, + { PARA_IN_SECTION, 0 }, + { PARA_IN_FOOTENOTE, 0 }, + { PARA_IN_ENDNOTE, 0 }, + { PARA_IN_HEADER, 0 }, + { PARA_IN_FOOTER, 0 }, + { PARA_IN_OUTLINE, 0 }, + { PARA_IN_OUTLINE, 1 }, + { PARA_IN_OUTLINE, 2 }, + { PARA_IN_OUTLINE, 3 }, + { PARA_IN_OUTLINE, 4 }, + { PARA_IN_OUTLINE, 5 }, + { PARA_IN_OUTLINE, 6 }, + { PARA_IN_OUTLINE, 7 }, + { PARA_IN_OUTLINE, 8 }, + { PARA_IN_OUTLINE, 9 }, + { PARA_IN_LIST, 0 }, + { PARA_IN_LIST, 1 }, + { PARA_IN_LIST, 2 }, + { PARA_IN_LIST, 3 }, + { PARA_IN_LIST, 4 }, + { PARA_IN_LIST, 5 }, + { PARA_IN_LIST, 6 }, + { PARA_IN_LIST, 7 }, + { PARA_IN_LIST, 8 }, + { PARA_IN_LIST, 9 } }; @@ -204,7 +204,7 @@ int SwCondCollItem::operator==( const SfxPoolItem& rItem) const ****************************************************************************/ -const String& SwCondCollItem::GetStyle(USHORT nPos) const +const String& SwCondCollItem::GetStyle(USHORT nPos) const { return nPos < COND_COMMAND_COUNT ? sStyles[nPos] : aEmptyStr; } diff --git a/sw/source/ui/chrdlg/ccoll.hrc b/sw/source/ui/chrdlg/ccoll.hrc index f3d21092273a..9bab79775143 100644 --- a/sw/source/ui/chrdlg/ccoll.hrc +++ b/sw/source/ui/chrdlg/ccoll.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 @@ -30,18 +30,18 @@ // #define ****************************************************************** -#define CB_CONDITION 1 +#define CB_CONDITION 1 #define FL_CONDITION 2 -#define FT_CONTEXT 3 -#define FT_USED 4 +#define FT_CONTEXT 3 +#define FT_USED 4 #define TB_CONDCOLLS 5 -#define FT_STYLE 6 -#define LB_STYLE 7 -#define LB_FILTER 8 -#define PB_REMOVE 9 -#define PB_ASSIGN 10 +#define FT_STYLE 6 +#define LB_STYLE 7 +#define LB_FILTER 8 +#define PB_REMOVE 9 +#define PB_ASSIGN 10 #define STR_REGIONS 11 -#define STR_NOTEMPL 12 +#define STR_NOTEMPL 12 // ********************************************************************** EOF diff --git a/sw/source/ui/chrdlg/ccoll.src b/sw/source/ui/chrdlg/ccoll.src index eab997761d8d..0d8baf2b2ba4 100644 --- a/sw/source/ui/chrdlg/ccoll.src +++ b/sw/source/ui/chrdlg/ccoll.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/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 38b1ba906fdd..907db6eacf2e 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -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 @@ -63,7 +63,7 @@ #include <fmtinfmt.hxx> #include <macassgn.hxx> #ifndef _CHRDLG_HXX -#include <chrdlg.hxx> // der Dialog +#include <chrdlg.hxx> // der Dialog #endif #include <swmodule.hxx> #include <poolfmt.hxx> @@ -94,7 +94,7 @@ using namespace ::com::sun::star::uno; using namespace ::sfx2; /*-------------------------------------------------------------------- - Beschreibung: Der Traeger des Dialoges + Beschreibung: Der Traeger des Dialoges --------------------------------------------------------------------*/ @@ -145,7 +145,7 @@ SwCharDlg::~SwCharDlg() } /*-------------------------------------------------------------------- - Beschreibung: FontList setzen + Beschreibung: FontList setzen --------------------------------------------------------------------*/ @@ -190,26 +190,26 @@ void SwCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) --------------------------------------------------*/ -SwCharURLPage::SwCharURLPage( Window* pParent, +SwCharURLPage::SwCharURLPage( Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage( pParent, SW_RES( TP_CHAR_URL ), rCoreSet ), aURLFL ( this, SW_RES(FL_URL)), aURLFT( this, SW_RES(FT_URL )), - aURLED( this, SW_RES(ED_URL )), - aTextFT( this, SW_RES(FT_TEXT )), - aTextED( this, SW_RES(ED_TEXT )), - aNameFT( this, SW_RES(FT_NAME )), - aNameED( this, SW_RES(ED_NAME)), - aTargetFrmFT( this, SW_RES(FT_TARGET )), - aTargetFrmLB( this, SW_RES(LB_TARGET )), + aURLED( this, SW_RES(ED_URL )), + aTextFT( this, SW_RES(FT_TEXT )), + aTextED( this, SW_RES(ED_TEXT )), + aNameFT( this, SW_RES(FT_NAME )), + aNameED( this, SW_RES(ED_NAME)), + aTargetFrmFT( this, SW_RES(FT_TARGET )), + aTargetFrmLB( this, SW_RES(LB_TARGET )), aURLPB( this, SW_RES(PB_URL )), aEventPB( this, SW_RES(PB_EVENT )), aStyleFL( this, SW_RES(FL_STYLE )), - aVisitedFT( this, SW_RES(FT_VISITED )), - aVisitedLB( this, SW_RES(LB_VISITED )), - aNotVisitedFT( this, SW_RES(FT_NOT_VISITED)), - aNotVisitedLB( this, SW_RES(LB_NOT_VISITED)), + aVisitedFT( this, SW_RES(FT_VISITED )), + aVisitedLB( this, SW_RES(LB_VISITED )), + aNotVisitedFT( this, SW_RES(FT_NOT_VISITED)), + aNotVisitedLB( this, SW_RES(LB_NOT_VISITED)), pINetItem(0), bModified(FALSE) @@ -233,7 +233,7 @@ SwCharURLPage::SwCharURLPage( Window* pParent, } } - aURLPB.SetClickHdl (LINK( this, SwCharURLPage, InsertFileHdl)); + aURLPB.SetClickHdl (LINK( this, SwCharURLPage, InsertFileHdl)); aEventPB.SetClickHdl(LINK( this, SwCharURLPage, EventHdl )); SwView *pView = ::GetActiveView(); @@ -323,7 +323,7 @@ BOOL SwCharURLPage::FillItemSet(SfxItemSet& rSet) if(sURL.getLength()) { sURL = URIHelper::SmartRel2Abs(INetURLObject(), sURL, Link(), false ); - // #i100683# file URLs should be normalized in the UI + // #i100683# file URLs should be normalized in the UI static const sal_Char* pFile = "file:"; sal_Int32 nLength = ((sal_Int32)sizeof(pFile)-1); if( sURL.copy(0, nLength ).equalsAsciiL( pFile, nLength )) @@ -371,7 +371,7 @@ BOOL SwCharURLPage::FillItemSet(SfxItemSet& rSet) --------------------------------------------------*/ -SfxTabPage* SwCharURLPage::Create( Window* pParent, +SfxTabPage* SwCharURLPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwCharURLPage( pParent, rAttrSet ) ); diff --git a/sw/source/ui/chrdlg/chardlg.hrc b/sw/source/ui/chrdlg/chardlg.hrc index 48a661bfebec..625a016a0694 100644 --- a/sw/source/ui/chrdlg/chardlg.hrc +++ b/sw/source/ui/chrdlg/chardlg.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 @@ -68,7 +68,7 @@ #define FONTTYPE_FT 46 #define FL_URL 50 -#define FT_URL 51 +#define FT_URL 51 #define ED_URL 52 #define FL_STYLE 53 #define FT_VISITED 55 @@ -78,9 +78,9 @@ #define PB_EVENT 59 #define PB_URL 60 #define LB_TARGET 61 -#define FT_TARGET 62 +#define FT_TARGET 62 #define FT_TEXT 63 #define ED_TEXT 64 #define FT_NAME 65 -#define ED_NAME 66 +#define ED_NAME 66 diff --git a/sw/source/ui/chrdlg/chardlg.src b/sw/source/ui/chrdlg/chardlg.src index 8340b4f60669..e6a6a827297f 100644 --- a/sw/source/ui/chrdlg/chardlg.src +++ b/sw/source/ui/chrdlg/chardlg.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/chrdlg/chrdlg.src b/sw/source/ui/chrdlg/chrdlg.src index 297668f6093a..27e897e29e00 100644 --- a/sw/source/ui/chrdlg/chrdlg.src +++ b/sw/source/ui/chrdlg/chrdlg.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/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 8caf959195dd..d05fe5976eb0 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -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 @@ -82,7 +82,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; //using namespace i18n; !using this namespace leads to mysterious conflicts with ScriptType::...! -// so don't use this instead of the following defines! +// so don't use this instead of the following defines! #define I18N ::com::sun::star::i18n #define I18N_SCRIPTTYPE ::com::sun::star::i18n::ScriptType @@ -100,40 +100,40 @@ static USHORT __FAR_DATA aPageRg[] = { class SwDropCapsPict : public Control { - String maText; - String maScriptText; - Color maBackColor; - Color maTextLineColor; - BYTE mnLines; - long mnTotLineH; - long mnLineH; - long mnTextH; - USHORT mnDistance; + String maText; + String maScriptText; + Color maBackColor; + Color maTextLineColor; + BYTE mnLines; + long mnTotLineH; + long mnLineH; + long mnTextH; + USHORT mnDistance; sal_Int32 mnLeading; - Printer* mpPrinter; - BOOL mbDelPrinter; - SvULongs maTextWidth; - SvXub_StrLens maScriptChg; - SvUShorts maScriptType; - SvxFont maFont; - SvxFont maCJKFont; - SvxFont maCTLFont; - Size maTextSize; - Reference< I18N::XBreakIterator > xBreak; - - virtual void Paint(const Rectangle &rRect); - void CheckScript( void ); - Size CalcTextSize( void ); - inline void InitPrinter( void ); - void _InitPrinter( void ); - void GetFontSettings( const SwDropCapsPage& _rPage, Font& _rFont, USHORT _nWhich ); + Printer* mpPrinter; + BOOL mbDelPrinter; + SvULongs maTextWidth; + SvXub_StrLens maScriptChg; + SvUShorts maScriptType; + SvxFont maFont; + SvxFont maCJKFont; + SvxFont maCTLFont; + Size maTextSize; + Reference< I18N::XBreakIterator > xBreak; + + virtual void Paint(const Rectangle &rRect); + void CheckScript( void ); + Size CalcTextSize( void ); + inline void InitPrinter( void ); + void _InitPrinter( void ); + void GetFontSettings( const SwDropCapsPage& _rPage, Font& _rFont, USHORT _nWhich ); public: SwDropCapsPict(Window *pParent, const ResId &rResId) : Control(pParent, rResId), mpPrinter( NULL ), mbDelPrinter( FALSE ) {} ~SwDropCapsPict(); - void UpdatePaintSettings( void ); // also invalidates control! + void UpdatePaintSettings( void ); // also invalidates control! inline void SetText( const String& rT ); inline void SetLines( BYTE nL ); @@ -346,7 +346,7 @@ void SwDropCapsPict::Paint(const Rectangle &/*rRect*/) SetFillColor( maBackColor ); if(((SwDropCapsPage*)GetParent())->aDropCapsBox.IsChecked()) { - Size aTextSize( maTextSize ); + Size aTextSize( maTextSize ); aTextSize.Width() += nDistW; DrawRect( Rectangle( Point( BORDER, nY0 ), aTextSize ) ); @@ -362,12 +362,12 @@ void SwDropCapsPict::DrawPrev( const Point& rPt ) Point aPt(rPt); InitPrinter(); - Font aOldFont = mpPrinter->GetFont(); - USHORT nScript; - USHORT nIdx = 0; - xub_StrLen nStart = 0; - xub_StrLen nEnd; - USHORT nCnt = maScriptChg.Count(); + Font aOldFont = mpPrinter->GetFont(); + USHORT nScript; + USHORT nIdx = 0; + xub_StrLen nStart = 0; + xub_StrLen nEnd; + USHORT nCnt = maScriptChg.Count(); if( nCnt ) { @@ -381,7 +381,7 @@ void SwDropCapsPict::DrawPrev( const Point& rPt ) } do { - SvxFont& rFnt = (nScript==I18N_SCRIPTTYPE::ASIAN) ? maCJKFont : ((nScript==I18N_SCRIPTTYPE::COMPLEX) ? maCTLFont : maFont); + SvxFont& rFnt = (nScript==I18N_SCRIPTTYPE::ASIAN) ? maCJKFont : ((nScript==I18N_SCRIPTTYPE::COMPLEX) ? maCTLFont : maFont); mpPrinter->SetFont( rFnt ); rFnt.DrawPrev( this, mpPrinter, aPt, maText, nStart, nEnd - nStart ); @@ -452,11 +452,11 @@ Size SwDropCapsPict::CalcTextSize( void ) { InitPrinter(); - USHORT nScript; - USHORT nIdx = 0; - xub_StrLen nStart = 0; - xub_StrLen nEnd; - USHORT nCnt = maScriptChg.Count(); + USHORT nScript; + USHORT nIdx = 0; + xub_StrLen nStart = 0; + xub_StrLen nEnd; + USHORT nCnt = maScriptChg.Count(); if( nCnt ) { nEnd = maScriptChg[ nIdx ]; @@ -467,18 +467,18 @@ Size SwDropCapsPict::CalcTextSize( void ) nEnd = maText.Len(); nScript = I18N_SCRIPTTYPE::LATIN; } - long nTxtWidth = 0; - long nCJKHeight = 0; - long nCTLHeight = 0; - long nHeight = 0; - long nAscent = 0; - long nCJKAscent = 0; - long nCTLAscent = 0; + long nTxtWidth = 0; + long nCJKHeight = 0; + long nCTLHeight = 0; + long nHeight = 0; + long nAscent = 0; + long nCJKAscent = 0; + long nCTLAscent = 0; do { - SvxFont& rFnt = ( nScript == I18N_SCRIPTTYPE::ASIAN )? maCJKFont : + SvxFont& rFnt = ( nScript == I18N_SCRIPTTYPE::ASIAN )? maCJKFont : ( ( nScript == I18N_SCRIPTTYPE::COMPLEX )? maCTLFont : maFont ); - ULONG nWidth = rFnt.GetTxtSize( mpPrinter, maText, nStart, nEnd-nStart ).Width(); + ULONG nWidth = rFnt.GetTxtSize( mpPrinter, maText, nStart, nEnd-nStart ).Width(); if( nIdx < maTextWidth.Count() ) maTextWidth[ nIdx++ ] = nWidth; @@ -524,7 +524,7 @@ Size SwDropCapsPict::CalcTextSize( void ) void SwDropCapsPict::_InitPrinter() { - SfxViewShell* pSh = SfxViewShell::Current(); + SfxViewShell* pSh = SfxViewShell::Current(); if ( pSh ) mpPrinter = pSh->GetPrinter(); @@ -570,7 +570,7 @@ SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, SW_RES(TP_DROPCAPS), rSet), aDropCapsBox (this, SW_RES(CB_SWITCH )), - aWholeWordCB (this, SW_RES(CB_WORD )), + aWholeWordCB (this, SW_RES(CB_WORD )), aSwitchText (this, SW_RES(FT_DROPCAPS )), aDropCapsField(this, SW_RES(FLD_DROPCAPS)), aLinesText (this, SW_RES(TXT_LINES )), @@ -703,7 +703,7 @@ void SwDropCapsPage::Reset(const SfxItemSet &rSet) } // Preview - pPict->SetValues( aTextEdit.GetText(), + pPict->SetValues( aTextEdit.GetText(), BYTE( aLinesField.GetValue() ), USHORT( aDistanceField.Denormalize( aDistanceField.GetValue( FUNIT_TWIP ) ) ) ); @@ -730,8 +730,8 @@ IMPL_LINK( SwDropCapsPage, ClickHdl, Button *, EMPTYARG ) aDistanceField.Enable( bChecked ); aTemplateText .Enable( bChecked ); aTemplateBox .Enable( bChecked ); - aTextEdit .Enable( bChecked && !bFormat ); - aTextText .Enable( bChecked && !bFormat ); + aTextEdit .Enable( bChecked && !bFormat ); + aTextText .Enable( bChecked && !bFormat ); if ( bChecked ) { @@ -801,7 +801,7 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit ) if (bSetText) aTextEdit.SetText(sPreview); } - else if (pEdit == &aTextEdit) // Ggf. Anzahl setzen + else if (pEdit == &aTextEdit) // Ggf. Anzahl setzen { USHORT nTmp = aTextEdit.GetText().Len(); aDropCapsField.SetValue(Max((USHORT)1, nTmp)); diff --git a/sw/source/ui/chrdlg/drpcps.hrc b/sw/source/ui/chrdlg/drpcps.hrc index d1b432edbba7..4c6cf06ceb88 100644 --- a/sw/source/ui/chrdlg/drpcps.hrc +++ b/sw/source/ui/chrdlg/drpcps.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 @@ -44,7 +44,7 @@ #define FL_SETTINGS 12 #define CB_SWITCH 13 #define FL_CONTENT 15 -#define CB_WORD 16 +#define CB_WORD 16 #endif diff --git a/sw/source/ui/chrdlg/drpcps.src b/sw/source/ui/chrdlg/drpcps.src index af8a0d920375..ae3da330c464 100644 --- a/sw/source/ui/chrdlg/drpcps.src +++ b/sw/source/ui/chrdlg/drpcps.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/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index f80130f475e9..3742fd242c82 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -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 @@ -66,15 +66,15 @@ static USHORT __FAR_DATA aPageRg[] = { SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage(pParent, SW_RES(TP_NUMPARA), rAttr), - aOutlineStartFL ( this, SW_RES( FL_OUTLINE_START )), - aOutlineLvFT ( this, SW_RES( FT_OUTLINE_LEVEL )), - aOutlineLvLB ( this, SW_RES( LB_OUTLINE_LEVEL )), + aOutlineStartFL ( this, SW_RES( FL_OUTLINE_START )), + aOutlineLvFT ( this, SW_RES( FT_OUTLINE_LEVEL )), + aOutlineLvLB ( this, SW_RES( LB_OUTLINE_LEVEL )), aNumberStyleFT ( this, SW_RES( FT_NUMBER_STYLE ) ), aNumberStyleLB ( this, SW_RES( LB_NUMBER_STYLE ) ), aNewStartFL ( this, SW_RES( FL_NEW_START ) ), - aNewStartCB ( this, SW_RES( CB_NEW_START ) ), + aNewStartCB ( this, SW_RES( CB_NEW_START ) ), aNewStartNumberCB ( this, SW_RES( CB_NUMBER_NEW_START ) ), - aNewStartNF ( this, SW_RES( NF_NEW_START ) ), + aNewStartNF ( this, SW_RES( NF_NEW_START ) ), aCountParaFL ( this, SW_RES( FL_COUNT_PARA ) ), aCountParaCB ( this, SW_RES( CB_COUNT_PARA ) ), aRestartParaCountCB ( this, SW_RES( CB_RESTART_PARACOUNT ) ), @@ -122,7 +122,7 @@ SwParagraphNumTabPage::~SwParagraphNumTabPage() /*-----------------31.01.98 08:38------------------- --------------------------------------------------*/ -SfxTabPage* SwParagraphNumTabPage::Create( Window* pParent, +SfxTabPage* SwParagraphNumTabPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SwParagraphNumTabPage(pParent, rSet); @@ -131,7 +131,7 @@ SfxTabPage* SwParagraphNumTabPage::Create( Window* pParent, /*-----------------31.01.98 08:38------------------- --------------------------------------------------*/ -USHORT* SwParagraphNumTabPage::GetRanges() +USHORT* SwParagraphNumTabPage::GetRanges() { return aPageRg; } @@ -139,7 +139,7 @@ USHORT* SwParagraphNumTabPage::GetRanges() /*-----------------31.01.98 08:38------------------- --------------------------------------------------*/ -BOOL SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) +BOOL SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) { //<-#outline level, added by zhaojianwei if( aOutlineLvLB.GetSelectEntryPos() != aOutlineLvLB.GetSavedValue()) @@ -153,7 +153,7 @@ BOOL SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) bModified = TRUE; } //<-end - if( aNumberStyleLB.GetSelectEntryPos() != aNumberStyleLB.GetSavedValue()) + if( aNumberStyleLB.GetSelectEntryPos() != aNumberStyleLB.GetSavedValue()) { String aStyle; if(aNumberStyleLB.GetSelectEntryPos()) @@ -194,7 +194,7 @@ BOOL SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) /*-----------------31.01.98 08:38------------------- --------------------------------------------------*/ -void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet ) +void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet ) { BOOL bHasNumberStyle = FALSE; @@ -246,7 +246,7 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet ) bCurNumrule = TRUE; const SfxBoolItem& rStart = (const SfxBoolItem&)rSet.Get(FN_NUMBER_NEWSTART); aNewStartCB.SetState( - rStart.GetValue() ? + rStart.GetValue() ? STATE_CHECK : STATE_NOCHECK ); aNewStartCB.EnableTriState(FALSE); } @@ -350,8 +350,8 @@ IMPL_LINK( SwParagraphNumTabPage, LineCountHdl_Impl, CheckBox* , EMPTYARG) --------------------------------------------------*/ IMPL_LINK( SwParagraphNumTabPage, StyleHdl_Impl, ListBox*, pBox ) { -// String dd=aNumberStyleLB.GetSavedValue(); -// if( msOutlineNumbering == dd) +// String dd=aNumberStyleLB.GetSavedValue(); +// if( msOutlineNumbering == dd) { } BOOL bEnable = bCurNumrule || pBox->GetSelectEntryPos() > 0; diff --git a/sw/source/ui/chrdlg/numpara.hrc b/sw/source/ui/chrdlg/numpara.hrc index 536dc8d935dd..4b5e2834db70 100644 --- a/sw/source/ui/chrdlg/numpara.hrc +++ b/sw/source/ui/chrdlg/numpara.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 @@ -41,9 +41,9 @@ #define CB_RESTART_PARACOUNT 9 #define FT_RESTART_NO 10 #define NF_RESTART_PARA 11 -#define FL_OUTLINE_START 12 -#define LB_OUTLINE_LEVEL 13 -#define FT_OUTLINE_LEVEL 14 +#define FL_OUTLINE_START 12 +#define LB_OUTLINE_LEVEL 13 +#define FT_OUTLINE_LEVEL 14 // ********************************************************************** #endif diff --git a/sw/source/ui/chrdlg/numpara.src b/sw/source/ui/chrdlg/numpara.src index 2c384d5dc7a8..14ed11fa0a8d 100644 --- a/sw/source/ui/chrdlg/numpara.src +++ b/sw/source/ui/chrdlg/numpara.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/chrdlg/paradlg.hrc b/sw/source/ui/chrdlg/paradlg.hrc index e8e48dfaa956..a1b243ec1a60 100644 --- a/sw/source/ui/chrdlg/paradlg.hrc +++ b/sw/source/ui/chrdlg/paradlg.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 diff --git a/sw/source/ui/chrdlg/paradlg.src b/sw/source/ui/chrdlg/paradlg.src index 1384e4ae8fa3..636e29f9678b 100644 --- a/sw/source/ui/chrdlg/paradlg.src +++ b/sw/source/ui/chrdlg/paradlg.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/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 0976c7fbf5aa..a7e1970a8bf9 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -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 @@ -100,18 +100,18 @@ SwParaDlg::SwParaDlg(Window *pParent, DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_STD, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) ); + AddTabPage( TP_PARA_STD, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) ); DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_ALIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH) ); + AddTabPage( TP_PARA_ALIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH) ); SvxHtmlOptions* pHtmlOpt = SvxHtmlOptions::Get(); if (!bDrawParaDlg && (!bHtmlMode || pHtmlOpt->IsPrintLayoutExtension())) { DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_EXT, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) ); + AddTabPage( TP_PARA_EXT, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) ); } else @@ -122,7 +122,7 @@ SwParaDlg::SwParaDlg(Window *pParent, { DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) ); + AddTabPage( TP_PARA_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) ); } else RemoveTabPage(TP_PARA_ASIAN); @@ -135,7 +135,7 @@ SwParaDlg::SwParaDlg(Window *pParent, { DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_TABULATOR, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) ); + AddTabPage( TP_TABULATOR, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) ); } if (!bDrawParaDlg) @@ -146,7 +146,7 @@ SwParaDlg::SwParaDlg(Window *pParent, RemoveTabPage(TP_NUMPARA); if(!bHtmlMode || (nHtmlMode & HTMLMODE_FULL_STYLES)) { - AddTabPage(TP_DROPCAPS, SwDropCapsPage::Create, SwDropCapsPage::GetRanges); + AddTabPage(TP_DROPCAPS, SwDropCapsPage::Create, SwDropCapsPage::GetRanges); } else { diff --git a/sw/source/ui/chrdlg/swbreak.src b/sw/source/ui/chrdlg/swbreak.src index 8c6cee69d440..c626278748d5 100644 --- a/sw/source/ui/chrdlg/swbreak.src +++ b/sw/source/ui/chrdlg/swbreak.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/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index a9d90a4c02e4..7fb20bf3f8fe 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -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 @@ -66,7 +66,7 @@ static USHORT __FAR_DATA aPageRg[] = { // Achtung im Code wird dieses Array direkt (0, 1, ...) indiziert static long nTabs[] = - { 2, // Number of Tabs + { 2, // Number of Tabs 0, 100 }; @@ -80,16 +80,16 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, SW_RES(TP_CONDCOLL), rSet), aConditionFL( this, SW_RES( FL_CONDITION )), aConditionCB( this, SW_RES( CB_CONDITION ) ), - aContextFT ( this, SW_RES( FT_CONTEXT ) ), - aUsedFT ( this, SW_RES( FT_USED ) ), - aTbLinks( this, SW_RES( TB_CONDCOLLS ) ), - aStyleFT ( this, SW_RES( FT_STYLE ) ), - aStyleLB ( this, SW_RES( LB_STYLE ) ), - aFilterLB ( this, SW_RES( LB_FILTER ) ), - aRemovePB ( this, SW_RES( PB_REMOVE ) ), - aAssignPB ( this, SW_RES( PB_ASSIGN ) ), - sNoTmpl ( SW_RES( STR_NOTEMPL ) ), - aStrArr ( SW_RES( STR_REGIONS ) ), + aContextFT ( this, SW_RES( FT_CONTEXT ) ), + aUsedFT ( this, SW_RES( FT_USED ) ), + aTbLinks( this, SW_RES( TB_CONDCOLLS ) ), + aStyleFT ( this, SW_RES( FT_STYLE ) ), + aStyleLB ( this, SW_RES( LB_STYLE ) ), + aFilterLB ( this, SW_RES( LB_FILTER ) ), + aRemovePB ( this, SW_RES( PB_REMOVE ) ), + aAssignPB ( this, SW_RES( PB_ASSIGN ) ), + sNoTmpl ( SW_RES( STR_NOTEMPL ) ), + aStrArr ( SW_RES( STR_REGIONS ) ), rSh(::GetActiveView()->GetWrtShell()), pCmds( SwCondCollItem::GetCmds() ), pFmt(0), @@ -100,19 +100,19 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) SetExchangeSupport(); // Handler installieren - aConditionCB.SetClickHdl( LINK(this, SwCondCollPage, OnOffHdl)); + aConditionCB.SetClickHdl( LINK(this, SwCondCollPage, OnOffHdl)); aTbLinks.SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); aStyleLB.SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); - aRemovePB.SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); - aAssignPB.SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); - aTbLinks.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); - aStyleLB.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); - aFilterLB.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); + aRemovePB.SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); + aAssignPB.SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); + aTbLinks.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); + aStyleLB.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); + aFilterLB.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); aTbLinks.SetWindowBits(WB_HSCROLL|WB_CLIPCHILDREN); aTbLinks.SetSelectionMode( SINGLE_SELECTION ); aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT ); - aTbLinks.Resize(); // OS: Hack fuer richtige Selektion + aTbLinks.Resize(); // OS: Hack fuer richtige Selektion aTbLinks.SetSpaceBetweenEntries( 0 ); aTbLinks.SetHelpId(HID_COND_COLL_TABLIST); diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx index 263cb9703ef5..96a10fd0f851 100644 --- a/sw/source/ui/chrdlg/tblnumfm.cxx +++ b/sw/source/ui/chrdlg/tblnumfm.cxx @@ -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/config/barcfg.cxx b/sw/source/ui/config/barcfg.cxx index 5fb403da58ce..91731c9e0a2f 100644 --- a/sw/source/ui/config/barcfg.cxx +++ b/sw/source/ui/config/barcfg.cxx @@ -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 @@ -41,11 +41,11 @@ using namespace utl; using rtl::OUString; using namespace com::sun::star::uno; -#define SEL_TYPE_TABLE_TEXT 0 +#define SEL_TYPE_TABLE_TEXT 0 #define SEL_TYPE_LIST_TEXT 1 #define SEL_TYPE_TABLE_LIST 2 #define SEL_TYPE_BEZIER 3 -#define SEL_TYPE_GRAPHIC 4 +#define SEL_TYPE_GRAPHIC 4 /* --------------------------------------------------------------------------- @@ -123,8 +123,8 @@ Sequence<OUString> SwToolbarConfigItem::GetPropertyNames() "Selection/Table", // SEL_TYPE_TABLE_TEXT "Selection/NumberedList", // SEL_TYPE_LIST_TEXT "Selection/NumberedList_InTable", // SEL_TYPE_TABLE_LIST - "Selection/BezierObject", // SEL_TYPE_BEZIER - "Selection/Graphic" //SEL_TYPE_GRAPHIC + "Selection/BezierObject", // SEL_TYPE_BEZIER + "Selection/Graphic" //SEL_TYPE_GRAPHIC }; const int nCount = 5; Sequence<OUString> aNames(nCount); diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx index d60361e49453..d311a677cf0e 100644 --- a/sw/source/ui/config/caption.cxx +++ b/sw/source/ui/config/caption.cxx @@ -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 @@ -34,7 +34,7 @@ #include "numrule.hxx" #include "caption.hxx" -#define VERSION_01 1 +#define VERSION_01 1 #define CAPTION_VERSION VERSION_01 /*-------------------------------------------------------------------- @@ -103,11 +103,11 @@ InsCaptionOpt& InsCaptionOpt::operator=( const InsCaptionOpt& rOpt ) BOOL InsCaptionOpt::operator==( const InsCaptionOpt& rOpt ) const { return (eObjType == rOpt.eObjType && - aOleId == rOpt.aOleId); // Damit gleiche Ole-IDs nicht mehrfach eingefuegt + aOleId == rOpt.aOleId); // Damit gleiche Ole-IDs nicht mehrfach eingefuegt // werden koennen, auf nichts weiteres vergleichen -/* && +/* && sCategory == rOpt.sCategory && nNumType == rOpt.nNumType && sCaption == rOpt.sCaption && @@ -132,15 +132,15 @@ BOOL InsCaptionOpt::operator==( const InsCaptionOpt& rOpt ) const BYTE nVersion; rIStream >> nVersion; - rIStream >> cVal; rCapOpt.UseCaption() = cVal != 0; - rIStream >> nVal; rCapOpt.eObjType = (SwCapObjType)nVal; + rIStream >> cVal; rCapOpt.UseCaption() = cVal != 0; + rIStream >> nVal; rCapOpt.eObjType = (SwCapObjType)nVal; rIStream >> rCapOpt.aOleId; rIStream.ReadByteString( rCapOpt.sCategory, eEncoding ); - rIStream >> nVal; rCapOpt.nNumType = nVal; + rIStream >> nVal; rCapOpt.nNumType = nVal; rIStream.ReadByteString( rCapOpt.sCaption, eEncoding ); - rIStream >> nVal; rCapOpt.nPos = nVal; - rIStream >> nVal; rCapOpt.nLevel = nVal; + rIStream >> nVal; rCapOpt.nPos = nVal; + rIStream >> nVal; rCapOpt.nLevel = nVal; rIStream >> cVal; rCapOpt.sSeparator = UniString( @@ -160,19 +160,19 @@ BOOL InsCaptionOpt::operator==( const InsCaptionOpt& rOpt ) const /*SvStream& operator<<( SvStream& rOStream, const InsCaptionOpt& rCapOpt ) { rtl_TextEncoding eEncoding = gsl_getSystemTextEncoding(); - rOStream << (BYTE)CAPTION_VERSION + rOStream << (BYTE)CAPTION_VERSION << (BYTE)rCapOpt.UseCaption() << (UINT16)rCapOpt.eObjType << rCapOpt.aOleId; rOStream.WriteByteString( rCapOpt.sCategory, eEncoding ); - rOStream << (UINT16)rCapOpt.nNumType; + rOStream << (UINT16)rCapOpt.nNumType; rOStream.WriteByteString( rCapOpt.sCaption, eEncoding ); BYTE cSep = ByteString(rCapOpt.sSeparator, eEncoding).GetChar(0); - rOStream << (UINT16)rCapOpt.nPos + rOStream << (UINT16)rCapOpt.nPos << (UINT16)rCapOpt.nLevel << cSep; diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx index 3a462ce452b2..352819a18440 100644 --- a/sw/source/ui/config/cfgitems.cxx +++ b/sw/source/ui/config/cfgitems.cxx @@ -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 @@ -58,14 +58,14 @@ SwDocDisplayItem::SwDocDisplayItem( USHORT _nWhich ) : SfxPoolItem(_nWhich), aIndexBackgrndCol(COL_GRAY) { - bParagraphEnd = - bTab = - bSpace = - bNonbreakingSpace = - bSoftHyphen = + bParagraphEnd = + bTab = + bSpace = + bNonbreakingSpace = + bSoftHyphen = bFldHiddenText = bCharHiddenText = - bManualBreak = + bManualBreak = bShowHiddenPara = FALSE; }; @@ -87,14 +87,14 @@ SwDocDisplayItem::SwDocDisplayItem( const SwDocDisplayItem& rDocDisplayItem ): SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt, USHORT _nWhich ) : SfxPoolItem( _nWhich ) { - bParagraphEnd = rVOpt.IsParagraph(TRUE); - bTab = rVOpt.IsTab(TRUE); - bSpace = rVOpt.IsBlank(TRUE); - bNonbreakingSpace = rVOpt.IsHardBlank(); - bSoftHyphen = rVOpt.IsSoftHyph(); + bParagraphEnd = rVOpt.IsParagraph(TRUE); + bTab = rVOpt.IsTab(TRUE); + bSpace = rVOpt.IsBlank(TRUE); + bNonbreakingSpace = rVOpt.IsHardBlank(); + bSoftHyphen = rVOpt.IsSoftHyph(); bCharHiddenText = rVOpt.IsShowHiddenChar(TRUE); bFldHiddenText = rVOpt.IsShowHiddenField(); - bManualBreak = rVOpt.IsLineBreak(TRUE); + bManualBreak = rVOpt.IsLineBreak(TRUE); bShowHiddenPara = rVOpt.IsShowHiddenPara(); } @@ -102,7 +102,7 @@ SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt, USHORT _nWhich ) : Beschreibung: --------------------------------------------------------------------*/ -SfxPoolItem* SwDocDisplayItem::Clone( SfxItemPool* ) const +SfxPoolItem* SwDocDisplayItem::Clone( SfxItemPool* ) const { return new SwDocDisplayItem( *this ); } @@ -117,14 +117,14 @@ int SwDocDisplayItem::operator==( const SfxPoolItem& rAttr ) const const SwDocDisplayItem& rItem = (SwDocDisplayItem&)rAttr; - return ( bParagraphEnd == rItem.bParagraphEnd && - bTab == rItem.bTab && - bSpace == rItem.bSpace && - bNonbreakingSpace == rItem.bNonbreakingSpace && - bSoftHyphen == rItem.bSoftHyphen && + return ( bParagraphEnd == rItem.bParagraphEnd && + bTab == rItem.bTab && + bSpace == rItem.bSpace && + bNonbreakingSpace == rItem.bNonbreakingSpace && + bSoftHyphen == rItem.bSoftHyphen && bCharHiddenText == rItem.bCharHiddenText && bFldHiddenText == rItem.bFldHiddenText && - bManualBreak == rItem.bManualBreak && + bManualBreak == rItem.bManualBreak && bShowHiddenPara == rItem.bShowHiddenPara ); } @@ -136,14 +136,14 @@ int SwDocDisplayItem::operator==( const SfxPoolItem& rAttr ) const void SwDocDisplayItem::operator=( const SwDocDisplayItem& rDocDisplayItem) { - bParagraphEnd = rDocDisplayItem.bParagraphEnd ; - bTab = rDocDisplayItem.bTab ; - bSpace = rDocDisplayItem.bSpace ; - bNonbreakingSpace = rDocDisplayItem.bNonbreakingSpace ; - bSoftHyphen = rDocDisplayItem.bSoftHyphen ; + bParagraphEnd = rDocDisplayItem.bParagraphEnd ; + bTab = rDocDisplayItem.bTab ; + bSpace = rDocDisplayItem.bSpace ; + bNonbreakingSpace = rDocDisplayItem.bNonbreakingSpace ; + bSoftHyphen = rDocDisplayItem.bSoftHyphen ; bCharHiddenText = rDocDisplayItem.bCharHiddenText ; bFldHiddenText = rDocDisplayItem.bFldHiddenText ; - bManualBreak = rDocDisplayItem.bManualBreak ; + bManualBreak = rDocDisplayItem.bManualBreak ; bShowHiddenPara = rDocDisplayItem.bShowHiddenPara ; } @@ -152,14 +152,14 @@ void SwDocDisplayItem::operator=( const SwDocDisplayItem& rDocDisplayItem) --------------------------------------------------------------------*/ void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt) const { - rVOpt.SetParagraph (bParagraphEnd ); - rVOpt.SetTab (bTab ); - rVOpt.SetBlank (bSpace ); - rVOpt.SetHardBlank (bNonbreakingSpace ); - rVOpt.SetSoftHyph (bSoftHyphen ); + rVOpt.SetParagraph (bParagraphEnd ); + rVOpt.SetTab (bTab ); + rVOpt.SetBlank (bSpace ); + rVOpt.SetHardBlank (bNonbreakingSpace ); + rVOpt.SetSoftHyph (bSoftHyphen ); rVOpt.SetShowHiddenChar(bCharHiddenText ); rVOpt.SetShowHiddenField(bFldHiddenText ); - rVOpt.SetLineBreak (bManualBreak ); + rVOpt.SetLineBreak (bManualBreak ); rVOpt.SetShowHiddenPara(bShowHiddenPara ); } @@ -174,16 +174,16 @@ SwElemItem::SwElemItem( USHORT _nWhich ) : bVertScrollbar = bAnyRuler = bHorzRuler = - bVertRuler = + bVertRuler = bVertRulerRight= - bCrosshair = - bHandles = - bBigHandles = + bCrosshair = + bHandles = + bBigHandles = bSmoothScroll = - bTable = - bGraphic = - bDrawing = - bFieldName = + bTable = + bGraphic = + bDrawing = + bFieldName = bNotes = FALSE; } /*-------------------------------------------------------------------- @@ -202,21 +202,21 @@ SwElemItem::SwElemItem( const SwElemItem& rElemItem ): SwElemItem::SwElemItem(const SwViewOption& rVOpt, USHORT _nWhich) : SfxPoolItem( _nWhich ) { - bHorzScrollbar = rVOpt.IsViewHScrollBar(); - bVertScrollbar = rVOpt.IsViewVScrollBar(); + bHorzScrollbar = rVOpt.IsViewHScrollBar(); + bVertScrollbar = rVOpt.IsViewVScrollBar(); bAnyRuler = rVOpt.IsViewAnyRuler(); bHorzRuler = rVOpt.IsViewHRuler(TRUE); bVertRuler = rVOpt.IsViewVRuler(TRUE); bVertRulerRight = rVOpt.IsVRulerRight(); - bCrosshair = rVOpt.IsCrossHair(); - bHandles = rVOpt.IsSolidMarkHdl(); + bCrosshair = rVOpt.IsCrossHair(); + bHandles = rVOpt.IsSolidMarkHdl(); bBigHandles = rVOpt.IsBigMarkHdl(); - bSmoothScroll = rVOpt.IsSmoothScroll(); - bTable = rVOpt.IsTable(); - bGraphic = rVOpt.IsGraphic(); - bDrawing = rVOpt.IsDraw() && rVOpt.IsControl(); - bFieldName = rVOpt.IsFldName(); - bNotes = rVOpt.IsPostIts(); + bSmoothScroll = rVOpt.IsSmoothScroll(); + bTable = rVOpt.IsTable(); + bGraphic = rVOpt.IsGraphic(); + bDrawing = rVOpt.IsDraw() && rVOpt.IsControl(); + bFieldName = rVOpt.IsFldName(); + bNotes = rVOpt.IsPostIts(); } @@ -239,15 +239,15 @@ int SwElemItem::operator==( const SfxPoolItem& rAttr ) const const SwElemItem& rItem = (SwElemItem&)rAttr; - return ( bHorzScrollbar == rItem.bHorzScrollbar && - bVertScrollbar == rItem.bVertScrollbar && + return ( bHorzScrollbar == rItem.bHorzScrollbar && + bVertScrollbar == rItem.bVertScrollbar && bAnyRuler == rItem.bAnyRuler && bHorzRuler == rItem.bHorzRuler && - bVertRuler == rItem.bVertRuler && + bVertRuler == rItem.bVertRuler && bVertRulerRight == rItem.bVertRulerRight&& - bCrosshair == rItem.bCrosshair && - bHandles == rItem.bHandles && - bBigHandles == rItem.bBigHandles && + bCrosshair == rItem.bCrosshair && + bHandles == rItem.bHandles && + bBigHandles == rItem.bBigHandles && bSmoothScroll == rItem.bSmoothScroll && bTable == rItem.bTable && bGraphic == rItem.bGraphic && @@ -263,16 +263,16 @@ int SwElemItem::operator==( const SfxPoolItem& rAttr ) const void SwElemItem::operator=( const SwElemItem& rElemItem) { - bHorzScrollbar = rElemItem. bHorzScrollbar ; - bVertScrollbar = rElemItem. bVertScrollbar ; + bHorzScrollbar = rElemItem. bHorzScrollbar ; + bVertScrollbar = rElemItem. bVertScrollbar ; bAnyRuler = rElemItem. bAnyRuler; bHorzRuler = rElemItem. bHorzRuler ; - bVertRuler = rElemItem. bVertRuler ; + bVertRuler = rElemItem. bVertRuler ; bVertRulerRight = rElemItem. bVertRulerRight ; - bCrosshair = rElemItem. bCrosshair ; - bHandles = rElemItem. bHandles ; - bBigHandles = rElemItem. bBigHandles ; - bSmoothScroll = rElemItem. bSmoothScroll ; + bCrosshair = rElemItem. bCrosshair ; + bHandles = rElemItem. bHandles ; + bBigHandles = rElemItem. bBigHandles ; + bSmoothScroll = rElemItem. bSmoothScroll ; bTable = rElemItem.bTable ; bGraphic = rElemItem.bGraphic ; bDrawing = rElemItem.bDrawing ; @@ -292,16 +292,16 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const rVOpt.SetViewHRuler(bHorzRuler ); rVOpt.SetViewVRuler(bVertRuler ); rVOpt.SetVRulerRight(bVertRulerRight ); - rVOpt.SetCrossHair(bCrosshair ); - rVOpt.SetSolidMarkHdl(bHandles ); + rVOpt.SetCrossHair(bCrosshair ); + rVOpt.SetSolidMarkHdl(bHandles ); rVOpt.SetBigMarkHdl(bBigHandles ); rVOpt.SetSmoothScroll(bSmoothScroll); - rVOpt.SetTable (bTable ); - rVOpt.SetGraphic (bGraphic ); - rVOpt.SetDraw (bDrawing ); - rVOpt.SetControl (bDrawing ); - rVOpt.SetFldName (bFieldName ); - rVOpt.SetPostIts (bNotes ); + rVOpt.SetTable (bTable ); + rVOpt.SetGraphic (bGraphic ); + rVOpt.SetDraw (bDrawing ); + rVOpt.SetControl (bDrawing ); + rVOpt.SetFldName (bFieldName ); + rVOpt.SetPostIts (bNotes ); } @@ -387,7 +387,7 @@ SfxPoolItem* SwShadowCursorItem::Clone( SfxItemPool* ) const int SwShadowCursorItem::operator==( const SfxPoolItem& rCmp ) const { - return IsOn() == ((SwShadowCursorItem&)rCmp).IsOn() && + return IsOn() == ((SwShadowCursorItem&)rCmp).IsOn() && GetMode() == ((SwShadowCursorItem&)rCmp).GetMode(); } diff --git a/sw/source/ui/config/config.hrc b/sw/source/ui/config/config.hrc index 197e6482d7a1..e5a6ef2f9aaa 100644 --- a/sw/source/ui/config/config.hrc +++ b/sw/source/ui/config/config.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 @@ -32,30 +32,30 @@ // Dialoge fuer die Konfiguration // Strings fuer die Konfiguration -#define STR_CFG_SIGNATUR (RC_CONFIG_BEGIN + 0) -#define DLG_CONFIG_VIEW (RC_CONFIG_BEGIN + 1) -#define DLG_CONFIG_MISC (RC_CONFIG_BEGIN + 2) -#define DLG_CONFIG_SAVE (RC_CONFIG_BEGIN + 3) -#define DLG_CONFIG_PATH (RC_CONFIG_BEGIN + 4) -#define DLG_CONFIG_MENU (RC_CONFIG_BEGIN + 5) -#define DLG_CONFIG_KEY (RC_CONFIG_BEGIN + 6) -#define DLG_CONFIG_TOOLBOX (RC_CONFIG_BEGIN + 7) -#define DLG_CONFIG_COLOR (RC_CONFIG_BEGIN + 8) -#define DLG_TBSEL (RC_CONFIG_BEGIN + 9) -#define DLG_CFGSEL (RC_CONFIG_BEGIN + 10) -#define DLG_CONFIG (RC_CONFIG_BEGIN + 11) -#define DLG_MAC_ASSIGN (RC_CONFIG_BEGIN + 12) +#define STR_CFG_SIGNATUR (RC_CONFIG_BEGIN + 0) +#define DLG_CONFIG_VIEW (RC_CONFIG_BEGIN + 1) +#define DLG_CONFIG_MISC (RC_CONFIG_BEGIN + 2) +#define DLG_CONFIG_SAVE (RC_CONFIG_BEGIN + 3) +#define DLG_CONFIG_PATH (RC_CONFIG_BEGIN + 4) +#define DLG_CONFIG_MENU (RC_CONFIG_BEGIN + 5) +#define DLG_CONFIG_KEY (RC_CONFIG_BEGIN + 6) +#define DLG_CONFIG_TOOLBOX (RC_CONFIG_BEGIN + 7) +#define DLG_CONFIG_COLOR (RC_CONFIG_BEGIN + 8) +#define DLG_TBSEL (RC_CONFIG_BEGIN + 9) +#define DLG_CFGSEL (RC_CONFIG_BEGIN + 10) +#define DLG_CONFIG (RC_CONFIG_BEGIN + 11) +#define DLG_MAC_ASSIGN (RC_CONFIG_BEGIN + 12) -#define MSG_DOUBLE_MENU_ID (RC_CONFIG_BEGIN + 13) -#define MSG_DOUBLE_ID (RC_CONFIG_BEGIN + 14) -#define DLG_SYMBOL_SELECT (RC_CONFIG_BEGIN + 15) -#define DLG_CONFIG_GRID (RC_CONFIG_BEGIN + 16) -#define DLG_CONFIG_ADDR (RC_CONFIG_BEGIN + 17) +#define MSG_DOUBLE_MENU_ID (RC_CONFIG_BEGIN + 13) +#define MSG_DOUBLE_ID (RC_CONFIG_BEGIN + 14) +#define DLG_SYMBOL_SELECT (RC_CONFIG_BEGIN + 15) +#define DLG_CONFIG_GRID (RC_CONFIG_BEGIN + 16) +#define DLG_CONFIG_ADDR (RC_CONFIG_BEGIN + 17) #define DLG_MM_TESTACCOUNTSETTINGS (RC_CONFIG_BEGIN + 19) #define DLG_MM_SERVERAUTHENTICATION (RC_CONFIG_BEGIN + 20) -#define STR_ERROR_PATH (RC_CONFIG_BEGIN + 25) +#define STR_ERROR_PATH (RC_CONFIG_BEGIN + 25) #define STR_ARR_METRIC (RC_CONFIG_BEGIN + 26) #define CONFIG_ACT_END STR_ARR_METRIC diff --git a/sw/source/ui/config/dbconfig.cxx b/sw/source/ui/config/dbconfig.cxx index ade5163a5921..e189fe7d3816 100644 --- a/sw/source/ui/config/dbconfig.cxx +++ b/sw/source/ui/config/dbconfig.cxx @@ -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/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx index e1b951c1c879..89e7f142dfa7 100644 --- a/sw/source/ui/config/fontcfg.cxx +++ b/sw/source/ui/config/fontcfg.cxx @@ -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 @@ -154,7 +154,7 @@ SwStdFontConfig::SwStdFontConfig() : /* -----------------------------08.09.00 15:58-------------------------------- ---------------------------------------------------------------------------*/ -void SwStdFontConfig::Commit() +void SwStdFontConfig::Commit() { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -303,7 +303,10 @@ sal_Int32 SwStdFontConfig::GetDefaultHeightFor(USHORT nFontType, LanguageType eL case FONT_OUTLINE_CJK: case FONT_OUTLINE_CTL: nRet = FONTSIZE_OUTLINE; - break; + break; + case FONT_STANDARD_CJK: + nRet = FONTSIZE_CJK_DEFAULT; + break; } if( eLang == LANGUAGE_THAI && nFontType >= FONT_STANDARD_CTL ) { diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 5fa03de5e0a5..e8752bd08fbf 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -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/config/mailconfigpage.hrc b/sw/source/ui/config/mailconfigpage.hrc index a7115878ccf5..0a52c9428715 100644 --- a/sw/source/ui/config/mailconfigpage.hrc +++ b/sw/source/ui/config/mailconfigpage.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 diff --git a/sw/source/ui/config/mailconfigpage.src b/sw/source/ui/config/mailconfigpage.src index 1ad1378222c0..f76f01ccaba1 100644 --- a/sw/source/ui/config/mailconfigpage.src +++ b/sw/source/ui/config/mailconfigpage.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 @@ -392,7 +392,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION }; Edit ED_INPASSWORD { - Pos = MAP_APPFONT ( 78 , 165 ) ; + Pos = MAP_APPFONT ( 78 , 165 ) ; Size = MAP_APPFONT ( 115 , 12 ) ; Border = TRUE; PassWord = TRUE; diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx index ec0e47393eb2..1143d433c833 100644 --- a/sw/source/ui/config/modcfg.cxx +++ b/sw/source/ui/config/modcfg.cxx @@ -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 @@ -57,7 +57,7 @@ using namespace utl; using rtl::OUString; using namespace com::sun::star::uno; -#define GLOB_NAME_CALC 0 +#define GLOB_NAME_CALC 0 #define GLOB_NAME_IMPRESS 1 #define GLOB_NAME_DRAW 2 #define GLOB_NAME_MATH 3 @@ -186,9 +186,9 @@ String SwModuleOptions::ConvertWordDelimiter(const String& rDelim, BOOL bFromUI) switch (c) { - case 'n': sReturn += '\n'; break; - case 't': sReturn += '\t'; break; - case '\\': sReturn += '\\'; break; + case 'n': sReturn += '\n'; break; + case 't': sReturn += '\t'; break; + case '\\': sReturn += '\\'; break; case 'x': { @@ -218,7 +218,7 @@ String SwModuleOptions::ConvertWordDelimiter(const String& rDelim, BOOL bFromUI) break; } - default: // Unbekannt, daher nur Backslash einfuegen + default: // Unbekannt, daher nur Backslash einfuegen sReturn += '\\'; i--; break; @@ -236,9 +236,9 @@ String SwModuleOptions::ConvertWordDelimiter(const String& rDelim, BOOL bFromUI) switch (c) { - case '\n': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\n")); break; - case '\t': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\t")); break; - case '\\': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\\\")); break; + case '\n': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\n")); break; + case '\t': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\t")); break; + case '\\': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\\\")); break; default: if( c <= 0x1f || c >= 0x7f ) @@ -265,14 +265,14 @@ const Sequence<OUString>& SwRevisionConfig::GetPropertyNames() aNames.realloc(nCount); static const char* aPropNames[] = { - "TextDisplay/Insert/Attribute", // 0 - "TextDisplay/Insert/Color", // 1 - "TextDisplay/Delete/Attribute", // 2 - "TextDisplay/Delete/Color", // 3 + "TextDisplay/Insert/Attribute", // 0 + "TextDisplay/Insert/Color", // 1 + "TextDisplay/Delete/Attribute", // 2 + "TextDisplay/Delete/Color", // 3 "TextDisplay/ChangedAttribute/Attribute", // 4 - "TextDisplay/ChangedAttribute/Color", // 5 - "LinesChanged/Mark", // 6 - "LinesChanged/Color" // 7 + "TextDisplay/ChangedAttribute/Color", // 5 + "LinesChanged/Mark", // 6 + "LinesChanged/Color" // 7 }; OUString* pNames = aNames.getArray(); for(int i = 0; i < nCount; i++) @@ -313,7 +313,7 @@ sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr) sal_Int32 nRet = 0; switch(rAttr.nItemId) { - case SID_ATTR_CHAR_WEIGHT: nRet = 1; break; + case SID_ATTR_CHAR_WEIGHT: nRet = 1; break; case SID_ATTR_CHAR_POSTURE: nRet = 2; break; case SID_ATTR_CHAR_UNDERLINE: nRet = UNDERLINE_SINGLE == rAttr.nAttr ? 3 : 4; break; case SID_ATTR_CHAR_STRIKEOUT: nRet = 3; break; @@ -347,12 +347,12 @@ void SwRevisionConfig::Commit() switch(nProp) { case 0 : nVal = lcl_ConvertAttrToCfg(aInsertAttr); break; - case 1 : nVal = aInsertAttr.nColor ; break; + case 1 : nVal = aInsertAttr.nColor ; break; case 2 : nVal = lcl_ConvertAttrToCfg(aDeletedAttr); break; case 3 : nVal = aDeletedAttr.nColor ; break; case 4 : nVal = lcl_ConvertAttrToCfg(aFormatAttr); break; - case 5 : nVal = aFormatAttr.nColor ; break; - case 6 : nVal = nMarkAlign ; break; + case 5 : nVal = aFormatAttr.nColor ; break; + case 6 : nVal = nMarkAlign ; break; case 7 : nVal = aMarkColor.GetColor(); break; } pValues[nProp] <<= nVal; @@ -367,7 +367,7 @@ void lcl_ConvertCfgToAttr(sal_Int32 nVal, AuthorCharAttr& rAttr, sal_Bool bDelet rAttr.nItemId = rAttr.nAttr = 0; switch(nVal) { - case 1: rAttr.nItemId = SID_ATTR_CHAR_WEIGHT; rAttr.nAttr = WEIGHT_BOLD ; break; + case 1: rAttr.nItemId = SID_ATTR_CHAR_WEIGHT; rAttr.nAttr = WEIGHT_BOLD ; break; case 2: rAttr.nItemId = SID_ATTR_CHAR_POSTURE; rAttr.nAttr = ITALIC_NORMAL ; break; case 3: if(bDelete) { @@ -385,7 +385,7 @@ void lcl_ConvertCfgToAttr(sal_Int32 nVal, AuthorCharAttr& rAttr, sal_Bool bDelet case 6: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP; rAttr.nAttr = SVX_CASEMAP_GEMEINE ; break; case 7: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP; rAttr.nAttr = SVX_CASEMAP_KAPITAELCHEN ; break; case 8: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP; rAttr.nAttr = SVX_CASEMAP_TITEL ; break; - case 9: rAttr.nItemId = SID_ATTR_BRUSH; break; + case 9: rAttr.nItemId = SID_ATTR_BRUSH; break; } } void SwRevisionConfig::Load() @@ -405,11 +405,11 @@ void SwRevisionConfig::Load() switch(nProp) { case 0 : lcl_ConvertCfgToAttr(nVal, aInsertAttr); break; - case 1 : aInsertAttr.nColor = nVal; break; + case 1 : aInsertAttr.nColor = nVal; break; case 2 : lcl_ConvertCfgToAttr(nVal, aDeletedAttr, sal_True); break; - case 3 : aDeletedAttr.nColor = nVal; break; + case 3 : aDeletedAttr.nColor = nVal; break; case 4 : lcl_ConvertCfgToAttr(nVal, aFormatAttr); break; - case 5 : aFormatAttr.nColor = nVal; break; + case 5 : aFormatAttr.nColor = nVal; break; case 6 : nMarkAlign = sal::static_int_cast< sal_uInt16, sal_Int32>(nVal); break; case 7 : aMarkColor.SetColor(nVal); break; } @@ -516,7 +516,7 @@ enum InsertConfigProp INS_PROP_CAP_OBJECT_OLEMISC_POSITION, //91 INS_PROP_CAP_OBJECT_OLEMISC_CHARACTERSTYLE, //92 INS_PROP_CAP_OBJECT_OLEMISC_APPLYATTRIBUTES //93 -}; +}; const Sequence<OUString>& SwInsertConfig::GetPropertyNames() { static Sequence<OUString> aNames; @@ -619,7 +619,7 @@ const Sequence<OUString>& SwInsertConfig::GetPropertyNames() "Caption/OfficeObject/OLEMisc/Settings/Position", //91 "Caption/OfficeObject/OLEMisc/Settings/CharacterStyle", //92 "Caption/OfficeObject/OLEMisc/Settings/ApplyAttributes" //93 - }; + }; const int nCount = INS_PROP_CAP_OBJECT_OLEMISC_APPLYATTRIBUTES + 1; const int nWebCount = INS_PROP_TABLE_BORDER + 1; aNames.realloc(nCount); @@ -647,7 +647,7 @@ SwInsertConfig::SwInsertConfig(sal_Bool bWeb) : aInsTblOpts(0,0), bIsWeb(bWeb) { - aGlobalNames[GLOB_NAME_CALC ] = SvGlobalName(SO3_SC_CLASSID); + aGlobalNames[GLOB_NAME_CALC ] = SvGlobalName(SO3_SC_CLASSID); aGlobalNames[GLOB_NAME_IMPRESS] = SvGlobalName(SO3_SIMPRESS_CLASSID); aGlobalNames[GLOB_NAME_DRAW ] = SvGlobalName(SO3_SDRAW_CLASSID); aGlobalNames[GLOB_NAME_MATH ] = SvGlobalName(SO3_SM_CLASSID); @@ -743,7 +743,7 @@ void SwInsertConfig::Commit() } break;//"Table/Split", case INS_PROP_CAP_AUTOMATIC: pValues[nProp].setValue(&bInsWithCaption, rType);break;//"Caption/Automatic", - case INS_PROP_CAP_CAPTIONORDERNUMBERINGFIRST: + case INS_PROP_CAP_CAPTIONORDERNUMBERINGFIRST: pValues[nProp] <<= bCaptionOrderNumberingFirst; break;//"Caption/CaptionOrderNumberingFirst" @@ -904,7 +904,7 @@ void lcl_ReadOpt(InsCaptionOpt& rOpt, const Any* pValues, sal_Int32 nProp, sal_I break;//CaptionText", case 5: { - OUString sTemp; + OUString sTemp; if(pValues[nProp] >>= sTemp) rOpt.SetSeparator(sTemp); } @@ -1176,14 +1176,14 @@ const Sequence<OUString>& SwTableConfig::GetPropertyNames() static Sequence<OUString> aNames(nCount); static const char* aPropNames[] = { - "Shift/Row", // 0 - "Shift/Column", // 1 - "Insert/Row", // 2 - "Insert/Column", // 3 - "Change/Effect", // 4 - "Input/NumberRecognition", // 5 + "Shift/Row", // 0 + "Shift/Column", // 1 + "Insert/Row", // 2 + "Insert/Column", // 3 + "Change/Effect", // 4 + "Input/NumberRecognition", // 5 "Input/NumberFormatRecognition",// 6 - "Input/Alignment" // 7 + "Input/Alignment" // 7 }; OUString* pNames = aNames.getArray(); for(int i = 0; i < nCount; i++) @@ -1251,12 +1251,12 @@ void SwTableConfig::Load() sal_Int32 nTemp = 0; switch(nProp) { - case 0 : pValues[nProp] >>= nTemp; nTblHMove = (USHORT)MM100_TO_TWIP(nTemp); break; //"Shift/Row", + case 0 : pValues[nProp] >>= nTemp; nTblHMove = (USHORT)MM100_TO_TWIP(nTemp); break; //"Shift/Row", case 1 : pValues[nProp] >>= nTemp; nTblVMove = (USHORT)MM100_TO_TWIP(nTemp); break; //"Shift/Column", case 2 : pValues[nProp] >>= nTemp; nTblHInsert = (USHORT)MM100_TO_TWIP(nTemp); break; //"Insert/Row", case 3 : pValues[nProp] >>= nTemp; nTblVInsert = (USHORT)MM100_TO_TWIP(nTemp); break; //"Insert/Column", case 4 : pValues[nProp] >>= nTemp; eTblChgMode = (TblChgMode)nTemp; break; //"Change/Effect", - case 5 : bInsTblFormatNum = *(sal_Bool*)pValues[nProp].getValue(); break; //"Input/NumberRecognition", + case 5 : bInsTblFormatNum = *(sal_Bool*)pValues[nProp].getValue(); break; //"Input/NumberRecognition", case 6 : bInsTblChangeNumFormat = *(sal_Bool*)pValues[nProp].getValue(); break; //"Input/NumberFormatRecognition", case 7 : bInsTblAlignNum = *(sal_Bool*)pValues[nProp].getValue(); break; //"Input/Alignment" } @@ -1299,15 +1299,15 @@ const Sequence<OUString>& SwMiscConfig::GetPropertyNames() aNames.realloc(nCount); static const char* aPropNames[] = { - "Statistics/WordNumber/Delimiter", // 0 - "DefaultFont/Document", // 1 - "Index/ShowPreview", // 2 - "Misc/GraphicToGalleryAsLink", // 3 - "Numbering/Graphic/KeepRatio", // 4 + "Statistics/WordNumber/Delimiter", // 0 + "DefaultFont/Document", // 1 + "Index/ShowPreview", // 2 + "Misc/GraphicToGalleryAsLink", // 3 + "Numbering/Graphic/KeepRatio", // 4 "FormLetter/PrintOutput/SinglePrintJobs", // 5 - "FormLetter/MailingOutput/Format", // 6 + "FormLetter/MailingOutput/Format", // 6 "FormLetter/FileOutput/FileName/FromDatabaseField", // 7 - "FormLetter/FileOutput/Path", // 8 + "FormLetter/FileOutput/Path", // 8 "FormLetter/FileOutput/FileName/FromManualSetting", // 9 "FormLetter/FileOutput/FileName/Generation",//10 "FormLetter/PrintOutput/AskForMerge" //11 @@ -1339,14 +1339,14 @@ void SwMiscConfig::Commit() SwModuleOptions::ConvertWordDelimiter(sWordDelimiter, sal_False)); break; case 1 : pValues[nProp].setValue(&bDefaultFontsInCurrDocOnly, rType); break; - case 2 : pValues[nProp].setValue(&bShowIndexPreview, rType) ; break; - case 3 : pValues[nProp].setValue(&bGrfToGalleryAsLnk, rType); break; - case 4 : pValues[nProp].setValue(&bNumAlignSize, rType); break; - case 5 : pValues[nProp].setValue(&bSinglePrintJob, rType); break; - case 6 : pValues[nProp] <<= nMailingFormats; break; + case 2 : pValues[nProp].setValue(&bShowIndexPreview, rType) ; break; + case 3 : pValues[nProp].setValue(&bGrfToGalleryAsLnk, rType); break; + case 4 : pValues[nProp].setValue(&bNumAlignSize, rType); break; + case 5 : pValues[nProp].setValue(&bSinglePrintJob, rType); break; + case 6 : pValues[nProp] <<= nMailingFormats; break; case 7 : pValues[nProp] <<= OUString(sNameFromColumn); break; - case 8 : pValues[nProp] <<= OUString(sMailingPath); break; - case 9 : pValues[nProp] <<= OUString(sMailName); break; + case 8 : pValues[nProp] <<= OUString(sMailingPath); break; + case 9 : pValues[nProp] <<= OUString(sMailName); break; case 10: pValues[nProp].setValue(&bIsNameFromColumn, rType);break; case 11: pValues[nProp] <<= bAskForMailMergeInPrint; break; } @@ -1379,10 +1379,10 @@ void SwMiscConfig::Load() case 3 : bGrfToGalleryAsLnk = *(sal_Bool*)pValues[nProp].getValue(); break; case 4 : bNumAlignSize = *(sal_Bool*)pValues[nProp].getValue(); break; case 5 : bSinglePrintJob = *(sal_Bool*)pValues[nProp].getValue(); break; - case 6 : pValues[nProp] >>= nMailingFormats; ; break; + case 6 : pValues[nProp] >>= nMailingFormats; ; break; case 7 : pValues[nProp] >>= sTmp; sNameFromColumn = sTmp; break; - case 8 : pValues[nProp] >>= sTmp; sMailingPath = sTmp; break; - case 9 : pValues[nProp] >>= sTmp; sMailName = sTmp; break; + case 8 : pValues[nProp] >>= sTmp; sMailingPath = sTmp; break; + case 9 : pValues[nProp] >>= sTmp; sMailName = sTmp; break; case 10: bIsNameFromColumn = *(sal_Bool*)pValues[nProp].getValue(); break; case 11: pValues[nProp] >>= bAskForMailMergeInPrint; break; } diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 49c073103501..53603031e1d5 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -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 @@ -58,30 +58,30 @@ using namespace ::com::sun::star::uno; using ::rtl::OUString; using namespace ::std; -#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM( s ) ) -#define DEFAULT_ENTRY COMPATIBILITY_DEFAULT_NAME -#define USER_ENTRY ASCII_STR( "_user" ) -#define BUTTON_BORDER 2 +#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM( s ) ) +#define DEFAULT_ENTRY COMPATIBILITY_DEFAULT_NAME +#define USER_ENTRY ASCII_STR( "_user" ) +#define BUTTON_BORDER 2 // struct CompatibilityItem ---------------------------------------------- struct CompatibilityItem { - String m_sName; - String m_sModule; - bool m_bUsePrtMetrics; - bool m_bAddSpacing; - bool m_bAddSpacingAtPages; - bool m_bUseOurTabStops; - bool m_bNoExtLeading; - bool m_bUseLineSpacing; - bool m_bAddTableSpacing; - bool m_bUseObjPos; - bool m_bUseOurTextWrapping; - bool m_bConsiderWrappingStyle; + String m_sName; + String m_sModule; + bool m_bUsePrtMetrics; + bool m_bAddSpacing; + bool m_bAddSpacingAtPages; + bool m_bUseOurTabStops; + bool m_bNoExtLeading; + bool m_bUseLineSpacing; + bool m_bAddTableSpacing; + bool m_bUseObjPos; + bool m_bUseOurTextWrapping; + bool m_bConsiderWrappingStyle; bool m_bExpandWordSpace; - bool m_bIsDefault; - bool m_bIsUser; + bool m_bIsDefault; + bool m_bIsUser; CompatibilityItem( const String& _rName, const String& _rModule, bool _bUsePrtMetrics, bool _bAddSpacing, bool _bAddSpacingAtPages, @@ -90,21 +90,21 @@ struct CompatibilityItem bool _bConsiderWrappingStyle, bool _bExpandWordSpace, bool _bIsDefault, bool _bIsUser ) : - m_sName ( _rName ), - m_sModule ( _rModule ), - m_bUsePrtMetrics ( _bUsePrtMetrics ), - m_bAddSpacing ( _bAddSpacing ), - m_bAddSpacingAtPages ( _bAddSpacingAtPages ), - m_bUseOurTabStops ( _bUseOurTabStops ), - m_bNoExtLeading ( _bNoExtLeading ), - m_bUseLineSpacing ( _bUseLineSpacing ), - m_bAddTableSpacing ( _bAddTableSpacing ), - m_bUseObjPos ( _bUseObjPos ), - m_bUseOurTextWrapping ( _bUseOurTextWrapping ), + m_sName ( _rName ), + m_sModule ( _rModule ), + m_bUsePrtMetrics ( _bUsePrtMetrics ), + m_bAddSpacing ( _bAddSpacing ), + m_bAddSpacingAtPages ( _bAddSpacingAtPages ), + m_bUseOurTabStops ( _bUseOurTabStops ), + m_bNoExtLeading ( _bNoExtLeading ), + m_bUseLineSpacing ( _bUseLineSpacing ), + m_bAddTableSpacing ( _bAddTableSpacing ), + m_bUseObjPos ( _bUseObjPos ), + m_bUseOurTextWrapping ( _bUseOurTextWrapping ), m_bConsiderWrappingStyle( _bConsiderWrappingStyle ), m_bExpandWordSpace ( _bExpandWordSpace ), - m_bIsDefault ( _bIsDefault ), - m_bIsUser ( _bIsUser ) {} + m_bIsDefault ( _bIsDefault ), + m_bIsUser ( _bIsUser ) {} }; #include <vector> @@ -113,7 +113,7 @@ struct SwCompatibilityOptPage_Impl { typedef vector< CompatibilityItem > SwCompatibilityItemList; - SwCompatibilityItemList m_aList; + SwCompatibilityItemList m_aList; }; // class SwCompatibilityOptPage ------------------------------------------ @@ -122,18 +122,18 @@ SwCompatibilityOptPage::SwCompatibilityOptPage( Window* pParent, const SfxItemSe SfxTabPage( pParent, SW_RES( TP_OPTCOMPATIBILITY_PAGE ), rSet ), - m_aMainFL ( this, SW_RES( FL_MAIN ) ), - m_aFormattingFT ( this, SW_RES( FT_FORMATTING ) ), - m_aFormattingLB ( this, SW_RES( LB_FORMATTING ) ), - m_aOptionsFT ( this, SW_RES( FT_OPTIONS ) ), - m_aOptionsLB ( this, SW_RES( LB_OPTIONS ) ), - m_aResetPB ( this, SW_RES( PB_RESET ) ), - m_aDefaultPB ( this, SW_RES( PB_DEFAULT ) ), - m_sUserEntry ( SW_RES( STR_USERENTRY ) ), - m_sUseAsDefaultQuery( SW_RES( STR_QRYBOX_USEASDEFAULT ) ), - m_pWrtShell ( NULL ), - m_pImpl ( new SwCompatibilityOptPage_Impl ), - m_nSavedOptions ( 0 ) + m_aMainFL ( this, SW_RES( FL_MAIN ) ), + m_aFormattingFT ( this, SW_RES( FT_FORMATTING ) ), + m_aFormattingLB ( this, SW_RES( LB_FORMATTING ) ), + m_aOptionsFT ( this, SW_RES( FT_OPTIONS ) ), + m_aOptionsLB ( this, SW_RES( LB_OPTIONS ) ), + m_aResetPB ( this, SW_RES( PB_RESET ) ), + m_aDefaultPB ( this, SW_RES( PB_DEFAULT ) ), + m_sUserEntry ( SW_RES( STR_USERENTRY ) ), + m_sUseAsDefaultQuery( SW_RES( STR_QRYBOX_USEASDEFAULT ) ), + m_pWrtShell ( NULL ), + m_pImpl ( new SwCompatibilityOptPage_Impl ), + m_nSavedOptions ( 0 ) { // init options strings with local resource ids -> so do it before FreeResource() @@ -437,7 +437,7 @@ IMPL_LINK( SwCompatibilityOptPage, UseAsDefaultHdl, PushButton*, EMPTYARG ) switch ( eOption ) { case COPT_USE_PRINTERDEVICE : pItem->m_bUsePrtMetrics = bChecked; break; - case COPT_ADD_SPACING : pItem->m_bAddSpacing = bChecked; break; + case COPT_ADD_SPACING : pItem->m_bAddSpacing = bChecked; break; case COPT_ADD_SPACING_AT_PAGES : pItem->m_bAddSpacingAtPages = bChecked; break; case COPT_USE_OUR_TABSTOPS : pItem->m_bUseOurTabStops = bChecked; break; case COPT_NO_EXTLEADING : pItem->m_bNoExtLeading = bChecked; break; @@ -519,7 +519,7 @@ void SwCompatibilityOptPage::WriteOptions() // ----------------------------------------------------------------------- -SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwCompatibilityOptPage( pParent, rAttrSet ); } diff --git a/sw/source/ui/config/optcomp.hrc b/sw/source/ui/config/optcomp.hrc index 4219724a9106..f378ff739386 100644 --- a/sw/source/ui/config/optcomp.hrc +++ b/sw/source/ui/config/optcomp.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 @@ -27,29 +27,29 @@ // the controls -#define FL_MAIN 10 -#define FT_FORMATTING 11 -#define LB_FORMATTING 12 -#define FT_OPTIONS 13 -#define LB_OPTIONS 14 -#define PB_RESET 15 -#define PB_DEFAULT 16 +#define FL_MAIN 10 +#define FT_FORMATTING 11 +#define LB_FORMATTING 12 +#define FT_OPTIONS 13 +#define LB_OPTIONS 14 +#define PB_RESET 15 +#define PB_DEFAULT 16 // the option strings -#define STR_USERENTRY 10 -#define STR_QRYBOX_USEASDEFAULT 11 +#define STR_USERENTRY 10 +#define STR_QRYBOX_USEASDEFAULT 11 -#define STR_COMP_OPTIONS_START 100 -#define STR_PRINTER_METRICS (STR_COMP_OPTIONS_START + 0) -#define STR_MERGE_PARA_DIST (STR_COMP_OPTIONS_START + 1) -#define STR_MERGE_PARA_DIST_PAGESTART (STR_COMP_OPTIONS_START + 2) -#define STR_TAB_ALIGNMENT (STR_COMP_OPTIONS_START + 3) -#define STR_EXTERNAL_LEADING (STR_COMP_OPTIONS_START + 4) -#define STR_LINE_SPACING (STR_COMP_OPTIONS_START + 5) -#define STR_ADD_TABLESPACING (STR_COMP_OPTIONS_START + 6) -#define STR_USE_OBJPOSITIONING (STR_COMP_OPTIONS_START + 7) -#define STR_USE_OURTEXTWRAPPING (STR_COMP_OPTIONS_START + 8) +#define STR_COMP_OPTIONS_START 100 +#define STR_PRINTER_METRICS (STR_COMP_OPTIONS_START + 0) +#define STR_MERGE_PARA_DIST (STR_COMP_OPTIONS_START + 1) +#define STR_MERGE_PARA_DIST_PAGESTART (STR_COMP_OPTIONS_START + 2) +#define STR_TAB_ALIGNMENT (STR_COMP_OPTIONS_START + 3) +#define STR_EXTERNAL_LEADING (STR_COMP_OPTIONS_START + 4) +#define STR_LINE_SPACING (STR_COMP_OPTIONS_START + 5) +#define STR_ADD_TABLESPACING (STR_COMP_OPTIONS_START + 6) +#define STR_USE_OBJPOSITIONING (STR_COMP_OPTIONS_START + 7) +#define STR_USE_OURTEXTWRAPPING (STR_COMP_OPTIONS_START + 8) #define STR_CONSIDER_WRAPPINGSTYLE (STR_COMP_OPTIONS_START + 9) #define STR_EXPAND_WORDSPACE (STR_COMP_OPTIONS_START + 10) #define STR_COMP_OPTIONS_END (STR_EXPAND_WORDSPACE + 1) diff --git a/sw/source/ui/config/optcomp.src b/sw/source/ui/config/optcomp.src index 927eadc183a1..3682b49477d3 100644 --- a/sw/source/ui/config/optcomp.src +++ b/sw/source/ui/config/optcomp.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/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc index 4162b656d7e5..31f2e7041f5b 100644 --- a/sw/source/ui/config/optdlg.hrc +++ b/sw/source/ui/config/optdlg.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 @@ -30,7 +30,7 @@ #define FL_NOPRINT 2 #define FL_WINDOW 3 -#define CB_GRF 1 +#define CB_GRF 1 #define CB_TBL 2 #define CB_DRWFAST 3 #define CB_FIELD 4 @@ -42,7 +42,7 @@ #define CB_FLD_HIDDEN 10 #define CB_BREAK 11 #define CB_ANY_RULER 12 -#define CB_CROSS 14 +#define CB_CROSS 14 #define CB_HSCROLL 15 #define CB_VSCROLL 16 #define CB_HRULER 17 @@ -57,29 +57,29 @@ #define FT_METRIC 28 //test tab page -#define CB_TEST1 25 -#define CB_TEST2 26 -#define CB_TEST3 27 -#define CB_TEST4 28 -#define CB_TEST5 29 -#define CB_TEST6 30 -#define CB_TEST7 31 -#define CB_TEST8 32 -#define CB_TEST9 33 -#define CB_TEST10 34 +#define CB_TEST1 25 +#define CB_TEST2 26 +#define CB_TEST3 27 +#define CB_TEST4 28 +#define CB_TEST5 29 +#define CB_TEST6 30 +#define CB_TEST7 31 +#define CB_TEST8 32 +#define CB_TEST9 33 +#define CB_TEST10 34 #define FL_TEST 35 #define CB_FLD_HIDDEN_PARA 36 //Mittendrin, damit die HelpIds zum FPII kompatibel bleiben #define CB_SMOOTH_SCROLL 37 -#define BT_OK 38 -#define BT_CANCEL 39 -#define BT_MORE 40 -#define BT_GRID 41 -#define MF_HFRAME 42 -#define MF_VFRAME 43 +#define BT_OK 38 +#define BT_CANCEL 39 +#define BT_MORE 40 +#define BT_GRID 41 +#define MF_HFRAME 42 +#define MF_VFRAME 43 -#define CB_INDEX 44 +#define CB_INDEX 44 #define LB_COLOR 50 #define WIN_COLOR 52 @@ -89,12 +89,12 @@ #define BT_DELETE 57 #define BT_DEFAULT 58 #define CB_HANDLE 59 -#define CB_SECT_BOUNDS 60 +#define CB_SECT_BOUNDS 60 #define CB_CHAR_HIDDEN 61 // Print-Extra-Page #define CB_PGRF 61 //#define CB_PTAB 62 merged with CB_PGRF in printerpullpages -//#define CB_PDRAW 63 removed in printerpullpages +//#define CB_PDRAW 63 removed in printerpullpages #define CB_LEFTP 64 #define CB_RIGHTP 65 //#define CB_REVERSE 66 removed in printerpullpages @@ -107,7 +107,7 @@ #define FL_3 73 #define FL_4 74 #define FT_FAX 76 -#define CB_BACKGROUND 79 +#define CB_BACKGROUND 79 #define RB_NO 80 #define RB_ONLY 81 @@ -126,7 +126,7 @@ // Tabpage Grundschriften -#define FT_STANDARD 90 +#define FT_STANDARD 90 #define LB_STANDARD 91 #define FT_TITLE 92 #define LB_TITLE 93 @@ -161,31 +161,31 @@ #define FL_TABLE_INSERT 108 #define CB_NUMFMT_FORMATTING 109 #define FL_MOVE 110 -#define FT_ROWMOVE 111 -#define MF_ROWMOVE 112 -#define FT_COLMOVE 113 -#define MF_COLMOVE 114 +#define FT_ROWMOVE 111 +#define MF_ROWMOVE 112 +#define FT_COLMOVE 113 +#define MF_COLMOVE 114 #define FT_INSERT 115 #define FT_ROWINSERT 116 #define MF_ROWINSERT 117 #define FT_COLINSERT 118 #define MF_COLINSERT 119 #define FT_HANDLING 120 -#define RB_FIX 121 -#define RB_FIXPROP 122 -#define RB_VAR 123 -#define FT_FIX 124 -#define FT_FIXPROP 125 -#define FT_VAR 126 +#define RB_FIX 121 +#define RB_FIXPROP 122 +#define RB_VAR 123 +#define FT_FIX 124 +#define FT_FIXPROP 125 +#define FT_VAR 126 #define FT_MOVE 128 #define FL_COLOR 130 -#define FT_SGML 131 -#define LB_SGML 132 +#define FT_SGML 131 +#define LB_SGML 132 #define FT_COMMENT 133 #define LB_COMMENT 134 -#define FT_KEYWD 135 -#define LB_KEYWD 136 +#define FT_KEYWD 135 +#define LB_KEYWD 136 #define FT_UNKNOWN 137 #define LB_UNKNOWN 138 #define FL_TABLE_SEPARATOR 139 @@ -194,12 +194,12 @@ #define FL_SHDWCRSFLAG 1 #define CB_SHDWCRSONOFF 2 #define FL_SHDWCRSMODE 3 -#define FT_SHDWCRSFILLMODE 4 +#define FT_SHDWCRSFILLMODE 4 #define RB_SHDWCRSFILLMARGIN 5 #define RB_SHDWCRSFILLINDENT 6 #define RB_SHDWCRSFILLTAB 7 #define RB_SHDWCRSFILLSPACE 8 -#define CB_ALLOW_IN_PROT 12 +#define CB_ALLOW_IN_PROT 12 #define FL_CRSR_OPT 13 #define FL_SEPARATOR_SHDW 14 diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src index 97f903557bda..a2573ed3c1f2 100755 --- a/sw/source/ui/config/optdlg.src +++ b/sw/source/ui/config/optdlg.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 @@ -38,7 +38,7 @@ /**************************************************************************/ /* */ -/* TabPage Ansicht/Inhalt */ +/* TabPage Ansicht/Inhalt */ /* */ /**************************************************************************/ TabPage TP_CONTENT_OPT @@ -220,7 +220,7 @@ TabPage TP_OPTPRINT_PAGE TabStop = TRUE ; Group = TRUE ; }; -/* +/* removed, tables now always get printed CheckBox CB_PTAB { @@ -229,7 +229,7 @@ TabPage TP_OPTPRINT_PAGE Text [ en-US ] = "~Tables" ; }; */ -/* +/* functionally merged with CB_PGRF (pictures and graphics) CheckBox CB_PDRAW { @@ -801,7 +801,7 @@ TabPage TP_OPTTABLE_PAGE }; /**************************************************************************/ /* */ -/* TabPage ShadowCursor */ +/* TabPage ShadowCursor */ /* */ /**************************************************************************/ TabPage TP_OPTSHDWCRSR @@ -965,7 +965,7 @@ StringArray STR_PRINTOPTUI < "Specifies whether to always print text in black."; >; < "Pages"; >; < "Print ~automatically inserted blank pages"; >; - < "If this option is enabled automatically inserted blank pages are printed. This is best if you are printing double-sided. For example, in a book, a \"chapter\" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not"; >; + < "If this option is enabled automatically inserted blank pages are printed. This is best if you are printing double-sided. For example, in a book, a \"chapter\" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not"; >; < "~Use only paper tray from printer preferences"; >; < "For printers with multiple trays this option specifies whether the paper tray used is specified by the system settings of the printer."; >; < "Print"; >; diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 4a0c9c2a6b25..8fe85c4cca30 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -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 @@ -77,6 +77,10 @@ using namespace ::com::sun::star; +#ifndef _SFXENUMITEM_HXX //autogen +#include <svl/eitem.hxx> +#endif + /* -----------------22.10.98 15:12------------------- * * --------------------------------------------------*/ @@ -100,10 +104,11 @@ SwLoadOptPage::SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ) : aTabFT ( this, SW_RES( FT_TAB ) ), aTabMF ( this, SW_RES( MF_TAB ) ), aUseSquaredPageMode ( this, SW_RES( CB_USE_SQUARE_PAGE_MODE ) ), + aUseCharUnit ( this , SW_RES( CB_USE_CHAR_UNIT ) ), - pWrtShell ( NULL ), + pWrtShell ( NULL ), bHTMLMode ( FALSE ), - nLastTab ( 0 ), + nLastTab ( 0 ), nOldLinkMode( MANUAL ) { @@ -139,10 +144,13 @@ SwLoadOptPage::SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ) : aTabFT.Hide(); aTabMF.Hide(); } - + SvtCJKOptions aCJKOptions; if(!aCJKOptions.IsAsianTypographyEnabled()) + { aUseSquaredPageMode.Hide(); + aUseCharUnit.Hide(); + } } /*-----------------18.01.97 12.43------------------- @@ -157,7 +165,7 @@ SwLoadOptPage::~SwLoadOptPage() --------------------------------------------------*/ -SfxTabPage* __EXPORT SwLoadOptPage::Create( Window* pParent, +SfxTabPage* __EXPORT SwLoadOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwLoadOptPage(pParent, rAttrSet ); @@ -220,6 +228,15 @@ BOOL __EXPORT SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) bRet = TRUE; } + sal_Bool bIsUseCharUnitFlag = aUseCharUnit.IsChecked(); + SvtCJKOptions aCJKOptions; + bIsUseCharUnitFlag = bIsUseCharUnitFlag && aCJKOptions.IsAsianTypographyEnabled(); + if( bIsUseCharUnitFlag != aUseCharUnit.GetSavedValue()) + { + rSet.Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bIsUseCharUnitFlag )); + bRet = TRUE; + } + sal_Bool bIsSquaredPageModeFlag = aUseSquaredPageMode.IsChecked(); if ( bIsSquaredPageModeFlag != aUseSquaredPageMode.GetSavedValue() ) { @@ -263,9 +280,9 @@ void __EXPORT SwLoadOptPage::Reset( const SfxItemSet& rSet) switch (nOldLinkMode) { - case NEVER: aNeverRB.Check(); break; - case MANUAL: aRequestRB.Check(); break; - case AUTOMATIC: aAlwaysRB.Check(); break; + case NEVER: aNeverRB.Check(); break; + case MANUAL: aRequestRB.Check(); break; + case AUTOMATIC: aAlwaysRB.Check(); break; } aAutoUpdateFields.SaveValue(); @@ -298,7 +315,7 @@ void __EXPORT SwLoadOptPage::Reset( const SfxItemSet& rSet) { bHTMLMode = 0 != (((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON); } - + //default page mode loading if(pWrtShell) { @@ -306,6 +323,17 @@ void __EXPORT SwLoadOptPage::Reset( const SfxItemSet& rSet) aUseSquaredPageMode.Check( bSquaredPageMode ); aUseSquaredPageMode.SaveValue(); } + + if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_APPLYCHARUNIT, FALSE, &pItem)) + { + BOOL bUseCharUnit = ((const SfxBoolItem*)pItem)->GetValue(); + aUseCharUnit.Check(bUseCharUnit); + } + else + { + aUseCharUnit.Check(pUsrPref->IsApplyCharUnit()); + } + aUseCharUnit.SaveValue(); } /*-----------------13.01.97 14.44------------------- Metric des Deftabstops umschalten @@ -370,7 +398,7 @@ SwCaptionPreview::SwCaptionPreview( Window* pParent, const ResId& rResId ) { maDrawPos = Point( 4, 6 ); - Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() ); + Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() ); SetBackground( aBack ); SetFillColor( aBack.GetColor() ); SetLineColor( aBack.GetColor() ); @@ -400,47 +428,47 @@ void SwCaptionPreview::Paint( const Rectangle& rRect ) SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, SW_RES(TP_OPTCAPTION_PAGE), rSet), - aCheckFT (this, SW_RES(FT_OBJECTS )), - aCheckLB (this, SW_RES(CLB_OBJECTS )), + aCheckFT (this, SW_RES(FT_OBJECTS )), + aCheckLB (this, SW_RES(CLB_OBJECTS )), aFtCaptionOrder(this, SW_RES( FT_ORDER )), aLbCaptionOrder(this, SW_RES( LB_ORDER )), aPreview (this, SW_RES(WIN_PREVIEW )), - aSettingsGroupFL(this, SW_RES(FL_SETTINGS_2 )), - aCategoryText (this, SW_RES(TXT_CATEGORY )), - aCategoryBox (this, SW_RES(BOX_CATEGORY )), - aFormatText (this, SW_RES(TXT_FORMAT )), - aFormatBox (this, SW_RES(BOX_FORMAT )), + aSettingsGroupFL(this, SW_RES(FL_SETTINGS_2 )), + aCategoryText (this, SW_RES(TXT_CATEGORY )), + aCategoryBox (this, SW_RES(BOX_CATEGORY )), + aFormatText (this, SW_RES(TXT_FORMAT )), + aFormatBox (this, SW_RES(BOX_FORMAT )), aNumberingSeparatorFT(this, SW_RES(FT_NUM_SEP )), aNumberingSeparatorED(this, SW_RES(ED_NUM_SEP )), - aTextText (this, SW_RES(TXT_TEXT )), - aTextEdit (this, SW_RES(EDT_TEXT )), - aPosText (this, SW_RES(TXT_POS )), - aPosBox (this, SW_RES(BOX_POS )), - aNumCaptFL (this, SW_RES(FL_NUMCAPT )), - aFtLevel (this, SW_RES(FT_LEVEL )), - aLbLevel (this, SW_RES(LB_LEVEL )), - aFtDelim (this, SW_RES(FT_SEPARATOR )), - aEdDelim (this, SW_RES(ED_SEPARATOR )), - aCategoryFL (this, SW_RES(FL_CATEGORY )), - aCharStyleFT (this, SW_RES(FT_CHARSTYLE )), - aCharStyleLB (this, SW_RES(LB_CHARSTYLE )), - aApplyBorderCB (this, SW_RES(CB_APPLYBORDER)), - - sSWTable (SW_RES(STR_TABLE )), - sSWFrame (SW_RES(STR_FRAME )), - sSWGraphic (SW_RES(STR_GRAPHIC )), - sOLE (SW_RES(STR_OLE )), - - sBegin (SW_RESSTR(STR_BEGINNING )), - sEnd (SW_RESSTR(STR_END )), - sAbove (SW_RESSTR(STR_ABOVE )), - sBelow (SW_RESSTR(STR_CP_BELOW )), + aTextText (this, SW_RES(TXT_TEXT )), + aTextEdit (this, SW_RES(EDT_TEXT )), + aPosText (this, SW_RES(TXT_POS )), + aPosBox (this, SW_RES(BOX_POS )), + aNumCaptFL (this, SW_RES(FL_NUMCAPT )), + aFtLevel (this, SW_RES(FT_LEVEL )), + aLbLevel (this, SW_RES(LB_LEVEL )), + aFtDelim (this, SW_RES(FT_SEPARATOR )), + aEdDelim (this, SW_RES(ED_SEPARATOR )), + aCategoryFL (this, SW_RES(FL_CATEGORY )), + aCharStyleFT (this, SW_RES(FT_CHARSTYLE )), + aCharStyleLB (this, SW_RES(LB_CHARSTYLE )), + aApplyBorderCB (this, SW_RES(CB_APPLYBORDER)), + + sSWTable (SW_RES(STR_TABLE )), + sSWFrame (SW_RES(STR_FRAME )), + sSWGraphic (SW_RES(STR_GRAPHIC )), + sOLE (SW_RES(STR_OLE )), + + sBegin (SW_RESSTR(STR_BEGINNING )), + sEnd (SW_RESSTR(STR_END )), + sAbove (SW_RESSTR(STR_ABOVE )), + sBelow (SW_RESSTR(STR_CP_BELOW )), sNone (SW_RESSTR( STR_CATEGORY_NONE )), - pMgr (new SwFldMgr()), + pMgr (new SwFldMgr()), bHTMLMode(FALSE) { - Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() ); + Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() ); aPreview.SetBackground( aBack ); SwStyleNameMapper::FillUIName( RES_POOLCOLL_LABEL_ABB, sIllustration ); @@ -483,7 +511,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) aLbLevel.InsertEntry(String::CreateFromInt32(i + 1)); sal_Unicode nLvl = MAXLEVEL; - String sDelim( String::CreateFromAscii( ": " ) ); + String sDelim( String::CreateFromAscii( ": " ) ); if (pSh) { @@ -506,11 +534,11 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) Link aLk = LINK( this, SwCaptionOptPage, ModifyHdl ); aCategoryBox.SetModifyHdl( aLk ); aNumberingSeparatorED.SetModifyHdl( aLk ); - aTextEdit .SetModifyHdl( aLk ); + aTextEdit .SetModifyHdl( aLk ); aLk = LINK(this, SwCaptionOptPage, SelectHdl); aCategoryBox.SetSelectHdl( aLk ); - aFormatBox .SetSelectHdl( aLk ); + aFormatBox .SetSelectHdl( aLk ); aLbCaptionOrder.SetSelectHdl( LINK(this, SwCaptionOptPage, OrderHdl)); @@ -533,7 +561,7 @@ SwCaptionOptPage::~SwCaptionOptPage() --------------------------------------------------*/ -SfxTabPage* SwCaptionOptPage::Create( Window* pParent, +SfxTabPage* SwCaptionOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwCaptionOptPage(pParent, rAttrSet ); @@ -548,7 +576,7 @@ BOOL SwCaptionOptPage::FillItemSet( SfxItemSet& ) BOOL bRet = FALSE; SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); - SaveEntry(aCheckLB.FirstSelected()); // Aktuellen Eintrag uebernehmen + SaveEntry(aCheckLB.FirstSelected()); // Aktuellen Eintrag uebernehmen SvLBoxEntry* pEntry = aCheckLB.First(); @@ -779,8 +807,8 @@ IMPL_LINK( SwCaptionOptPage, ShowEntryHdl, SvxCheckListBox *, EMPTYARG ) break; } aPosBox.SelectEntryPos(pOpt->GetPos()); - aPosBox.Enable( pOpt->GetObjType() != GRAPHIC_CAP && - pOpt->GetObjType() != OLE_CAP && + aPosBox.Enable( pOpt->GetObjType() != GRAPHIC_CAP && + pOpt->GetObjType() != OLE_CAP && aPosText.IsEnabled() ); aPosBox.SelectEntryPos(pOpt->GetPos()); @@ -810,7 +838,7 @@ IMPL_LINK( SwCaptionOptPage, SaveEntryHdl, SvxCheckListBox *, EMPTYARG ) { SvLBoxEntry* pEntry = aCheckLB.GetHdlEntry(); - if (pEntry) // Alles speichern + if (pEntry) // Alles speichern SaveEntry(pEntry); return 0; @@ -970,7 +998,7 @@ void SwCaptionOptPage::DrawSample() } /*------------------------------------------------------------------------ - Beschreibung: ComboBox ohne Spaces + Beschreibung: ComboBox ohne Spaces ------------------------------------------------------------------------*/ void CaptionComboBox::KeyInput(const KeyEvent& rEvt) diff --git a/sw/source/ui/config/optload.hrc b/sw/source/ui/config/optload.hrc index b396b2d9f9f0..12b7a3c3f6df 100644 --- a/sw/source/ui/config/optload.hrc +++ b/sw/source/ui/config/optload.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 @@ -27,56 +27,57 @@ // SwLoadOptPage -------------------------------- -#define FL_UPDATE 10 -#define FT_LINK 11 -#define RB_ALWAYS 12 -#define RB_REQUEST 13 -#define RB_NEVER 14 -#define FT_FIELD 15 -#define CB_AUTO_UPDATE_FIELDS 16 -#define CB_AUTO_UPDATE_CHARTS 17 -#define FL_SETTINGS 18 -#define LB_METRIC 19 -#define FT_METRIC 20 -#define FT_TAB 21 -#define MF_TAB 22 +#define FL_UPDATE 10 +#define FT_LINK 11 +#define RB_ALWAYS 12 +#define RB_REQUEST 13 +#define RB_NEVER 14 +#define FT_FIELD 15 +#define CB_AUTO_UPDATE_FIELDS 16 +#define CB_AUTO_UPDATE_CHARTS 17 +#define FL_SETTINGS 18 +#define LB_METRIC 19 +#define FT_METRIC 20 +#define FT_TAB 21 +#define MF_TAB 22 #define CB_USE_SQUARE_PAGE_MODE 23 +#define CB_USE_CHAR_UNIT 24 // SwCaptionOptPage ----------------------------- -#define FT_OBJECTS 10 -#define CLB_OBJECTS 11 -#define FL_SETTINGS_2 12 -#define TXT_CATEGORY 13 -#define BOX_CATEGORY 14 -#define TXT_FORMAT 15 -#define BOX_FORMAT 16 -#define TXT_TEXT 17 -#define EDT_TEXT 18 -#define TXT_POS 19 -#define BOX_POS 20 -#define FL_NUMCAPT 21 -#define FT_LEVEL 22 -#define LB_LEVEL 23 -#define FT_SEPARATOR 24 -#define ED_SEPARATOR 25 -#define FL_CATEGORY 26 -#define FT_CHARSTYLE 27 -#define LB_CHARSTYLE 28 -#define CB_APPLYBORDER 29 -#define WIN_PREVIEW 30 +#define FT_OBJECTS 10 +#define CLB_OBJECTS 11 +#define FL_SETTINGS_2 12 +#define TXT_CATEGORY 13 +#define BOX_CATEGORY 14 +#define TXT_FORMAT 15 +#define BOX_FORMAT 16 +#define TXT_TEXT 17 +#define EDT_TEXT 18 +#define TXT_POS 19 +#define BOX_POS 20 +#define FL_NUMCAPT 21 +#define FT_LEVEL 22 +#define LB_LEVEL 23 +#define FT_SEPARATOR 24 +#define ED_SEPARATOR 25 +#define FL_CATEGORY 26 +#define FT_CHARSTYLE 27 +#define LB_CHARSTYLE 28 +#define CB_APPLYBORDER 29 +#define WIN_PREVIEW 30 #define STR_CATEGORY_NONE 31 #define LB_ORDER 32 #define FT_ORDER 33 #define FT_NUM_SEP 34 #define ED_NUM_SEP 35 -#define STR_TABLE 10 -#define STR_FRAME 11 -#define STR_GRAPHIC 12 -#define STR_OLE 13 -#define STR_BEGINNING 14 -#define STR_END 15 -#define STR_ABOVE 16 -#define STR_CP_BELOW 17 +#define STR_TABLE 10 +#define STR_FRAME 11 +#define STR_GRAPHIC 12 +#define STR_OLE 13 +#define STR_BEGINNING 14 +#define STR_END 15 +#define STR_ABOVE 16 +#define STR_CP_BELOW 17 diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src index febd2a6fc35f..a20d578f4729 100644 --- a/sw/source/ui/config/optload.src +++ b/sw/source/ui/config/optload.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 @@ -139,6 +139,15 @@ TabPage TP_OPTLOAD_PAGE Text [ en-US ] = "Use square page mode for text grid"; Text [ zh-CN ] = "使用稿纸模å¼"; }; + + CheckBox CB_USE_CHAR_UNIT + { + Pos = MAP_APPFONT ( 12 , 130) ; + Size = MAP_APPFONT ( 109 , 10 ) ; + Text [ en-US ] = "Enable char unit"; + Text [ x-comment ] = " "; + }; + }; /**************************************************************************/ /* */ @@ -394,6 +403,8 @@ StringArray STR_ARR_METRIC < "Miles" ; FUNIT_MILE ; > ; < "Pica" ; FUNIT_PICA ; > ; < "Point" ; FUNIT_POINT ; > ; + < "Char" ; FUNIT_CHAR ; >; + < "Line" ; FUNIT_LINE ; >; }; }; diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 921d2a652002..de4f359c2521 100755 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -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 @@ -116,27 +116,27 @@ SwContentOptPage::SwContentOptPage( Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage( pParent, SW_RES( TP_CONTENT_OPT ), rCoreSet ), aLineFL ( this, SW_RES( FL_LINE ) ), - aCrossCB ( this, SW_RES( CB_CROSS ) ), - aSolidHandleCB( this, SW_RES( CB_HANDLE ) ), - aBigHandleCB ( this, SW_RES( CB_BIGHANDLE) ), + aCrossCB ( this, SW_RES( CB_CROSS ) ), + aSolidHandleCB( this, SW_RES( CB_HANDLE ) ), + aBigHandleCB ( this, SW_RES( CB_BIGHANDLE) ), aWindowFL ( this, SW_RES( FL_WINDOW ) ), - aHScrollBox ( this, SW_RES( CB_HSCROLL ) ), - aVScrollBox ( this, SW_RES( CB_VSCROLL ) ), + aHScrollBox ( this, SW_RES( CB_HSCROLL ) ), + aVScrollBox ( this, SW_RES( CB_VSCROLL ) ), aAnyRulerCB ( this, SW_RES( CB_ANY_RULER ) ), aHRulerCBox ( this, SW_RES( CB_HRULER ) ), aHMetric ( this, SW_RES( LB_HMETRIC ) ), - aVRulerCBox ( this, SW_RES( CB_VRULER ) ), + aVRulerCBox ( this, SW_RES( CB_VRULER ) ), aVRulerRightCBox( this, SW_RES( CB_VRULER_RIGHT ) ), aVMetric ( this, SW_RES( LB_VMETRIC ) ), aSmoothCBox ( this, SW_RES( CB_SMOOTH_SCROLL ) ), aDispFL ( this, SW_RES( FL_DISP ) ), - aGrfCB ( this, SW_RES( CB_GRF ) ), - aTblCB ( this, SW_RES( CB_TBL ) ), - aDrwCB ( this, SW_RES( CB_DRWFAST ) ), - aFldNameCB ( this, SW_RES( CB_FIELD ) ), - aPostItCB ( this, SW_RES( CB_POSTIT ) ), + aGrfCB ( this, SW_RES( CB_GRF ) ), + aTblCB ( this, SW_RES( CB_TBL ) ), + aDrwCB ( this, SW_RES( CB_DRWFAST ) ), + aFldNameCB ( this, SW_RES( CB_FIELD ) ), + aPostItCB ( this, SW_RES( CB_POSTIT ) ), aSettingsFL ( this, SW_RES( FL_SETTINGS ) ), aMetricFT ( this, SW_RES( FT_METRIC ) ), @@ -176,14 +176,25 @@ SwContentOptPage::SwContentOptPage( Window* pParent, case FUNIT_POINT: case FUNIT_PICA: case FUNIT_INCH: + case FUNIT_CHAR: // add two units , 'character' and 'line' , their ticks are not fixed + case FUNIT_LINE: { // nur diese Metriken benutzen - USHORT nPos = aMetricLB.InsertEntry( sMetric ); - aMetricLB.SetEntryData( nPos, (void*)(long)eFUnit ); - aVMetric.InsertEntry( sMetric ); - aVMetric.SetEntryData( nPos, (void*)(long)eFUnit ); - aHMetric.InsertEntry( sMetric ); - aHMetric.SetEntryData( nPos, (void*)(long)eFUnit ); + // a horizontal ruler has not the 'line' unit + // there isn't 'line' unit in HTML format + if ( eFUnit != FUNIT_LINE ) + { + USHORT nPos = aMetricLB.InsertEntry( sMetric ); + aMetricLB.SetEntryData( nPos, (void*)(long)eFUnit ); + aHMetric.InsertEntry( sMetric ); + aHMetric.SetEntryData( nPos, (void*)(long)eFUnit ); + } + // a vetical ruler has not the 'character' unit + if ( eFUnit != FUNIT_CHAR ) + { + USHORT nPos = aVMetric.InsertEntry( sMetric ); + aVMetric.SetEntryData( nPos, (void*)(long)eFUnit ); + } } default:;//prevent warning } @@ -200,7 +211,7 @@ SwContentOptPage::~SwContentOptPage() /*-----------------31.08.96 13.58------------------- --------------------------------------------------*/ -SfxTabPage* SwContentOptPage::Create( Window* pParent, +SfxTabPage* SwContentOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwContentOptPage(pParent, rAttrSet); @@ -347,11 +358,11 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent, SfxTabPage( pParent, SW_RES( TP_OPTPRINT_PAGE ), rCoreSet), aFL1 (this, SW_RES(FL_1)), aGrfCB (this, SW_RES(CB_PGRF)), -// aTabCB (this, SW_RES(CB_PTAB)), -// aDrawCB (this, SW_RES(CB_PDRAW)), +// aTabCB (this, SW_RES(CB_PTAB)), +// aDrawCB (this, SW_RES(CB_PDRAW)), aCtrlFldCB (this, SW_RES(CB_CTRLFLD)), aBackgroundCB (this, SW_RES(CB_BACKGROUND)), - aBlackFontCB (this, SW_RES(CB_BLACK_FONT)), + aBlackFontCB (this, SW_RES(CB_BLACK_FONT)), aPrintHiddenTextCB(this, SW_RES(CB_HIDDEN_TEXT)), aPrintTextPlaceholderCB(this, SW_RES(CB_TEXT_PLACEHOLDER)), aSeparatorLFL (this, SW_RES(FL_SEP_PRT_LEFT )), @@ -383,14 +394,14 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent, aGrfCB.SetClickHdl( aLk ); aRightPageCB.SetClickHdl( aLk ); aLeftPageCB.SetClickHdl( aLk ); -// aTabCB.SetClickHdl( aLk ); -// aDrawCB.SetClickHdl( aLk ); +// aTabCB.SetClickHdl( aLk ); +// aDrawCB.SetClickHdl( aLk ); aCtrlFldCB.SetClickHdl( aLk ); aBackgroundCB.SetClickHdl( aLk ); aBlackFontCB.SetClickHdl( aLk ); aPrintHiddenTextCB.SetClickHdl( aLk ); aPrintTextPlaceholderCB.SetClickHdl( aLk ); -// aReverseCB.SetClickHdl( aLk ); +// aReverseCB.SetClickHdl( aLk ); aProspectCB.SetClickHdl( aLk ); aProspectCB_RTL.SetClickHdl( aLk ); aPaperFromSetupCB.SetClickHdl( aLk ); @@ -399,28 +410,28 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent, aEndRB.SetClickHdl( aLk ); aOnlyRB.SetClickHdl( aLk ); aNoRB.SetClickHdl( aLk ); -// aSingleJobsCB.SetClickHdl( aLk ); +// aSingleJobsCB.SetClickHdl( aLk ); aFaxLB.SetSelectHdl( LINK( this, SwAddPrinterTabPage, SelectHdl ) ); const SfxPoolItem* pItem; if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, FALSE, &pItem ) && ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON) { -// aDrawCB .Hide(); +// aDrawCB .Hide(); aLeftPageCB .Hide(); aRightPageCB .Hide(); aPrintHiddenTextCB.Hide(); aPrintTextPlaceholderCB.Hide(); -// aReverseCB.SetPosPixel(aLeftPageCB.GetPosPixel()); +// aReverseCB.SetPosPixel(aLeftPageCB.GetPosPixel()); aProspectCB.SetPosPixel(aLeftPageCB.GetPosPixel()); Point aPt( aRightPageCB.GetPosPixel() ); aPt.setX(aPt.getX() + 15); // indent aProspectCB_RTL.SetPosPixel(aPt); -// aBlackFontCB.SetPosPixel(aBackgroundCB.GetPosPixel()); +// aBlackFontCB.SetPosPixel(aBackgroundCB.GetPosPixel()); // aPrintHiddenTextCB.SetPosPixel(aBlackFontCB.GetPosPixel()); -// aBackgroundCB.SetPosPixel(aCtrlFldCB.GetPosPixel()); -// aCtrlFldCB.SetPosPixel(aDrawCB.GetPosPixel()); - +// aBackgroundCB.SetPosPixel(aCtrlFldCB.GetPosPixel()); +// aCtrlFldCB.SetPosPixel(aDrawCB.GetPosPixel()); + // hide aPrintEmptyPagesCB and move everything below up accordingly long nDeltaY = aPaperFromSetupCB.GetPosPixel().getY() - aPrintEmptyPagesCB.GetPosPixel().getY(); aPrintEmptyPagesCB.Hide(); @@ -461,7 +472,7 @@ void SwAddPrinterTabPage::SetPreview(BOOL bPrev) //------------------------------------------------------------------------ -SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent, +SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwAddPrinterTabPage( pParent, rAttrSet ) ); @@ -469,15 +480,15 @@ SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent, //------------------------------------------------------------------------ -BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) +BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) { if ( bAttrModified ) { SwAddPrinterItem aAddPrinterAttr (FN_PARAM_ADDPRINTER); - aAddPrinterAttr.bPrintGraphic = aGrfCB.IsChecked(); - aAddPrinterAttr.bPrintTable = TRUE; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/ + aAddPrinterAttr.bPrintGraphic = aGrfCB.IsChecked(); + aAddPrinterAttr.bPrintTable = TRUE; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/ aAddPrinterAttr.bPrintDraw = aGrfCB.IsChecked(); // UI merged with aGrfCB in CWS printerpullgpages /*aDrawCB.IsChecked()*/; - aAddPrinterAttr.bPrintControl = aCtrlFldCB.IsChecked(); + aAddPrinterAttr.bPrintControl = aCtrlFldCB.IsChecked(); aAddPrinterAttr.bPrintPageBackground = aBackgroundCB.IsChecked(); aAddPrinterAttr.bPrintBlackFont = aBlackFontCB.IsChecked(); aAddPrinterAttr.bPrintHiddenText = aPrintHiddenTextCB.IsChecked(); @@ -492,7 +503,7 @@ BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) aAddPrinterAttr.bPrintEmptyPages = aPrintEmptyPagesCB.IsChecked(); aAddPrinterAttr.bPrintSingleJobs = TRUE; // handled by vcl in new print dialog since CWS printerpullpages /*aSingleJobsCB.IsChecked()*/; - if (aNoRB.IsChecked()) aAddPrinterAttr.nPrintPostIts = + if (aNoRB.IsChecked()) aAddPrinterAttr.nPrintPostIts = POSTITS_NONE; if (aOnlyRB.IsChecked()) aAddPrinterAttr.nPrintPostIts = POSTITS_ONLY; @@ -510,30 +521,30 @@ BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) //------------------------------------------------------------------------ -void SwAddPrinterTabPage::Reset( const SfxItemSet& ) +void SwAddPrinterTabPage::Reset( const SfxItemSet& ) { - const SfxItemSet& rSet = GetItemSet(); - const SwAddPrinterItem* pAddPrinterAttr = 0; + const SfxItemSet& rSet = GetItemSet(); + const SwAddPrinterItem* pAddPrinterAttr = 0; if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ADDPRINTER , FALSE, (const SfxPoolItem**)&pAddPrinterAttr )) { - aGrfCB.Check( pAddPrinterAttr->bPrintGraphic || pAddPrinterAttr->bPrintDraw ); -// aTabCB.Check( pAddPrinterAttr->bPrintTable); + aGrfCB.Check( pAddPrinterAttr->bPrintGraphic || pAddPrinterAttr->bPrintDraw ); +// aTabCB.Check( pAddPrinterAttr->bPrintTable); // aDrawCB.Check( pAddPrinterAttr->bPrintDraw); - aCtrlFldCB.Check( pAddPrinterAttr->bPrintControl); + aCtrlFldCB.Check( pAddPrinterAttr->bPrintControl); aBackgroundCB.Check( pAddPrinterAttr->bPrintPageBackground); - aBlackFontCB.Check( pAddPrinterAttr->bPrintBlackFont); + aBlackFontCB.Check( pAddPrinterAttr->bPrintBlackFont); aPrintHiddenTextCB.Check( pAddPrinterAttr->bPrintHiddenText); aPrintTextPlaceholderCB.Check(pAddPrinterAttr->bPrintTextPlaceholder); aLeftPageCB.Check( pAddPrinterAttr->bPrintLeftPages); aRightPageCB.Check( pAddPrinterAttr->bPrintRightPages); -// aReverseCB.Check( pAddPrinterAttr->bPrintReverse); +// aReverseCB.Check( pAddPrinterAttr->bPrintReverse); aPaperFromSetupCB.Check(pAddPrinterAttr->bPaperFromSetup); aPrintEmptyPagesCB.Check(pAddPrinterAttr->bPrintEmptyPages); aProspectCB.Check( pAddPrinterAttr->bPrintProspect); aProspectCB_RTL.Check( pAddPrinterAttr->bPrintProspectRTL); -// aSingleJobsCB.Check( pAddPrinterAttr->bPrintSingleJobs); +// aSingleJobsCB.Check( pAddPrinterAttr->bPrintSingleJobs); aNoRB.Check (pAddPrinterAttr->nPrintPostIts== POSTITS_NONE ) ; aOnlyRB.Check (pAddPrinterAttr->nPrintPostIts== POSTITS_ONLY ) ; @@ -555,7 +566,7 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet& ) //----------------------------------------------------------------------- -void SwAddPrinterTabPage::Init() +void SwAddPrinterTabPage::Init() { } @@ -619,7 +630,7 @@ void SwAddPrinterTabPage::PageCreated (SfxAllItemSet aSet) aFaxList.Insert(rpString, 0); } SetFax( aFaxList ); -/* SvStringsDtor aFaxList; +/* SvStringsDtor aFaxList; const List *pList = (pListItem)->GetList(); sal_uInt32 nCount = pList->Count(); for(sal_uInt32 i = 0; i < nCount ; i++) @@ -698,8 +709,8 @@ SwStdFontTabPage::SwStdFontTabPage( Window* pParent, aStandardPB.SetClickHdl(LINK(this, SwStdFontTabPage, StandardHdl)); aStandardBox.SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); aListBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); - aLabelBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); - aIdxBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); + aLabelBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); + aIdxBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); Link aFocusLink = LINK( this, SwStdFontTabPage, LoseFocusHdl); aStandardBox.SetLoseFocusHdl( aFocusLink ); aTitleBox .SetLoseFocusHdl( aFocusLink ); @@ -730,7 +741,7 @@ SwStdFontTabPage::~SwStdFontTabPage() /*-----------------03.09.96 11.53------------------- --------------------------------------------------*/ -SfxTabPage* SwStdFontTabPage::Create( Window* pParent, +SfxTabPage* SwStdFontTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwStdFontTabPage(pParent, rAttrSet); @@ -777,16 +788,16 @@ BOOL SwStdFontTabPage::FillItemSet( SfxItemSet& ) BOOL bNotDocOnly = !aDocOnlyCB.IsChecked(); SW_MOD()->GetModuleConfig()->SetDefaultFontInCurrDocOnly(!bNotDocOnly); - String sStandard = aStandardBox.GetText(); - String sTitle = aTitleBox .GetText(); - String sList = aListBox .GetText(); - String sLabel = aLabelBox .GetText(); - String sIdx = aIdxBox .GetText(); - String sStandardBak = aStandardBox.GetSavedValue(); - String sTitleBak = aTitleBox .GetSavedValue(); - String sListBak = aListBox .GetSavedValue(); - String sLabelBak = aLabelBox .GetSavedValue(); - String sIdxBak = aIdxBox .GetSavedValue(); + String sStandard = aStandardBox.GetText(); + String sTitle = aTitleBox .GetText(); + String sList = aListBox .GetText(); + String sLabel = aLabelBox .GetText(); + String sIdx = aIdxBox .GetText(); + String sStandardBak = aStandardBox.GetSavedValue(); + String sTitleBak = aTitleBox .GetSavedValue(); + String sListBak = aListBox .GetSavedValue(); + String sLabelBak = aLabelBox .GetSavedValue(); + String sIdxBak = aIdxBox .GetSavedValue(); bool bStandardHeightChanged = aStandardHeightLB.GetSavedValue() != aStandardHeightLB.GetText(); bool bTitleHeightChanged = aTitleHeightLB.GetSavedValue() != aTitleHeightLB.GetText(); @@ -1306,7 +1317,7 @@ SwTableOptionsTabPage::~SwTableOptionsTabPage() --------------------------------------------------*/ -SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent, +SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwTableOptionsTabPage(pParent, rAttrSet ); @@ -1425,9 +1436,9 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet) switch(pModOpt->GetTblMode()) { - case TBLFIX_CHGABS: aFixRB.Check(); break; - case TBLFIX_CHGPROP: aFixPropRB.Check(); break; - case TBLVAR_CHGABS: aVarRB.Check(); break; + case TBLFIX_CHGABS: aFixRB.Check(); break; + case TBLFIX_CHGPROP: aFixPropRB.Check(); break; + case TBLVAR_CHGABS: aVarRB.Check(); break; } const SfxPoolItem* pItem; if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, FALSE, &pItem)) @@ -1567,7 +1578,7 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent, if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, FALSE, &pItem ) && ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON) { - aTabCB .Hide(); + aTabCB .Hide(); aCharHiddenCB.Hide(); aFldHiddenCB .Hide(); aFldHiddenParaCB.Hide(); @@ -1595,7 +1606,7 @@ SwShdwCrsrOptionsTabPage::~SwShdwCrsrOptionsTabPage() } -SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SwShdwCrsrOptionsTabPage( pParent, rSet ); } @@ -1706,17 +1717,17 @@ struct CharAttr // Editieren entspricht Einfuegen-Attributen static CharAttr __FAR_DATA aRedlineAttr[] = { - { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_NOT_MAPPED }, - { SID_ATTR_CHAR_WEIGHT, WEIGHT_BOLD }, - { SID_ATTR_CHAR_POSTURE, ITALIC_NORMAL }, - { SID_ATTR_CHAR_UNDERLINE, UNDERLINE_SINGLE }, - { SID_ATTR_CHAR_UNDERLINE, UNDERLINE_DOUBLE }, - { SID_ATTR_CHAR_STRIKEOUT, STRIKEOUT_SINGLE }, - { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_VERSALIEN }, - { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_GEMEINE }, - { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_KAPITAELCHEN }, - { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_TITEL }, - { SID_ATTR_BRUSH, 0 } + { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_NOT_MAPPED }, + { SID_ATTR_CHAR_WEIGHT, WEIGHT_BOLD }, + { SID_ATTR_CHAR_POSTURE, ITALIC_NORMAL }, + { SID_ATTR_CHAR_UNDERLINE, UNDERLINE_SINGLE }, + { SID_ATTR_CHAR_UNDERLINE, UNDERLINE_DOUBLE }, + { SID_ATTR_CHAR_STRIKEOUT, STRIKEOUT_SINGLE }, + { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_VERSALIEN }, + { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_GEMEINE }, + { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_KAPITAELCHEN }, + { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_TITEL }, + { SID_ATTR_BRUSH, 0 } }; // Items from aRedlineAttr relevant for InsertAttr: strikethrough is // not used @@ -1818,23 +1829,23 @@ void SwMarkPreview::Paint(const Rectangle &/*rRect*/) switch (nMarkPos) { - case 1: // Links + case 1: // Links aRightMark.SetPos(Point(aRightPagePrtArea.Left() - 2 - aRightMark.GetWidth(), aRightMark.Top())); break; - case 2: // Rechts + case 2: // Rechts aLeftMark.SetPos(Point(aLeftPagePrtArea.Right() + 2, aLeftMark.Top())); break; - case 3: // Aussen + case 3: // Aussen break; - case 4: // Innen + case 4: // Innen aLeftMark.SetPos(Point(aLeftPagePrtArea.Right() + 2, aLeftMark.Top())); aRightMark.SetPos(Point(aRightPagePrtArea.Left() - 2 - aRightMark.GetWidth(), aRightMark.Top())); break; - case 0: // Keine + case 0: // Keine default: return; } @@ -1854,8 +1865,8 @@ void SwMarkPreview::PaintPage(const Rectangle &rRect) Rectangle aTextLine = rRect; aTextLine.SetSize(Size(aTextLine.GetWidth(), 2)); - aTextLine.Left() += nLTxtBorder; - aTextLine.Right() -= nRTxtBorder; + aTextLine.Left() += nLTxtBorder; + aTextLine.Right() -= nRTxtBorder; aTextLine.Move(0, nTTxtBorder); sal_Int32 nStep; @@ -1932,14 +1943,14 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent, aChangedFL ( this, SW_RES( FL_LC )), - aMarkPosFT ( this, SW_RES( FT_MARKPOS )), - aMarkPosLB ( this, SW_RES( LB_MARKPOS )), - aMarkColorFT ( this, SW_RES( FT_LC_COL )), - aMarkColorLB ( this, SW_RES( LB_LC_COL )), - aMarkPreviewWN ( this, SW_RES( WIN_MARK )), + aMarkPosFT ( this, SW_RES( FT_MARKPOS )), + aMarkPosLB ( this, SW_RES( LB_MARKPOS )), + aMarkColorFT ( this, SW_RES( FT_LC_COL )), + aMarkColorLB ( this, SW_RES( LB_LC_COL )), + aMarkPreviewWN ( this, SW_RES( WIN_MARK )), sAuthor ( SW_RES( STR_AUTHOR )), - sNone ( SW_RES( STR_NOTHING )) + sNone ( SW_RES( STR_NOTHING )) { FreeResource(); @@ -1957,7 +1968,7 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent, aChangedLB.RemoveEntry(5); aDeletedLB.RemoveEntry(4); aDeletedLB.RemoveEntry(3); - + Link aLk = LINK(this, SwRedlineOptionsTabPage, AttribHdl); aInsertLB.SetSelectHdl( aLk ); aDeletedLB.SetSelectHdl( aLk ); @@ -2202,14 +2213,14 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet& ) aInsertLB.SelectEntryPos(0); aDeletedLB.SelectEntryPos(0); aChangedLB.SelectEntryPos(0); - + lcl_FillRedlineAttrListBox(aInsertLB, rInsertAttr, aInsertAttrMap, sizeof(aInsertAttrMap) / sizeof(USHORT)); lcl_FillRedlineAttrListBox(aDeletedLB, rDeletedAttr, aDeletedAttrMap, sizeof(aDeletedAttrMap) / sizeof(USHORT)); lcl_FillRedlineAttrListBox(aChangedLB, rChangedAttr, aChangedAttrMap, sizeof(aChangedAttrMap) / sizeof(USHORT)); - + USHORT nPos = 0; switch (pOpt->GetMarkAlignMode()) { @@ -2253,8 +2264,8 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox *, pLB ) pPrev = &aChangedPreviewWN; } - SvxFont& rFont = pPrev->GetFont(); - SvxFont& rCJKFont = pPrev->GetCJKFont(); + SvxFont& rFont = pPrev->GetFont(); + SvxFont& rCJKFont = pPrev->GetCJKFont(); rFont.SetWeight(WEIGHT_NORMAL); rCJKFont.SetWeight(WEIGHT_NORMAL); @@ -2267,7 +2278,7 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox *, pLB ) rFont.SetCaseMap(SVX_CASEMAP_NOT_MAPPED); rCJKFont.SetCaseMap(SVX_CASEMAP_NOT_MAPPED); - USHORT nPos = pColorLB->GetSelectEntryPos(); + USHORT nPos = pColorLB->GetSelectEntryPos(); switch( nPos ) { @@ -2290,7 +2301,7 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox *, pLB ) if( nPos == LISTBOX_ENTRY_NOTFOUND ) nPos = 0; - CharAttr* pAttr = ( CharAttr* ) pLB->GetEntryData( nPos ); + CharAttr* pAttr = ( CharAttr* ) pLB->GetEntryData( nPos ); //switch off preview background color pPrev->ResetColor(); switch (pAttr->nItemId) @@ -2360,13 +2371,13 @@ IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, ColorListBox *, pColorLB ) pPrev = &aChangedPreviewWN; } - SvxFont& rFont = pPrev->GetFont(); - SvxFont& rCJKFont = pPrev->GetCJKFont(); - USHORT nPos = pLB->GetSelectEntryPos(); + SvxFont& rFont = pPrev->GetFont(); + SvxFont& rCJKFont = pPrev->GetCJKFont(); + USHORT nPos = pLB->GetSelectEntryPos(); if( nPos == LISTBOX_ENTRY_NOTFOUND ) nPos = 0; - CharAttr* pAttr = ( CharAttr* ) pLB->GetEntryData( nPos ); + CharAttr* pAttr = ( CharAttr* ) pLB->GetEntryData( nPos ); if( pAttr->nItemId == SID_ATTR_BRUSH ) { @@ -2417,20 +2428,20 @@ IMPL_LINK( SwRedlineOptionsTabPage, ChangedMaskPrevHdl, ListBox *, EMPTYARG ) void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) { - const AllSettings& rAllSettings = Application::GetSettings(); - LanguageType eLangType = rAllSettings.GetUILanguage(); - Color aBackCol( rAllSettings.GetStyleSettings().GetWindowColor() ); - SvxFont& rFont = rExampleWin.GetFont(); - SvxFont& rCJKFont = rExampleWin.GetCJKFont(); - SvxFont& rCTLFont = rExampleWin.GetCTLFont(); + const AllSettings& rAllSettings = Application::GetSettings(); + LanguageType eLangType = rAllSettings.GetUILanguage(); + Color aBackCol( rAllSettings.GetStyleSettings().GetWindowColor() ); + SvxFont& rFont = rExampleWin.GetFont(); + SvxFont& rCJKFont = rExampleWin.GetCJKFont(); + SvxFont& rCTLFont = rExampleWin.GetCTLFont(); - Font aFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, eLangType, + Font aFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, eLangType, DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); - Font aCJKFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, eLangType, + Font aCJKFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, eLangType, DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); - Font aCTLFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_TEXT, eLangType, + Font aCTLFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_TEXT, eLangType, DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); - const Size aDefSize( 0, 12 ); + const Size aDefSize( 0, 12 ); aFont.SetSize( aDefSize ); aCJKFont.SetSize( aDefSize ); aCTLFont.SetSize( aDefSize ); @@ -2447,7 +2458,7 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) rCJKFont = aCJKFont; rCTLFont = aCTLFont; - const Size aNewSize( 0, rExampleWin.GetOutputSize().Height() * 2 / 3 ); + const Size aNewSize( 0, rExampleWin.GetOutputSize().Height() * 2 / 3 ); rFont.SetSize( aNewSize ); rCJKFont.SetSize( aNewSize ); @@ -2455,7 +2466,7 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) rExampleWin.UseResourceText(); - Wallpaper aWall( aBackCol ); + Wallpaper aWall( aBackCol ); rExampleWin.SetBackground( aWall ); rExampleWin.Invalidate(); } @@ -2479,30 +2490,30 @@ SwTestTabPage::SwTestTabPage( Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage( pParent, WB_HIDE, rCoreSet), aTestFL ( this, WB_GROUP ), - aTest1CBox ( this, 0 ), - aTest2CBox ( this, 0 ), - aTest3CBox ( this, 0 ), - aTest4CBox ( this, 0 ), - aTest5CBox ( this, 0 ), - aTest6CBox ( this, 0 ), - aTest7CBox ( this, 0 ), - aTest8CBox ( this, 0 ), - aTest9CBox ( this, 0 ), - aTest10CBox ( this, 0 ), + aTest1CBox ( this, 0 ), + aTest2CBox ( this, 0 ), + aTest3CBox ( this, 0 ), + aTest4CBox ( this, 0 ), + aTest5CBox ( this, 0 ), + aTest6CBox ( this, 0 ), + aTest7CBox ( this, 0 ), + aTest8CBox ( this, 0 ), + aTest9CBox ( this, 0 ), + aTest10CBox ( this, 0 ), bAttrModified( FALSE ) { - lcl_SetPosSize(*this, Point(0,0), Size(260 , 135)); + lcl_SetPosSize(*this, Point(0,0), Size(260 , 135)); lcl_SetPosSize(aTestFL, Point(6,2), Size(209,8)); - lcl_SetPosSize(aTest1CBox , Point(12 , 14), Size(74 , 10)); - lcl_SetPosSize(aTest2CBox , Point(12 , 27), Size(74 , 10)); - lcl_SetPosSize(aTest3CBox , Point(12 , 40), Size(74 , 10)); - lcl_SetPosSize(aTest4CBox , Point(12 , 53), Size(74 , 10)); - lcl_SetPosSize(aTest5CBox , Point(12 , 66), Size(74 , 10)); - lcl_SetPosSize(aTest6CBox , Point(116, 14), Size(74 , 10)); - lcl_SetPosSize(aTest7CBox , Point(116, 27), Size(74 , 10)); - lcl_SetPosSize(aTest8CBox , Point(116, 40), Size(74 , 10)); - lcl_SetPosSize(aTest9CBox , Point(116, 53), Size(74 , 10)); - lcl_SetPosSize(aTest10CBox , Point(116, 66), Size(74 , 10)); + lcl_SetPosSize(aTest1CBox , Point(12 , 14), Size(74 , 10)); + lcl_SetPosSize(aTest2CBox , Point(12 , 27), Size(74 , 10)); + lcl_SetPosSize(aTest3CBox , Point(12 , 40), Size(74 , 10)); + lcl_SetPosSize(aTest4CBox , Point(12 , 53), Size(74 , 10)); + lcl_SetPosSize(aTest5CBox , Point(12 , 66), Size(74 , 10)); + lcl_SetPosSize(aTest6CBox , Point(116, 14), Size(74 , 10)); + lcl_SetPosSize(aTest7CBox , Point(116, 27), Size(74 , 10)); + lcl_SetPosSize(aTest8CBox , Point(116, 40), Size(74 , 10)); + lcl_SetPosSize(aTest9CBox , Point(116, 53), Size(74 , 10)); + lcl_SetPosSize(aTest10CBox , Point(116, 66), Size(74 , 10)); aTestFL.SetText( String(ByteString("Einstellungen nur f\xFCr Testzwecke" ), RTL_TEXTENCODING_MS_1252)); aTest1CBox .SetText( C2S("unused")); @@ -2534,7 +2545,7 @@ SwTestTabPage::SwTestTabPage( Window* pParent, //------------------------------------------------------------------------ -SfxTabPage* SwTestTabPage::Create( Window* pParent, +SfxTabPage* SwTestTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwTestTabPage( pParent, rAttrSet ) ); @@ -2542,7 +2553,7 @@ SfxTabPage* SwTestTabPage::Create( Window* pParent, //------------------------------------------------------------------------ -BOOL SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet ) +BOOL SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet ) { if ( bAttrModified ) diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/ui/config/prtopt.cxx index a07c2c154696..b6631686dfb7 100644 --- a/sw/source/ui/config/prtopt.cxx +++ b/sw/source/ui/config/prtopt.cxx @@ -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 @@ -50,15 +50,15 @@ Sequence<OUString> SwPrintOptions::GetPropertyNames() { static const char* aPropNames[] = { - "Content/Graphic", // 0 - "Content/Table", // 1 - "Content/Control", // 2 - "Content/Background", // 3 - "Content/PrintBlack", // 4 - "Content/Note", // 5 + "Content/Graphic", // 0 + "Content/Table", // 1 + "Content/Control", // 2 + "Content/Background", // 3 + "Content/PrintBlack", // 4 + "Content/Note", // 5 "Page/Reversed", // 6 "Page/Brochure", // 7 - "Page/BrochureRightToLeft", // 8 + "Page/BrochureRightToLeft", // 8 "Output/SinglePrintJob", // 9 "Output/Fax", // 10 "Papertray/FromPrinterSetup", // 11 @@ -104,11 +104,11 @@ SwPrintOptions::SwPrintOptions(sal_Bool bWeb) : { switch(nProp) { - case 0: bPrintGraphic = *(sal_Bool*)pValues[nProp].getValue(); break; - case 1: bPrintTable = *(sal_Bool*)pValues[nProp].getValue(); break; - case 2: bPrintControl = *(sal_Bool*)pValues[nProp].getValue() ; break; + case 0: bPrintGraphic = *(sal_Bool*)pValues[nProp].getValue(); break; + case 1: bPrintTable = *(sal_Bool*)pValues[nProp].getValue(); break; + case 2: bPrintControl = *(sal_Bool*)pValues[nProp].getValue() ; break; case 3: bPrintPageBackground= *(sal_Bool*)pValues[nProp].getValue(); break; - case 4: bPrintBlackFont = *(sal_Bool*)pValues[nProp].getValue(); break; + case 4: bPrintBlackFont = *(sal_Bool*)pValues[nProp].getValue(); break; case 5: { sal_Int32 nTmp = 0; @@ -151,7 +151,7 @@ SwPrintOptions::~SwPrintOptions() void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} -void SwPrintOptions::Commit() +void SwPrintOptions::Commit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -165,10 +165,10 @@ void SwPrintOptions::Commit() switch(nProp) { case 0: bVal = bPrintGraphic; pValues[nProp].setValue(&bVal, rType);break; - case 1: bVal = bPrintTable ;pValues[nProp].setValue(&bVal, rType); break; - case 2: bVal = bPrintControl ; pValues[nProp].setValue(&bVal, rType); break; + case 1: bVal = bPrintTable ;pValues[nProp].setValue(&bVal, rType); break; + case 2: bVal = bPrintControl ; pValues[nProp].setValue(&bVal, rType); break; case 3: bVal = bPrintPageBackground; pValues[nProp].setValue(&bVal, rType); break; - case 4: bVal = bPrintBlackFont ; pValues[nProp].setValue(&bVal, rType); break; + case 4: bVal = bPrintBlackFont ; pValues[nProp].setValue(&bVal, rType); break; case 5: pValues[nProp] <<= (sal_Int32)nPrintPostIts ; break; case 6: bVal = bPrintReverse ; pValues[nProp].setValue(&bVal, rType); break; case 7: bVal = bPrintProspect ; pValues[nProp].setValue(&bVal, rType); break; diff --git a/sw/source/ui/config/redlopt.hrc b/sw/source/ui/config/redlopt.hrc index 877f23d75c4c..f77f84b664d7 100644 --- a/sw/source/ui/config/redlopt.hrc +++ b/sw/source/ui/config/redlopt.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 diff --git a/sw/source/ui/config/redlopt.src b/sw/source/ui/config/redlopt.src index 4d6816dcec23..2d5da1977213 100644 --- a/sw/source/ui/config/redlopt.src +++ b/sw/source/ui/config/redlopt.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/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index 40d56b3b6507..424df12405fa 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -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 @@ -44,7 +44,7 @@ #include <tools/resid.hxx> #include <fmtornt.hxx> -#include <swtypes.hxx> // Leerstring +#include <swtypes.hxx> // Leerstring #include <wrtsh.hxx> #include <uinums.hxx> #include <poolfmt.hxx> @@ -56,18 +56,18 @@ using namespace ::com::sun::star; -#define VERSION_30B ((USHORT)250) -#define VERSION_31B ((USHORT)326) -#define VERSION_40A ((USHORT)364) +#define VERSION_30B ((USHORT)250) +#define VERSION_31B ((USHORT)326) +#define VERSION_40A ((USHORT)364) #define VERSION_50A ((USHORT)373) #define VERSION_53A ((USHORT)596) -#define ACT_NUM_VERSION VERSION_53A +#define ACT_NUM_VERSION VERSION_53A #define NUMRULE_FILENAME "numrule.cfg" #define CHAPTER_FILENAME "chapter.cfg" /*------------------------------------------------------------------------ - Beschreibung: Ops. zum Laden / Speichern + Beschreibung: Ops. zum Laden / Speichern ------------------------------------------------------------------------*/ @@ -77,8 +77,8 @@ SV_IMPL_PTRARR( _SwNumFmtsAttrs, SfxPoolItem* ) // SwNumRulesWithName ---------------------------------------------------- // PUBLIC METHODES ------------------------------------------------------- /*------------------------------------------------------------------------ - Beschreibung: Speichern einer Regel - Parameter: rCopy -- die zu speichernde Regel + Beschreibung: Speichern einer Regel + Parameter: rCopy -- die zu speichernde Regel nIdx -- Position, an der die Regel zu speichern ist. Eine alte Regel an dieser Position wird ueberschrieben. ------------------------------------------------------------------------*/ @@ -146,7 +146,7 @@ void SwBaseNumRules::ApplyNumRules(const SwNumRulesWithName &rCopy, USHORT nIdx) // PROTECTED METHODES ---------------------------------------------------- /*------------------------------------------------------------------------ - Beschreibung: Speichern + Beschreibung: Speichern ------------------------------------------------------------------------*/ BOOL /**/ SwBaseNumRules::Store(SvStream &rStream) @@ -170,13 +170,13 @@ BOOL /**/ SwBaseNumRules::Store(SvStream &rStream) /*------------------------------------------------------------------------ - Beschreibung: Speichern / Laden + Beschreibung: Speichern / Laden ------------------------------------------------------------------------*/ int SwBaseNumRules::Load(SvStream &rStream) { - int rc = 0; + int rc = 0; rStream >> nVersion; @@ -305,7 +305,7 @@ SwNumRulesWithName::SwNumRulesWithName( SvStream &rStream, USHORT nVersion ) // wegen eines kleinen aber schweren Fehlers schreibt die PreFinal die // gleiche VERSION_40A wie das SP2 #55402# else if(nVersion < VERSION_40A && n > 5) -// else if(nVersion < VERSION_50A && n > 5) +// else if(nVersion < VERSION_50A && n > 5) c = 0; else rStream >> c; @@ -420,47 +420,47 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, BOOL bFlag; String sStr; - rStream >> nUS; aFmt.SetNumberingType((sal_Int16)nUS ); + rStream >> nUS; aFmt.SetNumberingType((sal_Int16)nUS ); if( VERSION_53A > nVersion ) { - rStream >> cChar; aFmt.SetBulletChar( cChar ); + rStream >> cChar; aFmt.SetBulletChar( cChar ); } else { - rStream >> nUS; aFmt.SetBulletChar( nUS ); + rStream >> nUS; aFmt.SetBulletChar( nUS ); } - rStream >> bFlag; aFmt.SetIncludeUpperLevels( bFlag ); + rStream >> bFlag; aFmt.SetIncludeUpperLevels( bFlag ); if( VERSION_30B == nVersion ) { long nL; - rStream >> cChar; aFmt.SetStart( (USHORT)cChar ); + rStream >> cChar; aFmt.SetStart( (USHORT)cChar ); rStream.ReadByteString(sStr, eEncoding); aFmt.SetPrefix( sStr ); rStream.ReadByteString(sStr, eEncoding); aFmt.SetSuffix( sStr ); - rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); - rStream >> nL; aFmt.SetLSpace( lNumIndent ); - rStream >> nL; aFmt.SetFirstLineOffset( (short)nL ); + rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); + rStream >> nL; aFmt.SetLSpace( lNumIndent ); + rStream >> nL; aFmt.SetFirstLineOffset( (short)nL ); } - else // alter StartWert war ein Byte + else // alter StartWert war ein Byte { - rStream >> nUS; aFmt.SetStart( nUS ); + rStream >> nUS; aFmt.SetStart( nUS ); rStream.ReadByteString(sStr, eEncoding); aFmt.SetPrefix( sStr ); rStream.ReadByteString(sStr, eEncoding); aFmt.SetSuffix( sStr ); - rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); - rStream >> nUS; aFmt.SetAbsLSpace( nUS ); - rStream >> nShort; aFmt.SetFirstLineOffset( nShort ); - rStream >> nUS; aFmt.SetCharTextDistance( nUS ); - rStream >> nShort; aFmt.SetLSpace( nShort ); + rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); + rStream >> nUS; aFmt.SetAbsLSpace( nUS ); + rStream >> nShort; aFmt.SetFirstLineOffset( nShort ); + rStream >> nUS; aFmt.SetCharTextDistance( nUS ); + rStream >> nShort; aFmt.SetLSpace( nShort ); rStream >> bFlag; } - USHORT nFamily; + USHORT nFamily; USHORT nCharSet; short nWidth; short nHeight; @@ -660,7 +660,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::ChgNumFmt( SwWrtShell& rSh, else pFmt = rSh.GetCharFmtFromPool( nCharPoolId ); - if( !pFmt->GetDepends() ) // Attribute setzen + if( !pFmt->GetDepends() ) // Attribute setzen for( USHORT n = aItems.Count(); n; ) pFmt->SetFmtAttr( *aItems[ --n ] ); } diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx index 85d3886fc79f..c6be3b66c994 100644 --- a/sw/source/ui/config/usrpref.cxx +++ b/sw/source/ui/config/usrpref.cxx @@ -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 @@ -63,6 +63,7 @@ SwMasterUsrPref::SwMasterUsrPref(BOOL bWeb) : bIsVScrollMetricSet(sal_False), nDefTab( MM50 * 4 ), bIsSquaredPageMode(sal_False), + bApplyCharUnit(sal_False), aContentConfig(bWeb, *this), aLayoutConfig(bWeb, *this), aGridConfig(bWeb, *this), @@ -95,11 +96,11 @@ Sequence<OUString> SwContentViewConfig::GetPropertyNames() { static const char* aPropNames[] = { - "Display/GraphicObject", // 0 - "Display/Table", // 1 - "Display/DrawingControl", // 2 - "Display/FieldCode", // 3 - "Display/Note", // 4 + "Display/GraphicObject", // 0 + "Display/Table", // 1 + "Display/DrawingControl", // 2 + "Display/FieldCode", // 3 + "Display/Note", // 4 "Display/PreventTips", // 5 "NonprintingCharacter/MetaCharacters", // 6 "NonprintingCharacter/ParagraphEnd", // 7 @@ -165,11 +166,11 @@ void SwContentViewConfig::Commit() sal_Bool bVal = FALSE; switch(nProp) { - case 0: bVal = rParent.IsGraphic(); break;// "Display/GraphicObject", - case 1: bVal = rParent.IsTable(); break;// "Display/Table", - case 2: bVal = rParent.IsDraw(); break;// "Display/DrawingControl", - case 3: bVal = rParent.IsFldName(); break;// "Display/FieldCode", - case 4: bVal = rParent.IsPostIts(); break;// "Display/Note", + case 0: bVal = rParent.IsGraphic(); break;// "Display/GraphicObject", + case 1: bVal = rParent.IsTable(); break;// "Display/Table", + case 2: bVal = rParent.IsDraw(); break;// "Display/DrawingControl", + case 3: bVal = rParent.IsFldName(); break;// "Display/FieldCode", + case 4: bVal = rParent.IsPostIts(); break;// "Display/Note", case 5: bVal = rParent.IsPreventTips(); break; // "Display/PreventTips" case 6: bVal = rParent.IsViewMetaChars(); break; //"NonprintingCharacter/MetaCharacters" case 7: bVal = rParent.IsParagraph(sal_True); break;// "NonprintingCharacter/ParagraphEnd", @@ -208,11 +209,11 @@ void SwContentViewConfig::Load() sal_Bool bSet = nProp != 16 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False; switch(nProp) { - case 0: rParent.SetGraphic(bSet); break;// "Display/GraphicObject", - case 1: rParent.SetTable(bSet); break;// "Display/Table", - case 2: rParent.SetDraw(bSet); break;// "Display/DrawingControl", - case 3: rParent.SetFldName(bSet); break;// "Display/FieldCode", - case 4: rParent.SetPostIts(bSet); break;// "Display/Note", + case 0: rParent.SetGraphic(bSet); break;// "Display/GraphicObject", + case 1: rParent.SetTable(bSet); break;// "Display/Table", + case 2: rParent.SetDraw(bSet); break;// "Display/DrawingControl", + case 3: rParent.SetFldName(bSet); break;// "Display/FieldCode", + case 4: rParent.SetPostIts(bSet); break;// "Display/Note", case 5: rParent.SetPreventTips(bSet); break;// "Display/PreventTips", case 6: rParent.SetViewMetaChars(bSet); break; //"NonprintingCharacter/MetaCharacters" case 7: rParent.SetParagraph(bSet); break;// "NonprintingCharacter/ParagraphEnd", @@ -263,9 +264,10 @@ Sequence<OUString> SwLayoutViewConfig::GetPropertyNames() "Window/IsVerticalRulerRight", //15 "ViewLayout/Columns", //16 "ViewLayout/BookMode", //17 - "Other/IsSquaredPageMode" //18 + "Other/IsSquaredPageMode", //18 + "Other/ApplyCharUnit" //19 }; - const int nCount = bWeb ? 14 : 19; + const int nCount = bWeb ? 14 : 20; Sequence<OUString> aNames(nCount); OUString* pNames = aNames.getArray(); for(int i = 0; i < nCount; i++) @@ -332,8 +334,9 @@ void SwLayoutViewConfig::Commit() case 16: pValues[nProp] <<= (sal_Int32)rParent.GetViewLayoutColumns(); break;// "ViewLayout/Columns", case 17: bSet = rParent.IsViewLayoutBookMode(); break;// "ViewLayout/BookMode", case 18: bSet = rParent.IsSquaredPageMode(); break;// "Other/IsSquaredPageMode", + case 19: bSet = rParent.IsApplyCharUnit(); break;// "Other/ApplyCharUnit", } - if(nProp < 8 || nProp == 10 || nProp == 15 || nProp == 17 || nProp == 18 ) + if(nProp < 8 || nProp == 10 || nProp == 15 || nProp == 17 || nProp == 18 || nProp == 19 ) pValues[nProp].setValue(&bSet, ::getBooleanCppuType()); } PutProperties(aNames, aValues); @@ -353,7 +356,7 @@ void SwLayoutViewConfig::Load() { if(pValues[nProp].hasValue()) { - sal_Bool bSet = nProp < 8 || nProp == 10 || nProp == 17 || nProp == 18 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False; + sal_Bool bSet = nProp < 8 || nProp == 10 || nProp == 17 || nProp == 18 || nProp == 19 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False; switch(nProp) { case 0: rParent.SetCrossHair(bSet); break;// "Line/Guide", @@ -419,6 +422,7 @@ void SwLayoutViewConfig::Load() break;// "ViewLayout/Columns", case 17: rParent.SetViewLayoutBookMode(bSet); break;// "ViewLayout/BookMode", case 18: rParent.SetDefaultPageMode(bSet,TRUE); break;// "Other/IsSquaredPageMode", + case 19: rParent.SetApplyCharUnit(bSet); break;// "Other/ApplyUserChar" } } } @@ -434,13 +438,13 @@ Sequence<OUString> SwGridConfig::GetPropertyNames() { static const char* aPropNames[] = { - "Option/SnapToGrid", // 0 - "Option/VisibleGrid", // 1 - "Option/Synchronize", // 2 - "Resolution/XAxis", // 3 - "Resolution/YAxis", // 4 - "Subdivision/XAxis", // 5 - "Subdivision/YAxis" // 6 + "Option/SnapToGrid", // 0 + "Option/VisibleGrid", // 1 + "Option/Synchronize", // 2 + "Resolution/XAxis", // 3 + "Resolution/YAxis", // 4 + "Subdivision/XAxis", // 5 + "Subdivision/YAxis" // 6 }; const int nCount = 7; Sequence<OUString> aNames(nCount); @@ -482,7 +486,7 @@ void SwGridConfig::Commit() sal_Bool bSet; switch(nProp) { - case 0: bSet = rParent.IsSnap(); break;// "Option/SnapToGrid", + case 0: bSet = rParent.IsSnap(); break;// "Option/SnapToGrid", case 1: bSet = rParent.IsGridVisible(); break;//"Option/VisibleGrid", case 2: bSet = rParent.IsSynchronize(); break;// "Option/Synchronize", case 3: pValues[nProp] <<= (sal_Int32)TWIP_TO_MM100(rParent.GetSnapSize().Width()); break;// "Resolution/XAxis", @@ -517,7 +521,7 @@ void SwGridConfig::Load() pValues[nProp] >>= nSet; switch(nProp) { - case 0: rParent.SetSnap(bSet); break;// "Option/SnapToGrid", + case 0: rParent.SetSnap(bSet); break;// "Option/SnapToGrid", case 1: rParent.SetGridVisible(bSet); break;//"Option/VisibleGrid", case 2: rParent.SetSynchronize(bSet); break;// "Option/Synchronize", case 3: aSnap.Width() = MM100_TO_TWIP(nSet); break;// "Resolution/XAxis", @@ -540,8 +544,8 @@ Sequence<OUString> SwCursorConfig::GetPropertyNames() { static const char* aPropNames[] = { - "DirectCursor/UseDirectCursor", // 0 - "DirectCursor/Insert", // 1 + "DirectCursor/UseDirectCursor", // 0 + "DirectCursor/Insert", // 1 "Option/ProtectedArea" // 2 }; const int nCount = 3; @@ -581,8 +585,8 @@ void SwCursorConfig::Commit() sal_Bool bSet; switch(nProp) { - case 0: bSet = rParent.IsShadowCursor(); break;// "DirectCursor/UseDirectCursor", - case 1: pValues[nProp] <<= (sal_Int32)rParent.GetShdwCrsrFillMode(); break;// "DirectCursor/Insert", + case 0: bSet = rParent.IsShadowCursor(); break;// "DirectCursor/UseDirectCursor", + case 1: pValues[nProp] <<= (sal_Int32)rParent.GetShdwCrsrFillMode(); break;// "DirectCursor/Insert", case 2: bSet = rParent.IsCursorInProtectedArea(); break;// "Option/ProtectedArea" } if(nProp != 1 ) @@ -614,7 +618,7 @@ void SwCursorConfig::Load() pValues[nProp] >>= nSet; switch(nProp) { - case 0: rParent.SetShadowCursor(bSet); break;// "DirectCursor/UseDirectCursor", + case 0: rParent.SetShadowCursor(bSet); break;// "DirectCursor/UseDirectCursor", case 1: rParent.SetShdwCrsrFillMode((BYTE)nSet); break;// "DirectCursor/Insert", case 2: rParent.SetCursorInProtectedArea(bSet); break;// "Option/ProtectedArea" } @@ -654,7 +658,7 @@ void SwWebColorConfig::Commit() { switch(nProp) { - case 0: pValues[nProp] <<= (sal_Int32)rParent.GetRetoucheColor().GetColor(); break;// "Color", + case 0: pValues[nProp] <<= (sal_Int32)rParent.GetRetoucheColor().GetColor(); break;// "Color", } } PutProperties(aPropNames, aValues); diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 13cec2b93bb5..6960e56ceb92 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -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 @@ -60,7 +60,7 @@ #include <editeng/acorrcfg.hxx> #ifdef DBG_UTIL -BOOL SwViewOption::bTest9 = FALSE; //DrawingLayerNotLoading +BOOL SwViewOption::bTest9 = FALSE; //DrawingLayerNotLoading #endif Color SwViewOption::aDocBoundColor(COL_LIGHTGRAY); Color SwViewOption::aObjectBoundColor(COL_LIGHTGRAY); @@ -87,25 +87,25 @@ USHORT SwViewOption::nPixelTwips = 0; //ein Pixel auf dem Bildschirm #define LINEBREAK_SIZE 12, 8 #define TAB_SIZE 12, 6 -#define MIN_BLANKWIDTH 40 -#define MIN_BLANKHEIGHT 40 -#define MIN_TABWIDTH 120 -#define MIN_TABHEIGHT 200 +#define MIN_BLANKWIDTH 40 +#define MIN_BLANKHEIGHT 40 +#define MIN_TABWIDTH 120 +#define MIN_TABHEIGHT 200 static const char __FAR_DATA aPostItStr[] = " "; /************************************************************************* - * SwViewOption::IsEqualFlags() + * SwViewOption::IsEqualFlags() *************************************************************************/ BOOL SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const { - return nCoreOptions == rOpt.nCoreOptions + return nCoreOptions == rOpt.nCoreOptions && nCore2Options == rOpt.nCore2Options - && aSnapSize == rOpt.aSnapSize + && aSnapSize == rOpt.aSnapSize && mnViewLayoutColumns == rOpt.mnViewLayoutColumns - && nDivisionX == rOpt.GetDivisionX() - && nDivisionY == rOpt.GetDivisionY() + && nDivisionX == rOpt.GetDivisionX() + && nDivisionY == rOpt.GetDivisionY() && nPagePrevRow == rOpt.GetPagePrevRow() && nPagePrevCol == rOpt.GetPagePrevCol() && aRetoucheColor == rOpt.GetRetoucheColor() @@ -129,7 +129,7 @@ BOOL SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const } /************************************************************************* - * SwViewOption::DrawRect() + * SwViewOption::DrawRect() *************************************************************************/ void SwViewOption::DrawRect( OutputDevice *pOut, @@ -148,7 +148,7 @@ void SwViewOption::DrawRect( OutputDevice *pOut, } /************************************************************************* - * SwViewOption::DrawRectPrinter() + * SwViewOption::DrawRectPrinter() *************************************************************************/ void SwViewOption::DrawRectPrinter( OutputDevice *pOut, @@ -164,7 +164,7 @@ void SwViewOption::DrawRectPrinter( OutputDevice *pOut, } /************************************************************************* - * SwViewOption::GetPostItsWidth() + * SwViewOption::GetPostItsWidth() *************************************************************************/ USHORT SwViewOption::GetPostItsWidth( const OutputDevice *pOut ) const @@ -174,7 +174,7 @@ USHORT SwViewOption::GetPostItsWidth( const OutputDevice *pOut ) const } /************************************************************************* - * SwViewOption::PaintPostIts() + * SwViewOption::PaintPostIts() *************************************************************************/ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bool bIsScript ) const @@ -187,7 +187,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bo USHORT nPix = GetPixelTwips() * 2; if( rRect.Width() <= 2 * nPix || rRect.Height() <= 2 * nPix ) nPix = 0; - const Point aTopLeft( rRect.Left() + nPix, rRect.Top() + nPix ); + const Point aTopLeft( rRect.Left() + nPix, rRect.Top() + nPix ); const Point aBotRight( rRect.Right() - nPix, rRect.Bottom() - nPix ); const SwRect aRect( aTopLeft, aBotRight ); DrawRect( pOut, aRect, aScriptIndicatorColor.GetColor() ); @@ -198,9 +198,9 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bo /************************************************************************* |* -|* ViewOption::ViewOption() +|* ViewOption::ViewOption() |* -|* Letzte Aenderung MA 04. Aug. 93 +|* Letzte Aenderung MA 04. Aug. 93 |* |*************************************************************************/ @@ -230,16 +230,16 @@ SwViewOption::SwViewOption() : nCoreOptions = VIEWOPT_1_HARDBLANK | VIEWOPT_1_SOFTHYPH | VIEWOPT_1_REF | VIEWOPT_1_GRAPHIC | - VIEWOPT_1_TABLE | VIEWOPT_1_DRAW | VIEWOPT_1_CONTROL | + VIEWOPT_1_TABLE | VIEWOPT_1_DRAW | VIEWOPT_1_CONTROL | VIEWOPT_1_PAGEBACK | VIEWOPT_1_SOLIDMARKHDL | VIEWOPT_1_POSTITS; nCore2Options = VIEWOPT_CORE2_BLACKFONT | VIEWOPT_CORE2_HIDDENPARA; nUIOptions = VIEWOPT_2_MODIFIED | VIEWOPT_2_GRFKEEPZOOM |VIEWOPT_2_ANY_RULER; if(MEASURE_METRIC != SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()) - aSnapSize.Width() = aSnapSize.Height() = 720; // 1/2" + aSnapSize.Width() = aSnapSize.Height() = 720; // 1/2" else - aSnapSize.Width() = aSnapSize.Height() = 567; // 1 cm + aSnapSize.Width() = aSnapSize.Height() = 567; // 1 cm nDivisionX = nDivisionY = 1; bSelectionInReadonly = SW_MOD()->GetAccessibilityOptions().IsSelectionInReadonly(); @@ -261,23 +261,23 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt) bFormView = rVOpt.bFormView; // <-- nZoom = rVOpt.nZoom ; - aSnapSize = rVOpt.aSnapSize ; + aSnapSize = rVOpt.aSnapSize ; mnViewLayoutColumns = rVOpt.mnViewLayoutColumns ; - nDivisionX = rVOpt.nDivisionX ; - nDivisionY = rVOpt.nDivisionY ; - nPagePrevRow = rVOpt.nPagePrevRow; - nPagePrevCol = rVOpt.nPagePrevCol; + nDivisionX = rVOpt.nDivisionX ; + nDivisionY = rVOpt.nDivisionY ; + nPagePrevRow = rVOpt.nPagePrevRow; + nPagePrevCol = rVOpt.nPagePrevCol; bIsPagePreview = rVOpt.bIsPagePreview; - eZoom = rVOpt.eZoom ; - nTblDest = rVOpt.nTblDest ; - nUIOptions = rVOpt.nUIOptions ; - nCoreOptions = rVOpt.nCoreOptions ; - nCore2Options = rVOpt.nCore2Options ; - aRetoucheColor = rVOpt.GetRetoucheColor(); - sSymbolFont = rVOpt.sSymbolFont; + eZoom = rVOpt.eZoom ; + nTblDest = rVOpt.nTblDest ; + nUIOptions = rVOpt.nUIOptions ; + nCoreOptions = rVOpt.nCoreOptions ; + nCore2Options = rVOpt.nCore2Options ; + aRetoucheColor = rVOpt.GetRetoucheColor(); + sSymbolFont = rVOpt.sSymbolFont; nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode; bStarOneSetting = rVOpt.bStarOneSetting; - bBookview = rVOpt.bBookview; + bBookview = rVOpt.bBookview; mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode; bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields; bIdle = rVOpt.bIdle; @@ -301,24 +301,24 @@ SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt ) // --> DVO FME 2004-06-29 #114856# Formular view bFormView = rVOpt.bFormView ; // <-- - nZoom = rVOpt.nZoom ; - aSnapSize = rVOpt.aSnapSize ; + nZoom = rVOpt.nZoom ; + aSnapSize = rVOpt.aSnapSize ; mnViewLayoutColumns = rVOpt.mnViewLayoutColumns ; - nDivisionX = rVOpt.nDivisionX ; - nDivisionY = rVOpt.nDivisionY ; - nPagePrevRow = rVOpt.nPagePrevRow; - nPagePrevCol = rVOpt.nPagePrevCol; + nDivisionX = rVOpt.nDivisionX ; + nDivisionY = rVOpt.nDivisionY ; + nPagePrevRow = rVOpt.nPagePrevRow; + nPagePrevCol = rVOpt.nPagePrevCol; bIsPagePreview = rVOpt.bIsPagePreview; - eZoom = rVOpt.eZoom ; - nTblDest = rVOpt.nTblDest ; - nUIOptions = rVOpt.nUIOptions ; - nCoreOptions = rVOpt.nCoreOptions; - nCore2Options = rVOpt.nCore2Options; - aRetoucheColor = rVOpt.GetRetoucheColor(); - sSymbolFont = rVOpt.sSymbolFont; + eZoom = rVOpt.eZoom ; + nTblDest = rVOpt.nTblDest ; + nUIOptions = rVOpt.nUIOptions ; + nCoreOptions = rVOpt.nCoreOptions; + nCore2Options = rVOpt.nCore2Options; + aRetoucheColor = rVOpt.GetRetoucheColor(); + sSymbolFont = rVOpt.sSymbolFont; nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode; bStarOneSetting = rVOpt.bStarOneSetting; - bBookview = rVOpt.bBookview; + bBookview = rVOpt.bBookview; mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode; bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields; bIdle = rVOpt.bIdle; @@ -344,9 +344,9 @@ SwViewOption::~SwViewOption() /************************************************************************* |* -|* ViewOption::Init() +|* ViewOption::Init() |* -|* Letzte Aenderung MA 04. Aug. 93 +|* Letzte Aenderung MA 04. Aug. 93 |* |*************************************************************************/ @@ -369,9 +369,9 @@ BOOL SwViewOption::IsAutoCompleteWords() const /*************************************************************************/ AuthorCharAttr::AuthorCharAttr() : - nItemId (SID_ATTR_CHAR_UNDERLINE), - nAttr (UNDERLINE_SINGLE), - nColor (COL_TRANSPARENT) + nItemId (SID_ATTR_CHAR_UNDERLINE), + nAttr (UNDERLINE_SINGLE), + nColor (COL_TRANSPARENT) { } @@ -379,7 +379,7 @@ AuthorCharAttr::AuthorCharAttr() : --------------------------------------------------*/ -USHORT GetHtmlMode(const SwDocShell* pShell) +USHORT GetHtmlMode(const SwDocShell* pShell) { USHORT nRet = 0; if(!pShell || PTR_CAST(SwWebDocShell, pShell)) diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index dc007fc68e13..c543cf702c9f 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -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/dbui/addresslistdialog.hrc b/sw/source/ui/dbui/addresslistdialog.hrc index 821ddd81b4f0..4715507951f2 100644 --- a/sw/source/ui/dbui/addresslistdialog.hrc +++ b/sw/source/ui/dbui/addresslistdialog.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 diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index 0623df315d39..30f0e26ab595 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -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/dbui/addresslistdialog.src b/sw/source/ui/dbui/addresslistdialog.src index 38a82e65ea76..64fcaf7806ef 100644 --- a/sw/source/ui/dbui/addresslistdialog.src +++ b/sw/source/ui/dbui/addresslistdialog.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/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 6c13fee26b9c..2d0c1d0a0028 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -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/dbui/createaddresslistdialog.hrc b/sw/source/ui/dbui/createaddresslistdialog.hrc index d843acbcf63f..90554fae05e2 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hrc +++ b/sw/source/ui/dbui/createaddresslistdialog.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 @@ -60,5 +60,5 @@ #define ST_ADD_BUTTON 4 #define PB_FIND 5 - -#endif + +#endif diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index b900d7d21ff6..39cd1bc33a1b 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -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/dbui/createaddresslistdialog.src b/sw/source/ui/dbui/createaddresslistdialog.src index b43a373cd047..c1c0c1c74849 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.src +++ b/sw/source/ui/dbui/createaddresslistdialog.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 @@ -30,7 +30,7 @@ #include <helpid.h> /*-- 13.04.2004 13:58:13--------------------------------------------------- - + -----------------------------------------------------------------------*/ ModalDialog DLG_MM_CREATEADDRESSLIST { @@ -165,7 +165,7 @@ ModalDialog DLG_MM_CREATEADDRESSLIST }; /*-- 13.04.2004 13:58:13--------------------------------------------------- - + -----------------------------------------------------------------------*/ ModelessDialog DLG_MM_FIND_ENTRY { diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index f5191fe0fe55..e1787da26d14 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -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/dbui/customizeaddresslistdialog.hrc b/sw/source/ui/dbui/customizeaddresslistdialog.hrc index 8e04f81a07b3..af09b30c5906 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hrc +++ b/sw/source/ui/dbui/customizeaddresslistdialog.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 @@ -45,5 +45,5 @@ #define ST_RENAME_TITLE 3 #define ST_ADD_BUTTON 4 - -#endif + +#endif diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index 42298a463cbf..68139828a157 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -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/dbui/customizeaddresslistdialog.src b/sw/source/ui/dbui/customizeaddresslistdialog.src index 21e32ecb89c4..05892d90ecb5 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.src +++ b/sw/source/ui/dbui/customizeaddresslistdialog.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 @@ -30,7 +30,7 @@ #include <helpid.h> /*-- 13.04.2004 13:58:13--------------------------------------------------- - + -----------------------------------------------------------------------*/ ModalDialog DLG_MM_CUSTOMIZE_ADDRESS_LIST { @@ -109,7 +109,7 @@ ModalDialog DLG_MM_CUSTOMIZE_ADDRESS_LIST }; }; /*-- 13.04.2004 13:58:13--------------------------------------------------- - + -----------------------------------------------------------------------*/ ModalDialog DLG_MM_ADD_RENAME_ENTRY { diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 9e62f7a4de36..42d4db33f09e 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -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 @@ -125,8 +125,8 @@ using namespace ::com::sun::star::beans; // tblafmt.hxx SV_IMPL_PTRARR( _SwTableAutoFmtTbl, SwTableAutoFmt* ) -const char cDBFldStart = '<'; -const char cDBFldEnd = '>'; +const char cDBFldStart = '<'; +const char cDBFldEnd = '>'; // Hilfsstruktur fuers einfuegen von Datenbankspalten als Felder oder Text struct _DB_Column @@ -185,9 +185,9 @@ SV_IMPL_OP_PTRARR_SORT( SwInsDBColumns, SwInsDBColumnPtr ) /* */ -#define DBCOLUMN_CONFIG_VERSION1 1 -#define DBCOLUMN_CONFIG_VERSION DBCOLUMN_CONFIG_VERSION1 -#define DBCOLUMN_MAXDATA 5 +#define DBCOLUMN_CONFIG_VERSION1 1 +#define DBCOLUMN_CONFIG_VERSION DBCOLUMN_CONFIG_VERSION1 +#define DBCOLUMN_MAXDATA 5 struct _DB_ColumnConfigData { @@ -461,7 +461,7 @@ SwInsertDBColAutoPilot::~SwInsertDBColAutoPilot() delete pTblSet; delete pRep; -// delete pConfig; +// delete pConfig; delete pTAutoFmt; } /* --------------------------------------------------------------------------- @@ -631,13 +631,13 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton ) aFld += cDBFldEnd; if( aStr.Len() ) { - if( nPos ) // ein Space davor + if( nPos ) // ein Space davor { sal_Unicode c = aStr.GetChar( nPos-1 ); if( '\n' != c && '\r' != c ) aFld.Insert( ' ', 0 ); } - if( nPos < aStr.Len() ) // ein Space dahinter + if( nPos < aStr.Len() ) // ein Space dahinter { sal_Unicode c = aStr.GetChar( nPos ); if( '\n' != c && '\r' != c ) @@ -1045,7 +1045,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, Reference <XNameAccess> xCols = xColsSupp->getColumns(); do{ // middle checked loop!! - if( bAsTable ) // Daten als Tabelle einfuegen + if( bAsTable ) // Daten als Tabelle einfuegen { rSh.DoUndo( FALSE ); @@ -1165,7 +1165,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, if( xColumn.is() ) { double fVal = xColumn->getDouble(); - if( xColumn->wasNull() ) + if( xColumn->wasNull() ) aTblSet.ClearItem( RES_BOXATR_VALUE ); else { @@ -1241,7 +1241,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, } rSh.SetAutoUpdateCells( bIsAutoUpdateCells ); } - else // Daten als Felder/Text einfuegen + else // Daten als Felder/Text einfuegen { _DB_Columns aColArr; if( SplitTextToColArr( aEdDbText.GetText(), aColArr, aRbAsField.IsChecked() ) ) @@ -1373,7 +1373,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, Any aType = xColumnProps->getPropertyValue(C2U("Type")); sal_Int32 eDataType = 0; aType >>= eDataType; - if( DataType::DATE == eDataType || DataType::TIME == eDataType || + if( DataType::DATE == eDataType || DataType::TIME == eDataType || DataType::TIMESTAMP == eDataType) { @@ -1845,7 +1845,7 @@ void SwInsertDBColAutoPilot::Load() pInsDBColumn->nUsrNumFmt = rNFmtr.GetEntryKey( pInsDBColumn->sUsrNumFmt, pInsDBColumn->eUsrNumFmtLng ); -// pInsDBColumn->nDBNumFmt +// pInsDBColumn->nDBNumFmt pNewData->aDBColumns.Insert(pInsDBColumn); } diff --git a/sw/source/ui/dbui/dbinsdlg.hrc b/sw/source/ui/dbui/dbinsdlg.hrc index fd2bdcf3d776..4bc8164f8ea7 100644 --- a/sw/source/ui/dbui/dbinsdlg.hrc +++ b/sw/source/ui/dbui/dbinsdlg.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 @@ -29,45 +29,45 @@ #define _DBINSDLG_HRC -#define FT_INSERT_DATA 1 -#define RB_AS_TABLE 2 -#define RB_AS_FIELD 3 -#define RB_AS_TEXT 4 -#define BT_OK 5 -#define BT_CANCEL 6 -#define BT_HELP 7 +#define FT_INSERT_DATA 1 +#define RB_AS_TABLE 2 +#define RB_AS_FIELD 3 +#define RB_AS_TEXT 4 +#define BT_OK 5 +#define BT_CANCEL 6 +#define BT_HELP 7 #define FL_HEAD 8 -#define FT_DB_COLUMN 10 +#define FT_DB_COLUMN 10 #define FL_FORMAT 11 -#define RB_DBFMT_FROM_DB 12 -#define RB_DBFMT_FROM_USR 13 -#define LB_DBFMT_FROM_USR 14 +#define RB_DBFMT_FROM_DB 12 +#define RB_DBFMT_FROM_USR 13 +#define LB_DBFMT_FROM_USR 14 /* ------------- Page Text/Field ------------------ */ -#define LB_TXT_DB_COLUMN 15 +#define LB_TXT_DB_COLUMN 15 #define IB_DBCOL_TOEDIT 16 #define ED_DB_TEXT 17 -#define FT_DB_PARA_COLL 18 -#define LB_DB_PARA_COLL 19 +#define FT_DB_PARA_COLL 18 +#define LB_DB_PARA_COLL 19 /* ------------- Page Table -------------------- */ -#define LB_TBL_DB_COLUMN 20 +#define LB_TBL_DB_COLUMN 20 #define IB_DBCOL_ALL_TO 21 #define IB_DBCOL_ONE_TO 22 #define IB_DBCOL_ONE_FROM 23 #define IB_DBCOL_ALL_FROM 24 -#define FT_TABLE_COL 25 -#define LB_TABLE_COL 26 +#define FT_TABLE_COL 25 +#define LB_TABLE_COL 26 #define FL_BOTTOM 27 -#define CB_TABLE_HEADON 28 -#define RB_HEADL_COLNMS 29 -#define RB_HEADL_EMPTY 30 -#define PB_TBL_FORMAT 31 -#define PB_TBL_AUTOFMT 32 +#define CB_TABLE_HEADON 28 +#define RB_HEADL_COLNMS 29 +#define RB_HEADL_EMPTY 30 +#define PB_TBL_FORMAT 31 +#define PB_TBL_AUTOFMT 32 -#define STR_NOTEMPL 33 +#define STR_NOTEMPL 33 #endif diff --git a/sw/source/ui/dbui/dbinsdlg.src b/sw/source/ui/dbui/dbinsdlg.src index 28e045a3a235..d08305dde17e 100644 --- a/sw/source/ui/dbui/dbinsdlg.src +++ b/sw/source/ui/dbui/dbinsdlg.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 @@ -248,7 +248,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL { Pos = MAP_APPFONT ( 137 , 31 ) ; Size = MAP_APPFONT ( 75 , 8 ) ; - + Text [ en-US ] = "Tab~le column(s)" ; }; ListBox LB_TABLE_COL diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index cf894f8728c4..d550c3b3af84 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -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 @@ -154,8 +154,8 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::task; using namespace ::com::sun::star::ui::dialogs; -#define DB_SEP_SPACE 0 -#define DB_SEP_TAB 1 +#define DB_SEP_SPACE 0 +#define DB_SEP_TAB 1 #define DB_SEP_RETURN 2 #define DB_SEP_NEWLINE 3 @@ -460,7 +460,7 @@ BOOL SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc ) rMergeDesc); break; - default: // Einfuegen der selektierten Eintraege + default: // Einfuegen der selektierten Eintraege // (war: InsertRecord) ImportFromConnection(&rMergeDesc.rSh); break; @@ -490,7 +490,7 @@ BOOL SwNewDBMgr::Merge(SwWrtShell* pSh) /*-------------------------------------------------------------------- Beschreibung: --------------------------------------------------------------------*/ -void SwNewDBMgr::ImportFromConnection( SwWrtShell* pSh ) +void SwNewDBMgr::ImportFromConnection( SwWrtShell* pSh ) { if(pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB) { @@ -527,7 +527,7 @@ void SwNewDBMgr::ImportFromConnection( SwWrtShell* pSh ) --------------------------------------------------*/ -String lcl_FindColumn(const String& sFormatStr,USHORT &nUsedPos, BYTE &nSeparator) +String lcl_FindColumn(const String& sFormatStr,USHORT &nUsedPos, BYTE &nSeparator) { String sReturn; USHORT nLen = sFormatStr.Len(); @@ -574,7 +574,7 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh) const char cSpace = ' '; const char cTab = '\t'; USHORT nUsedPos = 0; - BYTE nSeparator; + BYTE nSeparator; String sColumn = lcl_FindColumn(sFormatStr, nUsedPos, nSeparator); while( sColumn.Len() ) { @@ -586,7 +586,7 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh) if(xColumnProp.is()) { SwDBFormatData aDBFormat; - String sInsert = GetDBField( xColumnProp, aDBFormat); + String sInsert = GetDBField( xColumnProp, aDBFormat); if( DB_SEP_SPACE == nSeparator ) sInsert += cSpace; else if( DB_SEP_TAB == nSeparator) @@ -626,7 +626,7 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh) sStr += '\t'; } pSh->SwEditShell::Insert2(sStr); - pSh->SwFEShell::SplitNode(); // Zeilenvorschub + pSh->SwFEShell::SplitNode(); // Zeilenvorschub } } } @@ -779,7 +779,7 @@ SwNewDBMgr::~SwNewDBMgr() } /*-------------------------------------------------------------------- - Beschreibung: Serienbriefe als einzelne Dokumente speichern + Beschreibung: Serienbriefe als einzelne Dokumente speichern --------------------------------------------------------------------*/ String lcl_FindUniqueName(SwWrtShell* pTargetShell, const String& rStartingPageDesc, ULONG nDocNo ) { @@ -1002,7 +1002,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, SwDBFormatData aDBFormat; aDBFormat.xFormatter = pImpl->pMergeData->xFormatter; aDBFormat.aNullDate = pImpl->pMergeData->aNullDate; - sAddress = GetDBField( xColumnProp, aDBFormat); + sAddress = GetDBField( xColumnProp, aDBFormat); if (!sAddress.Len()) sAddress = '_'; sPath += sAddress; @@ -1038,7 +1038,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, { INetURLObject aTempFileURL(aTempFile->GetURL()); aPrtMonDlg.aPrinter.SetText( aTempFileURL.GetBase() ); - String sStat(SW_RES(STR_STATSTR_LETTER)); // Brief + String sStat(SW_RES(STR_STATSTR_LETTER)); // Brief sStat += ' '; sStat += String::CreateFromInt32( nDocNo ); aPrtMonDlg.aPrintInfo.SetText(sStat); @@ -1255,9 +1255,9 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, nEndRow = pImpl->pMergeData ? pImpl->pMergeData->xResultSet->getRow() : 0; } while( !bCancel && (bSynchronizedDoc && (nStartRow != nEndRow)? ExistsNextRecord() : ToNextMergeRecord())); - + aPrtMonDlg.Show( FALSE ); - + // save the single output document if(rMergeDescriptor.bCreateSingleFile || bAsSingleFile) { @@ -1303,18 +1303,18 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, aVal >>= _sVal; } #endif - // printing should be done synchronously otherwise the document + // printing should be done synchronously otherwise the document // might already become invalid during the process uno::Sequence< beans::PropertyValue > aOptions( rMergeDescriptor.aPrintOptions ); const sal_Int32 nOpts = aOptions.getLength(); aOptions.realloc( nOpts + 1 ); aOptions[ nOpts ].Name = rtl::OUString::createFromAscii( "Wait" ); aOptions[ nOpts ].Value <<= sal_True ; -// aPrintArgs.Put(SfxBoolItem(FN_QRY_MERGE, TRUE) ); +// aPrintArgs.Put(SfxBoolItem(FN_QRY_MERGE, TRUE) ); // // #i52629# aynchronous printing should only be done in silent mode - otherwise // // the printer dialog does not come up // aPrintArgs.Put( SfxBoolItem( SID_ASYNCHRON, rMergeDescriptor.bPrintAsync )); - // move print options + // move print options const beans::PropertyValue* pPrintOptions = rMergeDescriptor.aPrintOptions.getConstArray(); for( sal_Int32 nOption = 0; nOption < rMergeDescriptor.aPrintOptions.getLength(); ++nOption) { @@ -1333,11 +1333,11 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, // const SwModuleOptions * pModOpt = SW_MOD()->GetModuleConfig(); // if (pModOpt->IsSinglePrintJob()) // { -// } +// } // else // { pTargetView->ExecPrint( aOptions, IsMergeSilent(), rMergeDescriptor.bPrintAsync ); -// } +// } } xTargetDocShell->DoClose(); } @@ -1629,7 +1629,7 @@ uno::Reference< sdbc::XConnection> SwNewDBMgr::GetConnection(const String& rData ---------------------------------------------------------------------------*/ uno::Reference< sdbcx::XColumnsSupplier> SwNewDBMgr::GetColumnSupplier(uno::Reference<sdbc::XConnection> xConnection, const String& rTableOrQuery, - BYTE eTableOrQuery) + BYTE eTableOrQuery) { Reference< sdbcx::XColumnsSupplier> xRet; try @@ -1719,8 +1719,8 @@ String SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps, case DataType::TIME: case DataType::TIMESTAMP: { -// ::Date aTempDate(rDBFormatData.aNullDate.Day, -// rDBFormatData.aNullDate.Month, rDBFormatData.aNullDate.Year); +// ::Date aTempDate(rDBFormatData.aNullDate.Day, +// rDBFormatData.aNullDate.Month, rDBFormatData.aNullDate.Year); try { @@ -1747,32 +1747,32 @@ String SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps, } break; -// case DataType::BINARY: -// case DataType::VARBINARY: -// case DataType::LONGVARBINARY: -// case DataType::SQLNULL: -// case DataType::OTHER: -// case DataType::OBJECT: -// case DataType::DISTINCT: -// case DataType::STRUCT: -// case DataType::ARRAY: -// case DataType::BLOB: -// case DataType::CLOB: -// case DataType::REF: -// default: - } -// if (pFormat) -// { -// SFX_ITEMSET_GET(*pCol, pFormatItem, SfxUInt32Item, SBA_DEF_FMTVALUE, sal_True); -// *pFormat = pFormatItem->GetValue(); -// } +// case DataType::BINARY: +// case DataType::VARBINARY: +// case DataType::LONGVARBINARY: +// case DataType::SQLNULL: +// case DataType::OTHER: +// case DataType::OBJECT: +// case DataType::DISTINCT: +// case DataType::STRUCT: +// case DataType::ARRAY: +// case DataType::BLOB: +// case DataType::CLOB: +// case DataType::REF: +// default: + } +// if (pFormat) +// { +// SFX_ITEMSET_GET(*pCol, pFormatItem, SfxUInt32Item, SBA_DEF_FMTVALUE, sal_True); +// *pFormat = pFormatItem->GetValue(); +// } return sRet; } /* -----------------------------06.07.00 14:28-------------------------------- releases the merge data source table or query after merge is completed ---------------------------------------------------------------------------*/ -void SwNewDBMgr::EndMerge() +void SwNewDBMgr::EndMerge() { DBG_ASSERT(bInMerge, "merge is not active"); bInMerge = FALSE; @@ -1873,7 +1873,7 @@ BOOL SwNewDBMgr::GetColumnCnt(const String& rSourceName, const String& rTableNam /* -----------------------------06.07.00 16:47-------------------------------- reads the column data at the current position ---------------------------------------------------------------------------*/ -BOOL SwNewDBMgr::GetMergeColumnCnt(const String& rColumnName, USHORT nLanguage, +BOOL SwNewDBMgr::GetMergeColumnCnt(const String& rColumnName, USHORT nLanguage, String &rResult, double *pNumber, sal_uInt32 * /*pFormat*/) { if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is() || pImpl->pMergeData->bAfterSelection ) @@ -1972,9 +1972,9 @@ BOOL SwNewDBMgr::ExistsNextRecord() const /* -----------------------------13.07.00 10:41-------------------------------- ---------------------------------------------------------------------------*/ -sal_uInt32 SwNewDBMgr::GetSelectedRecordId() +sal_uInt32 SwNewDBMgr::GetSelectedRecordId() { - sal_uInt32 nRet = 0; + sal_uInt32 nRet = 0; DBG_ASSERT(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge"); if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is()) return FALSE; @@ -2115,7 +2115,7 @@ sal_uInt32 SwNewDBMgr::GetSelectedRecordId( if(pFound && pFound->xResultSet.is()) { try - { //if a selection array is set the current row at the result set may not be set yet + { //if a selection array is set the current row at the result set may not be set yet if(pFound->aSelection.getLength()) { sal_Int32 nSelIndex = pFound->nSelectionIndex; @@ -2136,7 +2136,7 @@ sal_uInt32 SwNewDBMgr::GetSelectedRecordId( /* -----------------------------17.07.00 14:18-------------------------------- close all data sources - after fields were updated ---------------------------------------------------------------------------*/ -void SwNewDBMgr::CloseAll(BOOL bIncludingMerge) +void SwNewDBMgr::CloseAll(BOOL bIncludingMerge) { //the only thing done here is to reset the selection index //all connections stay open @@ -2252,7 +2252,7 @@ SwDSParam* SwNewDBMgr::FindDSConnection(const rtl::OUString& rDataSource, BOOL /* -----------------------------17.07.00 14:34-------------------------------- ---------------------------------------------------------------------------*/ -const SwDBData& SwNewDBMgr::GetAddressDBName() +const SwDBData& SwNewDBMgr::GetAddressDBName() { return SW_MOD()->GetDBConfig()->GetAddressSource(); } @@ -2470,7 +2470,7 @@ String SwNewDBMgr::LoadAndRegisterDataSource() /* -----------------------------10.11.00 17:10-------------------------------- ---------------------------------------------------------------------------*/ -void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, +void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, const Sequence<PropertyValue>& rProperties, BOOL bWithDataSourceBrowser) { @@ -2485,8 +2485,8 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, ODataAccessDescriptor aDescriptor(rProperties); sDataSource = aDescriptor.getDataSource(); - aDescriptor[daCommand] >>= sDataTableOrQuery; - aDescriptor[daCommandType] >>= nCmdType; + aDescriptor[daCommand] >>= sDataTableOrQuery; + aDescriptor[daCommandType] >>= nCmdType; if ( aDescriptor.has(daSelection) ) aDescriptor[daSelection] >>= aSelection; @@ -2568,7 +2568,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, pWorkDoc->SetNewDBMgr( this ); SwMergeDescriptor aMergeDesc( pImpl->pMergeDialog->GetMergeType(), pView->GetWrtShell(), aDescriptor ); - aMergeDesc.sSaveToFilter = pImpl->pMergeDialog->GetSaveFilter(); + aMergeDesc.sSaveToFilter = pImpl->pMergeDialog->GetSaveFilter(); aMergeDesc.bCreateSingleFile= true; MergeNew(aMergeDesc); diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx index 463e64279e08..53b55be334ee 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx @@ -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/dbui/dbtablepreviewdialog.hrc b/sw/source/ui/dbui/dbtablepreviewdialog.hrc index 645cbe92ab74..a260f9fa98dd 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.hrc +++ b/sw/source/ui/dbui/dbtablepreviewdialog.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 diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx index 212bb873ca4b..e121c3f893f8 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx @@ -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 @@ -34,7 +34,7 @@ #endif #include <com/sun/star/uno/Sequence.h> -namespace com{ namespace sun{ namespace star{ +namespace com{ namespace sun{ namespace star{ namespace beans{ struct PropertyValue; } namespace frame{ class XFrame; } }}} @@ -50,11 +50,11 @@ class SwDBTablePreviewDialog : public SfxModalDialog OKButton m_aOK; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; -public: +public: SwDBTablePreviewDialog(Window* pParent, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rValues ); ~SwDBTablePreviewDialog(); - + }; #endif diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.src b/sw/source/ui/dbui/dbtablepreviewdialog.src index a52290db80fb..3ad385ebbd09 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.src +++ b/sw/source/ui/dbui/dbtablepreviewdialog.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/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index 1e0a1faf1cbc..4b31760592e8 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -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 @@ -228,12 +228,12 @@ SwDBTreeList::SwDBTreeList(Window *pParent, const ResId& rResId, SwWrtShell* pSh, const String& rDefDBName, const BOOL bShowCol): - SvTreeListBox (pParent, rResId), + SvTreeListBox (pParent, rResId), aImageList (SW_RES(ILIST_DB_DLG )), aImageListHC (SW_RES(ILIST_DB_DLG_HC )), - sDefDBName (rDefDBName), + sDefDBName (rDefDBName), bInitialized (FALSE), - bShowColumns (bShowCol), + bShowColumns (bShowCol), pImpl(new SwDBTreeList_Impl(pSh)) { SetHelpId(HID_DB_SELECTION_TLB); @@ -324,7 +324,7 @@ void SwDBTreeList::ShowColumns(BOOL bShowCol) while (pEntry) { pEntry = (SvLBoxEntry*)GetRootLevelParent( pEntry ); - Collapse(pEntry); // zuklappen + Collapse(pEntry); // zuklappen SvLBoxEntry* pChild; while ((pChild = FirstChild(pEntry)) != 0L) @@ -335,7 +335,7 @@ void SwDBTreeList::ShowColumns(BOOL bShowCol) if (sDBName.Len()) { - Select(sDBName, sTableName, sColumnName); // force RequestingChilds + Select(sDBName, sTableName, sColumnName); // force RequestingChilds } SetUpdateMode(TRUE); } @@ -349,7 +349,7 @@ void SwDBTreeList::RequestingChilds(SvLBoxEntry* pParent) { if (!pParent->HasChilds()) { - if (GetParent(pParent)) // column names + if (GetParent(pParent)) // column names { try { @@ -419,7 +419,7 @@ void SwDBTreeList::RequestingChilds(SvLBoxEntry* pParent) { } } - else // Tabellennamen + else // Tabellennamen { try { @@ -487,9 +487,9 @@ IMPL_LINK( SwDBTreeList, DBCompare, SvSortData*, pData ) SvLBoxEntry* pRight = (SvLBoxEntry*)(pData->pRight ); if (GetParent(pRight) && GetParent(GetParent(pRight))) - return COMPARE_GREATER; // Spaltennamen nicht sortieren + return COMPARE_GREATER; // Spaltennamen nicht sortieren - return DefaultCompare(pData); // Sonst Basisklasse rufen + return DefaultCompare(pData); // Sonst Basisklasse rufen } /*------------------------------------------------------------------------ @@ -506,7 +506,7 @@ String SwDBTreeList::GetDBName(String& rTableName, String& rColumnName, BOOL* p if (GetParent(GetParent(pEntry))) { rColumnName = GetEntryText(pEntry); - pEntry = GetParent(pEntry); // Spaltenname war selektiert + pEntry = GetParent(pEntry); // Spaltenname war selektiert } sDBName = GetEntryText(GetParent(pEntry)); if(pbIsTable) @@ -519,7 +519,7 @@ String SwDBTreeList::GetDBName(String& rTableName, String& rColumnName, BOOL* p } /*------------------------------------------------------------------------ - Beschreibung: Format: Datenbank.Tabelle + Beschreibung: Format: Datenbank.Tabelle ------------------------------------------------------------------------*/ diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx index 9dc0c899f574..79f3b6229762 100644 --- a/sw/source/ui/dbui/dbui.cxx +++ b/sw/source/ui/dbui/dbui.cxx @@ -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,14 +43,14 @@ ---------------------------------------------------------------------*/ PrintMonitor::PrintMonitor( Window *pParent, PrintMonitorType eType ) -: ModelessDialog( pParent, SW_RES(DLG_PRINTMONITOR) ), - aDocName (this, SW_RES( FT_DOCNAME )), - aPrinting (this, SW_RES( - eType == MONITOR_TYPE_MAIL ? +: ModelessDialog( pParent, SW_RES(DLG_PRINTMONITOR) ), + aDocName (this, SW_RES( FT_DOCNAME )), + aPrinting (this, SW_RES( + eType == MONITOR_TYPE_MAIL ? FT_SENDING : eType == MONITOR_TYPE_SAVE ? FT_SAVING : FT_PRINTING )), - aPrinter (this, SW_RES( FT_PRINTER )), - aPrintInfo (this, SW_RES( FT_PRINTINFO )), - aCancel (this, SW_RES( PB_CANCELPRNMON )) + aPrinter (this, SW_RES( FT_PRINTER )), + aPrintInfo (this, SW_RES( FT_PRINTINFO )), + aCancel (this, SW_RES( PB_CANCELPRNMON )) { switch (eType) { @@ -61,20 +61,20 @@ PrintMonitor::PrintMonitor( Window *pParent, PrintMonitorType eType ) FreeResource(); } /*--------------------------------------------------------------------- - + ---------------------------------------------------------------------*/ void lcl_ResizeControl( Window* pWin, long nDiff ) { Size aSize( pWin->GetSizePixel() ); - aSize.Width() += nDiff; - pWin->SetSizePixel( aSize ); -} + aSize.Width() += nDiff; + pWin->SetSizePixel( aSize ); +} void lcl_RePosControl( Window* pWin, long nDiff ) { Point aPos( pWin->GetPosPixel() ); - aPos.X() += nDiff; - pWin->SetPosPixel( aPos ); -} + aPos.X() += nDiff; + pWin->SetPosPixel( aPos ); +} void PrintMonitor::ResizeControls() { @@ -88,18 +88,18 @@ void PrintMonitor::ResizeControls() long nDiff = nPrinterTextWidth - aPrinterSize.Width(); if( nDiff > 2 * aDlgSize.Width() ) { - aPrinter.SetStyle( WB_RIGHT | aPrinter.GetStyle() ); + aPrinter.SetStyle( WB_RIGHT | aPrinter.GetStyle() ); nDiff = 2 * aDlgSize.Width(); } aDlgSize.Width() += nDiff; SetSizePixel(aDlgSize); - lcl_ResizeControl( &aPrinter, nDiff ); + lcl_ResizeControl( &aPrinter, nDiff ); nDiff /= 2; - lcl_RePosControl( &aDocName, nDiff ); - lcl_RePosControl( &aPrinting, nDiff ); + lcl_RePosControl( &aDocName, nDiff ); + lcl_RePosControl( &aPrinting, nDiff ); lcl_RePosControl( &aPrintInfo, nDiff ); - lcl_RePosControl( &aCancel, nDiff ); + lcl_RePosControl( &aCancel, nDiff ); } } /*--------------------------------------------------------------------- @@ -107,12 +107,12 @@ void PrintMonitor::ResizeControls() ---------------------------------------------------------------------*/ CreateMonitor::CreateMonitor( Window *pParent ) -: ModelessDialog( pParent, SW_RES(DLG_MM_CREATIONMONITOR) ), - m_aStatus (this, SW_RES( FT_STATUS )), - m_aProgress (this, SW_RES( FT_PROGRESS )), - m_aCreateDocuments (this, SW_RES( FT_CREATEDOCUMENTS )), - m_aCounting (this, SW_RES( FT_COUNTING )), - m_aCancelButton (this, SW_RES( PB_CANCELPRNMON )), +: ModelessDialog( pParent, SW_RES(DLG_MM_CREATIONMONITOR) ), + m_aStatus (this, SW_RES( FT_STATUS )), + m_aProgress (this, SW_RES( FT_PROGRESS )), + m_aCreateDocuments (this, SW_RES( FT_CREATEDOCUMENTS )), + m_aCounting (this, SW_RES( FT_COUNTING )), + m_aCancelButton (this, SW_RES( PB_CANCELPRNMON )), m_sCountingPattern(), m_sVariable_Total( String::CreateFromAscii("%Y") ), m_sVariable_Position( String::CreateFromAscii("%X") ), @@ -127,7 +127,7 @@ CreateMonitor::CreateMonitor( Window *pParent ) void CreateMonitor::UpdateCountingText() { - String sText(m_sCountingPattern); + String sText(m_sCountingPattern); sText.SearchAndReplaceAll( m_sVariable_Total, String::CreateFromInt32( m_nTotalCount ) ); sText.SearchAndReplaceAll( m_sVariable_Position, String::CreateFromInt32( m_nCurrentPosition ) ); m_aCounting.SetText(sText); diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src index f0dba28f75cc..8d073412ab26 100644 --- a/sw/source/ui/dbui/dbui.src +++ b/sw/source/ui/dbui/dbui.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 @@ -210,9 +210,9 @@ ModelessDialog DLG_MM_CREATIONMONITOR _HEIGHT = 52 ; MOVEABLE = TRUE ; APP = FALSE ; - + Text [ en-US ] = "Mail Merge" ; - + FixedText FT_STATUS { HIDE = FALSE ; diff --git a/sw/source/ui/dbui/maildispatcher.cxx b/sw/source/ui/dbui/maildispatcher.cxx index 2203f70c3404..354541e7449e 100644 --- a/sw/source/ui/dbui/maildispatcher.cxx +++ b/sw/source/ui/dbui/maildispatcher.cxx @@ -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 @@ -40,30 +40,30 @@ typedef std::list< ::rtl::Reference<IMailDispatcherListener> > MailDispatcherLis namespace /* private */ { - /* Generic event notifier for started, - stopped, and idle events which are + /* Generic event notifier for started, + stopped, and idle events which are very similary */ class GenericEventNotifier { public: // pointer to virtual function typedef typedef void (IMailDispatcherListener::*GenericNotificationFunc_t)(::rtl::Reference<MailDispatcher>); - + GenericEventNotifier( - GenericNotificationFunc_t notification_function, + GenericNotificationFunc_t notification_function, ::rtl::Reference<MailDispatcher> mail_dispatcher) : notification_function_(notification_function), mail_dispatcher_(mail_dispatcher) {} - + void operator() (::rtl::Reference<IMailDispatcherListener> listener) const { (listener.get()->*notification_function_)(mail_dispatcher_); } - + private: GenericNotificationFunc_t notification_function_; ::rtl::Reference<MailDispatcher> mail_dispatcher_; }; - + class MailDeliveryNotifier { public: @@ -71,78 +71,78 @@ namespace /* private */ mail_dispatcher_(xMailDispatcher), message_(message) {} - + void operator() (::rtl::Reference<IMailDispatcherListener> listener) const - { listener->mailDelivered(mail_dispatcher_, message_); } - + { listener->mailDelivered(mail_dispatcher_, message_); } + private: ::rtl::Reference<MailDispatcher> mail_dispatcher_; uno::Reference<mail::XMailMessage> message_; }; - + class MailDeliveryErrorNotifier { public: MailDeliveryErrorNotifier( ::rtl::Reference<MailDispatcher> xMailDispatcher, - uno::Reference<mail::XMailMessage> message, - const ::rtl::OUString& error_message) : + uno::Reference<mail::XMailMessage> message, + const ::rtl::OUString& error_message) : mail_dispatcher_(xMailDispatcher), message_(message), error_message_(error_message) {} - + void operator() (::rtl::Reference<IMailDispatcherListener> listener) const { listener->mailDeliveryError(mail_dispatcher_, message_, error_message_); } - + private: ::rtl::Reference<MailDispatcher> mail_dispatcher_; uno::Reference<mail::XMailMessage> message_; ::rtl::OUString error_message_; }; - + } // namespace private - + MailDispatcher::MailDispatcher(uno::Reference<mail::XSmtpService> mailserver) : mailserver_ (mailserver), - run_(false), + run_(false), shutdown_requested_(false) -{ +{ wakening_call_.reset(); mail_dispatcher_active_.reset(); - - if (!create()) - throw uno::RuntimeException(); - - // wait until the mail dispatcher thread is really alive - // and has aquired a reference to this instance of the - // class - mail_dispatcher_active_.wait(); + + if (!create()) + throw uno::RuntimeException(); + + // wait until the mail dispatcher thread is really alive + // and has aquired a reference to this instance of the + // class + mail_dispatcher_active_.wait(); } MailDispatcher::~MailDispatcher() -{ +{ } void MailDispatcher::enqueueMailMessage(uno::Reference<mail::XMailMessage> message) -{ - ::osl::MutexGuard thread_status_guard(thread_status_mutex_); +{ + ::osl::MutexGuard thread_status_guard(thread_status_mutex_); ::osl::MutexGuard message_container_guard(message_container_mutex_); - + OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already"); - - messages_.push_back(message); + + messages_.push_back(message); if (run_) - wakening_call_.set(); + wakening_call_.set(); } uno::Reference<mail::XMailMessage> MailDispatcher::dequeueMailMessage() -{ +{ ::osl::MutexGuard guard(message_container_mutex_); uno::Reference<mail::XMailMessage> message; if(!messages_.empty()) - { + { message = messages_.front(); messages_.pop_front(); } @@ -150,51 +150,51 @@ uno::Reference<mail::XMailMessage> MailDispatcher::dequeueMailMessage() } void MailDispatcher::start() -{ - OSL_PRECOND(!isStarted(), "MailDispatcher is already started!"); - - ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_); - +{ + OSL_PRECOND(!isStarted(), "MailDispatcher is already started!"); + + ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_); + OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already"); - + if (!shutdown_requested_) { run_ = true; wakening_call_.set(); thread_status_guard.clear(); - - MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); - std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::started, this)); - } + + MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); + std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::started, this)); + } } void MailDispatcher::stop() { - OSL_PRECOND(isStarted(), "MailDispatcher not started!"); - - ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_); - + OSL_PRECOND(isStarted(), "MailDispatcher not started!"); + + ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_); + OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already"); - + if (!shutdown_requested_) { run_ = false; wakening_call_.reset(); thread_status_guard.clear(); - - MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); - std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::stopped, this)); + + MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); + std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::stopped, this)); } } void MailDispatcher::shutdown() -{ - ::osl::MutexGuard thread_status_guard(thread_status_mutex_); - +{ + ::osl::MutexGuard thread_status_guard(thread_status_mutex_); + OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already"); - + shutdown_requested_ = true; - wakening_call_.set(); + wakening_call_.set(); } bool MailDispatcher::isStarted() const @@ -205,7 +205,7 @@ bool MailDispatcher::isStarted() const void MailDispatcher::addListener(::rtl::Reference<IMailDispatcherListener> listener) { OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already"); - + ::osl::MutexGuard guard(listener_container_mutex_); listeners_.push_back(listener); } @@ -213,7 +213,7 @@ void MailDispatcher::addListener(::rtl::Reference<IMailDispatcherListener> liste void MailDispatcher::removeListener(::rtl::Reference<IMailDispatcherListener> listener) { OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already"); - + ::osl::MutexGuard guard(listener_container_mutex_); listeners_.remove(listener); } @@ -228,69 +228,69 @@ void MailDispatcher::sendMailMessageNotifyListener(uno::Reference<mail::XMailMes { try { - mailserver_->sendMailMessage(message); - MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); - std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryNotifier(this, message)); + mailserver_->sendMailMessage(message); + MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); + std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryNotifier(this, message)); } catch (mail::MailException& ex) - { - MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); - std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryErrorNotifier(this, message, ex.Message)); + { + MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); + std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryErrorNotifier(this, message, ex.Message)); } catch (uno::RuntimeException& ex) - { - MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); - std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryErrorNotifier(this, message, ex.Message)); + { + MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); + std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryErrorNotifier(this, message, ex.Message)); } } void MailDispatcher::run() -{ +{ // aquire a self reference in order to avoid race // conditions. The last client of this class must - // call shutdown before releasing his last reference + // call shutdown before releasing his last reference // to this class in order to shutdown this thread // which will release his (the very last reference - // to the class and so force their destruction - m_xSelfReference = this; - + // to the class and so force their destruction + m_xSelfReference = this; + // signal that the mail dispatcher thread is now alive mail_dispatcher_active_.set(); - + for(;;) - { + { wakening_call_.wait(); - - ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_); + + ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_); if (shutdown_requested_) break; - + ::osl::ClearableMutexGuard message_container_guard(message_container_mutex_); - + if (messages_.size()) - { - thread_status_guard.clear(); + { + thread_status_guard.clear(); uno::Reference<mail::XMailMessage> message = messages_.front(); messages_.pop_front(); message_container_guard.clear(); sendMailMessageNotifyListener(message); } - else // idle - put ourself to sleep + else // idle - put ourself to sleep { wakening_call_.reset(); message_container_guard.clear(); thread_status_guard.clear(); - MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); - std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::idle, this)); - } + MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); + std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::idle, this)); + } } // end for SSH ALI } /*-- 27.08.2004 12:04:46--------------------------------------------------- -----------------------------------------------------------------------*/ -void MailDispatcher::onTerminated() +void MailDispatcher::onTerminated() { - //keep the reference until the end of onTerminated() because of the call order in the + //keep the reference until the end of onTerminated() because of the call order in the //_threadFunc() from osl/thread.hxx m_xSelfReference = 0; } diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index 758f52840230..e03b12903430 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -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/dbui/mailmergechildwindow.hrc b/sw/source/ui/dbui/mailmergechildwindow.hrc index 9b5931522975..edba002b0d3f 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.hrc +++ b/sw/source/ui/dbui/mailmergechildwindow.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 diff --git a/sw/source/ui/dbui/mailmergechildwindow.src b/sw/source/ui/dbui/mailmergechildwindow.src index 3caf5b1a7607..187f50b5848c 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.src +++ b/sw/source/ui/dbui/mailmergechildwindow.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/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index 7cc5d4070891..d9a56fa166b1 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -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/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 365c56b4c0ea..4a412991e08d 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -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/dbui/mailmergewizard.hrc b/sw/source/ui/dbui/mailmergewizard.hrc index f6b00013b2fe..02a2c08130a7 100644 --- a/sw/source/ui/dbui/mailmergewizard.hrc +++ b/sw/source/ui/dbui/mailmergewizard.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 diff --git a/sw/source/ui/dbui/mailmergewizard.src b/sw/source/ui/dbui/mailmergewizard.src index d3da4d7c9945..ad7d57480092 100644 --- a/sw/source/ui/dbui/mailmergewizard.src +++ b/sw/source/ui/dbui/mailmergewizard.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/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index a35b0727c1ed..ae6b6b0cb067 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -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 @@ -224,7 +224,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, SettingsHdl_Impl, PushButton*, pButton) for(sal_Int32 nAddress = 0; nAddress < aBlocks.getLength(); ++nAddress) m_aSettingsWIN.AddAddress(aBlocks[nAddress]); m_aSettingsWIN.SelectAddress(0); - m_aSettingsWIN.Invalidate(); // #i40408 + m_aSettingsWIN.Invalidate(); // #i40408 rConfig.SetCountrySettings(pDlg->IsIncludeCountry(), pDlg->GetCountry()); InsertDataHdl_Impl(0); } @@ -533,7 +533,7 @@ IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, PushButton*, pButton m_aPreview.SelectAddress(nSelect); } m_aDeletePB.Enable( m_aAddressBlocks.getLength() > 1); - } + } delete pDlg; return 0; } @@ -561,7 +561,7 @@ void SwRestrictedComboBox::KeyInput(const KeyEvent& rEvt) if(rEvt.GetCharCode()) { String sKey = rEvt.GetCharCode(); - if( STRING_NOTFOUND != sForbiddenChars.Search(sKey)) + if( STRING_NOTFOUND != sForbiddenChars.Search(sKey)) bCallParent = FALSE; } if(bCallParent) diff --git a/sw/source/ui/dbui/mmaddressblockpage.hrc b/sw/source/ui/dbui/mmaddressblockpage.hrc index 8dbae66b94e6..99887597a253 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hrc +++ b/sw/source/ui/dbui/mmaddressblockpage.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 @@ -66,12 +66,12 @@ #define IB_INSERTFIELD 42 #define IB_REMOVEFIELD 43 #define FT_DRAG 48 -#define ED_DRAG 49 +#define ED_DRAG 49 #define IB_UP 50 #define IB_LEFT 51 #define IB_RIGHT 52 #define IB_DOWN 53 -#define FT_FIELD 54 +#define FT_FIELD 54 #define CB_FIELD 55 #define ST_SALUTATION 56 #define ST_PUNCTUATION 57 @@ -85,7 +85,7 @@ #define ST_INSERTSALUTATIONFIELD 65 #define ST_REMOVESALUTATIONFIELD 66 #define ST_DRAGSALUTATION 67 -#define ST_TITLE_EDIT 68 +#define ST_TITLE_EDIT 68 #define FI_MATCHING 70 @@ -93,7 +93,7 @@ #define ST_SALUTATIONPREVIEW 72 #define ST_SALUTATIONMATCHING 73 #define ST_SALUTATIONELEMENT 74 -#define CB_HIDE_EMPTY_PARA 75 +#define CB_HIDE_EMPTY_PARA 75 #define FI_FIRST 76 #define FL_FIRST 77 #define FL_SECOND 78 diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index eddaca225e9b..2436a170d40a 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -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 @@ -44,7 +44,7 @@ class SwMailMergeWizard; class SwMailMergeConfigItem; /*-- 13.04.2004 15:50:37--------------------------------------------------- - + -----------------------------------------------------------------------*/ class SwMailMergeAddressBlockPage : public svt::OWizardPage { @@ -53,9 +53,9 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage FixedInfo m_aAddressListFI; PushButton m_aAddressListPB; FixedInfo m_aCurrentAddressFI; - + FixedLine m_aFirstFL; - + FixedInfo m_aSecondFI; FixedInfo m_aSettingsFI; CheckBox m_aAddressCB; @@ -70,7 +70,7 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage FixedInfo m_aMatchFieldsFI; PushButton m_aAssignPB; - + FixedLine m_aThirdFL; FixedInfo m_aFourthFI; @@ -94,14 +94,14 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage DECL_LINK(InsertDataHdl_Impl, ImageButton*); DECL_LINK(AddressBlockSelectHdl_Impl, SwAddressPreview*); DECL_LINK(HideParagraphsHdl_Impl, CheckBox*); - + void EnableAddressBlock(sal_Bool bAll, sal_Bool bSelective); - + virtual void ActivatePage(); virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); virtual bool canAdvance() const; -public: +public: SwMailMergeAddressBlockPage( SwMailMergeWizard* _pParent); ~SwMailMergeAddressBlockPage(); @@ -117,19 +117,19 @@ class SwSelectAddressBlockDialog : public SfxModalDialog PushButton m_aNewPB; PushButton m_aCustomizePB; PushButton m_aDeletePB; - + FixedInfo m_aSettingsFI; RadioButton m_aNeverRB; RadioButton m_aAlwaysRB; RadioButton m_aDependentRB; Edit m_aCountryED; - + FixedLine m_aSeparatorFL; - + OKButton m_aOK; CancelButton m_aCancel; HelpButton m_aHelp; - + com::sun::star::uno::Sequence< ::rtl::OUString> m_aAddressBlocks; SwMailMergeConfigItem& m_rConfig; @@ -150,7 +150,7 @@ public: void SetSettings(sal_Bool bIsCountry, ::rtl::OUString sCountry); sal_Bool IsIncludeCountry() const {return !m_aNeverRB.IsChecked();} ::rtl::OUString GetCountry() const; -}; +}; /*-- 26.05.2004 11:16:25--------------------------------------------------- @@ -160,10 +160,10 @@ class SwCustomizeAddressBlockDialog; class DDListBox : public SvTreeListBox { SwCustomizeAddressBlockDialog* m_pParentDialog; -public: +public: DDListBox(SwCustomizeAddressBlockDialog* pParent, const ResId rResId); ~DDListBox(); - + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); }; /*-- 26.05.2004 11:16:25--------------------------------------------------- @@ -178,19 +178,19 @@ class AddressMultiLineEdit : public MultiLineEdit, public SfxListener { Link m_aSelectionLink; SwCustomizeAddressBlockDialog* m_pParentDialog; - + using Window::Notify; using MultiLineEdit::SetText; protected: long PreNotify( NotifyEvent& rNEvt ); -public: +public: AddressMultiLineEdit(SwCustomizeAddressBlockDialog* pParent, const ResId& rResId); ~AddressMultiLineEdit(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - + void SetSelectionChangedHdl( const Link& rLink ) {m_aSelectionLink = rLink;} void SetText( const String& rStr ); @@ -205,25 +205,25 @@ public: bool HasCurrentItem(); String GetCurrentItem(); void SelectCurrentItem(); -}; +}; /*-- 13.04.2004 15:45:31--------------------------------------------------- - Dialog is used to create custom address blocks as well as + Dialog is used to create custom address blocks as well as custom greeting lines -----------------------------------------------------------------------*/ class SwRestrictedComboBox : public ComboBox -{ +{ String sForbiddenChars; protected: virtual void KeyInput( const KeyEvent& ); - virtual void Modify(); -public: + virtual void Modify(); +public: SwRestrictedComboBox(Window* pParent, const ResId& rResId): ComboBox( pParent, rResId ){} - - ~SwRestrictedComboBox(); - - void SetForbiddenChars(const String& rSet){sForbiddenChars = rSet;} + + ~SwRestrictedComboBox(); + + void SetForbiddenChars(const String& rSet){sForbiddenChars = rSet;} }; class SwCustomizeAddressBlockDialog : public SfxModalDialog @@ -237,8 +237,8 @@ public: ADDRESSBLOCK_EDIT, GREETING_FEMALE, GREETING_MALE - }; -private: + }; +private: FixedText m_aAddressElementsFT; DDListBox m_aAddressElementsLB; @@ -284,7 +284,7 @@ private: bool HasItem_Impl(sal_Int32 nUserData); sal_Int32 GetSelectedItem_Impl(); void UpdateImageButtons_Impl(); - void MoveFocus( Window* pMember, bool bNext ); + void MoveFocus( Window* pMember, bool bNext ); public: SwCustomizeAddressBlockDialog(Window* pParent, SwMailMergeConfigItem& rConfig, DialogType); @@ -292,7 +292,7 @@ public: void SetAddress(const ::rtl::OUString& rAddress); ::rtl::OUString GetAddress(); -}; +}; /*-- 13.04.2004 17:41:11--------------------------------------------------- -----------------------------------------------------------------------*/ @@ -301,12 +301,12 @@ class SwAssignFieldsDialog : public SfxModalDialog { FixedInfo m_aMatchingFI; SwAssignFieldsControl* m_pFieldsControl; - + FixedInfo m_aPreviewFI; SwAddressPreview m_aPreviewWIN; - + FixedLine m_aSeparatorFL; - + OKButton m_aOK; CancelButton m_aCancel; HelpButton m_aHelp; @@ -315,18 +315,18 @@ class SwAssignFieldsDialog : public SfxModalDialog ::rtl::OUString m_rPreviewString; SwMailMergeConfigItem& m_rConfigItem; - + ::com::sun::star::uno::Sequence< ::rtl::OUString > CreateAssignments(); DECL_LINK(OkHdl_Impl, PushButton*); DECL_LINK(AssignmentModifyHdl_Impl, void*); public: - SwAssignFieldsDialog(Window* pParent, - SwMailMergeConfigItem& rConfigItem, + SwAssignFieldsDialog(Window* pParent, + SwMailMergeConfigItem& rConfigItem, const ::rtl::OUString& rPreview, bool bIsAddressBlock); ~SwAssignFieldsDialog(); -}; +}; #endif diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src index 238d1cfa1260..7052b27f2512 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.src +++ b/sw/source/ui/dbui/mmaddressblockpage.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 @@ -78,12 +78,12 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE Hide = TRUE; Text[ en-US ] = "Current address list: %1"; }; - FixedLine FL_FIRST + FixedLine FL_FIRST { Pos = MAP_APPFONT ( 6 , 55 ) ; Size = MAP_APPFONT ( 248 , 8 ) ; }; - FixedText FI_SECOND + FixedText FI_SECOND { Pos = MAP_APPFONT ( 6 , 66 ) ; Size = MAP_APPFONT ( 10 , 8 ) ; @@ -138,7 +138,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE Size = MAP_APPFONT ( 60 , 14 ) ; Text[ en-US ] = "Match ~Fields..."; }; - FixedLine FL_THIRD + FixedLine FL_THIRD { Pos = MAP_APPFONT ( 6 , 169 ) ; Size = MAP_APPFONT ( 248 , 8 ) ; @@ -149,19 +149,19 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE Size = MAP_APPFONT ( 10 , 8 ) ; Text[ en-US ] = "4."; }; - FixedText FI_PREVIEW + FixedText FI_PREVIEW { Pos = MAP_APPFONT ( 16 , 180 ) ; Size = MAP_APPFONT ( 228 , 8 ) ; Text[ en-US ] = "Check if the address data matches correctly."; }; - Window WIN_PREVIEW + Window WIN_PREVIEW { Border = TRUE; Pos = MAP_APPFONT ( 12 , 191 ) ; Size = MAP_APPFONT ( 176 , 46 ) ; }; - FixedText FI_DOCINDEX + FixedText FI_DOCINDEX { Pos = MAP_APPFONT ( 111 , 239 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; @@ -302,8 +302,8 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK HelpID = HID_MM_CUSTOMIZEADDRESSBLOCK; Size = MAP_APPFONT ( 320 , 176 ) ; Moveable = TRUE ; - - WORKAROUND + + WORKAROUND String ST_TITLE_EDIT { diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx index be1ad7d3a43d..09c4b01d63c7 100644 --- a/sw/source/ui/dbui/mmconfigitem.cxx +++ b/sw/source/ui/dbui/mmconfigitem.cxx @@ -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/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index e125b4f8ed2e..7427bfc687db 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -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/dbui/mmdocselectpage.hrc b/sw/source/ui/dbui/mmdocselectpage.hrc index f3c5698214ff..d2ebb3ae84cc 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hrc +++ b/sw/source/ui/dbui/mmdocselectpage.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 diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index 6483025f88ed..363aecdddc98 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -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 @@ -47,12 +47,12 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage RadioButton m_aLoadDocRB; RadioButton m_aLoadTemplateRB; RadioButton m_aRecentDocRB; - + PushButton m_aBrowseDocPB; PushButton m_aBrowseTemplatePB; - + ListBox m_aRecentDocLB; - + String m_sLoadFileName; String m_sLoadTemplateName; @@ -60,10 +60,10 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage DECL_LINK(DocSelectHdl, RadioButton*); DECL_LINK(FileSelectHdl, PushButton*); - + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); -public: +public: SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent); ~SwMailMergeDocSelectPage(); diff --git a/sw/source/ui/dbui/mmdocselectpage.src b/sw/source/ui/dbui/mmdocselectpage.src index 9bc2077c6619..ace679af4f97 100644 --- a/sw/source/ui/dbui/mmdocselectpage.src +++ b/sw/source/ui/dbui/mmdocselectpage.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/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 7281880c593d..db0038274afa 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -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/dbui/mmgreetingspage.hrc b/sw/source/ui/dbui/mmgreetingspage.hrc index 422d04983e49..508c247f9775 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hrc +++ b/sw/source/ui/dbui/mmgreetingspage.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 diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index 3e237d797e2f..230beab4c3b5 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -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 @@ -42,12 +42,12 @@ class SwMailMergeWizard; /*-- 17.05.2004 14:51:45--------------------------------------------------- -----------------------------------------------------------------------*/ -class SwGreetingsHandler +class SwGreetingsHandler { friend class SwMailBodyDialog; friend class SwMailMergeGreetingsPage; CheckBox* m_pGreetingLineCB; - + CheckBox* m_pPersonalizedCB; FixedText* m_pFemaleFT; @@ -63,32 +63,32 @@ class SwGreetingsHandler ListBox* m_pFemaleColumnLB; FixedText* m_pFemaleFieldFT; ComboBox* m_pFemaleFieldCB; - + FixedText* m_pNeutralFT; ComboBox* m_pNeutralCB; bool m_bIsTabPage; SwMailMergeWizard* m_pWizard; - + DECL_LINK(IndividualHdl_Impl, CheckBox*); DECL_LINK(GreetingHdl_Impl, PushButton*); - + void Contains(sal_Bool bContainsGreeting); virtual void UpdatePreview(); -}; +}; /*-- 02.04.2004 09:21:06--------------------------------------------------- -----------------------------------------------------------------------*/ -class SwMailMergeGreetingsPage : public svt::OWizardPage, +class SwMailMergeGreetingsPage : public svt::OWizardPage, public SwGreetingsHandler { SwBoldFixedInfo m_aHeaderFI; - + CheckBox m_aGreetingLineCB; - + CheckBox m_aPersonalizedCB; - + FixedText m_aFemaleFT; ListBox m_aFemaleLB; PushButton m_aFemalePB; @@ -102,19 +102,19 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage, ListBox m_aFemaleColumnLB; FixedText m_aFemaleFieldFT; ComboBox m_aFemaleFieldCB; - + FixedText m_aNeutralFT; ComboBox m_aNeutralCB; - + FixedInfo m_aPreviewFI; SwAddressPreview m_aPreviewWIN; PushButton m_aAssignPB; FixedInfo m_aDocumentIndexFI; ImageButton m_aPrevSetIB; ImageButton m_aNextSetIB; - + String m_sDocument; - + DECL_LINK(ContainsHdl_Impl, CheckBox*); DECL_LINK(InsertDataHdl_Impl, ImageButton*); DECL_LINK(GreetingSelectHdl_Impl, ListBox*); @@ -123,7 +123,7 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage, virtual void UpdatePreview(); virtual void ActivatePage(); virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); -public: +public: SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent); ~SwMailMergeGreetingsPage(); @@ -134,9 +134,9 @@ public: class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler { CheckBox m_aGreetingLineCB; - + CheckBox m_aPersonalizedCB; - + FixedText m_aFemaleFT; ListBox m_aFemaleLB; PushButton m_aFemalePB; @@ -150,10 +150,10 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler ListBox m_aFemaleColumnLB; FixedText m_aFemaleFieldFT; ComboBox m_aFemaleFieldCB; - + FixedText m_aNeutralFT; ComboBox m_aNeutralCB; - + FixedText m_aBodyFT; MultiLineEdit m_aBodyMLE; FixedLine m_aSeparatorFL; @@ -164,7 +164,7 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler DECL_LINK(ContainsHdl_Impl, CheckBox*); DECL_LINK(OKHdl, PushButton*); -public: +public: SwMailBodyDialog(Window* pParent, SwMailMergeWizard* pWizard); ~SwMailBodyDialog(); diff --git a/sw/source/ui/dbui/mmgreetingspage.src b/sw/source/ui/dbui/mmgreetingspage.src index a9447034d749..fff77d9240db 100644 --- a/sw/source/ui/dbui/mmgreetingspage.src +++ b/sw/source/ui/dbui/mmgreetingspage.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 @@ -32,7 +32,7 @@ StringList [en-US]= \ { \ < "< not available >" ; > ; \ - }; + }; #define GREETINGS_BODY \ @@ -150,23 +150,23 @@ TabPage DLG_MM_GREETINGS_PAGE }; GREETINGS_BODY FixedText FI_PREVIEW - { + { Pos = MAP_APPFONT ( 12 , 168 ) ; - Size = MAP_APPFONT ( 242 , 8 ) ; + Size = MAP_APPFONT ( 242 , 8 ) ; Text[ en-US ] = "Preview"; - }; + }; Window WIN_PREVIEW - { + { Pos = MAP_APPFONT ( 12 , 179 ); - Size = MAP_APPFONT ( 186 , 21 ) ; + Size = MAP_APPFONT ( 186 , 21 ) ; Border = TRUE; - }; + }; PushButton PB_ASSIGN - { + { Pos = MAP_APPFONT ( 204 , 179 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; Text[ en-US ] = "~Match fields..."; - }; + }; FixedText FI_DOCINDEX { Pos = MAP_APPFONT ( 121 , 206 ) ; @@ -193,7 +193,7 @@ TabPage DLG_MM_GREETINGS_PAGE }; }; -#undef TOP_OFFSET +#undef TOP_OFFSET #undef LEFT_OFFSET #define TOP_OFFSET 0 @@ -207,11 +207,11 @@ ModalDialog DLG_MM_MAILBODY Moveable = TRUE ; Text [ en-US ] = "E-Mail Message"; CheckBox CB_GREETINGLINE - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 242 , 10 ) ; + { + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 242 , 10 ) ; Text[ en-US ] = "This e-mail should contain a salutation"; - }; + }; GREETINGS_BODY FixedText FT_BODY { diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index d9ae7b9c518f..91312c9914ea 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -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 @@ -168,7 +168,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : m_aTopMF.SetUpHdl(aFrameHdl); m_aTopMF.SetDownHdl(aFrameHdl); m_aTopMF.SetLoseFocusHdl(aFrameHdl); - + FieldUnit eFieldUnit = ::GetDfltMetric(sal_False); ::SetFieldUnit( m_aLeftMF, eFieldUnit ); ::SetFieldUnit( m_aTopMF, eFieldUnit ); diff --git a/sw/source/ui/dbui/mmlayoutpage.hrc b/sw/source/ui/dbui/mmlayoutpage.hrc index a54ba58fa025..10d334e62ab4 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hrc +++ b/sw/source/ui/dbui/mmlayoutpage.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,6 +43,6 @@ #define WIN_EXAMPLECONTAINER 13 #define FT_ZOOM 14 #define LB_ZOOM 15 - -#endif - + +#endif + diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index b7dd9dfab2e6..137eb7bf04b0 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -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 @@ -50,24 +50,24 @@ namespace com{ namespace sun{ namespace star{ namespace beans{ class XPropertySe class SwMailMergeLayoutPage : public svt::OWizardPage { SwBoldFixedInfo m_aHeaderFI; - + FixedLine m_aPositionFL; - + CheckBox m_aAlignToBodyCB; FixedText m_aLeftFT; MetricField m_aLeftMF; FixedText m_aTopFT; MetricField m_aTopMF; - + FixedLine m_aGreetingLineFL; FixedText m_aUpFT; PushButton m_aUpPB; FixedText m_aDownFT; PushButton m_aDownPB; - + Window m_aExampleContainerWIN; Window m_aExampleWIN; - + FixedText m_aZoomFT; ListBox m_aZoomLB; @@ -78,7 +78,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage SwFrmFmt* m_pAddressBlockFormat; bool m_bIsGreetingInserted; - + SwMailMergeWizard* m_pWizard; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xViewProperties; @@ -90,21 +90,21 @@ class SwMailMergeLayoutPage : public svt::OWizardPage DECL_LINK(AlignToTextHdl_Impl, CheckBox*); static SwFrmFmt* InsertAddressFrame( - SwWrtShell& rShell, - SwMailMergeConfigItem& rConfigItem, - const Point& rDestination, - bool bAlignToBody, + SwWrtShell& rShell, + SwMailMergeConfigItem& rConfigItem, + const Point& rDestination, + bool bAlignToBody, bool bExample); static void InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem& rConfigItem, bool bExample); virtual void ActivatePage(); virtual sal_Bool commitPage(::svt::WizardTypes::CommitPageReason _eReason); -public: +public: SwMailMergeLayoutPage( SwMailMergeWizard* _pParent); ~SwMailMergeLayoutPage(); - static SwFrmFmt* InsertAddressAndGreeting(SwView* pView, - SwMailMergeConfigItem& rConfigItem, + static SwFrmFmt* InsertAddressAndGreeting(SwView* pView, + SwMailMergeConfigItem& rConfigItem, const Point& rAddressPos, bool bAlignToBody); }; diff --git a/sw/source/ui/dbui/mmlayoutpage.src b/sw/source/ui/dbui/mmlayoutpage.src index 8e012674719d..07582a45efdc 100644 --- a/sw/source/ui/dbui/mmlayoutpage.src +++ b/sw/source/ui/dbui/mmlayoutpage.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/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index bb58496effd3..a73a93114d20 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -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/dbui/mmmergepage.hrc b/sw/source/ui/dbui/mmmergepage.hrc index bf9c730bf743..b7c3762c8321 100644 --- a/sw/source/ui/dbui/mmmergepage.hrc +++ b/sw/source/ui/dbui/mmmergepage.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 diff --git a/sw/source/ui/dbui/mmmergepage.hxx b/sw/source/ui/dbui/mmmergepage.hxx index ad3d51260bb2..2b8ade72dcae 100644 --- a/sw/source/ui/dbui/mmmergepage.hxx +++ b/sw/source/ui/dbui/mmmergepage.hxx @@ -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 @@ -42,15 +42,15 @@ class SwMailMergeWizard; class SwMailMergeMergePage : public svt::OWizardPage { SwBoldFixedInfo m_aHeaderFI; - + FixedInfo m_aEditFI; PushButton m_aEditPB; - + FixedLine m_aFindFL; FixedText m_aFineFT; ReturnActionEdit m_aFindED; PushButton m_aFindPB; - + CheckBox m_aWholeWordsCB; CheckBox m_aBackwardsCB; CheckBox m_aMatchCaseCB; @@ -61,7 +61,7 @@ class SwMailMergeMergePage : public svt::OWizardPage DECL_LINK(FindHdl_Impl, PushButton*); DECL_LINK(EnteredFindStringHdl_Impl, void*); -public: +public: SwMailMergeMergePage( SwMailMergeWizard* _pParent); ~SwMailMergeMergePage(); diff --git a/sw/source/ui/dbui/mmmergepage.src b/sw/source/ui/dbui/mmmergepage.src index d2f55bceb978..fd9fffc0de8e 100644 --- a/sw/source/ui/dbui/mmmergepage.src +++ b/sw/source/ui/dbui/mmmergepage.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/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 0fe1a3717ca1..9ede2af8a02f 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -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 @@ -990,7 +990,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG) rConfigItem.SetPrintRange( (USHORT)nBegin, (USHORT)nEnd ); SwDocMergeInfo& rStartInfo = rConfigItem.GetDocumentMergeInfo(nBegin); SwDocMergeInfo& rEndInfo = rConfigItem.GetDocumentMergeInfo(nEnd - 1); - + rtl::OUString sPages(rtl::OUString::valueOf( rStartInfo.nStartPageInTarget )); sPages += rtl::OUString::createFromAscii( " - "); sPages += rtl::OUString::valueOf( rEndInfo.nEndPageInTarget ); @@ -1015,7 +1015,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG) aProps[0].Value <<= sal_True; aProps[1]. Name = rtl::OUString::createFromAscii("Pages"); aProps[1]. Value <<= sPages; - + pTargetView->ExecPrint( aProps, false, true ); SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE_END, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE_END), pObjSh)); diff --git a/sw/source/ui/dbui/mmoutputpage.hrc b/sw/source/ui/dbui/mmoutputpage.hrc index f8daf2734b0c..ec64620eb0a0 100644 --- a/sw/source/ui/dbui/mmoutputpage.hrc +++ b/sw/source/ui/dbui/mmoutputpage.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 @@ -49,7 +49,7 @@ #define PB_PRINTERSETTINGS 23 #define RB_PRINTALL 24 #define RB_PRINTCURRENT 25 -#define PB_PRINTNOW 26 +#define PB_PRINTNOW 26 #define ST_SAVESTART 27 #define ST_SAVEMERGED 28 #define ST_PRINT 29 diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index c48d6d210c4f..f6e3987d1e45 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -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 @@ -114,7 +114,7 @@ class SwMailMergeOutputPage : public svt::OWizardPage long m_nFromToFTPos; long m_nFromToNFPos; long m_nRBOffset; - + bool m_bCancelSaving; SwMailMergeWizard* m_pWizard; diff --git a/sw/source/ui/dbui/mmoutputpage.src b/sw/source/ui/dbui/mmoutputpage.src index efe84e34bfe9..29e54bbb403b 100644 --- a/sw/source/ui/dbui/mmoutputpage.src +++ b/sw/source/ui/dbui/mmoutputpage.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/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 8d229b94c06c..388528623978 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -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/dbui/mmoutputtypepage.hrc b/sw/source/ui/dbui/mmoutputtypepage.hrc index 6deff71251b9..da8d34fe5814 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.hrc +++ b/sw/source/ui/dbui/mmoutputtypepage.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 diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx index 9db02409cd1c..9486b057d155 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.hxx +++ b/sw/source/ui/dbui/mmoutputtypepage.hxx @@ -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 @@ class SwMailMergeOutputTypePage : public svt::OWizardPage FixedInfo m_aTypeFT; RadioButton m_aLetterRB; RadioButton m_aMailRB; - + SwBoldFixedInfo m_aHintHeaderFI; FixedInfo m_aHintFI; FixedInfo m_aNoMailHintFI; @@ -57,7 +57,7 @@ class SwMailMergeOutputTypePage : public svt::OWizardPage DECL_LINK(TypeHdl_Impl, RadioButton*); -public: +public: SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent); ~SwMailMergeOutputTypePage(); diff --git a/sw/source/ui/dbui/mmoutputtypepage.src b/sw/source/ui/dbui/mmoutputtypepage.src index 3c776ff8fb59..a6dd74cc7a07 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.src +++ b/sw/source/ui/dbui/mmoutputtypepage.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/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index 8539f037ecdc..5fe51c094efd 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -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/dbui/mmpreparemergepage.hrc b/sw/source/ui/dbui/mmpreparemergepage.hrc index 958df827749b..d5a89256d419 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.hrc +++ b/sw/source/ui/dbui/mmpreparemergepage.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 diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx index 8fb7ad938996..53494b36d5ad 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.hxx +++ b/sw/source/ui/dbui/mmpreparemergepage.hxx @@ -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 @@ -51,22 +51,22 @@ class SwMailMergePrepareMergePage : public svt::OWizardPage PushButton m_aNextPB; PushButton m_aLastPB; CheckBox m_ExcludeCB; - + FixedLine m_aNoteHeaderFL; FixedInfo m_aEditFI; PushButton m_aEditPB; - + SwMailMergeWizard* m_pWizard; - + DECL_LINK(EditDocumentHdl_Impl, PushButton*); DECL_LINK(ExcludeHdl_Impl, CheckBox*); DECL_LINK(MoveHdl_Impl, void*); - + virtual void ActivatePage(); virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); -public: +public: SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent); ~SwMailMergePrepareMergePage(); diff --git a/sw/source/ui/dbui/mmpreparemergepage.src b/sw/source/ui/dbui/mmpreparemergepage.src index eac858b1b814..b1ecd375d45a 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.src +++ b/sw/source/ui/dbui/mmpreparemergepage.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/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 6cb7b87336c8..51277a1fed7f 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -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/dbui/selectdbtabledialog.hrc b/sw/source/ui/dbui/selectdbtabledialog.hrc index 24ed1183f97b..a5c55ff480d9 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.hrc +++ b/sw/source/ui/dbui/selectdbtabledialog.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 diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx index 25b23f692a4c..fe3721c48279 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.hxx +++ b/sw/source/ui/dbui/selectdbtabledialog.hxx @@ -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 @@ -65,9 +65,9 @@ class SwSelectDBTableDialog : public SfxModalDialog ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; DECL_LINK(PreviewHdl, PushButton*); -public: - - SwSelectDBTableDialog(Window* pParent, +public: + + SwSelectDBTableDialog(Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection ); ~SwSelectDBTableDialog(); diff --git a/sw/source/ui/dbui/selectdbtabledialog.src b/sw/source/ui/dbui/selectdbtabledialog.src index 271201463fef..467cb8333e68 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.src +++ b/sw/source/ui/dbui/selectdbtabledialog.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/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx index ca50ee02d593..786c60be6586 100644 --- a/sw/source/ui/dbui/swdbtoolsclient.cxx +++ b/sw/source/ui/dbui/swdbtoolsclient.cxx @@ -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 @@ -156,7 +156,7 @@ void SwDbtoolsClient::getFactory() { registerClient(); if(getDbToolsClientFactoryFunction()) - { // loading the lib succeeded + { // loading the lib succeeded void* pUntypedFactory = (*getDbToolsClientFactoryFunction())(); IDataAccessToolsFactory* pDBTFactory = static_cast<IDataAccessToolsFactory*>(pUntypedFactory); OSL_ENSURE(pDBTFactory, "SwDbtoolsClient::SwDbtoolsClient: no factory returned!"); diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx index c9e99979e66b..b7fd18974197 100644 --- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx @@ -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 @@ -282,8 +282,8 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck) m_pSpellState->m_aStartDrawingSelection = ESelection(); /* Note: spelling in a selection only, or starting in a mid of a drawing object requires -further changes elsewhere. (Especially if it should work in sc and sd as well.) -The code below would only be part of the solution. +further changes elsewhere. (Especially if it should work in sc and sd as well.) +The code below would only be part of the solution. (Keeping it a as a comment for the time being) ESelection aCurSel( pOLV->GetSelection() ); ESelection aSentenceSel( pOLV->GetEditView().GetEditEngine()->SelectSentence( aCurSel ) ); @@ -341,7 +341,7 @@ The code below would only be part of the solution. //spell inside of the Writer text if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn)) { - // if there is a selection (within body or header/footer text) + // if there is a selection (within body or header/footer text) // then spell/grammar checking should not move outside of it. if (!m_pSpellState->m_bStartedInSelection) { diff --git a/sw/source/ui/dialog/abstract.cxx b/sw/source/ui/dialog/abstract.cxx index 54955c286a02..a265d03af1ac 100644 --- a/sw/source/ui/dialog/abstract.cxx +++ b/sw/source/ui/dialog/abstract.cxx @@ -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/dialog/abstract.hrc b/sw/source/ui/dialog/abstract.hrc index c36d02ee1b1f..a42781e4544e 100644 --- a/sw/source/ui/dialog/abstract.hrc +++ b/sw/source/ui/dialog/abstract.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 @@ -26,11 +26,11 @@ ************************************************************************/ #define FL_1 1 -#define FT_PARA 2 -#define NF_PARA 3 -#define FT_LEVEL 4 -#define NF_LEVEL 5 -#define FT_DESC 6 -#define PB_OK 7 +#define FT_PARA 2 +#define NF_PARA 3 +#define FT_LEVEL 4 +#define NF_LEVEL 5 +#define FT_DESC 6 +#define PB_OK 7 #define PB_CANCEL 8 -#define PB_HELP 9 +#define PB_HELP 9 diff --git a/sw/source/ui/dialog/abstract.src b/sw/source/ui/dialog/abstract.src index 87f7bfb9174c..ab5a86394bd7 100644 --- a/sw/source/ui/dialog/abstract.src +++ b/sw/source/ui/dialog/abstract.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/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx index f168d0684a81..4fe00e88cd8f 100644 --- a/sw/source/ui/dialog/addrdlg.cxx +++ b/sw/source/ui/dialog/addrdlg.cxx @@ -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/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 355e68bd5c58..60b930162d55 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -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 @@ -64,7 +64,7 @@ using namespace ::com::sun::star; const sal_Unicode cDialogExtraDataClose = '}'; const char __FAR_DATA sDialogImpExtraData[] = "EncImpDlg:{"; const char __FAR_DATA sDialogExpExtraData[] = "EncExpDlg:{"; -const USHORT nDialogExtraDataLen = 11; // 12345678901 +const USHORT nDialogExtraDataLen = 11; // 12345678901 SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, SvStream* pStream ) @@ -128,12 +128,12 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, for( USHORT nCnt = 0; nCnt < nBytesRead; ++nCnt ) switch( aBuffer[ nCnt ] ) { - case 0x0: bNullChar = TRUE; break; - case 0xA: bLF = TRUE; break; - case 0xD: bCR = TRUE; break; + case 0x0: bNullChar = TRUE; break; + case 0xA: bLF = TRUE; break; + case 0xD: bCR = TRUE; break; case 0xC: case 0x1A: - case 0x9: break; + case 0x9: break; default: if( 0x20 > aBuffer[ nCnt ] ) bNoNormalChar = TRUE; @@ -147,20 +147,20 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, { aOpt.SetParaFlags( LINEEND_CRLF ); // have to check if of CharSet is type of ANSI -// aOpt.SetCharSet( CHARSET_ANSI ); +// aOpt.SetCharSet( CHARSET_ANSI ); } else { aOpt.SetParaFlags( LINEEND_CR ); // have to check if CharSet is type of MAC -// aOpt.SetCharSet( CHARSET_MAC ); +// aOpt.SetCharSet( CHARSET_MAC ); } } else if( bLF ) { aOpt.SetParaFlags( LINEEND_LF ); // have to check if of CharSet is type of ANSI -// aOpt.SetCharSet( CHARSET_ANSI ); +// aOpt.SetCharSet( CHARSET_ANSI ); } } @@ -259,16 +259,16 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, aLanguageLB.Hide(); long nY = aFontFT.GetPosPixel().Y() + 1; - Point aPos( aCRLF_FT.GetPosPixel() ); aPos.Y() = nY; + Point aPos( aCRLF_FT.GetPosPixel() ); aPos.Y() = nY; aCRLF_FT.SetPosPixel( aPos ); - aPos = aCRLF_RB.GetPosPixel(); aPos.Y() = nY; + aPos = aCRLF_RB.GetPosPixel(); aPos.Y() = nY; aCRLF_RB.SetPosPixel( aPos ); - aPos = aCR_RB.GetPosPixel(); aPos.Y() = nY; + aPos = aCR_RB.GetPosPixel(); aPos.Y() = nY; aCR_RB.SetPosPixel( aPos ); - aPos = aLF_RB.GetPosPixel(); aPos.Y() = nY; + aPos = aLF_RB.GetPosPixel(); aPos.Y() = nY; aLF_RB.SetPosPixel( aPos ); Size aSize = GetSizePixel(); @@ -346,9 +346,9 @@ void SwAsciiFilterDlg::SetCRLF( LineEnd eEnd ) { switch( eEnd ) { - case LINEEND_CR: aCR_RB.Check(); break; - case LINEEND_CRLF: aCRLF_RB.Check(); break; - case LINEEND_LF: aLF_RB.Check(); break; + case LINEEND_CR: aCR_RB.Check(); break; + case LINEEND_CRLF: aCRLF_RB.Check(); break; + case LINEEND_LF: aLF_RB.Check(); break; } } @@ -383,15 +383,15 @@ IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl, SvxTextEncodingBox*, pBox ) #ifdef UNX eEnd = LINEEND_LF; #else - eEnd = LINEEND_CRLF; // ANSI + eEnd = LINEEND_CRLF; // ANSI #endif break; - case RTL_TEXTENCODING_APPLE_ROMAN: // MAC + case RTL_TEXTENCODING_APPLE_ROMAN: // MAC eEnd = LINEEND_CR; break; - case RTL_TEXTENCODING_IBM_850: // DOS + case RTL_TEXTENCODING_IBM_850: // DOS eEnd = LINEEND_CRLF; break; @@ -420,7 +420,7 @@ IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl, SvxTextEncodingBox*, pBox ) } bSaveLineStatus = FALSE; - if( eEnd != (LineEnd)-1 ) // changed? + if( eEnd != (LineEnd)-1 ) // changed? { if( eOldEnd != eEnd ) SetCRLF( eEnd ); diff --git a/sw/source/ui/dialog/ascfldlg.hrc b/sw/source/ui/dialog/ascfldlg.hrc index b96cdc39b57a..efbafaa00be3 100644 --- a/sw/source/ui/dialog/ascfldlg.hrc +++ b/sw/source/ui/dialog/ascfldlg.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 @@ -26,7 +26,7 @@ ************************************************************************/ #define FL_1 1 -#define FT_CHARSET 2 +#define FT_CHARSET 2 #define LB_CHARSET 3 #define FT_FONT 4 #define LB_FONT 5 @@ -34,11 +34,11 @@ #define LB_LANGUAGE 7 #define FT_CRLF 8 #define RB_CRLF 9 -#define RB_CR 10 -#define RB_LF 11 -#define PB_OK 12 -#define PB_CANCEL 13 -#define PB_HELP 14 -#define STR_SYS_CHARSET 15 +#define RB_CR 10 +#define RB_LF 11 +#define PB_OK 12 +#define PB_CANCEL 13 +#define PB_HELP 14 +#define STR_SYS_CHARSET 15 diff --git a/sw/source/ui/dialog/ascfldlg.src b/sw/source/ui/dialog/ascfldlg.src index 6ef0ea42b656..f10fed8a871a 100644 --- a/sw/source/ui/dialog/ascfldlg.src +++ b/sw/source/ui/dialog/ascfldlg.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/dialog/dialog.src b/sw/source/ui/dialog/dialog.src index 26b615bff7b2..f3df744189c9 100644 --- a/sw/source/ui/dialog/dialog.src +++ b/sw/source/ui/dialog/dialog.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/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 40f0fddf98f8..b96fa4f1eeb6 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -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 @@ -75,32 +75,32 @@ SfxTabPage * SwDocStatPage::Create(Window *pParent, const SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: Ctor + Beschreibung: Ctor --------------------------------------------------------------------*/ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) : - SfxTabPage (pParent, SW_RES(TP_DOC_STAT), rSet), + SfxTabPage (pParent, SW_RES(TP_DOC_STAT), rSet), - aTableLbl (this, SW_RES( FT_TABLE )), - aGrfLbl (this, SW_RES( FT_GRF )), - aOLELbl (this, SW_RES( FT_OLE )), - aPageLbl (this, SW_RES( FT_PAGE )), - aParaLbl (this, SW_RES( FT_PARA )), - aWordLbl (this, SW_RES( FT_WORD )), - aCharLbl (this, SW_RES( FT_CHAR )), + aTableLbl (this, SW_RES( FT_TABLE )), + aGrfLbl (this, SW_RES( FT_GRF )), + aOLELbl (this, SW_RES( FT_OLE )), + aPageLbl (this, SW_RES( FT_PAGE )), + aParaLbl (this, SW_RES( FT_PARA )), + aWordLbl (this, SW_RES( FT_WORD )), + aCharLbl (this, SW_RES( FT_CHAR )), aLineLbl (this, SW_RES( FT_LINE )), aTableNo (this, SW_RES( FT_TABLE_COUNT)), - aGrfNo (this, SW_RES( FT_GRF_COUNT )), - aOLENo (this, SW_RES( FT_OLE_COUNT )), - aPageNo (this, SW_RES( FT_PAGE_COUNT )), - aParaNo (this, SW_RES( FT_PARA_COUNT )), - aWordNo (this, SW_RES( FT_WORD_COUNT )), - aCharNo (this, SW_RES( FT_CHAR_COUNT )), - aLineNo (this, SW_RES( FT_LINE_COUNT )), - aUpdatePB (this, SW_RES( PB_PDATE )) + aGrfNo (this, SW_RES( FT_GRF_COUNT )), + aOLENo (this, SW_RES( FT_OLE_COUNT )), + aPageNo (this, SW_RES( FT_PAGE_COUNT )), + aParaNo (this, SW_RES( FT_PARA_COUNT )), + aWordNo (this, SW_RES( FT_WORD_COUNT )), + aCharNo (this, SW_RES( FT_CHAR_COUNT )), + aLineNo (this, SW_RES( FT_LINE_COUNT )), + aUpdatePB (this, SW_RES( PB_PDATE )) { Update(); FreeResource(); @@ -123,7 +123,7 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) : } /*-------------------------------------------------------------------- - Beschreibung: ItemSet fuellen bei Aenderung + Beschreibung: ItemSet fuellen bei Aenderung --------------------------------------------------------------------*/ @@ -141,7 +141,7 @@ void SwDocStatPage::Reset(const SfxItemSet &/*rSet*/) { } /*------------------------------------------------------------------------ - Beschreibung: Aktualisieren / Setzen der Daten + Beschreibung: Aktualisieren / Setzen der Daten ------------------------------------------------------------------------*/ @@ -157,7 +157,7 @@ void SwDocStatPage::SetData(const SwDocStat &rStat) } /*------------------------------------------------------------------------ - Beschreibung: Aktualisieren der Statistik + Beschreibung: Aktualisieren der Statistik ------------------------------------------------------------------------*/ diff --git a/sw/source/ui/dialog/docstdlg.hrc b/sw/source/ui/dialog/docstdlg.hrc index 5084ea58dbdb..358b2770ea8f 100644 --- a/sw/source/ui/dialog/docstdlg.hrc +++ b/sw/source/ui/dialog/docstdlg.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 @@ -25,23 +25,23 @@ * ************************************************************************/ -#define FT_TABLE 1 -#define FT_GRF 2 -#define FT_OLE 3 -#define FT_PAGE 4 -#define FT_PARA 5 -#define FT_WORD 6 -#define FT_CHAR 9 -#define FT_TABLE_COUNT 10 -#define FT_GRF_COUNT 11 -#define FT_OLE_COUNT 12 -#define FT_PAGE_COUNT 13 -#define FT_PARA_COUNT 14 -#define FT_WORD_COUNT 15 -#define FT_CHAR_COUNT 16 +#define FT_TABLE 1 +#define FT_GRF 2 +#define FT_OLE 3 +#define FT_PAGE 4 +#define FT_PARA 5 +#define FT_WORD 6 +#define FT_CHAR 9 +#define FT_TABLE_COUNT 10 +#define FT_GRF_COUNT 11 +#define FT_OLE_COUNT 12 +#define FT_PAGE_COUNT 13 +#define FT_PARA_COUNT 14 +#define FT_WORD_COUNT 15 +#define FT_CHAR_COUNT 16 #define FT_LINE 17 #define FT_LINE_COUNT 18 #define PB_PDATE 19 -#define BT_OK 100 +#define BT_OK 100 diff --git a/sw/source/ui/dialog/docstdlg.src b/sw/source/ui/dialog/docstdlg.src index 4384acbe3fe9..5926321d8867 100644 --- a/sw/source/ui/dialog/docstdlg.src +++ b/sw/source/ui/dialog/docstdlg.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/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index 2d2b7c357720..ef83dba1a321 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -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 @@ -74,17 +74,17 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) switch( eType ) { - case MACASSGN_TEXTBAUST: // Textbausteine + case MACASSGN_TEXTBAUST: // Textbausteine // rPg.SetGetRangeLink( &_GetRangeHdl ); aItem.AddEvent( String( SW_RES(STR_EVENT_START_INS_GLOSSARY) ), String(), SW_EVENT_START_INS_GLOSSARY ); - aItem.AddEvent( String( SW_RES(STR_EVENT_END_INS_GLOSSARY) ), String(), + aItem.AddEvent( String( SW_RES(STR_EVENT_END_INS_GLOSSARY) ), String(), SW_EVENT_END_INS_GLOSSARY); // damit der neue Handler aktiv wird! // rPg.Reset( rSet ); break; case MACASSGN_ALLFRM: - case MACASSGN_GRAPHIC: // Grafiken + case MACASSGN_GRAPHIC: // Grafiken { aItem.AddEvent( String( SW_RES(STR_EVENT_IMAGE_ERROR) ), String(), SVX_EVENT_IMAGE_ERROR); @@ -94,7 +94,7 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) SVX_EVENT_IMAGE_LOAD); } // kein break; - case MACASSGN_FRMURL: // Frm - URL-Attribute + case MACASSGN_FRMURL: // Frm - URL-Attribute { if( !bHtmlMode && (MACASSGN_FRMURL == eType || MACASSGN_ALLFRM == eType)) @@ -110,14 +110,14 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) } } // kein break; - case MACASSGN_OLE: // OLE + case MACASSGN_OLE: // OLE { if( !bHtmlMode ) aItem.AddEvent( String( SW_RES(STR_EVENT_OBJECT_SELECT) ), String(), SW_EVENT_OBJECT_SELECT ); } // kein break; - case MACASSGN_INETFMT: // INetFmt-Attribute + case MACASSGN_INETFMT: // INetFmt-Attribute { aItem.AddEvent( String( SW_RES(STR_EVENT_MOUSEOVER_OBJECT) ), String(), SFX_EVENT_MOUSEOVER_OBJECT ); @@ -148,7 +148,7 @@ BOOL SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh, aSet.Put( AddEvents( MACASSGN_INETFMT ) ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - SfxAbstractDialog* pMacroDlg = pFact->CreateSfxDialog( pParent, aSet, + SfxAbstractDialog* pMacroDlg = pFact->CreateSfxDialog( pParent, aSet, rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), SID_EVENTCONFIG ); if ( pMacroDlg && pMacroDlg->Execute() == RET_OK ) diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx index 8a4304bcd5a9..b9ebb07f83e5 100644 --- a/sw/source/ui/dialog/regionsw.cxx +++ b/sw/source/ui/dialog/regionsw.cxx @@ -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 @@ -52,7 +52,7 @@ #include <view.hxx> #include <swmodule.hxx> #include <wrtsh.hxx> -#include <swundo.hxx> // fuer Undo-Ids +#include <swundo.hxx> // fuer Undo-Ids #include <column.hxx> #include <fmtfsize.hxx> #include <swunodef.hxx> @@ -68,7 +68,7 @@ #include "swabstdlg.hxx" /*-------------------------------------------------------------------- - Beschreibung: Bereiche einfuegen + Beschreibung: Bereiche einfuegen --------------------------------------------------------------------*/ @@ -224,7 +224,7 @@ IMPL_STATIC_LINK( SwWrtShell, InsertRegionDialog, SwSectionData*, pSect ) } /*-------------------------------------------------------------------- - Beschreibung: Bereich bearbeiten + Beschreibung: Bereich bearbeiten --------------------------------------------------------------------*/ void SwBaseShell::EditRegionDialog(SfxRequest& rReq) diff --git a/sw/source/ui/dialog/regionsw.hrc b/sw/source/ui/dialog/regionsw.hrc index 0535ed46a630..d396053ab200 100644 --- a/sw/source/ui/dialog/regionsw.hrc +++ b/sw/source/ui/dialog/regionsw.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 @@ -90,14 +90,14 @@ // <-- /* Globale Resourcen */ -#define STR_REG_DUPLICATE (RC_REGIONSW_BEGIN+6) -#define STR_INFO_DUPLICATE (RC_REGIONSW_BEGIN+7) +#define STR_REG_DUPLICATE (RC_REGIONSW_BEGIN+6) +#define STR_INFO_DUPLICATE (RC_REGIONSW_BEGIN+7) -#define MD_INS_REGION (RC_REGIONSW_BEGIN+8) -#define MD_EDIT_REGION (RC_REGIONSW_BEGIN+9) -#define QB_CONNECT (RC_REGIONSW_BEGIN+10) -#define REG_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11) -#define REG_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12) +#define MD_INS_REGION (RC_REGIONSW_BEGIN+8) +#define MD_EDIT_REGION (RC_REGIONSW_BEGIN+9) +#define QB_CONNECT (RC_REGIONSW_BEGIN+10) +#define REG_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11) +#define REG_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12) //ImageList elements #define BMP_HIDE 1 diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src index f2af8dca3b0d..e0da42f07f84 100644 --- a/sw/source/ui/dialog/regionsw.src +++ b/sw/source/ui/dialog/regionsw.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/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx index a39c1866b717..2214dc5608e1 100644 --- a/sw/source/ui/dialog/swabstdlg.cxx +++ b/sw/source/ui/dialog/swabstdlg.cxx @@ -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/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx index 308411358efa..37d6762d35de 100644 --- a/sw/source/ui/dialog/swdialmgr.cxx +++ b/sw/source/ui/dialog/swdialmgr.cxx @@ -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 @@ -39,7 +39,7 @@ #include <sfx2/app.hxx> //copy from core\bastyp\swtypes.cxx -String aEmptyStr; // Konstante Strings +String aEmptyStr; // Konstante Strings ResMgr* pSwResMgr=0; diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 8447489e5b03..9af9dfbd0b5c 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -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 @@ -73,7 +73,7 @@ #include "pattern.hxx" //add for SwBackgroundDlg #include "rowht.hxx" //add for SwTableHeightDlg #include "selglos.hxx" //add for SwSelGlossaryDlg -#include "splittbl.hxx" //add for SwSplitTblDlg +#include "splittbl.hxx" //add for SwSplitTblDlg #include "srtdlg.hxx" //add for SwSortDlg #include "tautofmt.hxx" //add for SwAutoFormatDlg #include "tblnumfm.hxx" //add for SwNumFmtDlg @@ -385,7 +385,7 @@ Window* AbstractSwFldDlg_Impl::GetWindow() { return (Window*)pDlg; } -void AbstractSwFldDlg_Impl::ShowPage( USHORT nId ) +void AbstractSwFldDlg_Impl::ShowPage( USHORT nId ) { pDlg->ShowPage(nId); } @@ -398,7 +398,7 @@ void AbstractSwRenameXNamedDlg_Impl::SetForbiddenChars( const String& rSet ) pDlg->SetForbiddenChars( rSet ); } -void AbstractSwRenameXNamedDlg_Impl::SetAlternativeAccess( +void AbstractSwRenameXNamedDlg_Impl::SetAlternativeAccess( STAR_REFERENCE( container::XNameAccess ) & xSecond, STAR_REFERENCE( container::XNameAccess ) & xThird ) { @@ -408,7 +408,7 @@ void AbstractSwRenameXNamedDlg_Impl::SetAlternativeAccess( //add for SwModalRedlineAcceptDlg begin -void AbstractSwModalRedlineAcceptDlg_Impl::AcceptAll( BOOL bAccept ) +void AbstractSwModalRedlineAcceptDlg_Impl::AcceptAll( BOOL bAccept ) { pDlg->AcceptAll( bAccept); } @@ -481,7 +481,7 @@ void AbstractInsTableDlg_Impl::GetValues( String& rName, USHORT& rRow, USHORT& r SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName, SwTableAutoFmt *& prTAFmt ) { - pDlg->GetValues( rName, rRow, rCol, rInsTblFlags, rTableAutoFmtName, prTAFmt); + pDlg->GetValues( rName, rRow, rCol, rInsTblFlags, rTableAutoFmtName, prTAFmt); } // AbstractInsTableDlg_Impl end @@ -727,8 +727,8 @@ AbstractSwAsciiFilterDlg* SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg( // add for SwInsertBookmarkDlg begin VclAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDlg( Window *pParent, - SwWrtShell &rSh, - SfxRequest& rReq, + SwWrtShell &rSh, + SfxRequest& rReq, int nResId ) { Dialog* pDlg=NULL; @@ -773,7 +773,7 @@ AbstractSwBreakDlg * SwAbstractDialogFactory_Impl::CreateSwBreakDlg ( Window *pP //add for SwBreakDlg end // add for SwChangeDBDlg begin -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg( SwView& rVw, int nResId ) +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg( SwView& rVw, int nResId ) { Dialog* pDlg=NULL; switch ( nResId ) @@ -816,7 +816,7 @@ SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwCharDlg(Window* pP // add for SwCharDlg end //add for SwConvertTableDlg begin -AbstractSwConvertTableDlg* SwAbstractDialogFactory_Impl::CreateSwConvertTableDlg ( +AbstractSwConvertTableDlg* SwAbstractDialogFactory_Impl::CreateSwConvertTableDlg ( SwView& rView,int nResId, bool bToTable ) { SwConvertTableDlg* pDlg=NULL; @@ -924,7 +924,7 @@ AbstractDropDownFieldDialog * SwAbstractDialogFactory_Impl::CreateDropDownField //add for SwEnvDlg begin SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, - SwWrtShell* pWrtSh, Printer* pPrt, + SwWrtShell* pWrtSh, Printer* pPrt, BOOL bInsert,int nResId ) //add for SwEnvDlg { SfxTabDialog* pDlg=NULL; @@ -974,7 +974,7 @@ SwLabDlgMethod SwAbstractDialogFactory_Impl::GetSwLabDlgStaticMethod () //add for SwParaDlg begin SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( Window *pParent, SwView& rVw, - const SfxItemSet& rCoreSet , + const SfxItemSet& rCoreSet , BYTE nDialogMode, int nResId, const String *pCollName, @@ -1055,7 +1055,7 @@ AbstarctSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg //add for SwSelGlossaryDlg end //add for SwAutoFormatDlg begin -AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, +AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, int nResId, BOOL bSetAutoFmt, const SwTableAutoFmt* pSelFmt ) @@ -1097,7 +1097,7 @@ SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Window* pPa //add for SwBorderDlg end //add for SwWrapDlg begin -SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode, int nResId ) +SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode, int nResId ) { SfxModalDialog* pDlg=NULL; switch ( nResId ) @@ -1137,7 +1137,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwTableWidthDlg ( Window //add for SwTableTabDlg begin SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool, - const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId ) + const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId ) { SfxTabDialog* pDlg=NULL; switch ( nResId ) @@ -1177,7 +1177,7 @@ AbstractSwFldDlg * SwAbstractDialogFactory_Impl::CreateSwFldDlg ( SfxBindings* p //add for SwFldDlg end //add for SwFldEditDlg begin -SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView& rVw, int nResId ) +SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView& rVw, int nResId ) { SfxModalDialog* pDlg=NULL; switch ( nResId ) @@ -1236,7 +1236,7 @@ AbstractSwModalRedlineAcceptDlg * SwAbstractDialogFactory_Impl::CreateSwModalRed } //add for SwModalRedlineAcceptDlg end -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwVclDialog( int nResId, +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwVclDialog( int nResId, Window* pParent, BOOL& rWithPrev ) //add for SwMergeTblDlg { Dialog* pDlg=NULL; @@ -1255,11 +1255,11 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwVclDialog( int nResId, SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog( int nResId, SfxViewFrame *pFrame, Window *pParent, const SfxItemSet& rCoreSet, - BOOL bNewFrm, - USHORT nResType, - BOOL bFmt, - UINT16 nDefPage, - const String* pFmtStr ) //add for SwFrmDlg + BOOL bNewFrm, + USHORT nResType, + BOOL bFmt, + UINT16 nDefPage, + const String* pFmtStr ) //add for SwFrmDlg { SfxTabDialog* pDlg=NULL; switch ( nResId ) @@ -1282,9 +1282,9 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog( int nR Window* pParent, SfxStyleSheetBase& rBase, USHORT nRegion, - BOOL bColumn, - SwWrtShell* pActShell, - BOOL bNew ) //add for SwTemplateDlg + BOOL bColumn, + SwWrtShell* pActShell, + BOOL bNew ) //add for SwTemplateDlg { SfxTabDialog* pDlg=NULL; switch ( nResId ) @@ -1302,8 +1302,8 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog( int nR } AbstractGlossaryDlg* SwAbstractDialogFactory_Impl::CreateGlossaryDlg( int nResId, - SfxViewFrame* pViewFrame, - SwGlossaryHdl* pGlosHdl, + SfxViewFrame* pViewFrame, + SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) //add for SwGlossaryDlg { SwGlossaryDlg* pDlg=NULL; @@ -1355,7 +1355,7 @@ AbstractInsFootNoteDlg* SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg( int return 0; } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId, +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId, SwView& rView, BOOL /*bCol*/ ) //add for SwInsRowColDlg, SwLineNumberingDlg { Dialog* pDlg=NULL; @@ -1373,7 +1373,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nRe return 0; } -AbstractInsertGrfRulerDlg * SwAbstractDialogFactory_Impl::CreateInsertGrfRulerDlg( int nResId, +AbstractInsertGrfRulerDlg * SwAbstractDialogFactory_Impl::CreateInsertGrfRulerDlg( int nResId, Window * pParent ) //add for SwInsertGrfRulerDlg { SwInsertGrfRulerDlg* pDlg=NULL; @@ -1479,7 +1479,7 @@ AbstractMailMergeFieldConnectionsDlg * SwAbstractDialogFactory_Impl::CreateMailM return 0; } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg( int nResId, +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg( int nResId, Window* pParent, SwTOXMgr &rTOXMgr ) //add for SwMultiTOXMarkDlg { Dialog* pDlg=NULL; @@ -1517,7 +1517,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTabDialog( int nResI return new AbstractTabDialog_Impl( pDlg ); return 0; } -AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog( int nResId, +AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog( int nResId, Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, USHORT nToxType, @@ -1536,7 +1536,7 @@ AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialo return new AbstractMultiTOXTabDialog_Impl( pDlg ); return 0; } -AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg( int nResId, +AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg( int nResId, Window* pParent, SwWrtShell& rWrtSh ) //add for SwEditRegionDlg { SwEditRegionDlg* pDlg=NULL; @@ -1552,7 +1552,7 @@ AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg( int n return new AbstractEditRegionDlg_Impl( pDlg ); return 0; } -AbstractInsertSectionTabDialog * SwAbstractDialogFactory_Impl::CreateInsertSectionTabDialog( int nResId, +AbstractInsertSectionTabDialog * SwAbstractDialogFactory_Impl::CreateInsertSectionTabDialog( int nResId, Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) //add for SwInsertSectionTabDialog { SwInsertSectionTabDialog* pDlg=NULL; @@ -1569,7 +1569,7 @@ AbstractInsertSectionTabDialog * SwAbstractDialogFactory_Impl::CreateInsertSecti return 0; } -AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg( int nResId, +AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg( int nResId, SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, @@ -1591,7 +1591,7 @@ AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg( in return 0; } -AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg( int nResId, +AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg( int nResId, SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, @@ -1613,7 +1613,7 @@ AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg( int } //add for SwIndexMarkModalDlg begin -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateIndexMarkModalDlg( int nResId, +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateIndexMarkModalDlg( int nResId, Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) //add for SwIndexMarkModalDlg { Dialog* pDlg=NULL; @@ -1640,7 +1640,7 @@ AbstractMailMergeWizard* SwAbstractDialogFactory_Impl::CreateMailMergeWizard( } //add for static func in SwGlossaryDlg -GlossaryGetCurrGroup SwAbstractDialogFactory_Impl::GetGlossaryCurrGroupFunc( USHORT nId ) +GlossaryGetCurrGroup SwAbstractDialogFactory_Impl::GetGlossaryCurrGroupFunc( USHORT nId ) { switch ( nId ) { @@ -1651,7 +1651,7 @@ GlossaryGetCurrGroup SwAbstractDialogFactory_Impl::GetGlossaryCurrGroupFunc( } return 0; } -GlossarySetActGroup SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc( USHORT nId ) +GlossarySetActGroup SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc( USHORT nId ) { switch ( nId ) { diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 5d8611d51f54..8c3355bb6b1b 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -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 @@ -56,24 +56,24 @@ namespace sw class DropDownFieldDialog; } -#define DECL_ABSTDLG_BASE(Class,DialogClass) \ - DialogClass* pDlg; \ -public: \ - Class( DialogClass* p) \ - : pDlg(p) \ +#define DECL_ABSTDLG_BASE(Class,DialogClass) \ + DialogClass* pDlg; \ +public: \ + Class( DialogClass* p) \ + : pDlg(p) \ {} \ - virtual ~Class(); \ - virtual short Execute() ; -// virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ) + virtual ~Class(); \ + virtual short Execute() ; +// virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ) -#define IMPL_ABSTDLG_BASE(Class) \ -Class::~Class() \ +#define IMPL_ABSTDLG_BASE(Class) \ +Class::~Class() \ { \ - delete pDlg; \ -} \ + delete pDlg; \ +} \ short Class::Execute() \ { \ - return pDlg->Execute(); \ + return pDlg->Execute(); \ } @@ -87,8 +87,8 @@ class AbstractSwWordCountDialog_Impl : public AbstractSwWordCountDialog class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg { DECL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl,SwInsertAbstractDlg) - virtual BYTE GetLevel() const ; - virtual BYTE GetPara() const ; + virtual BYTE GetLevel() const ; + virtual BYTE GetPara() const ; }; //add for SwInsertAbstractDlg end @@ -98,7 +98,7 @@ class SfxSingleTabDialog; class AbstractSfxDialog_Impl :public SfxAbstractDialog { DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog) - virtual const SfxItemSet* GetOutputItemSet() const; + virtual const SfxItemSet* GetOutputItemSet() const; virtual void SetText( const XubString& rStr ); virtual String GetText() const; }; @@ -129,7 +129,7 @@ class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg // add for SwBreakDlg virtual USHORT GetPageNumber(); }; -class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for +class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for { DECL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl, SwSplitTblDlg) virtual sal_uInt16 GetSplitMode(); @@ -141,8 +141,8 @@ class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for class AbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( USHORT nId ); - virtual const SfxItemSet* GetOutputItemSet() const; + virtual void SetCurPageId( USHORT nId ); + virtual const SfxItemSet* GetOutputItemSet() const; virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. @@ -184,8 +184,8 @@ class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog //ad class AbstarctSwLabDlg_Impl : public AbstarctSwLabDlg { DECL_ABSTDLG_BASE(AbstarctSwLabDlg_Impl,SwLabDlg) - virtual void SetCurPageId( USHORT nId ); - virtual const SfxItemSet* GetOutputItemSet() const; + virtual void SetCurPageId( USHORT nId ); + virtual const SfxItemSet* GetOutputItemSet() const; virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. @@ -200,9 +200,9 @@ class AbstarctSwLabDlg_Impl : public AbstarctSwLabDlg class AbstarctSwSelGlossaryDlg_Impl : public AbstarctSwSelGlossaryDlg { DECL_ABSTDLG_BASE(AbstarctSwSelGlossaryDlg_Impl,SwSelGlossaryDlg) - virtual void InsertGlos(const String &rRegion, const String &rGlosName); // inline - virtual USHORT GetSelectedIdx() const; // inline - virtual void SelectEntryPos(USHORT nIdx); // inline + virtual void InsertGlos(const String &rRegion, const String &rGlosName); // inline + virtual USHORT GetSelectedIdx() const; // inline + virtual void SelectEntryPos(USHORT nIdx); // inline }; //add for SwSelGlossaryDlg end @@ -219,19 +219,19 @@ class AbstractSwAutoFormatDlg_Impl : public AbstractSwAutoFormatDlg class AbstractSwFldDlg_Impl : public AbstractSwFldDlg //add for SwFldDlg { DECL_ABSTDLG_BASE(AbstractSwFldDlg_Impl,SwFldDlg ) - virtual void SetCurPageId( USHORT nId ); - virtual const SfxItemSet* GetOutputItemSet() const; + virtual void SetCurPageId( USHORT nId ); + virtual const SfxItemSet* GetOutputItemSet() const; virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. virtual void SetText( const XubString& rStr ); virtual String GetText() const; - virtual void Start( BOOL bShow = TRUE ); //this method from SfxTabDialog - virtual void ShowPage( USHORT nId );// this method from SfxTabDialog - virtual void Initialize(SfxChildWinInfo *pInfo); - virtual void ReInitDlg(); + virtual void Start( BOOL bShow = TRUE ); //this method from SfxTabDialog + virtual void ShowPage( USHORT nId );// this method from SfxTabDialog + virtual void Initialize(SfxChildWinInfo *pInfo); + virtual void ReInitDlg(); virtual void ActivateDatabasePage(); - virtual Window * GetWindow(); //this method is added for return a Window type pointer + virtual Window * GetWindow(); //this method is added for return a Window type pointer }; //add for SwFldD end @@ -239,7 +239,7 @@ class AbstractSwFldDlg_Impl : public AbstractSwFldDlg //add for SwFldDlg class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg { DECL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl,SwRenameXNamedDlg ) - virtual void SetForbiddenChars( const String& rSet ); + virtual void SetForbiddenChars( const String& rSet ); virtual void SetAlternativeAccess( STAR_REFERENCE( container::XNameAccess ) & xSecond, STAR_REFERENCE( container::XNameAccess ) & xThird ); @@ -249,7 +249,7 @@ class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg class AbstractSwModalRedlineAcceptDlg_Impl : public AbstractSwModalRedlineAcceptDlg { DECL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl,SwModalRedlineAcceptDlg ) - virtual void AcceptAll( BOOL bAccept ); + virtual void AcceptAll( BOOL bAccept ); }; //add for SwModalRedlineAcceptDlg end @@ -258,8 +258,8 @@ class SwGlossaryDlg; class AbstractGlossaryDlg_Impl : public AbstractGlossaryDlg { DECL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl,SwGlossaryDlg) - virtual String GetCurrGrpName() const; - virtual String GetCurrShortName() const; + virtual String GetCurrGrpName() const; + virtual String GetCurrShortName() const; }; //for SwGlossaryDlg end @@ -293,9 +293,9 @@ class SwInsertGrfRulerDlg; class AbstractInsertGrfRulerDlg_Impl : public AbstractInsertGrfRulerDlg { DECL_ABSTDLG_BASE(AbstractInsertGrfRulerDlg_Impl,SwInsertGrfRulerDlg) - virtual String GetGraphicName(); - virtual BOOL IsSimpleLine(); - virtual BOOL HasImages() const ; + virtual String GetGraphicName(); + virtual BOOL IsSimpleLine(); + virtual BOOL HasImages() const ; }; //for SwInsertGrfRulerDlg end @@ -304,7 +304,7 @@ class SwInsTableDlg; class AbstractInsTableDlg_Impl : public AbstractInsTableDlg { DECL_ABSTDLG_BASE(AbstractInsTableDlg_Impl,SwInsTableDlg) - virtual void GetValues( String& rName, USHORT& rRow, USHORT& rCol, + virtual void GetValues( String& rName, USHORT& rRow, USHORT& rCol, SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName, SwTableAutoFmt *& prTAFmt ); }; @@ -328,8 +328,8 @@ class SwMailMergeDlg; class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg { DECL_ABSTDLG_BASE(AbstractMailMergeDlg_Impl,SwMailMergeDlg) - virtual USHORT GetMergeType() ; - virtual const ::rtl::OUString& GetSaveFilter() const; + virtual USHORT GetMergeType() ; + virtual const ::rtl::OUString& GetSaveFilter() const; virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const; }; @@ -356,11 +356,11 @@ class SwMultiTOXTabDialog; class AbstractMultiTOXTabDialog_Impl : public AbstractMultiTOXTabDialog { DECL_ABSTDLG_BASE(AbstractMultiTOXTabDialog_Impl,SwMultiTOXTabDialog) - virtual SwForm* GetForm(CurTOXType eType); - virtual CurTOXType GetCurrentTOXType() const ; - virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes); + virtual SwForm* GetForm(CurTOXType eType); + virtual CurTOXType GetCurrentTOXType() const ; + virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes); //from SfxTabDialog - virtual const SfxItemSet* GetOutputItemSet() const; + virtual const SfxItemSet* GetOutputItemSet() const; }; //for SwMultiTOXTabDialog end @@ -387,7 +387,7 @@ class AbstractIndexMarkFloatDlg_Impl : public AbstractMarkFloatDlg { DECL_ABSTDLG_BASE(AbstractIndexMarkFloatDlg_Impl,SwIndexMarkFloatDlg) virtual void ReInitDlg(SwWrtShell& rWrtShell); - virtual Window * GetWindow(); //this method is added for return a Window type pointer + virtual Window * GetWindow(); //this method is added for return a Window type pointer }; //for SwIndexMarkFloatDlg end @@ -397,7 +397,7 @@ class AbstractAuthMarkFloatDlg_Impl : public AbstractMarkFloatDlg { DECL_ABSTDLG_BASE(AbstractAuthMarkFloatDlg_Impl,SwAuthMarkFloatDlg) virtual void ReInitDlg(SwWrtShell& rWrtShell); - virtual Window * GetWindow(); //this method is added for return a Window type pointer + virtual Window * GetWindow(); //this method is added for return a Window type pointer }; //for SwAuthMarkFloatDlg end @@ -412,7 +412,7 @@ public: AbstractMailMergeWizard_Impl( SwMailMergeWizard* p ) : pDlg(p) {} - virtual ~AbstractMailMergeWizard_Impl(); + virtual ~AbstractMailMergeWizard_Impl(); virtual void StartExecuteModal( const Link& rEndDialogHdl ); virtual long GetResult(); @@ -428,18 +428,18 @@ class SwAbstractDialogFactory_Impl : public SwAbstractDialogFactory { public: - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog + virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog const SfxItemSet& rAttr, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, sal_uInt32 nResId ); virtual AbstractSwWordCountDialog* CreateSwWordCountDialog(Window* pParent); virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg( Window* pParent,int nResId ); - virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh, + virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh, SvStream* pStream, int nResId ); //add for SwAsciiFilterDlg virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId );//add for SwInsertBookmarkDlg - virtual AbstractSwBreakDlg * CreateSwBreakDlg ( Window *pParent, SwWrtShell &rSh,int nResId ); // add for SwBreakDlg - virtual VclAbstractDialog * CreateSwChangeDBDlg( SwView& rVw, int nResId ); //add for SwChangeDBDlg + virtual AbstractSwBreakDlg * CreateSwBreakDlg ( Window *pParent, SwWrtShell &rSh,int nResId ); // add for SwBreakDlg + virtual VclAbstractDialog * CreateSwChangeDBDlg( SwView& rVw, int nResId ); //add for SwChangeDBDlg virtual SfxAbstractTabDialog * CreateSwCharDlg( Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, int nResId, // add for SwCharDlg const String* pFmtStr = 0, BOOL bIsDrwTxtDlg = FALSE); virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg ( SwView& rView, int nResId, bool bToTable ); //add for SwConvertTableDlg @@ -466,9 +466,9 @@ public: const String *pCollName = 0, BOOL bDraw = FALSE, UINT16 nDefPage = 0); - + virtual AbstarctSwSelGlossaryDlg * CreateSwSelGlossaryDlg ( Window * pParent, const String &rShortName, int nResId ); //add for SwSelGlossaryDlg - virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ); //add for SwTableHeightDlg SwSortDlg + virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ); //add for SwTableHeightDlg SwSortDlg virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ); //add for SwSplitTblDlg virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg @@ -482,103 +482,103 @@ public: virtual SfxAbstractTabDialog* CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId ); //add for SwTableTabDlg virtual AbstractSwFldDlg * CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId ); //add for SwFldDlg - virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ); //add for SwFldEditDlg + virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ); //add for SwFldEditDlg virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg( Window* pParent, //add for SwRenameXNamedDlg STAR_REFERENCE( container::XNamed ) & xNamed, STAR_REFERENCE( container::XNameAccess ) & xNameAccess, int nResId ); virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg ( Window *pParent, int nResId ); //add for SwModalRedlineAcceptDlg - virtual VclAbstractDialog* CreateSwVclDialog( int nResId, + virtual VclAbstractDialog* CreateSwVclDialog( int nResId, Window* pParent, BOOL& rWithPrev ); //add for SwMergeTblDlg - virtual SfxAbstractTabDialog* CreateFrmTabDialog( int nResId, + virtual SfxAbstractTabDialog* CreateFrmTabDialog( int nResId, SfxViewFrame *pFrame, Window *pParent, const SfxItemSet& rCoreSet, - BOOL bNewFrm = TRUE, - USHORT nResType = DLG_FRM_STD, - BOOL bFmt = FALSE, - UINT16 nDefPage = 0, - const String* pFmtStr = 0); //add for SwFrmDlg - virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId, + BOOL bNewFrm = TRUE, + USHORT nResType = DLG_FRM_STD, + BOOL bFmt = FALSE, + UINT16 nDefPage = 0, + const String* pFmtStr = 0); //add for SwFrmDlg + virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId, Window* pParent, SfxStyleSheetBase& rBase, USHORT nRegion, - BOOL bColumn = FALSE, - SwWrtShell* pActShell = 0, - BOOL bNew = FALSE ); //add for SwTemplateDlg - virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId, - SfxViewFrame* pViewFrame, - SwGlossaryHdl* pGlosHdl, + BOOL bColumn = FALSE, + SwWrtShell* pActShell = 0, + BOOL bNew = FALSE ); //add for SwTemplateDlg + virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId, + SfxViewFrame* pViewFrame, + SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell); //add for SwGlossaryDlg - virtual AbstractFldInputDlg* CreateFldInputDlg( int nResId, + virtual AbstractFldInputDlg* CreateFldInputDlg( int nResId, Window *pParent, SwWrtShell &rSh, SwField* pField, BOOL bNextButton = FALSE ); //add for SwFldInputDlg - virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId, + virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId, Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE); //add for SwInsFootNoteDlg - virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId, + virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId, SwView& rView, BOOL bCol = FALSE ); //add for SwInsRowColDlg, SwLineNumberingDlg - virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId, + virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId, Window * pParent ); //add for SwInsertGrfRulerDlg - virtual AbstractInsTableDlg* CreateInsTableDlg( int nResId, + virtual AbstractInsTableDlg* CreateInsTableDlg( int nResId, SwView& rView ); //add for SwInsTableDlg - virtual AbstractJavaEditDialog* CreateJavaEditDialog( int nResId, + virtual AbstractJavaEditDialog* CreateJavaEditDialog( int nResId, Window* pParent, SwWrtShell* pWrtSh ); //add for SwJavaEditDialog - virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId, + virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId, Window* pParent, SwWrtShell& rSh, const String& rSourceName, const String& rTblName, sal_Int32 nCommandType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ); //add for SwMailMergeDlg - virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg( int nResId, + virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg( int nResId, Window* pParent ); //add for SwMailMergeCreateFromDlg - virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg( int nResId, + virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg( int nResId, Window* pParent ); //add for SwMailMergeFieldConnectionsDlg - virtual VclAbstractDialog* CreateMultiTOXMarkDlg( int nResId, + virtual VclAbstractDialog* CreateMultiTOXMarkDlg( int nResId, Window* pParent, SwTOXMgr &rTOXMgr ); //add for SwMultiTOXMarkDlg - virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId, + virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId, Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &); //add for SwSvxNumBulletTabDialog, SwOutlineTabDialog - virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( int nResId, + virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( int nResId, Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, USHORT nToxType = USHRT_MAX, BOOL bGlobal = FALSE); //add for SwMultiTOXTabDialog - virtual AbstractEditRegionDlg* CreateEditRegionDlg( int nResId, + virtual AbstractEditRegionDlg* CreateEditRegionDlg( int nResId, Window* pParent, SwWrtShell& rWrtSh ); //add for SwEditRegionDlg - virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( int nResId, + virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( int nResId, Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); //add for SwInsertSectionTabDialog - virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( int nResId, + virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( int nResId, SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo, sal_Bool bNew=sal_True); //add for SwIndexMarkFloatDlg - virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( int nResId, + virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( int nResId, SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo, sal_Bool bNew=sal_True); //add for SwAuthMarkFloatDlg - virtual VclAbstractDialog * CreateIndexMarkModalDlg( int nResId, + virtual VclAbstractDialog * CreateIndexMarkModalDlg( int nResId, Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ); //add for SwIndexMarkModalDlg virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem); //add for static func in SwGlossaryDlg - virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc( USHORT nId ); - virtual GlossarySetActGroup SetGlossaryActGroupFunc( USHORT nId ); + virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc( USHORT nId ); + virtual GlossarySetActGroup SetGlossaryActGroupFunc( USHORT nId ); // For TabPage - virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ); + virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ); - virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ); + virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ); }; struct SwDialogsResMgr { - static ResMgr* GetResMgr(); + static ResMgr* GetResMgr(); }; #endif diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx index 3957a233f5e2..5a2f03205e54 100644 --- a/sw/source/ui/dialog/swuiexp.cxx +++ b/sw/source/ui/dialog/swuiexp.cxx @@ -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/dialog/swwrtshitem.cxx b/sw/source/ui/dialog/swwrtshitem.cxx index f9015e3a0387..7c0ef68bd2a5 100644 --- a/sw/source/ui/dialog/swwrtshitem.cxx +++ b/sw/source/ui/dialog/swwrtshitem.cxx @@ -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 @@ -34,13 +34,13 @@ SwWrtShellItem::SwWrtShellItem( USHORT _nWhich, SwWrtShell* pSh ) { } -SwWrtShellItem::SwWrtShellItem( const SwWrtShellItem& rItem) : +SwWrtShellItem::SwWrtShellItem( const SwWrtShellItem& rItem) : SfxPoolItem( rItem.Which() ), pWrtSh( rItem.pWrtSh ) { } -int SwWrtShellItem::operator==( const SfxPoolItem& rItem) const +int SwWrtShellItem::operator==( const SfxPoolItem& rItem) const { return ((SwWrtShellItem&)rItem).pWrtSh == pWrtSh; } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index b4151f6d1462..440457f0b106 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -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 @@ -54,13 +54,13 @@ #include <IMark.hxx> #include <section.hxx> #include <docary.hxx> -#include <doc.hxx> // fuers SwSectionFmt-Array +#include <doc.hxx> // fuers SwSectionFmt-Array #include <basesh.hxx> #include <wdocsh.hxx> #include <view.hxx> #include <swmodule.hxx> #include <wrtsh.hxx> -#include <swundo.hxx> // fuer Undo-Ids +#include <swundo.hxx> // fuer Undo-Ids #include <column.hxx> #include <fmtfsize.hxx> #include <swunodef.hxx> @@ -142,7 +142,7 @@ void lcl_FillSubRegionList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pA ppMark != pMarkAccess->getMarksEnd(); ppMark++) { - const ::sw::mark::IMark* pBkmk = ppMark->get(); + const ::sw::mark::IMark* pBkmk = ppMark->get(); if( pBkmk->IsExpanded() ) rSubRegions.InsertEntry( pBkmk->GetName() ); } @@ -259,7 +259,7 @@ void SectRepr::SetFile( const String& rFile ) sNewFile += sOldFileName.GetToken( 1, sfx2::cTokenSeperator ); sNewFile += sfx2::cTokenSeperator; - sNewFile += sSub; + sNewFile += sSub; } m_SectionData.SetLinkFileName( sNewFile ); @@ -375,7 +375,7 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ) aProtectFL ( this, SW_RES( FL_PROTECT ) ), aProtectCB ( this, SW_RES( CB_PROTECT ) ), - aPasswdCB ( this, SW_RES( CB_PASSWD ) ), + aPasswdCB ( this, SW_RES( CB_PASSWD ) ), aPasswdPB ( this, SW_RES( PB_PASSWD ) ), aHideFL ( this, SW_RES( FL_HIDE ) ), @@ -390,8 +390,8 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ) aOK ( this, SW_RES( PB_OK ) ), aCancel ( this, SW_RES( PB_CANCEL ) ), - aOptionsPB ( this, SW_RES( PB_OPTIONS ) ), - aDismiss ( this, SW_RES( CB_DISMISS ) ), + aOptionsPB ( this, SW_RES( PB_OPTIONS ) ), + aDismiss ( this, SW_RES( CB_DISMISS ) ), aHelp ( this, SW_RES( PB_HELP ) ), aImageIL ( SW_RES(IL_BITMAPS)), @@ -407,22 +407,22 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ) bWeb = 0 != PTR_CAST( SwWebDocShell, rSh.GetView().GetDocShell() ); - aTree.SetSelectHdl ( LINK( this, SwEditRegionDlg, GetFirstEntryHdl)); - aTree.SetDeselectHdl ( LINK( this, SwEditRegionDlg, DeselectHdl)); - aCurName.SetModifyHdl ( LINK( this, SwEditRegionDlg, NameEditHdl)); + aTree.SetSelectHdl ( LINK( this, SwEditRegionDlg, GetFirstEntryHdl)); + aTree.SetDeselectHdl ( LINK( this, SwEditRegionDlg, DeselectHdl)); + aCurName.SetModifyHdl ( LINK( this, SwEditRegionDlg, NameEditHdl)); aConditionED.SetModifyHdl( LINK( this, SwEditRegionDlg, ConditionEditHdl)); - aOK.SetClickHdl ( LINK( this, SwEditRegionDlg, OkHdl)); - aPasswdCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangePasswdHdl)); + aOK.SetClickHdl ( LINK( this, SwEditRegionDlg, OkHdl)); + aPasswdCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangePasswdHdl)); aPasswdPB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangePasswdHdl)); - aHideCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeHideHdl)); + aHideCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeHideHdl)); // --> FME 2004-06-22 #114856# edit in readonly sections aEditInReadonlyCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeEditInReadonlyHdl)); // <-- aOptionsPB.Show(); - aOptionsPB.SetClickHdl ( LINK( this, SwEditRegionDlg, OptionsHdl)); - aProtectCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeProtectHdl)); - aDismiss.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeDismissHdl)); + aOptionsPB.SetClickHdl ( LINK( this, SwEditRegionDlg, OptionsHdl)); + aProtectCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeProtectHdl)); + aDismiss.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeDismissHdl)); aFileCB.SetClickHdl ( LINK( this, SwEditRegionDlg, UseFileHdl )); aFilePB.SetClickHdl ( LINK( this, SwEditRegionDlg, FileSearchHdl )); aFileNameED.SetModifyHdl( LINK( this, SwEditRegionDlg, FileNameHdl )); @@ -439,14 +439,14 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ) { aConditionFT .Hide(); aConditionED .Hide(); - aPasswdCB .Hide(); - aHideCB .Hide(); + aPasswdCB .Hide(); + aHideCB .Hide(); aDDECB .Hide(); aDDECommandFT .Hide(); } - aDDECB.SetClickHdl ( LINK( this, SwEditRegionDlg, DDEHdl )); + aDDECB.SetClickHdl ( LINK( this, SwEditRegionDlg, DDEHdl )); //Ermitteln der vorhandenen Bereiche pCurrSect = rSh.GetCurrSection(); @@ -633,7 +633,7 @@ void SwEditRegionDlg::SelectSection(const String& rSectionName) } } /*--------------------------------------------------------------------- - Beschreibung: Selektierte Eintrag in der TreeListBox wird im + Beschreibung: Selektierte Eintrag in der TreeListBox wird im Edit-Fenster angezeigt Bei Multiselektion werden einige Controls disabled ---------------------------------------------------------------------*/ @@ -642,12 +642,12 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) { bDontCheckPasswd = sal_True; SvLBoxEntry* pEntry=pBox->FirstSelected(); - aHideCB .Enable(TRUE); + aHideCB .Enable(TRUE); // --> FME 2004-06-22 #114856# edit in readonly sections aEditInReadonlyCB.Enable(TRUE); // <-- aProtectCB .Enable(TRUE); - aFileCB .Enable(TRUE); + aFileCB .Enable(TRUE); UNO_NMSPC::Sequence <sal_Int8> aCurPasswd; if( 1 < pBox->GetSelectionCount() ) { @@ -668,9 +668,9 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) bool bHidden = true; bool bProtect = true; String sCondition; - BOOL bFirst = TRUE; - BOOL bFileValid = TRUE; - BOOL bFile = TRUE; + BOOL bFirst = TRUE; + BOOL bFileValid = TRUE; + BOOL bFile = TRUE; BOOL bPasswdValid = TRUE; while( pEntry ) @@ -722,20 +722,20 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) aConditionED.SetText(sCondition); else { -// aConditionED.SetText(aEmptyStr); +// aConditionED.SetText(aEmptyStr); aConditionFT.Enable(FALSE); aConditionED.Enable(FALSE); } aFilePB.Enable(FALSE); - aFileNameFT .Enable(FALSE); - aFileNameED .Enable(FALSE); + aFileNameFT .Enable(FALSE); + aFileNameED .Enable(FALSE); aSubRegionFT.Enable(FALSE); aSubRegionED.Enable(FALSE); // aNameFT .Enable(FALSE); - aCurName .Enable(FALSE); - aOptionsPB .Enable(FALSE); - aDDECB .Enable(FALSE); + aCurName .Enable(FALSE); + aOptionsPB .Enable(FALSE); + aDDECB .Enable(FALSE); aDDECommandFT .Enable(FALSE); BOOL bPasswdEnabled = aProtectCB.GetState() == STATE_CHECK; aPasswdCB.Enable(bPasswdEnabled); @@ -754,8 +754,8 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) else if (pEntry ) { // aNameFT .Enable(TRUE); - aCurName .Enable(TRUE); - aOptionsPB .Enable(TRUE); + aCurName .Enable(TRUE); + aOptionsPB .Enable(TRUE); SectRepr* pRepr=(SectRepr*) pEntry->GetUserData(); SwSectionData const& rData( pRepr->GetSectionData() ); aConditionED.SetText(rData.GetCondition()); @@ -815,8 +815,8 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox ) { if( !pBox->GetSelectionCount() ) { - aHideCB .Enable(FALSE); - aProtectCB .Enable(FALSE); + aHideCB .Enable(FALSE); + aProtectCB .Enable(FALSE); // --> FME 2004-06-22 #114856# edit in readonly sections aEditInReadonlyCB.Enable(FALSE); // <-- @@ -824,15 +824,15 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox ) aPasswdCB .Enable(FALSE); aConditionFT .Enable(FALSE); aConditionED.Enable(FALSE); - aFileCB .Enable(FALSE); - aFilePB .Enable(FALSE); + aFileCB .Enable(FALSE); + aFilePB .Enable(FALSE); aFileNameFT .Enable(FALSE); aFileNameED .Enable(FALSE); aSubRegionFT .Enable(FALSE); aSubRegionED .Enable(FALSE); // aNameFT .Enable(FALSE); - aCurName .Enable(FALSE); - aDDECB .Enable(FALSE); + aCurName .Enable(FALSE); + aDDECB .Enable(FALSE); aDDECommandFT .Enable(FALSE); UseFileHdl(&aFileCB); @@ -842,7 +842,7 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox ) } /*--------------------------------------------------------------------- - Beschreibung: Im OkHdl werden die veraenderten Einstellungen + Beschreibung: Im OkHdl werden die veraenderten Einstellungen uebernommen und aufgehobene Bereiche geloescht ---------------------------------------------------------------------*/ @@ -851,10 +851,10 @@ IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG ) // JP 13.03.96: // temp. Array weil sich waehrend des aendern eines Bereiches die // Position innerhalb des "Core-Arrays" verschieben kann: - // - bei gelinkten Bereichen, wenn sie weitere SubBereiche haben oder - // neu erhalten. + // - bei gelinkten Bereichen, wenn sie weitere SubBereiche haben oder + // neu erhalten. // JP 30.05.97: StartUndo darf natuerlich auch erst nach dem Kopieren - // der Formate erfolgen (ClearRedo!) + // der Formate erfolgen (ClearRedo!) const SwSectionFmts& rDocFmts = rSh.GetDoc()->GetSections(); SwSectionFmts aOrigArray( 0, 5 ); @@ -917,7 +917,7 @@ IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG ) aOrigArray.Remove( 0, aOrigArray.Count() ); //JP 21.05.97: EndDialog muss vor Ende der EndAction gerufen werden, - // sonst kann es ScrollFehler geben. + // sonst kann es ScrollFehler geben. EndDialog(RET_OK); rSh.EndUndo(); @@ -1058,19 +1058,19 @@ IMPL_LINK( SwEditRegionDlg, ChangeDismissHdl, CheckBox *, EMPTYARG ) { aConditionFT. Enable(FALSE); aConditionED. Enable(FALSE); - aDismiss. Enable(FALSE); - aCurName. Enable(FALSE); - aProtectCB. Enable(FALSE); - aPasswdCB. Enable(FALSE); - aHideCB. Enable(FALSE); + aDismiss. Enable(FALSE); + aCurName. Enable(FALSE); + aProtectCB. Enable(FALSE); + aPasswdCB. Enable(FALSE); + aHideCB. Enable(FALSE); // --> FME 2004-06-22 #114856# edit in readonly sections aEditInReadonlyCB.Enable(FALSE); aEditInReadonlyCB.SetState(STATE_NOCHECK); // <-- aProtectCB. SetState(STATE_NOCHECK); - aPasswdCB. Check(FALSE); - aHideCB. SetState(STATE_NOCHECK); - aFileCB. Check(FALSE); + aPasswdCB. Check(FALSE); + aHideCB. SetState(STATE_NOCHECK); + aFileCB. Check(FALSE); //sonst liegt der Focus auf dem HelpButton aOK.GrabFocus(); UseFileHdl(&aFileCB); @@ -1128,7 +1128,7 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) { aDDECB.Check(FALSE); DDEHdl(&aDDECB); -// aFileNameED.SetText(aEmptyStr); +// aFileNameED.SetText(aEmptyStr); aSubRegionED.SetText(aEmptyStr); } } @@ -1272,7 +1272,7 @@ IMPL_LINK( SwEditRegionDlg, OptionsHdl, PushButton *, EMPTYARG ) } /*--------------------------------------------------------------------- - Beschreibung: Uebernahme des Dateinamen oder + Beschreibung: Uebernahme des Dateinamen oder des verknuepften Bereichs ---------------------------------------------------------------------*/ @@ -1433,7 +1433,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) return 0; } /*--------------------------------------------------------------------- - Beschreibung: Aktueller Bereichsname wird sofort beim editieren + Beschreibung: Aktueller Bereichsname wird sofort beim editieren in die TreeListBox eingetragen, mit leerem String kein Ok() ---------------------------------------------------------------------*/ @@ -1446,7 +1446,7 @@ IMPL_LINK( SwEditRegionDlg, NameEditHdl, Edit *, EMPTYARG ) DBG_ASSERT(pEntry,"kein Entry gefunden"); if (pEntry) { - String aName = aCurName.GetText(); + String aName = aCurName.GetText(); aTree.SetEntryText(pEntry,aName); SectReprPtr pRepr = (SectReprPtr) pEntry->GetUserData(); pRepr->GetSectionData().SetSectionName(aName); @@ -1515,8 +1515,8 @@ IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent *, pEvent ) { if( !bSubRegionsFilled && pEvent && pEvent->GetId() == VCLEVENT_DROPDOWN_PRE_OPEN ) { - //if necessary fill the names bookmarks/sections/tables now - + //if necessary fill the names bookmarks/sections/tables now + rtl::OUString sFileName = aFileNameED.GetText(); if(sFileName.getLength()) { @@ -1531,11 +1531,11 @@ IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent *, pEvent ) SfxMedium aMedium( sFileName, STREAM_STD_READ ); sFileName = aMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); ::lcl_ReadSections( aMedium, aSubRegionED ); - } + } else lcl_FillSubRegionList( rSh, aSubRegionED, 0 ); bSubRegionsFilled = true; - } + } return 0; } @@ -1549,7 +1549,7 @@ Image SwEditRegionDlg::BuildBitmap(BOOL bProtect,BOOL bHidden, BOOL bHighContras } /*-------------------------------------------------------------------- - Beschreibung: Hilfsfunktion - Bereichsnamen aus dem Medium lesen + Beschreibung: Hilfsfunktion - Bereichsnamen aus dem Medium lesen --------------------------------------------------------------------*/ static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox ) @@ -1585,7 +1585,7 @@ SwInsertSectionTabDialog::SwInsertSectionTabDialog( SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); AddTabPage(TP_INSERT_SECTION, SwInsertSectionTabPage::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_SECTION_FTNENDNOTES, SwSectionFtnEndTabPage::Create, 0); AddTabPage(TP_SECTION_INDENTS, SwSectionIndentTabPage::Create, 0); @@ -1643,7 +1643,7 @@ void SwInsertSectionTabDialog::SetSectionData(SwSectionData const& rSect) /* -----------------21.05.99 13:10------------------- * * --------------------------------------------------*/ -short SwInsertSectionTabDialog::Ok() +short SwInsertSectionTabDialog::Ok() { short nRet = SfxTabDialog::Ok(); DBG_ASSERT(m_pSectionData.get(), @@ -1722,7 +1722,7 @@ SwInsertSectionTabPage::SwInsertSectionTabPage( { FreeResource(); - aProtectCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeProtectHdl)); + aProtectCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeProtectHdl)); aPasswdCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangePasswdHdl)); aPasswdPB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangePasswdHdl)); aHideCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeHideHdl)); @@ -1731,8 +1731,8 @@ SwInsertSectionTabPage::SwInsertSectionTabPage( // <-- aFileCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, UseFileHdl )); aFilePB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, FileSearchHdl )); - aCurName.SetModifyHdl ( LINK( this, SwInsertSectionTabPage, NameEditHdl)); - aDDECB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, DDEHdl )); + aCurName.SetModifyHdl ( LINK( this, SwInsertSectionTabPage, NameEditHdl)); + aDDECB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, DDEHdl )); ChangeProtectHdl(&aProtectCB); aSubRegionED.EnableAutocomplete( sal_True, sal_True ); } @@ -1744,14 +1744,14 @@ SwInsertSectionTabPage::~SwInsertSectionTabPage() delete m_pDocInserter; } -void SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh) +void SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh) { m_pWrtSh = &rSh; BOOL bWeb = 0 != PTR_CAST(SwWebDocShell, m_pWrtSh->GetView().GetDocShell()); if(bWeb) { - aHideCB .Hide(); + aHideCB .Hide(); aConditionED .Hide(); aConditionFT .Hide(); aDDECB .Hide(); @@ -1852,7 +1852,7 @@ void SwInsertSectionTabPage::Reset( const SfxItemSet& ) /* -----------------21.05.99 11:22------------------- * * --------------------------------------------------*/ -SfxTabPage* SwInsertSectionTabPage::Create( Window* pParent, +SfxTabPage* SwInsertSectionTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwInsertSectionTabPage(pParent, rAttrSet); @@ -1926,7 +1926,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton ) IMPL_LINK_INLINE_START( SwInsertSectionTabPage, NameEditHdl, Edit *, EMPTYARG ) { - String aName=aCurName.GetText(); + String aName=aCurName.GetText(); GetTabDialog()->GetOKButton().Enable(aName.Len() && aCurName.GetEntryPos( aName ) == USHRT_MAX); return 0; } @@ -1955,7 +1955,7 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox ) aDDECB.Enable(bFile); if( bFile ) { -// aFileNameED.SetText( aFileName ); +// aFileNameED.SetText( aFileName ); aFileNameED.GrabFocus(); aProtectCB.Check( TRUE ); } @@ -1963,7 +1963,7 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox ) { aDDECB.Check(FALSE); DDEHdl(&aDDECB); -// aFileNameED.SetText(aEmptyStr); +// aFileNameED.SetText(aEmptyStr); } return 0; } @@ -2040,14 +2040,14 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil // -------------------------------------------------------------- // Numerierungsformat Umsetzung: -// ListBox - Format - Enum-Wert -// 0 - A, B, C, ... - 0 -// 1 - a, b, c, ... - 1 -// 2 - I, II, III, ... - 2 -// 3 - i, ii, iii, ... - 3 -// 4 - 1, 2, 3, ... - 4 -// 5 - A, .., AA, .., - 9 -// 6 - a, .., aa, .., - 10 +// ListBox - Format - Enum-Wert +// 0 - A, B, C, ... - 0 +// 1 - a, b, c, ... - 1 +// 2 - I, II, III, ... - 2 +// 3 - i, ii, iii, ... - 3 +// 4 - 1, 2, 3, ... - 4 +// 5 - A, .., AA, .., - 9 +// 6 - a, .., aa, .., - 10 inline USHORT GetNumPos( USHORT n ) { @@ -2073,8 +2073,8 @@ SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( Window *pParent, aFtnPrefixFT ( this, SW_RES( FT_FTN_PREFIX )), aFtnPrefixED ( this, SW_RES( ED_FTN_PREFIX )), aFtnNumViewBox ( this, SW_RES( LB_FTN_NUMVIEW ), INSERT_NUM_EXTENDED_TYPES), - aFtnSuffixFT ( this, SW_RES( FT_FTN_SUFFIX )), - aFtnSuffixED ( this, SW_RES( ED_FTN_SUFFIX )), + aFtnSuffixFT ( this, SW_RES( FT_FTN_SUFFIX )), + aFtnSuffixED ( this, SW_RES( ED_FTN_SUFFIX )), aEndFL ( this, SW_RES( FL_END ) ), aEndNtAtTextEndCB ( this, SW_RES( CB_END_AT_TXTEND )), @@ -2087,8 +2087,8 @@ SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( Window *pParent, aEndPrefixFT ( this, SW_RES( FT_END_PREFIX )), aEndPrefixED ( this, SW_RES( ED_END_PREFIX )), aEndNumViewBox ( this, SW_RES( LB_END_NUMVIEW ), INSERT_NUM_EXTENDED_TYPES), - aEndSuffixFT ( this, SW_RES( FT_END_SUFFIX )), - aEndSuffixED ( this, SW_RES( ED_END_SUFFIX )) + aEndSuffixFT ( this, SW_RES( FT_END_SUFFIX )), + aEndSuffixED ( this, SW_RES( ED_END_SUFFIX )) { FreeResource(); @@ -2244,7 +2244,7 @@ void SwSectionFtnEndTabPage::Reset( const SfxItemSet& rSet ) RES_END_AT_TXTEND, FALSE )); } -SfxTabPage* SwSectionFtnEndTabPage::Create( Window* pParent, +SfxTabPage* SwSectionFtnEndTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwSectionFtnEndTabPage(pParent, rAttrSet); @@ -2252,7 +2252,7 @@ SfxTabPage* SwSectionFtnEndTabPage::Create( Window* pParent, IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox *, pBox ) { -// pBox->EnableTriState( FALSE ); +// pBox->EnableTriState( FALSE ); BOOL bFoot = &aFtnNtAtTextEndCB == pBox || &aFtnNtNumCB == pBox || &aFtnNtNumFmtCB == pBox ; @@ -2318,7 +2318,7 @@ SwSectionPropertyTabDialog::SwSectionPropertyTabDialog( FreeResource(); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); - AddTabPage(TP_COLUMN, SwColumnPage::Create, 0); + AddTabPage(TP_COLUMN, SwColumnPage::Create, 0); AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); AddTabPage(TP_SECTION_FTNENDNOTES, SwSectionFtnEndTabPage::Create, 0); AddTabPage(TP_SECTION_INDENTS, SwSectionIndentTabPage::Create, 0); diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index 4af058eeae1f..51e928eff73d 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -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/dialog/wordcountdialog.hrc b/sw/source/ui/dialog/wordcountdialog.hrc index 00749412ac97..ccb6391cf950 100644 --- a/sw/source/ui/dialog/wordcountdialog.hrc +++ b/sw/source/ui/dialog/wordcountdialog.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 diff --git a/sw/source/ui/dialog/wordcountdialog.src b/sw/source/ui/dialog/wordcountdialog.src index 454a6c050b34..d2d4676b35ef 100644 --- a/sw/source/ui/dialog/wordcountdialog.src +++ b/sw/source/ui/dialog/wordcountdialog.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/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src index f92ea43681d8..2afd19c92bd4 100755 --- a/sw/source/ui/dochdl/dochdl.src +++ b/sw/source/ui/dochdl/dochdl.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/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index cc789d6e4498..c19fb0bd9da7 100755 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -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 @@ -58,9 +58,9 @@ #include <gloshdl.hxx> #include <glosdoc.hxx> #include <shellio.hxx> -#include <swundo.hxx> // fuer Undo-Ids +#include <swundo.hxx> // fuer Undo-Ids #include <expfld.hxx> -#include <initui.hxx> // fuer ::GetGlossaries() +#include <initui.hxx> // fuer ::GetGlossaries() #include <gloslst.hxx> #include <swdtflvr.hxx> #ifndef _DOCSH_HXX @@ -102,7 +102,7 @@ SV_DECL_PTRARR_DEL( TextBlockInfoArr, TextBlockInfo_ImplPtr, 0, 4 ) SV_IMPL_PTRARR( TextBlockInfoArr, TextBlockInfo_ImplPtr ) SV_IMPL_REF( SwDocShell ) /*------------------------------------------------------------------------ - Beschreibung: Dialog fuer Bearbeiten Vorlagen + Beschreibung: Dialog fuer Bearbeiten Vorlagen ------------------------------------------------------------------------*/ @@ -133,7 +133,7 @@ void SwGlossaryHdl::GlossaryDlg() } /*------------------------------------------------------------------------ - Beschreibung: Setzen der aktuellen Gruppe; falls aus dem Dialog + Beschreibung: Setzen der aktuellen Gruppe; falls aus dem Dialog gerufen, wird die Gruppe temp. erzeugt fuer einen schnelleren Zugriff ------------------------------------------------------------------------*/ @@ -172,11 +172,11 @@ void SwGlossaryHdl::SetCurGroup(const String &rGrp, BOOL bApi, BOOL bAlwaysCreat sGroup.GetToken(0, GLOS_DELIM) == sCurBase) bPathEqual = TRUE; } -// const String aMac_Tmp(pCurGrp->GetName()); +// const String aMac_Tmp(pCurGrp->GetName()); // Beim Pfadwechsel kann man sich auf den Namen nicht verlassen if(!bAlwaysCreateNew && bPathEqual -// aMac_Tmp == sGroup +// aMac_Tmp == sGroup ) return; } @@ -325,7 +325,7 @@ BOOL SwGlossaryHdl::DelGroup(const String &rGrpName) } /*------------------------------------------------------------------------ - Beschreibung: Anzahl Textbausteine erfragen + Beschreibung: Anzahl Textbausteine erfragen ------------------------------------------------------------------------*/ @@ -347,7 +347,7 @@ String SwGlossaryHdl::GetGlossaryName( USHORT nId ) /* -----------------30.11.98 13:18------------------- * * --------------------------------------------------*/ -String SwGlossaryHdl::GetGlossaryShortName(USHORT nId) +String SwGlossaryHdl::GetGlossaryShortName(USHORT nId) { ASSERT(nId < GetGlossaryCnt(), Textbausteinarray ueberindiziert.); return pCurGrp->GetShortName( nId ); @@ -355,7 +355,7 @@ String SwGlossaryHdl::GetGlossaryShortName(USHORT nId) /*------------------------------------------------------------------------ - Beschreibung: Kurzname erfragen + Beschreibung: Kurzname erfragen ------------------------------------------------------------------------*/ @@ -376,7 +376,7 @@ String SwGlossaryHdl::GetGlossaryShortName(const String &rName) } /*------------------------------------------------------------------------ - Beschreibung: Kuerzel fuer Textbaustein bereits verwendet? + Beschreibung: Kuerzel fuer Textbaustein bereits verwendet? ------------------------------------------------------------------------*/ @@ -413,7 +413,7 @@ BOOL SwGlossaryHdl::ConvertToNew(SwTextBlocks& /*rOld*/) } /*------------------------------------------------------------------------ - Beschreibung: Erzeugen eines Textbausteines + Beschreibung: Erzeugen eines Textbausteines ------------------------------------------------------------------------*/ BOOL SwGlossaryHdl::NewGlossary(const String& rName, const String& rShortName, @@ -449,7 +449,7 @@ BOOL SwGlossaryHdl::NewGlossary(const String& rName, const String& rShortName, return BOOL( nSuccess != (USHORT) -1 ); } /*------------------------------------------------------------------------ - Beschreibung: Loeschen eines Textbausteines + Beschreibung: Loeschen eines Textbausteines ------------------------------------------------------------------------*/ @@ -519,7 +519,7 @@ BOOL SwGlossaryHdl::Expand( const String& rShortName, String aShortName( rShortName ); BOOL bCancel = FALSE; // search for text block - //#b6633427# - don't prefer current group depending on configuration setting + //#b6633427# - don't prefer current group depending on configuration setting const SvxAutoCorrCfg* pCfg = SvxAutoCorrCfg::Get(); USHORT nFound = !pCfg->IsSearchInAllCategories() ? pGlossary->GetIndex( aShortName ) : -1; // if not found then search in all groups @@ -700,7 +700,7 @@ BOOL SwGlossaryHdl::InsertGlossary(const String &rName) } /*------------------------------------------------------------------------ - Beschreibung: Macro setzen / erfragen + Beschreibung: Macro setzen / erfragen ------------------------------------------------------------------------*/ @@ -755,7 +755,7 @@ void SwGlossaryHdl::GetMacros( const String &rShortName, /*------------------------------------------------------------------------ - Beschreibung: ctor, dtor + Beschreibung: ctor, dtor ------------------------------------------------------------------------*/ @@ -776,7 +776,7 @@ SwGlossaryHdl::~SwGlossaryHdl() } /*------------------------------------------------------------------------ - Beschreibung: Umbenennen eines Textbausteines + Beschreibung: Umbenennen eines Textbausteines ------------------------------------------------------------------------*/ diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx index 79c18bb96e54..1c0598199183 100644 --- a/sw/source/ui/dochdl/selglos.cxx +++ b/sw/source/ui/dochdl/selglos.cxx @@ -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/dochdl/selglos.hrc b/sw/source/ui/dochdl/selglos.hrc index 175ee09abe1b..f42c5f263370 100644 --- a/sw/source/ui/dochdl/selglos.hrc +++ b/sw/source/ui/dochdl/selglos.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,8 +24,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define BT_OK 100 -#define BT_CANCEL 101 -#define BT_HELP 102 -#define LB_GLOS 1 +#define BT_OK 100 +#define BT_CANCEL 101 +#define BT_HELP 102 +#define LB_GLOS 1 #define FL_GLOS 2 diff --git a/sw/source/ui/dochdl/selglos.src b/sw/source/ui/dochdl/selglos.src index 1464b77bd7fc..81162518c1eb 100644 --- a/sw/source/ui/dochdl/selglos.src +++ b/sw/source/ui/dochdl/selglos.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/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 8220c7ee2c8d..211e5d0f73b0 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -101,8 +101,8 @@ #include <view.hxx> #include <docsh.hxx> #include <wdocsh.hxx> -#include <fldbas.hxx> //DDE -#include <swundo.hxx> // fuer Undo-Ids +#include <fldbas.hxx> //DDE +#include <swundo.hxx> // fuer Undo-Ids #include <pam.hxx> #include <ndole.hxx> #include <swwait.hxx> @@ -143,14 +143,14 @@ extern BOOL bDDINetAttr; extern BOOL bExecuteDrag; -#define OLESIZE 11905 - 2 * lMinBorder, 6 * MM50 +#define OLESIZE 11905 - 2 * lMinBorder, 6 * MM50 -#define SWTRANSFER_OBJECTTYPE_DRAWMODEL 0x00000001 +#define SWTRANSFER_OBJECTTYPE_DRAWMODEL 0x00000001 #define SWTRANSFER_OBJECTTYPE_HTML 0x00000002 -#define SWTRANSFER_OBJECTTYPE_RTF 0x00000004 -#define SWTRANSFER_OBJECTTYPE_STRING 0x00000008 -#define SWTRANSFER_OBJECTTYPE_SWOLE 0x00000010 -#define SWTRANSFER_OBJECTTYPE_DDE 0x00000020 +#define SWTRANSFER_OBJECTTYPE_RTF 0x00000004 +#define SWTRANSFER_OBJECTTYPE_STRING 0x00000008 +#define SWTRANSFER_OBJECTTYPE_SWOLE 0x00000010 +#define SWTRANSFER_OBJECTTYPE_DDE 0x00000020 #define SWTRANSFER_GRAPHIC_INSERTED 0x00000040 @@ -161,7 +161,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::datatransfer; using namespace nsTransferBufferType; -#define DDE_TXT_ENCODING gsl_getSystemTextEncoding() +#define DDE_TXT_ENCODING gsl_getSystemTextEncoding() //--------------------------------------------- // this struct conforms to the Microsoft @@ -288,7 +288,7 @@ SwTransferable::~SwTransferable() delete pClpDocFac; //JP 22.04.95: erst schliessen, dann kann die Ref. auch gecleared werden, - // so das die DocShell auch tatsaechlich geloescht wird! + // so das die DocShell auch tatsaechlich geloescht wird! if( aDocShellRef.Is() ) { SfxObjectShell * pObj = aDocShellRef; @@ -419,7 +419,7 @@ void SwTransferable::RemoveDDELinkFormat( const Window& rWin ) sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor ) { - sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor ); + sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor ); // we can only fullfil the request if // 1) we have data for this format @@ -455,7 +455,7 @@ sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor ) SwDoc *const pTmpDoc = lcl_GetDoc(*pClpDocFac); pTmpDoc->SetRefForDocShell( boost::addressof(aDocShellRef) ); - pTmpDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen + pTmpDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen pWrtShell->Copy( pTmpDoc ); // es wurde in der CORE eine neu angelegt (OLE-Objekte kopiert!) @@ -496,7 +496,7 @@ sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor ) } } - sal_Bool bOK = sal_False; + sal_Bool bOK = sal_False; if( TRNSFR_OLE == eBufferType ) { //TODO/MBA: testing - is this the "single OLE object" case?! @@ -603,7 +603,7 @@ sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor ) break; case SOT_FORMATSTR_ID_EMBED_SOURCE: -// default: +// default: if( !aDocShellRef.Is() ) { SwDoc *const pDoc = lcl_GetDoc(*pClpDocFac); @@ -760,7 +760,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream, SwWriter aWrt( *xStream, *pDoc ); if( !IsError( aWrt.Write( xWrt )) ) { - *xStream << '\0'; // terminate with a zero + *xStream << '\0'; // terminate with a zero xStream->Commit(); bRet = sal_True; } @@ -870,7 +870,7 @@ int SwTransferable::PrepareForCopy( BOOL bIsCut ) SwDoc *const pTmpDoc = lcl_GetDoc(*pClpDocFac); pTmpDoc->SetRefForDocShell( boost::addressof(aDocShellRef) ); - pTmpDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen + pTmpDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen pWrtShell->Copy( pTmpDoc ); { @@ -1053,7 +1053,7 @@ int SwTransferable::CopyGlossary( SwTextBlocks& rGlossary, SwPaM aPam( *pCNd ); pCDoc->SetRefForDocShell( boost::addressof(aDocShellRef) ); - pCDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen + pCDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen pCDoc->InsertGlossary( rGlossary, rStr, aPam, 0 ); @@ -1101,7 +1101,7 @@ BOOL SwTransferable::IsPaste( const SwWrtShell& rSh, bool bIsPaste = ( GetSwTransferable( rData ) != NULL ); // if it's not our own data, we need to have a closer look: - if( ! bIsPaste ) + if( ! bIsPaste ) { // determine the proper paste action, and return true if we find one uno::Reference<XTransferable> xTransferable( rData.GetXTransferable() ); @@ -1120,7 +1120,7 @@ BOOL SwTransferable::IsPaste( const SwWrtShell& rSh, USHORT nAction = SotExchange::GetExchangeAction( rData.GetDataFlavorExVector(), nDestination, - nSourceOptions, /* ?? */ + nSourceOptions, /* ?? */ EXCHG_IN_ACTION_DEFAULT, /* ?? */ nFormat, nEventAction, 0, lcl_getTransferPointer ( xTransferable ) ); @@ -1194,7 +1194,7 @@ int SwTransferable::PasteData( TransferableDataHelper& rData, int nRet = 0; bool bCallAutoCaption = false; - + if( pPt ) { // external Drop @@ -1232,7 +1232,7 @@ int SwTransferable::PasteData( TransferableDataHelper& rData, // - nicht bei Tabellen-Selektion // - nicht bei ReRead einer Grafik/DDEDaten // - nicht bei D&D, fuer die richtige Selektion wurde im - // Drop-Handler gesorgt + // Drop-Handler gesorgt BOOL bDelSel = FALSE; switch( nDestination ) { @@ -1267,7 +1267,7 @@ int SwTransferable::PasteData( TransferableDataHelper& rData, nRet = pTrans->PrivateDrop( rSh, *pPt, DND_ACTION_MOVE == nDropAction, bPasteSelection ); } - else if( !pPt && pTunneledTrans && + else if( !pPt && pTunneledTrans && EXCHG_OUT_ACTION_INSERT_PRIVATE == nAction ) { // then internal paste @@ -1595,15 +1595,15 @@ USHORT SwTransferable::GetSotDestination( const SwWrtShell& rSh, else nRet = EXCHG_DEST_DOC_TEXTFRAME; break; - case OBJCNT_OLE: nRet = EXCHG_DEST_DOC_OLEOBJ; break; + case OBJCNT_OLE: nRet = EXCHG_DEST_DOC_OLEOBJ; break; - case OBJCNT_CONTROL: /* no Action avail */ - case OBJCNT_SIMPLE: nRet = EXCHG_DEST_DOC_DRAWOBJ; break; - case OBJCNT_URLBUTTON: nRet = EXCHG_DEST_DOC_URLBUTTON; break; - case OBJCNT_GROUPOBJ: nRet = EXCHG_DEST_DOC_GROUPOBJ; break; + case OBJCNT_CONTROL: /* no Action avail */ + case OBJCNT_SIMPLE: nRet = EXCHG_DEST_DOC_DRAWOBJ; break; + case OBJCNT_URLBUTTON: nRet = EXCHG_DEST_DOC_URLBUTTON; break; + case OBJCNT_GROUPOBJ: nRet = EXCHG_DEST_DOC_GROUPOBJ; break; // was mmchen wir bei Mehrfachselektion??? -// case OBJCNT_DONTCARE: +// case OBJCNT_DONTCARE: default: { /* @@ -2085,7 +2085,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData, { ASSERT( !&rWrtShell, "DDE Data not found." ); return 0; - } //sinnvollen Fehler melden!! + } //sinnvollen Fehler melden!! rtl_TextEncoding eEncoding = DDE_TXT_ENCODING; xStrm->ReadCString( aApp, eEncoding ); @@ -2167,7 +2167,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData, String aExpand; if( rData.GetString( FORMAT_STRING, aExpand )) { - do { // middle checked loop + do { // middle checked loop // Wenn die Daten von einer Tabellenkalkulation kommen // fuegen wir eine DDE-Tabelle ein @@ -2208,7 +2208,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData, aSect.SetProtectFlag(true); rWrtShell.InsertSection( aSect ); - pDDETyp = 0; // FeldTypen wieder entfernen + pDDETyp = 0; // FeldTypen wieder entfernen } else { @@ -2220,7 +2220,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData, } while( FALSE ); } else - pDDETyp = 0; // FeldTypen wieder entfernen + pDDETyp = 0; // FeldTypen wieder entfernen if( !pDDETyp && !bDoublePaste ) { @@ -2281,7 +2281,7 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, case SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR: if( 0 != ( nRet = rData.GetINetBookmark( nFmt, aBkmk ) )) { -/* if( SW_PASTESDR_SETATTR != nAction ) +/* if( SW_PASTESDR_SETATTR != nAction ) { INetURLObject aURL( aBkmk.GetURL() ); bCheckForGrf = INET_PROT_FILE == aURL.GetProtocol(); @@ -2635,14 +2635,14 @@ int SwTransferable::_PasteDBData( TransferableDataHelper& rData, } else if( nWh ) { - SfxUsrAnyItem* pConnectionItem = 0; - SfxUsrAnyItem* pCursorItem = 0; - SfxUsrAnyItem* pColumnItem = 0; - SfxUsrAnyItem* pSourceItem = 0; - SfxUsrAnyItem* pCommandItem = 0; + SfxUsrAnyItem* pConnectionItem = 0; + SfxUsrAnyItem* pCursorItem = 0; + SfxUsrAnyItem* pColumnItem = 0; + SfxUsrAnyItem* pSourceItem = 0; + SfxUsrAnyItem* pCommandItem = 0; SfxUsrAnyItem* pCommandTypeItem = 0; - SfxUsrAnyItem* pColumnNameItem = 0; - SfxUsrAnyItem* pSelectionItem = 0; + SfxUsrAnyItem* pColumnNameItem = 0; + SfxUsrAnyItem* pSelectionItem = 0; BOOL bDataAvailable = TRUE; ODataAccessDescriptor aDesc; @@ -2816,7 +2816,7 @@ int SwTransferable::PasteFormat( SwWrtShell& rSh, nAction = SotExchange::GetExchangeAction( rData.GetDataFlavorExVector(), nDestination, - nSourceOptions, /* ?? */ + nSourceOptions, /* ?? */ EXCHG_IN_ACTION_DEFAULT, /* ?? */ nFormat, nEventAction, nFormat, lcl_getTransferPointer ( xTransferable ) ); @@ -2956,7 +2956,7 @@ void SwTransferable::FillClipFmtItem( const SwWrtShell& rSh, SvxClipboardFmtItem & rToFill ) { USHORT nDest = SwTransferable::GetSotDestination( rSh ); - + SwTransferable *pClipboard = GetSwTransferable( rData ); if( pClipboard ) { @@ -3168,7 +3168,7 @@ void SwTransferable::StartDrag( Window* pWin, const Point& rPos ) void SwTransferable::DragFinished( sal_Int8 nAction ) { //Und noch die letzten Nacharbeiten damit alle Stati stimmen. - if( DND_ACTION_MOVE == nAction ) + if( DND_ACTION_MOVE == nAction ) { if( bCleanUp ) { @@ -3205,14 +3205,14 @@ void SwTransferable::DragFinished( sal_Int8 nAction ) pWrtShell->HideCrsr(); else pWrtShell->ShowCrsr(); -//!! else if( DND_ACTION_NONE != nAction ) -//!! pWrtShell->ShowCrsr(); -//!! else -//!! { -//!! //Muss wohl sein weil gescrollt wurde und ?...? -//!! pWrtShell->StartAction(); -//!! pWrtShell->EndAction(); -//!! } +//!! else if( DND_ACTION_NONE != nAction ) +//!! pWrtShell->ShowCrsr(); +//!! else +//!! { +//!! //Muss wohl sein weil gescrollt wurde und ?...? +//!! pWrtShell->StartAction(); +//!! pWrtShell->EndAction(); +//!! } ((SwViewOption *)pWrtShell->GetViewOptions())->SetIdle( bOldIdle ); } @@ -3296,7 +3296,7 @@ int SwTransferable::PrivatePaste( SwWrtShell& rShell ) int SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, BOOL bMove, BOOL bIsXSelection ) { - int cWord = 0; + int cWord = 0; BOOL bInWrd = FALSE; BOOL bEndWrd = FALSE; BOOL bSttWrd = FALSE; @@ -3415,7 +3415,7 @@ int SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, rSh.GoNextCrsr(); } - bInWrd = rSh.IsInWrd(); + bInWrd = rSh.IsInWrd(); bEndWrd = rSh.IsEndWrd(); bSttWrd = !bEndWrd && rSh.IsSttWrd(); bSttPara= rSh.IsSttPara(); @@ -3616,7 +3616,7 @@ sal_Int64 SwTransferable::getSomething( const Sequence< sal_Int8 >& rId ) throw( SwTransferable* SwTransferable::GetSwTransferable( const TransferableDataHelper& rData ) { SwTransferable* pSwTransferable = NULL; - + uno::Reference<XUnoTunnel> xTunnel( rData.GetTransferable(), UNO_QUERY ); if ( xTunnel.is() ) { @@ -3624,9 +3624,9 @@ SwTransferable* SwTransferable::GetSwTransferable( const TransferableDataHelper& if ( nHandle ) pSwTransferable = (SwTransferable*) (sal_IntPtr) nHandle; } - + return pSwTransferable; - + } /* */ @@ -3787,9 +3787,9 @@ BOOL SwTrnsfrDdeLink::WriteData( SvStream& rStrm ) void SwTrnsfrDdeLink::Disconnect( BOOL bRemoveDataAdvise ) { //JP 29.01.96 Bug 24432: - // kein DataChanged mehr entgegen nehmen, wenn man - // sich schon im Disconnet befindet! - // (DTOR vom Bookmark verschickt einen DataChanged!) + // kein DataChanged mehr entgegen nehmen, wenn man + // sich schon im Disconnet befindet! + // (DTOR vom Bookmark verschickt einen DataChanged!) BOOL bOldDisconnect = bInDisconnect; bInDisconnect = TRUE; @@ -3842,11 +3842,11 @@ BOOL SwTrnsfrDdeLink::FindDocShell() SfxObjectShell* pTmpSh = SfxObjectShell::GetFirst( &aType ); while( pTmpSh ) { - if( pTmpSh == pDocShell ) // die wollen wir haben + if( pTmpSh == pDocShell ) // die wollen wir haben { if( pDocShell->GetDoc() ) return TRUE; - break; // das Doc ist nicht mehr vorhanden, also raus! + break; // das Doc ist nicht mehr vorhanden, also raus! } pTmpSh = SfxObjectShell::GetNext( *pTmpSh, &aType ); } diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx index 645d4773626a..35067b29474b 100644 --- a/sw/source/ui/docvw/PostItMgr.cxx +++ b/sw/source/ui/docvw/PostItMgr.cxx @@ -91,12 +91,12 @@ // distance between Anchor Y and initial note position #define POSTIT_INITIAL_ANCHOR_DISTANCE 20 //distance between two postits -#define POSTIT_SPACE_BETWEEN 8 -#define POSTIT_MINIMUMSIZE_WITH_META 60 -#define POSTIT_SCROLL_SIDEBAR_HEIGHT 20 +#define POSTIT_SPACE_BETWEEN 8 +#define POSTIT_MINIMUMSIZE_WITH_META 60 +#define POSTIT_SCROLL_SIDEBAR_HEIGHT 20 // if we layout more often we stop, this should never happen -#define MAX_LOOP_COUNT 50 +#define MAX_LOOP_COUNT 50 using namespace sw::sidebarwindows; @@ -277,7 +277,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } } } - else if ( rHint.IsA(TYPE(SfxSimpleHint) ) ) + else if ( rHint.IsA(TYPE(SfxSimpleHint) ) ) { sal_uInt32 nId = ((SfxSimpleHint&)rHint).GetId(); switch ( nId ) @@ -630,9 +630,9 @@ void SwPostItMgr::LayoutPostIts() if (mPages[n]->mList->size()>0) { std::list<SwSidebarWin*> aVisiblePostItList; - unsigned long lNeededHeight = 0; - long mlPageBorder = 0; - long mlPageEnd = 0; + unsigned long lNeededHeight = 0; + long mlPageBorder = 0; + long mlPageEnd = 0; for(SwSidebarItem_iterator i = mPages[n]->mList->begin(); i!= mPages[n]->mList->end(); i++) { @@ -883,7 +883,7 @@ void SwPostItMgr::Scroll(const long lScroll,const unsigned long aPage) if ((*i)->bShow) { bool bBottom = mpEditWin->PixelToLogic(Point(0,pPostIt->VirtualPos().Y()+pPostIt->VirtualSize().Height())).Y() <= (mPages[aPage-1]->mPageRect.Bottom()-aSidebarheight); - bool bTop = mpEditWin->PixelToLogic(Point(0,pPostIt->VirtualPos().Y())).Y() >= (mPages[aPage-1]->mPageRect.Top()+aSidebarheight); + bool bTop = mpEditWin->PixelToLogic(Point(0,pPostIt->VirtualPos().Y())).Y() >= (mPages[aPage-1]->mPageRect.Top()+aSidebarheight); if ( bBottom && bTop) { pPostIt->ShowNote(); @@ -999,19 +999,19 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons // - if we have space left, we always move the current one up, // otherwise the next one down // - first all notes are resized - // - then the real layout starts + // - then the real layout starts /*************************************************************/ //rBorder is the page rect - const Rectangle rBorder = mpEditWin->LogicToPixel( aBorder); - long lTopBorder = rBorder.Top() + 5; - long lBottomBorder = rBorder.Bottom() - 5; - const long lVisibleHeight = lBottomBorder - lTopBorder; //rBorder.GetHeight() ; - long lSpaceUsed = 0; - long lTranslatePos = 0; - int loop = 0; - bool bDone = false; - bool bScrollbars = false; + const Rectangle rBorder = mpEditWin->LogicToPixel( aBorder); + long lTopBorder = rBorder.Top() + 5; + long lBottomBorder = rBorder.Bottom() - 5; + const long lVisibleHeight = lBottomBorder - lTopBorder; //rBorder.GetHeight() ; + long lSpaceUsed = 0; + long lTranslatePos = 0; + int loop = 0; + bool bDone = false; + bool bScrollbars = false; // do all neccessary resizings if (lVisibleHeight < lNeededHeight) @@ -1158,7 +1158,7 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons { (*i)->TranslateTopPosition(lTranslatePos+GetSpaceBetween()); } - lTranslatePos = lBottomBorder - ((*i)->VirtualPos().Y()+ (*i)->VirtualSize().Height()); + lTranslatePos = lBottomBorder - ((*i)->VirtualPos().Y()+ (*i)->VirtualSize().Height()); if (lTranslatePos<0) { (*i)->TranslateTopPosition(lTranslatePos); @@ -1330,7 +1330,7 @@ void SwPostItMgr::Hide( const String& rAuthor ) { if ( (*i)->pPostIt && ((*i)->pPostIt->GetAuthor() == rAuthor) ) { - (*i)->bShow = false; + (*i)->bShow = false; (*i)->pPostIt->HideNote(); } } @@ -1647,13 +1647,13 @@ void SwPostItMgr::CorrectPositions() // yeah, I know, if this is a left page it could be wrong, but finding the page and the note is probably not even faster than just doing it // --> OD 2010-06-03 #i111964# - check, if anchor overlay object exists. - const long aAnchorX = pFirstPostIt->Anchor() + const long aAnchorX = pFirstPostIt->Anchor() ? mpEditWin->LogicToPixel( Point((long)(pFirstPostIt->Anchor()->GetSixthPosition().getX()),0)).X() : 0; - const long aAnchorY = pFirstPostIt->Anchor() + const long aAnchorY = pFirstPostIt->Anchor() ? mpEditWin->LogicToPixel( Point(0,(long)(pFirstPostIt->Anchor()->GetSixthPosition().getY()))).Y() + 1 : 0; - // <-- + // <-- if (Point(aAnchorX,aAnchorY) != pFirstPostIt->GetPosPixel()) { long aAnchorPosX = 0; @@ -1664,7 +1664,7 @@ void SwPostItMgr::CorrectPositions() { // --> OD 2010-06-03 #i111964# - check, if anchor overlay object exists. if ( (*i)->bShow && (*i)->pPostIt && (*i)->pPostIt->Anchor() ) - // <-- + // <-- { aAnchorPosX = mPages[n]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT ? mpEditWin->LogicToPixel( Point((long)((*i)->pPostIt->Anchor()->GetSeventhPosition().getX()),0)).X() @@ -1716,9 +1716,9 @@ Color SwPostItMgr::GetColorDark(sal_uInt16 aAuthorIndex) if (!Application::GetSettings().GetStyleSettings().GetHighContrastMode()) { static const Color aArrayNormal[] = { - COL_AUTHOR1_NORMAL, COL_AUTHOR2_NORMAL, COL_AUTHOR3_NORMAL, - COL_AUTHOR4_NORMAL, COL_AUTHOR5_NORMAL, COL_AUTHOR6_NORMAL, - COL_AUTHOR7_NORMAL, COL_AUTHOR8_NORMAL, COL_AUTHOR9_NORMAL }; + COL_AUTHOR1_NORMAL, COL_AUTHOR2_NORMAL, COL_AUTHOR3_NORMAL, + COL_AUTHOR4_NORMAL, COL_AUTHOR5_NORMAL, COL_AUTHOR6_NORMAL, + COL_AUTHOR7_NORMAL, COL_AUTHOR8_NORMAL, COL_AUTHOR9_NORMAL }; return Color( aArrayNormal[ aAuthorIndex % (sizeof( aArrayNormal )/ sizeof( aArrayNormal[0] ))]); } @@ -1731,9 +1731,9 @@ Color SwPostItMgr::GetColorLight(sal_uInt16 aAuthorIndex) if (!Application::GetSettings().GetStyleSettings().GetHighContrastMode()) { static const Color aArrayLight[] = { - COL_AUTHOR1_LIGHT, COL_AUTHOR2_LIGHT, COL_AUTHOR3_LIGHT, - COL_AUTHOR4_LIGHT, COL_AUTHOR5_LIGHT, COL_AUTHOR6_LIGHT, - COL_AUTHOR7_LIGHT, COL_AUTHOR8_LIGHT, COL_AUTHOR9_LIGHT }; + COL_AUTHOR1_LIGHT, COL_AUTHOR2_LIGHT, COL_AUTHOR3_LIGHT, + COL_AUTHOR4_LIGHT, COL_AUTHOR5_LIGHT, COL_AUTHOR6_LIGHT, + COL_AUTHOR7_LIGHT, COL_AUTHOR8_LIGHT, COL_AUTHOR9_LIGHT }; return Color( aArrayLight[ aAuthorIndex % (sizeof( aArrayLight )/ sizeof( aArrayLight[0] ))]); } @@ -1746,9 +1746,9 @@ Color SwPostItMgr::GetColorAnchor(sal_uInt16 aAuthorIndex) if (!Application::GetSettings().GetStyleSettings().GetHighContrastMode()) { static const Color aArrayAnchor[] = { - COL_AUTHOR1_DARK, COL_AUTHOR2_DARK, COL_AUTHOR3_DARK, - COL_AUTHOR4_DARK, COL_AUTHOR5_DARK, COL_AUTHOR6_DARK, - COL_AUTHOR7_DARK, COL_AUTHOR8_DARK, COL_AUTHOR9_DARK }; + COL_AUTHOR1_DARK, COL_AUTHOR2_DARK, COL_AUTHOR3_DARK, + COL_AUTHOR4_DARK, COL_AUTHOR5_DARK, COL_AUTHOR6_DARK, + COL_AUTHOR7_DARK, COL_AUTHOR8_DARK, COL_AUTHOR9_DARK }; return Color( aArrayAnchor[ aAuthorIndex % (sizeof( aArrayAnchor ) / sizeof( aArrayAnchor[0] ))]); } diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx index 829c79373a61..8353511e7699 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.cxx +++ b/sw/source/ui/docvw/SidebarTxtControl.cxx @@ -359,7 +359,7 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt ) const Size aSize = GetSizePixel(); aPos = Point( aSize.getWidth()/2, aSize.getHeight()/2 ); } - + //!! call different Execute function to get rid of the new thesaurus sub menu //!! pointer created in the call to Popup. //!! Otherwise we would have a memory leak (see also #i107205#) diff --git a/sw/source/ui/docvw/SidebarTxtControl.hxx b/sw/source/ui/docvw/SidebarTxtControl.hxx index 08a5de0003c4..ba517fff6b6b 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.hxx +++ b/sw/source/ui/docvw/SidebarTxtControl.hxx @@ -53,14 +53,14 @@ class SidebarTxtControl : public Control bool mbMouseOver; protected: - virtual void Paint( const Rectangle& rRect); + virtual void Paint( const Rectangle& rRect); virtual void KeyInput( const KeyEvent& rKeyEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void LoseFocus(); - virtual void RequestHelp(const HelpEvent &rEvt); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void LoseFocus(); + virtual void RequestHelp(const HelpEvent &rEvt); virtual XubString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index dc4f006e2026..8caf11c84d0c 100755 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -572,8 +572,8 @@ void SwSidebarWin::SetPosAndSize() SwSidebarWin* pWin = GetTopReplyNote(); // --> OD 2010-06-03 #i111964# if ( pWin && pWin->Anchor() ) - // <-- - { + // <-- + { pWin->Anchor()->SetAnchorState(AS_END); } } @@ -1137,8 +1137,8 @@ void SwSidebarWin::SetViewState(ViewState bViewState) SwSidebarWin* pWin = GetTopReplyNote(); // --> OD 2010-06-03 #i111964# if ( pWin && pWin->Anchor() ) - // <-- - { + // <-- + { pWin->Anchor()->SetAnchorState(AS_END); } mpAnchor->setLineSolid(true); @@ -1174,7 +1174,7 @@ void SwSidebarWin::SetViewState(ViewState bViewState) // <-- { if ( pTopWinSelf != mrMgr.GetActiveSidebarWin() ) - { + { pTopWinSelf->Anchor()->setLineSolid(false); } pTopWinSelf->Anchor()->SetAnchorState(AS_ALL); @@ -1183,7 +1183,7 @@ void SwSidebarWin::SetViewState(ViewState bViewState) mpAnchor->setLineSolid(false); } if ( mpShadow ) - { + { mpShadow->SetShadowState(SS_NORMAL); } break; diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx index 8e11e5117c27..8174d81b6534 100644 --- a/sw/source/ui/docvw/edtdd.cxx +++ b/sw/source/ui/docvw/edtdd.cxx @@ -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 @@ -232,7 +232,7 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt ) if ( aRect.IsInside(aPos) ) { rSh.StartAllAction(); -//!! sal_Int8 nRet = DND_ACTION_NONE/*pOLV->ExecuteDrop( rEvt )*/; +//!! sal_Int8 nRet = DND_ACTION_NONE/*pOLV->ExecuteDrop( rEvt )*/; rSh.EndAllAction(); return nRet; } @@ -253,7 +253,7 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt ) GetDataFlavorExVector(), m_nDropDestination, rEvt.mnAction, -//!! rEvt.GetSourceOptions(), +//!! rEvt.GetSourceOptions(), nUserOpt, m_nDropFormat, nEventAction, 0, &rEvt.maDropEvent.Transferable ); @@ -326,11 +326,11 @@ USHORT SwEditWin::GetDropDestination( const Point& rPixPnt, SdrObject ** ppObj ) else nDropDestination = EXCHG_DEST_DOC_TEXTFRAME; break; - case OBJCNT_OLE: nDropDestination = EXCHG_DEST_DOC_OLEOBJ; break; - case OBJCNT_CONTROL: /* no Action avail */ - case OBJCNT_SIMPLE: nDropDestination = EXCHG_DEST_DOC_DRAWOBJ; break; - case OBJCNT_URLBUTTON: nDropDestination = EXCHG_DEST_DOC_URLBUTTON; break; - case OBJCNT_GROUPOBJ: nDropDestination = EXCHG_DEST_DOC_GROUPOBJ; break; + case OBJCNT_OLE: nDropDestination = EXCHG_DEST_DOC_OLEOBJ; break; + case OBJCNT_CONTROL: /* no Action avail */ + case OBJCNT_SIMPLE: nDropDestination = EXCHG_DEST_DOC_DRAWOBJ; break; + case OBJCNT_URLBUTTON: nDropDestination = EXCHG_DEST_DOC_URLBUTTON; break; + case OBJCNT_GROUPOBJ: nDropDestination = EXCHG_DEST_DOC_GROUPOBJ; break; default: ASSERT( !this, "new ObjectType?" ); } @@ -410,7 +410,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) GetDataFlavorExVector(), m_nDropDestination, rEvt.mnAction, -//!! rEvt.GetSourceOptions(), +//!! rEvt.GetSourceOptions(), nUserOpt, m_nDropFormat, nEventAction ); if( EXCHG_INOUT_ACTION_NONE != m_nDropAction ) @@ -440,7 +440,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) else if( rEvt.mbDefault ) { // JP 13.08.98: internes Drag&Drop: bei gleichem Doc ein Move - // ansonten ein Copy - Task 54974 + // ansonten ein Copy - Task 54974 nEventAction = pSrcSh->GetDoc() == rSh.GetDoc() ? DND_ACTION_MOVE : DND_ACTION_COPY; diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 7b5741316cbb..9ab1e772a29c 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2312,7 +2312,7 @@ KEYINPUT_CHECKTABLE_INSDEL: ChgToEnEmDash | SetINetAttr | Autocorrect ) && !rSh.HasReadonlySel() ) - /* { + /* { pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd | ChgFractionSymbol | ChgOrdinalNumber | ChgToEnEmDash | SetINetAttr | diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index be201c32c24e..8aa6c2e766d0 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -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 @@ -81,18 +81,18 @@ // <-- /*-------------------------------------------------------------------- - Beschreibung: KeyEvents + Beschreibung: KeyEvents --------------------------------------------------------------------*/ static void lcl_GetRedlineHelp( const SwRedline& rRedl, String& rTxt, BOOL bBalloon ) { USHORT nResId = 0; switch( rRedl.GetType() ) { - case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERT; break; - case nsRedlineType_t::REDLINE_DELETE: nResId = STR_REDLINE_DELETE; break; - case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMAT; break; - case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLE; break; - case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLL; break; + case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERT; break; + case nsRedlineType_t::REDLINE_DELETE: nResId = STR_REDLINE_DELETE; break; + case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMAT; break; + case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLE; break; + case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLL; break; } if( nResId ) @@ -332,7 +332,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) */ break; } - case RES_INPUTFLD: // BubbleHelp, da der Hinweis ggf ziemlich lang sein kann + case RES_INPUTFLD: // BubbleHelp, da der Hinweis ggf ziemlich lang sein kann bBalloon = TRUE; /* no break */ case RES_JUMPEDITFLD: diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx index c2d7492cb066..7a4812dc3018 100644 --- a/sw/source/ui/docvw/edtwin3.cxx +++ b/sw/source/ui/docvw/edtwin3.cxx @@ -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 @@ -50,7 +50,7 @@ /*-------------------------------------------------------------------- - Beschreibung: Core-Notify + Beschreibung: Core-Notify --------------------------------------------------------------------*/ @@ -64,7 +64,7 @@ void ScrollMDI( ViewShell* pVwSh, const SwRect &rRect, } /*-------------------------------------------------------------------- - Beschreibung: Docmdi - verschiebbar + Beschreibung: Docmdi - verschiebbar --------------------------------------------------------------------*/ @@ -78,7 +78,7 @@ BOOL IsScrollMDI( ViewShell* pVwSh, const SwRect &rRect ) } /*-------------------------------------------------------------------- - Beschreibung: Notify fuer Groessen-Aenderung + Beschreibung: Notify fuer Groessen-Aenderung --------------------------------------------------------------------*/ @@ -96,7 +96,7 @@ void SizeNotify(ViewShell* pVwSh, const Size &rSize) } /*-------------------------------------------------------------------- - Beschreibung: Notify fuer Seitenzahl-Update + Beschreibung: Notify fuer Seitenzahl-Update --------------------------------------------------------------------*/ @@ -111,10 +111,10 @@ void PageNumNotify( ViewShell* pVwSh, USHORT nPhyNum, USHORT nVirtNum, } /****************************************************************************** - * Methode : void FrameNotify( DocMDIBase *pWin, FlyMode eMode ) - * Beschreibung: - * Erstellt : OK 08.02.94 13:49 - * Aenderung : + * Methode : void FrameNotify( DocMDIBase *pWin, FlyMode eMode ) + * Beschreibung: + * Erstellt : OK 08.02.94 13:49 + * Aenderung : ******************************************************************************/ @@ -126,7 +126,7 @@ void FrameNotify( ViewShell* pVwSh, FlyMode eMode ) } /*-------------------------------------------------------------------- - Beschreibung: Notify fuer Seitenzahl-Update + Beschreibung: Notify fuer Seitenzahl-Update --------------------------------------------------------------------*/ BOOL SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, BOOL bVerticalMode) { @@ -196,7 +196,7 @@ void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt ) pSh->LockPaint(); bUnlockPaint = TRUE; ViewShell::DeleteReplacementBitmaps(); - GetView().InvalidateBorder(); //Scrollbarbreiten + GetView().InvalidateBorder(); //Scrollbarbreiten } break; @@ -206,7 +206,7 @@ void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt ) case DATACHANGED_FONTSUBSTITUTION: pSh->LockPaint(); bUnlockPaint = TRUE; - GetView().GetDocShell()->UpdateFontList(); //z.B. Druckerwechsel + GetView().GetDocShell()->UpdateFontList(); //z.B. Druckerwechsel break; } pSh->LockView( bViewWasLocked ); diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx index f793a7f854b7..b412c7a88ad6 100644 --- a/sw/source/ui/docvw/romenu.cxx +++ b/sw/source/ui/docvw/romenu.cxx @@ -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 @@ -219,16 +219,16 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) : bReloadFrame ); EnableItem( MN_READONLY_RELOAD, !bReloadFrame); - Check( MN_READONLY_EDITDOC, SID_EDITDOC, rDis ); + Check( MN_READONLY_EDITDOC, SID_EDITDOC, rDis ); Check( MN_READONLY_SELECTION_MODE, FN_READONLY_SELECTION_MODE, rDis ); Check( MN_READONLY_SOURCEVIEW, SID_SOURCEVIEW, rDis ); - Check( MN_READONLY_BROWSE_BACKWARD, SID_BROWSE_BACKWARD,rDis ); - Check( MN_READONLY_BROWSE_FORWARD, SID_BROWSE_FORWARD, rDis ); + Check( MN_READONLY_BROWSE_BACKWARD, SID_BROWSE_BACKWARD,rDis ); + Check( MN_READONLY_BROWSE_FORWARD, SID_BROWSE_FORWARD, rDis ); #ifdef WNT - Check( MN_READONLY_PLUGINOFF, SID_PLUGINS_ACTIVE, rDis ); + Check( MN_READONLY_PLUGINOFF, SID_PLUGINS_ACTIVE, rDis ); #endif - Check( MN_READONLY_OPENURL, SID_OPENDOC, rDis ); - Check( MN_READONLY_OPENURLNEW, SID_OPENDOC, rDis ); + Check( MN_READONLY_OPENURL, SID_OPENDOC, rDis ); + Check( MN_READONLY_OPENURLNEW, SID_OPENDOC, rDis ); SfxPoolItem* pState; @@ -303,19 +303,19 @@ void SwReadOnlyPopup::Execute( Window* pWin, USHORT nId ) { case SID_WIN_FULLSCREEN : nExecId = SID_WIN_FULLSCREEN; break; case MN_READONLY_OPENURL: nFilter = URLLOAD_NOFILTER; break; - case MN_READONLY_OPENURLNEW: nFilter = URLLOAD_NEWVIEW; break; + case MN_READONLY_OPENURLNEW: nFilter = URLLOAD_NEWVIEW; break; case MN_READONLY_COPY: nExecId = SID_COPY; break; - case MN_READONLY_EDITDOC: nExecId = SID_EDITDOC; break; + case MN_READONLY_EDITDOC: nExecId = SID_EDITDOC; break; case MN_READONLY_SELECTION_MODE: nExecId = FN_READONLY_SELECTION_MODE; break; case MN_READONLY_RELOAD: case MN_READONLY_RELOAD_FRAME: rSh.GetView().GetViewFrame()->GetDispatcher()->Execute(SID_RELOAD); break; - case MN_READONLY_BROWSE_BACKWARD: nExecId = SID_BROWSE_BACKWARD;break; - case MN_READONLY_BROWSE_FORWARD: nExecId = SID_BROWSE_FORWARD; break; - case MN_READONLY_SOURCEVIEW: nExecId = SID_SOURCEVIEW; break; + case MN_READONLY_BROWSE_BACKWARD: nExecId = SID_BROWSE_BACKWARD;break; + case MN_READONLY_BROWSE_FORWARD: nExecId = SID_BROWSE_FORWARD; break; + case MN_READONLY_SOURCEVIEW: nExecId = SID_SOURCEVIEW; break; case MN_READONLY_SAVEGRAPHIC: case MN_READONLY_SAVEBACKGROUND: { @@ -347,9 +347,9 @@ void SwReadOnlyPopup::Execute( Window* pWin, USHORT nId ) rSh.ResetModified(); break; } - case MN_READONLY_GRAPHICOFF: nExecId = FN_VIEW_GRAPHIC; break; + case MN_READONLY_GRAPHICOFF: nExecId = FN_VIEW_GRAPHIC; break; #ifdef WNT - case MN_READONLY_PLUGINOFF: nExecId = SID_PLUGINS_ACTIVE; break; + case MN_READONLY_PLUGINOFF: nExecId = SID_PLUGINS_ACTIVE; break; #endif case MN_READONLY_TOGALLERYLINK: SW_MOD()->GetModuleConfig()->SetGrfToGalleryAsLnk( TRUE ); @@ -384,8 +384,8 @@ static void lcl_GetPreferedExtension( String &rExt, const Graphic &rGrf ) case GFX_LINK_TYPE_NATIVE_TIF: pExt = "tif"; break; case GFX_LINK_TYPE_NATIVE_WMF: pExt = "wmf"; break; case GFX_LINK_TYPE_NATIVE_MET: pExt = "met"; break; - case GFX_LINK_TYPE_NATIVE_PCT: pExt = "pct"; break; - case GFX_LINK_TYPE_NATIVE_JPG: pExt = "jpg"; break; + case GFX_LINK_TYPE_NATIVE_PCT: pExt = "pct"; break; + case GFX_LINK_TYPE_NATIVE_JPG: pExt = "jpg"; break; default:; //prevent warning } rExt.AssignAscii( pExt ); diff --git a/sw/source/ui/docvw/romenu.hxx b/sw/source/ui/docvw/romenu.hxx index 2d60689c6854..55f238fdca10 100644 --- a/sw/source/ui/docvw/romenu.hxx +++ b/sw/source/ui/docvw/romenu.hxx @@ -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 @@ -48,14 +48,14 @@ class SwReadOnlyPopup : public PopupMenu const SvxBrushItem *pItem; const Point &rDocPos; Graphic aGraphic; - String sURL, + String sURL, sTargetFrameName, sDescription, sGrfName; - List aThemeList; - BOOL bGrfToGalleryAsLnk; - ImageMap* pImageMap; - INetImage* pTargetURL; + List aThemeList; + BOOL bGrfToGalleryAsLnk; + ImageMap* pImageMap; + INetImage* pTargetURL; void Check( USHORT nMID, USHORT nSID, SfxDispatcher &rDis ); String SaveGraphic( USHORT nId ); @@ -65,7 +65,7 @@ class SwReadOnlyPopup : public PopupMenu public: SwReadOnlyPopup( const Point &rDPos, SwView &rV ); ~SwReadOnlyPopup(); - + void Execute( Window* pWin, const Point &rPPos ); void Execute( Window* pWin, USHORT nId ); }; diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index 55a0cb47e296..2ea48e2a7e84 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -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 @@ -91,21 +91,21 @@ static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList) { const sal_Unicode cOpenBracket = '<'; const sal_Unicode cCloseBracket= '>'; - const sal_Unicode cSlash = '/'; + const sal_Unicode cSlash = '/'; const sal_Unicode cExclamation = '!'; - const sal_Unicode cMinus = '-'; - const sal_Unicode cSpace = ' '; - const sal_Unicode cTab = 0x09; + const sal_Unicode cMinus = '-'; + const sal_Unicode cSpace = ' '; + const sal_Unicode cTab = 0x09; const sal_Unicode cLF = 0x0a; const sal_Unicode cCR = 0x0d; const USHORT nStrLen = rSource.Len(); - USHORT nInsert = 0; // Anzahl der eingefuegten Portions - USHORT nActPos = 0; //Position, an der '<' gefunden wurde - USHORT nOffset = 0; //Offset von nActPos zur '<' - USHORT nPortStart = USHRT_MAX; // fuer die TextPortion - USHORT nPortEnd = 0; // + USHORT nInsert = 0; // Anzahl der eingefuegten Portions + USHORT nActPos = 0; //Position, an der '<' gefunden wurde + USHORT nOffset = 0; //Offset von nActPos zur '<' + USHORT nPortStart = USHRT_MAX; // fuer die TextPortion + USHORT nPortEnd = 0; // SwTextPortion aText; while(nActPos < nStrLen) { @@ -153,9 +153,9 @@ static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList) while(++nSrchPos < nStrLen - 1) { sal_Unicode cNext = rSource.GetChar(nSrchPos); - if( cNext == cSpace || - cNext == cTab || - cNext == cLF || + if( cNext == cSpace || + cNext == cTab || + cNext == cLF || cNext == cCR) break; else if(cNext == cCloseBracket) @@ -329,8 +329,8 @@ void SwSrcEditWindow::Resize() aScrollPos = Point(aOutSz.Width() - nScrollStd, 0); pVScrollbar->SetPosSizePixel( aScrollPos, aScrollSz); - aOutSz.Width() -= nScrollStd; - aOutSz.Height() -= nScrollStd; + aOutSz.Width() -= nScrollStd; + aOutSz.Height() -= nScrollStd; pOutWin->SetOutputSizePixel(aOutSz); InitScrollBars(); @@ -552,7 +552,7 @@ void SwSrcEditWindow::CreateTextEngine() SfxBindings& rBind = GetSrcView()->GetViewFrame()->GetBindings(); rBind.Invalidate( SID_TABLE_CELL ); -// rBind.Invalidate( SID_ATTR_CHAR_FONTHEIGHT ); +// rBind.Invalidate( SID_ATTR_CHAR_FONTHEIGHT ); } /*-------------------------------------------------------------------- @@ -689,7 +689,7 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer ) // SyntaxTimerHdl wird gerufen, wenn Text-Aenderung // => gute Gelegenheit, Textbreite zu ermitteln! long nPrevTextWidth = nCurTextWidth; - nCurTextWidth = pTextEngine->CalcTextWidth() + 25; // kleine Toleranz + nCurTextWidth = pTextEngine->CalcTextWidth() + 25; // kleine Toleranz if ( nCurTextWidth != nPrevTextWidth ) SetScrollBarRanges(); bHighlighting = FALSE; @@ -754,7 +754,7 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff ) return; SwTextPortion& rLast = aPortionList[nCount-1]; - if ( rLast.nStart > rLast.nEnd ) // Nur bis Bug von MD behoeben + if ( rLast.nStart > rLast.nEnd ) // Nur bis Bug von MD behoeben { nCount--; aPortionList.Remove( nCount); @@ -781,7 +781,7 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff ) { SwTextPortion& r = aPortionList[i]; DBG_ASSERT( r.nLine == nLine, "doch mehrere Zeilen ?" ); - if ( r.nStart > r.nEnd ) // Nur bis Bug von MD behoeben + if ( r.nStart > r.nEnd ) // Nur bis Bug von MD behoeben continue; if ( r.nStart > nLastEnd ) @@ -799,7 +799,7 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff ) for ( USHORT i = 0; i < aPortionList.Count(); i++ ) { SwTextPortion& r = aPortionList[i]; - if ( r.nStart > r.nEnd ) // Nur bis Bug von MD behoeben + if ( r.nStart > r.nEnd ) // Nur bis Bug von MD behoeben continue; if(r.eType != svtools::HTMLSGML && r.eType != svtools::HTMLCOMMENT && @@ -890,8 +890,8 @@ void SwSrcEditWindow::GetFocus() /*void SwSrcEditWindow::LoseFocus() { Window::LoseFocus(); -// pOutWin->LoseFocus(); -// rView.LostFocus(); +// pOutWin->LoseFocus(); +// rView.LostFocus(); } */ /* -----------------------------29.08.2002 13:21------------------------------ @@ -1080,7 +1080,7 @@ void SwSrcEditWindow::SetFont() } const SvxFontListItem* pFontListItem = (const SvxFontListItem* )pSrcView->GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST ); - const FontList* pList = pFontListItem->GetFontList(); + const FontList* pList = pFontListItem->GetFontList(); FontInfo aInfo = pList->Get(sFontName,WEIGHT_NORMAL, ITALIC_NONE); const Font& rFont = GetTextEngine()->GetFont(); diff --git a/sw/source/ui/envelp/envelp.src b/sw/source/ui/envelp/envelp.src index 0381ad81d249..285f4887094e 100644 --- a/sw/source/ui/envelp/envelp.src +++ b/sw/source/ui/envelp/envelp.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/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index cfb5ad8f4afd..74484eb2044e 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -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 @@ -102,29 +102,29 @@ SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, SW_RES(TP_ENV_FMT), rSet), aAddrFL (this, SW_RES( FL_ADDRESSEE )), - aAddrPosInfo (this, SW_RES( TXT_ADDR_POS )), - aAddrLeftText (this, SW_RES( TXT_ADDR_LEFT )), - aAddrLeftField (this, SW_RES( FLD_ADDR_LEFT )), - aAddrTopText (this, SW_RES( TXT_ADDR_TOP )), - aAddrTopField (this, SW_RES( FLD_ADDR_TOP )), - aAddrFormatInfo (this, SW_RES( TXT_ADDR_FORMAT )), - aAddrEditButton (this, SW_RES( BTN_ADDR_EDIT )), + aAddrPosInfo (this, SW_RES( TXT_ADDR_POS )), + aAddrLeftText (this, SW_RES( TXT_ADDR_LEFT )), + aAddrLeftField (this, SW_RES( FLD_ADDR_LEFT )), + aAddrTopText (this, SW_RES( TXT_ADDR_TOP )), + aAddrTopField (this, SW_RES( FLD_ADDR_TOP )), + aAddrFormatInfo (this, SW_RES( TXT_ADDR_FORMAT )), + aAddrEditButton (this, SW_RES( BTN_ADDR_EDIT )), aSendFL (this, SW_RES( FL_SENDER )), - aSendPosInfo (this, SW_RES( TXT_SEND_POS )), - aSendLeftText (this, SW_RES( TXT_SEND_LEFT )), - aSendLeftField (this, SW_RES( FLD_SEND_LEFT )), - aSendTopText (this, SW_RES( TXT_SEND_TOP )), - aSendTopField (this, SW_RES( FLD_SEND_TOP )), - aSendFormatInfo (this, SW_RES( TXT_SEND_FORMAT )), - aSendEditButton (this, SW_RES( BTN_SEND_EDIT )), + aSendPosInfo (this, SW_RES( TXT_SEND_POS )), + aSendLeftText (this, SW_RES( TXT_SEND_LEFT )), + aSendLeftField (this, SW_RES( FLD_SEND_LEFT )), + aSendTopText (this, SW_RES( TXT_SEND_TOP )), + aSendTopField (this, SW_RES( FLD_SEND_TOP )), + aSendFormatInfo (this, SW_RES( TXT_SEND_FORMAT )), + aSendEditButton (this, SW_RES( BTN_SEND_EDIT )), aSizeFL (this, SW_RES( FL_SIZE )), - aSizeFormatText (this, SW_RES( TXT_SIZE_FORMAT )), - aSizeFormatBox (this, SW_RES( BOX_SIZE_FORMAT )), - aSizeWidthText (this, SW_RES( TXT_SIZE_WIDTH )), - aSizeWidthField (this, SW_RES( FLD_SIZE_WIDTH )), - aSizeHeightText (this, SW_RES( TXT_SIZE_HEIGHT )), - aSizeHeightField (this, SW_RES( FLD_SIZE_HEIGHT )), - aPreview (this, SW_RES( WIN_PREVIEW )) + aSizeFormatText (this, SW_RES( TXT_SIZE_FORMAT )), + aSizeFormatBox (this, SW_RES( BOX_SIZE_FORMAT )), + aSizeWidthText (this, SW_RES( TXT_SIZE_WIDTH )), + aSizeWidthField (this, SW_RES( FLD_SIZE_WIDTH )), + aSizeHeightText (this, SW_RES( TXT_SIZE_HEIGHT )), + aSizeHeightField (this, SW_RES( FLD_SIZE_HEIGHT )), + aPreview (this, SW_RES( WIN_PREVIEW )) { FreeResource(); diff --git a/sw/source/ui/envelp/envfmt.hrc b/sw/source/ui/envelp/envfmt.hrc index fb15678cacee..df10c15a1247 100644 --- a/sw/source/ui/envelp/envfmt.hrc +++ b/sw/source/ui/envelp/envfmt.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 @@ -35,32 +35,32 @@ // Lokale Resourcen ********************************************************* #define FL_ADDRESSEE 11 -#define TXT_ADDR_POS 12 -#define TXT_ADDR_LEFT 13 -#define FLD_ADDR_LEFT 14 -#define TXT_ADDR_TOP 15 -#define FLD_ADDR_TOP 16 -#define TXT_ADDR_FORMAT 17 -#define BTN_ADDR_EDIT 18 +#define TXT_ADDR_POS 12 +#define TXT_ADDR_LEFT 13 +#define FLD_ADDR_LEFT 14 +#define TXT_ADDR_TOP 15 +#define FLD_ADDR_TOP 16 +#define TXT_ADDR_FORMAT 17 +#define BTN_ADDR_EDIT 18 #define FL_SENDER 21 -#define TXT_SEND_POS 22 -#define TXT_SEND_LEFT 23 -#define FLD_SEND_LEFT 24 -#define TXT_SEND_TOP 25 -#define FLD_SEND_TOP 26 -#define TXT_SEND_FORMAT 27 -#define BTN_SEND_EDIT 28 +#define TXT_SEND_POS 22 +#define TXT_SEND_LEFT 23 +#define FLD_SEND_LEFT 24 +#define TXT_SEND_TOP 25 +#define FLD_SEND_TOP 26 +#define TXT_SEND_FORMAT 27 +#define BTN_SEND_EDIT 28 #define FL_SIZE 31 -#define TXT_SIZE_FORMAT 32 -#define BOX_SIZE_FORMAT 33 -#define TXT_SIZE_WIDTH 34 -#define FLD_SIZE_WIDTH 35 -#define TXT_SIZE_HEIGHT 36 -#define FLD_SIZE_HEIGHT 37 - -#define WIN_PREVIEW 41 +#define TXT_SIZE_FORMAT 32 +#define BOX_SIZE_FORMAT 33 +#define TXT_SIZE_WIDTH 34 +#define FLD_SIZE_WIDTH 35 +#define TXT_SIZE_HEIGHT 36 +#define FLD_SIZE_HEIGHT 37 + +#define WIN_PREVIEW 41 #define MID_CHAR 1 diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index f8508bb7e69a..9c45d6b3c0ed 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -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 @@ -53,20 +53,20 @@ class SwEnvFmtPage : public SfxTabPage { FixedLine aAddrFL; - FixedInfo aAddrPosInfo; + FixedInfo aAddrPosInfo; FixedText aAddrLeftText; MetricField aAddrLeftField; FixedText aAddrTopText; MetricField aAddrTopField; - FixedInfo aAddrFormatInfo; + FixedInfo aAddrFormatInfo; MenuButton aAddrEditButton; FixedLine aSendFL; - FixedInfo aSendPosInfo; + FixedInfo aSendPosInfo; FixedText aSendLeftText; MetricField aSendLeftField; FixedText aSendTopText; MetricField aSendTopField; - FixedInfo aSendFormatInfo; + FixedInfo aSendFormatInfo; MenuButton aSendEditButton; FixedLine aSizeFL; FixedText aSizeFormatText; @@ -88,10 +88,10 @@ class SwEnvFmtPage : public SfxTabPage void SetMinMax(); - SfxItemSet *GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender); - + SfxItemSet *GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender); + using Window::GetParent; - SwEnvDlg *GetParent() {return (SwEnvDlg*) SfxTabPage::GetParent()->GetParent();} + SwEnvDlg *GetParent() {return (SwEnvDlg*) SfxTabPage::GetParent()->GetParent();} using TabPage::ActivatePage; using TabPage::DeactivatePage; diff --git a/sw/source/ui/envelp/envfmt.src b/sw/source/ui/envelp/envfmt.src index ae0693205b87..16987430b7df 100644 --- a/sw/source/ui/envelp/envfmt.src +++ b/sw/source/ui/envelp/envfmt.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/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index 298e5cb7611e..2bf989f83342 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -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 @@ -262,7 +262,7 @@ SwEnvCfgItem::~SwEnvCfgItem() /* -----------------------------26.09.00 14:05-------------------------------- ---------------------------------------------------------------------------*/ -void SwEnvCfgItem::Commit() +void SwEnvCfgItem::Commit() { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -300,19 +300,19 @@ Sequence<rtl::OUString> SwEnvCfgItem::GetPropertyNames() { static const char* aPropNames[] = { - "Inscription/Addressee", // 0 - "Inscription/Sender", // 1 - "Inscription/UseSender", // 2 - "Format/AddresseeFromLeft", // 3 - "Format/AddresseeFromTop", // 4 - "Format/SenderFromLeft", // 5 - "Format/SenderFromTop", // 6 - "Format/Width", // 7 - "Format/Height", // 8 - "Print/Alignment", // 9 - "Print/FromAbove", // 10 - "Print/Right", // 11 - "Print/Down" // 12 + "Inscription/Addressee", // 0 + "Inscription/Sender", // 1 + "Inscription/UseSender", // 2 + "Format/AddresseeFromLeft", // 3 + "Format/AddresseeFromTop", // 4 + "Format/SenderFromLeft", // 5 + "Format/SenderFromTop", // 6 + "Format/Width", // 7 + "Format/Height", // 8 + "Print/Alignment", // 9 + "Print/FromAbove", // 10 + "Print/Right", // 11 + "Print/Down" // 12 }; const int nCount = 13; Sequence<OUString> aNames(nCount); diff --git a/sw/source/ui/envelp/envlop.hrc b/sw/source/ui/envelp/envlop.hrc index 43f51d3a48df..359b9f241936 100644 --- a/sw/source/ui/envelp/envlop.hrc +++ b/sw/source/ui/envelp/envlop.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 @@ -46,8 +46,8 @@ #define BOX_SEND 10 #define EDT_SEND 11 #define WIN_PREVIEW 12 -#define ST_INSERT 13 -#define ST_CHANGE 14 +#define ST_INSERT 13 +#define ST_CHANGE 14 // Globale Resourcen ******************************************************** #define STR_DOC_TITLE (RC_ENVLOP_BEGIN) diff --git a/sw/source/ui/envelp/envlop.src b/sw/source/ui/envelp/envlop.src index c85b6cd1a7ab..2c025633b0a1 100644 --- a/sw/source/ui/envelp/envlop.src +++ b/sw/source/ui/envelp/envlop.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/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 279ce515c1d9..12b0f1f38f6b 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -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 @@ -109,7 +109,7 @@ void SwEnvPreview::Paint(const Rectangle &) Color aBack = rSettings.GetWindowColor( ); Color aFront = SwViewOption::GetFontColor(); - Color aMedium = Color( ( aBack.GetRed() + aFront.GetRed() ) / 2, + Color aMedium = Color( ( aBack.GetRed() + aFront.GetRed() ) / 2, ( aBack.GetGreen() + aFront.GetGreen() ) / 2, ( aBack.GetBlue() + aFront.GetBlue() ) / 2 ); @@ -174,7 +174,7 @@ SwEnvDlg::SwEnvDlg(Window* pParent, const SfxItemSet& rSet, GetOKButton().SetText(String(SW_RES(STR_BTN_NEWDOC))); GetOKButton().SetHelpId(HID_ENVELOP_PRINT); - GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird + GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird if (GetUserButton()) { GetUserButton()->SetText(bInsert ? sInsert : sChange); @@ -258,10 +258,10 @@ SwEnvPage::SwEnvPage(Window* pParent, const SfxItemSet& rSet) : pSh = GetParent()->pSh; // Handler installieren - aDatabaseLB .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl )); - aTableLB .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl )); - aInsertBT .SetClickHdl (LINK(this, SwEnvPage, FieldHdl )); - aSenderBox .SetClickHdl (LINK(this, SwEnvPage, SenderHdl )); + aDatabaseLB .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl )); + aTableLB .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl )); + aInsertBT .SetClickHdl (LINK(this, SwEnvPage, FieldHdl )); + aSenderBox .SetClickHdl (LINK(this, SwEnvPage, SenderHdl )); aPreview.SetBorderStyle( WINDOW_BORDER_MONO ); SwDBData aData = pSh->GetDBData(); @@ -309,7 +309,7 @@ IMPL_LINK( SwEnvPage, FieldHdl, Button *, EMPTYARG ) String aStr ( '<' ); aStr += aDatabaseLB.GetSelectEntry(); aStr += '.'; -// aStr += DB_DELIM; +// aStr += DB_DELIM; aStr += aTableLB.GetSelectEntry(); aStr += '.'; aStr += aTableLB.GetEntryData(aTableLB.GetSelectEntryPos()) == 0 ? '0' : '1'; diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 22690e95abff..b7c155a72a15 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -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/envelp/envprt.hrc b/sw/source/ui/envelp/envprt.hrc index 902416e80764..b5a8a034c146 100644 --- a/sw/source/ui/envelp/envprt.hrc +++ b/sw/source/ui/envelp/envprt.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 diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 4c2c14fb5cd6..0ac2d90ca46e 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -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/envelp/envprt.src b/sw/source/ui/envelp/envprt.src index f671c9506dc6..25a92fcda222 100644 --- a/sw/source/ui/envelp/envprt.src +++ b/sw/source/ui/envelp/envprt.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/envelp/label.hrc b/sw/source/ui/envelp/label.hrc index 3817ff92def4..9457fff86609 100644 --- a/sw/source/ui/envelp/label.hrc +++ b/sw/source/ui/envelp/label.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 @@ -53,68 +53,68 @@ #define FT_DBFIELD 17 #define LB_DBFIELD 18 #define BTN_INSERT 19 -#define BTN_SYNC 20 +#define BTN_SYNC 20 -#define RB_FROM_AUTO_TEXT 1 -#define RB_FROM_EDIT 2 -#define LB_AUTO_TEXT 3 +#define RB_FROM_AUTO_TEXT 1 +#define RB_FROM_EDIT 2 +#define LB_AUTO_TEXT 3 #define FT_AUTO_TEXT_GROUP 4 #define LB_AUTO_TEXT_GROUP 5 -#define ED_TEXT 6 +#define ED_TEXT 6 #define FL_CONTENT 7 -#define WIN_EXAMPLE 8 -#define ST_VISCARD_GROUP 10 +#define WIN_EXAMPLE 8 +#define ST_VISCARD_GROUP 10 #define FL_DATA 30 -#define FT_NAME 31 -#define ED_FIRSTNAME 32 -#define ED_NAME 33 -#define ED_SHORTCUT 34 -#define FT_STREET 35 -#define ED_STREET 36 -#define FT_ZIPCITY 37 -#define ED_ZIP 38 -#define ED_CITY 39 -#define FT_COUNTRYSTATE 40 -#define ED_COUNTRY 41 -#define FT_TITLEPROF 42 -#define ED_PROFESSION 43 -#define ED_TITLE 44 - -#define ED_PHONE 46 -#define ED_MOBILE 47 - -#define ED_FAX 49 -#define FT_WWWMAIL 50 -#define ED_WWW 51 -#define ED_MAIL 52 -#define ED_STATE 53 -#define FT_COMP 54 -#define ED_COMP 55 +#define FT_NAME 31 +#define ED_FIRSTNAME 32 +#define ED_NAME 33 +#define ED_SHORTCUT 34 +#define FT_STREET 35 +#define ED_STREET 36 +#define FT_ZIPCITY 37 +#define ED_ZIP 38 +#define ED_CITY 39 +#define FT_COUNTRYSTATE 40 +#define ED_COUNTRY 41 +#define FT_TITLEPROF 42 +#define ED_PROFESSION 43 +#define ED_TITLE 44 + +#define ED_PHONE 46 +#define ED_MOBILE 47 + +#define ED_FAX 49 +#define FT_WWWMAIL 50 +#define ED_WWW 51 +#define ED_MAIL 52 +#define ED_STATE 53 +#define FT_COMP 54 +#define ED_COMP 55 #define FT_COMP_EXT 56 #define ED_COMP_EXT 57 -#define FT_SLOGAN 58 -#define ED_SLOGAN 59 +#define FT_SLOGAN 58 +#define ED_SLOGAN 59 #define FT_POSITION 60 #define ED_POSITION 61 -#define ST_BUSINESSCARDDLG 62 +#define ST_BUSINESSCARDDLG 62 #define ST_FIRSTPAGE_LAB 63 #define ST_FIRSTPAGE_BC 64 -#define FT_NAME_2 65 -#define ED_FIRSTNAME_2 66 -#define ED_NAME_2 67 -#define ED_SHORTCUT_2 68 +#define FT_NAME_2 65 +#define ED_FIRSTNAME_2 66 +#define ED_NAME_2 67 +#define ED_SHORTCUT_2 68 -#define FT_PHONE_MOBILE 70 -//#define FT_PHONE 71 -//#define FT_MOBILE 72 -#define FT_FAX 73 +#define FT_PHONE_MOBILE 70 +//#define FT_PHONE 71 +//#define FT_MOBILE 72 +#define FT_FAX 73 // Globale Resourcen ******************************************************** -#define STR_DOC_TITLE (RC_LABEL_BEGIN) -#define STR_CUSTOM (RC_LABEL_BEGIN + 1) +#define STR_DOC_TITLE (RC_LABEL_BEGIN) +#define STR_CUSTOM (RC_LABEL_BEGIN + 1) // Ueberlaufpruefung ******************************************************** diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src index 40d9560deee7..f2200a0c4428 100644 --- a/sw/source/ui/envelp/label.src +++ b/sw/source/ui/envelp/label.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,7 +31,7 @@ #include "globals.hrc" #include "helpid.h" // ----- defined strings ----------------------------------------------------- -#define LABEL_STRING \ +#define LABEL_STRING \ Text [ en-US ] = "Labels" ; \ #define BUSINESS_CARD_STRING \ diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 162a6a5cea4f..05c2cf90beb6 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -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 @@ -144,7 +144,7 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet, GetOKButton().SetText(String(SW_RES(STR_BTN_NEW_DOC))); GetOKButton().SetHelpId(HID_LABEL_INSERT); - GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird + GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird AddTabPage(TP_LAB_LAB, m_bLabel ? sFormat : sMedium ,SwLabPage ::Create, 0, sal_False, 0); AddTabPage(TP_VISITING_CARDS, SwVisitingCardPage::Create, 0); @@ -216,7 +216,7 @@ void SwLabDlg::GetLabItem(SwLabItem &rItem) const SwLabItem& rOldItem = (const SwLabItem&)GetInputSetImpl()->Get(FN_LABEL); if (rActItem != rOldItem) - { // Wurde schon mal mit (hoffentlich) korrektem Inhalt "geputtet" + { // Wurde schon mal mit (hoffentlich) korrektem Inhalt "geputtet" rItem = rActItem; } else @@ -250,7 +250,7 @@ SwLabRec* SwLabDlg::GetRecord(const String &rRecName, sal_Bool bCont) break; } } - if (!bFound) // Benutzerdefiniert + if (!bFound) // Benutzerdefiniert pRec = Recs()[0]; return(pRec); @@ -270,10 +270,10 @@ Printer *SwLabDlg::GetPrt() SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, SW_RES(TP_LAB_LAB), rSet), pNewDBMgr(NULL), - aItem ((const SwLabItem&) rSet.Get(FN_LABEL)), + aItem ((const SwLabItem&) rSet.Get(FN_LABEL)), aWritingText (this, SW_RES(TXT_WRITING)), - aAddrBox (this, SW_RES(BOX_ADDR )), + aAddrBox (this, SW_RES(BOX_ADDR )), aWritingEdit (this, SW_RES(EDT_WRITING)), aDatabaseFT (this, SW_RES(FT_DATABASE)), aDatabaseLB (this, SW_RES(LB_DATABASE)), @@ -285,10 +285,10 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) : aWritingFL (this, SW_RES(FL_WRITING)), aContButton (this, SW_RES(BTN_CONT )), aSheetButton (this, SW_RES(BTN_SHEET )), - aMakeText (this, SW_RES(TXT_MAKE )), - aMakeBox (this, SW_RES(BOX_MAKE )), - aTypeText (this, SW_RES(TXT_TYPE )), - aTypeBox (this, SW_RES(BOX_TYPE )), + aMakeText (this, SW_RES(TXT_MAKE )), + aMakeBox (this, SW_RES(BOX_MAKE )), + aTypeText (this, SW_RES(TXT_TYPE )), + aTypeBox (this, SW_RES(BOX_TYPE )), aHiddenSortTypeBox(this, WB_SORT|WB_HIDE), aFormatInfo (this, SW_RES(INF_FORMAT )), aFormatFL (this, SW_RES(FL_FORMAT )) @@ -300,14 +300,14 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) : // Handler installieren - aAddrBox .SetClickHdl (LINK(this, SwLabPage, AddrHdl )); - aDatabaseLB .SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); - aTableLB .SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); - aInsertBT .SetClickHdl (LINK(this, SwLabPage, FieldHdl )); - aContButton .SetClickHdl (LINK(this, SwLabPage, PageHdl )); - aSheetButton .SetClickHdl (LINK(this, SwLabPage, PageHdl )); - aMakeBox .SetSelectHdl(LINK(this, SwLabPage, MakeHdl )); - aTypeBox .SetSelectHdl(LINK(this, SwLabPage, TypeHdl )); + aAddrBox .SetClickHdl (LINK(this, SwLabPage, AddrHdl )); + aDatabaseLB .SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); + aTableLB .SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); + aInsertBT .SetClickHdl (LINK(this, SwLabPage, FieldHdl )); + aContButton .SetClickHdl (LINK(this, SwLabPage, PageHdl )); + aSheetButton .SetClickHdl (LINK(this, SwLabPage, PageHdl )); + aMakeBox .SetSelectHdl(LINK(this, SwLabPage, MakeHdl )); + aTypeBox .SetSelectHdl(LINK(this, SwLabPage, TypeHdl )); InitDatabaseBox(); @@ -321,7 +321,7 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) : if ( rStr == String(aItem.aLstMake) ) nLstGroup = i; } -// Reset(rSet); +// Reset(rSet); aMakeBox.SelectEntryPos( nLstGroup ); aMakeBox.GetSelectHdl().Call( &aMakeBox ); } @@ -463,7 +463,7 @@ IMPL_LINK( SwLabPage, MakeHdl, ListBox *, EMPTYARG ) GetParent()->ReplaceGroup( aMake ); aItem.aLstMake = aMake; - const sal_Bool bCont = aContButton.IsChecked(); + const sal_Bool bCont = aContButton.IsChecked(); const sal_uInt16 nCount = GetParent()->Recs().Count(); sal_uInt16 nLstType = 0; @@ -527,8 +527,8 @@ void SwLabPage::DisplayFormat() FieldUnit aMetric = ::GetDfltMetric(FALSE); SetMetric(aField, aMetric); aField.SetDecimalDigits(2); - aField.SetMin (0); - aField.SetMax (LONG_MAX); + aField.SetMin (0); + aField.SetMax (LONG_MAX); SwLabRec* pRec = GetSelectedEntryPos(); aItem.aLstType = pRec->aType; @@ -648,8 +648,8 @@ void SwLabPage::Reset(const SfxItemSet& rSet) String aWriting( aItem.aWriting ); - aAddrBox .Check ( aItem.bAddr ); - aWritingEdit.SetText ( aWriting.ConvertLineEnd() ); + aAddrBox .Check ( aItem.bAddr ); + aWritingEdit.SetText ( aWriting.ConvertLineEnd() ); const sal_uInt16 nCount = (sal_uInt16)GetParent()->Makes().Count(); for (sal_uInt16 i = 0; i < nCount; ++i) @@ -660,7 +660,7 @@ void SwLabPage::Reset(const SfxItemSet& rSet) } - aMakeBox .SelectEntry( aItem.aMake ); + aMakeBox .SelectEntry( aItem.aMake ); //save the current type String sType(aItem.aType); aMakeBox.GetSelectHdl().Call( &aMakeBox ); @@ -715,11 +715,11 @@ void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt, SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, SW_RES(TP_VISITING_CARDS), rSet), - aAutoTextLB(this, SW_RES( LB_AUTO_TEXT )), - aAutoTextGroupFT(this, SW_RES( FT_AUTO_TEXT_GROUP )), - aAutoTextGroupLB(this, SW_RES( LB_AUTO_TEXT_GROUP )), + aAutoTextLB(this, SW_RES( LB_AUTO_TEXT )), + aAutoTextGroupFT(this, SW_RES( FT_AUTO_TEXT_GROUP )), + aAutoTextGroupLB(this, SW_RES( LB_AUTO_TEXT_GROUP )), aContentFL(this, SW_RES( FL_CONTENT )), - aExampleWIN(this, SW_RES( WIN_EXAMPLE )), + aExampleWIN(this, SW_RES( WIN_EXAMPLE )), sVisCardGroup(SW_RES(ST_VISCARD_GROUP)), pExampleFrame(0) { @@ -949,24 +949,24 @@ sal_Bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet) { SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL); - aItem.aPrivFirstName = aFirstNameED .GetText(); - aItem.aPrivName = aNameED .GetText( ); - aItem.aPrivShortCut = aShortCutED .GetText( ); - aItem.aPrivFirstName2 = aFirstName2ED .GetText(); - aItem.aPrivName2 = aName2ED .GetText( ); + aItem.aPrivFirstName = aFirstNameED .GetText(); + aItem.aPrivName = aNameED .GetText( ); + aItem.aPrivShortCut = aShortCutED .GetText( ); + aItem.aPrivFirstName2 = aFirstName2ED .GetText(); + aItem.aPrivName2 = aName2ED .GetText( ); aItem.aPrivShortCut2 = aShortCut2ED .GetText( ); - aItem.aPrivStreet = aStreetED .GetText( ); - aItem.aPrivZip = aZipED .GetText( ); - aItem.aPrivCity = aCityED .GetText( ); - aItem.aPrivCountry = aCountryED .GetText( ); - aItem.aPrivState = aStateED .GetText( ); - aItem.aPrivTitle = aTitleED .GetText( ); - aItem.aPrivProfession= aProfessionED.GetText( ); - aItem.aPrivPhone = aPhoneED .GetText( ); - aItem.aPrivMobile = aMobilePhoneED.GetText( ); - aItem.aPrivFax = aFaxED .GetText( ); - aItem.aPrivWWW = aHomePageED .GetText( ); - aItem.aPrivMail = aMailED .GetText( ); + aItem.aPrivStreet = aStreetED .GetText( ); + aItem.aPrivZip = aZipED .GetText( ); + aItem.aPrivCity = aCityED .GetText( ); + aItem.aPrivCountry = aCountryED .GetText( ); + aItem.aPrivState = aStateED .GetText( ); + aItem.aPrivTitle = aTitleED .GetText( ); + aItem.aPrivProfession= aProfessionED.GetText( ); + aItem.aPrivPhone = aPhoneED .GetText( ); + aItem.aPrivMobile = aMobilePhoneED.GetText( ); + aItem.aPrivFax = aFaxED .GetText( ); + aItem.aPrivWWW = aHomePageED .GetText( ); + aItem.aPrivMail = aMailED .GetText( ); rSet.Put(aItem); return sal_True; @@ -1002,30 +1002,30 @@ void SwPrivateDataPage::Reset(const SfxItemSet& rSet) SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, SW_RES(TP_BUSINESS_DATA), rSet), aDataFL (this, SW_RES( FL_DATA )), - aCompanyFT (this, SW_RES( FT_COMP )), - aCompanyED (this, SW_RES( ED_COMP )), - aCompanyExtFT (this, SW_RES( FT_COMP_EXT )), - aCompanyExtED (this, SW_RES( ED_COMP_EXT )), - aSloganFT (this, SW_RES( FT_SLOGAN )), - aSloganED (this, SW_RES( ED_SLOGAN )), - aStreetFT (this, SW_RES( FT_STREET )), - aStreetED (this, SW_RES( ED_STREET )), - aZipCityFT (this, SW_RES( FT_ZIPCITY )), - aZipED (this, SW_RES( ED_ZIP )), - aCityED (this, SW_RES( ED_CITY )), - aCountryStateFT (this, SW_RES( FT_COUNTRYSTATE )), - aCountryED (this, SW_RES( ED_COUNTRY )), - aStateED (this, SW_RES( ED_STATE )), - aPositionFT (this, SW_RES( FT_POSITION )), - aPositionED (this, SW_RES( ED_POSITION )), - aPhoneFT (this, SW_RES( FT_PHONE_MOBILE )), - aPhoneED (this, SW_RES( ED_PHONE )), - aMobilePhoneED (this, SW_RES( ED_MOBILE )), - aFaxFT (this, SW_RES( FT_FAX )), - aFaxED (this, SW_RES( ED_FAX )), - aWWWMailFT (this, SW_RES( FT_WWWMAIL )), - aHomePageED (this, SW_RES( ED_WWW )), - aMailED (this, SW_RES( ED_MAIL )) + aCompanyFT (this, SW_RES( FT_COMP )), + aCompanyED (this, SW_RES( ED_COMP )), + aCompanyExtFT (this, SW_RES( FT_COMP_EXT )), + aCompanyExtED (this, SW_RES( ED_COMP_EXT )), + aSloganFT (this, SW_RES( FT_SLOGAN )), + aSloganED (this, SW_RES( ED_SLOGAN )), + aStreetFT (this, SW_RES( FT_STREET )), + aStreetED (this, SW_RES( ED_STREET )), + aZipCityFT (this, SW_RES( FT_ZIPCITY )), + aZipED (this, SW_RES( ED_ZIP )), + aCityED (this, SW_RES( ED_CITY )), + aCountryStateFT (this, SW_RES( FT_COUNTRYSTATE )), + aCountryED (this, SW_RES( ED_COUNTRY )), + aStateED (this, SW_RES( ED_STATE )), + aPositionFT (this, SW_RES( FT_POSITION )), + aPositionED (this, SW_RES( ED_POSITION )), + aPhoneFT (this, SW_RES( FT_PHONE_MOBILE )), + aPhoneED (this, SW_RES( ED_PHONE )), + aMobilePhoneED (this, SW_RES( ED_MOBILE )), + aFaxFT (this, SW_RES( FT_FAX )), + aFaxED (this, SW_RES( ED_FAX )), + aWWWMailFT (this, SW_RES( FT_WWWMAIL )), + aHomePageED (this, SW_RES( ED_WWW )), + aMailED (this, SW_RES( ED_MAIL )) { FreeResource(); SetExchangeSupport(); @@ -1067,20 +1067,20 @@ sal_Bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet) { SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL); - aItem.aCompCompany = aCompanyED .GetText(); + aItem.aCompCompany = aCompanyED .GetText(); aItem.aCompCompanyExt= aCompanyExtED .GetText(); - aItem.aCompSlogan = aSloganED .GetText(); - aItem.aCompStreet = aStreetED .GetText(); - aItem.aCompZip = aZipED .GetText(); - aItem.aCompCity = aCityED .GetText(); - aItem.aCompCountry = aCountryED .GetText(); - aItem.aCompState = aStateED .GetText(); - aItem.aCompPosition = aPositionED .GetText(); - aItem.aCompPhone = aPhoneED .GetText(); - aItem.aCompMobile = aMobilePhoneED .GetText(); - aItem.aCompFax = aFaxED .GetText(); - aItem.aCompWWW = aHomePageED .GetText(); - aItem.aCompMail = aMailED .GetText(); + aItem.aCompSlogan = aSloganED .GetText(); + aItem.aCompStreet = aStreetED .GetText(); + aItem.aCompZip = aZipED .GetText(); + aItem.aCompCity = aCityED .GetText(); + aItem.aCompCountry = aCountryED .GetText(); + aItem.aCompState = aStateED .GetText(); + aItem.aCompPosition = aPositionED .GetText(); + aItem.aCompPhone = aPhoneED .GetText(); + aItem.aCompMobile = aMobilePhoneED .GetText(); + aItem.aCompFax = aFaxED .GetText(); + aItem.aCompWWW = aHomePageED .GetText(); + aItem.aCompMail = aMailED .GetText(); rSet.Put(aItem); return sal_True; diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx index 7b906c0ae6bf..4cd165e6ca4f 100644 --- a/sw/source/ui/envelp/labelcfg.cxx +++ b/sw/source/ui/envelp/labelcfg.cxx @@ -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 @@ -58,7 +58,7 @@ SwLabelConfig::~SwLabelConfig() /* -----------------------------06.09.00 16:43-------------------------------- ---------------------------------------------------------------------------*/ -void SwLabelConfig::Commit() +void SwLabelConfig::Commit() { // the config item is not writable yet } @@ -125,11 +125,11 @@ SwLabRec* lcl_CreateSwLabRec(Sequence<Any>& rValues, const OUString& rManufactur return pNewRec; } //----------------------------------------------------------------------------- -Sequence<PropertyValue> lcl_CreateProperties( +Sequence<PropertyValue> lcl_CreateProperties( Sequence<OUString>& rPropNames, const SwLabRec& rRec) { const OUString* pNames = rPropNames.getConstArray(); - Sequence<PropertyValue> aRet(rPropNames.getLength()); + Sequence<PropertyValue> aRet(rPropNames.getLength()); PropertyValue* pValues = aRet.getArray(); OUString sColon(C2U(";")); @@ -159,7 +159,7 @@ Sequence<PropertyValue> lcl_CreateProperties( return aRet; } //----------------------------------------------------------------------------- -void SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr) +void SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr) { OUString sManufacturer(wrapConfigurationElementName(rManufacturer)); const Sequence<OUString> aLabels = GetNodeNames(sManufacturer); @@ -171,7 +171,7 @@ void SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLab sPrefix += pLabels[nLabel]; sPrefix += C2U("/"); Sequence<OUString> aPropNames = lcl_CreatePropertyNames(sPrefix); - Sequence<Any> aValues = GetProperties(aPropNames); + Sequence<Any> aValues = GetProperties(aPropNames); SwLabRec* pNewRec = lcl_CreateSwLabRec(aValues, rManufacturer); rLabArr.C40_INSERT( SwLabRec, pNewRec, rLabArr.Count() ); } @@ -179,7 +179,7 @@ void SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLab /* -----------------------------23.01.01 11:36-------------------------------- ---------------------------------------------------------------------------*/ -sal_Bool SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType) +sal_Bool SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType) { const OUString* pNode = aNodeNames.getConstArray(); sal_Bool bFound = sal_False; @@ -202,7 +202,7 @@ sal_Bool SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rt Sequence<OUString> aProperties(1); aProperties.getArray()[0] = sPrefix; aProperties.getArray()[0] += C2U("Name"); - Sequence<Any> aValues = GetProperties(aProperties); + Sequence<Any> aValues = GetProperties(aProperties); const Any* pValues = aValues.getConstArray(); if(pValues[0].hasValue()) { @@ -227,8 +227,8 @@ sal_Bool lcl_Exists(const OUString& rNode, const Sequence<OUString>& rLabels) return sal_False; } //----------------------------------------------------------------------------- -void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer, - const rtl::OUString& rType, const SwLabRec& rRec) +void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer, + const rtl::OUString& rType, const SwLabRec& rRec) { const OUString* pNode = aNodeNames.getConstArray(); sal_Bool bFound = sal_False; @@ -263,7 +263,7 @@ void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer, Sequence<OUString> aProperties(1); aProperties.getArray()[0] = sPrefix; aProperties.getArray()[0] += C2U("Name"); - Sequence<Any> aValues = GetProperties(aProperties); + Sequence<Any> aValues = GetProperties(aProperties); const Any* pValues = aValues.getConstArray(); if(pValues[0].hasValue()) { @@ -294,7 +294,7 @@ void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer, sPrefix += sFoundNode; sPrefix += C2U("/"); Sequence<OUString> aPropNames = lcl_CreatePropertyNames(sPrefix); - Sequence<PropertyValue> aPropValues = lcl_CreateProperties(aPropNames, rRec); + Sequence<PropertyValue> aPropValues = lcl_CreateProperties(aPropNames, rRec); SetSetProperties(wrapConfigurationElementName(rManufacturer), aPropValues); } diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index 22e281cfcef7..604677395eb3 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -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/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index c39daed1729e..feae56b71e51 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -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 @@ -80,7 +80,7 @@ SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) : Font aFont = GetFont(); aFont.SetTransparent(TRUE); - aFont.SetWeight (WEIGHT_NORMAL); + aFont.SetWeight (WEIGHT_NORMAL); SetFont(aFont); const Size aSz(GetOutputSizePixel()); @@ -92,9 +92,9 @@ SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) : lHDistWidth = GetTextWidth(aHDistStr ); lVDistWidth = GetTextWidth(aVDistStr ); lHeightWidth = GetTextWidth(aHeightStr); - lLeftWidth = GetTextWidth(aLeftStr ); + lLeftWidth = GetTextWidth(aLeftStr ); lUpperWidth = GetTextWidth(aUpperStr ); - lColsWidth = GetTextWidth(aColsStr ); + lColsWidth = GetTextWidth(aColsStr ); lXHeight = GetTextHeight(); lXWidth = GetTextWidth('X'); @@ -153,8 +153,8 @@ void SwLabPreview::Paint(const Rectangle &) long lX0 = (lOutWPix - lOutlineW) / 2; long lY0 = (lOutHPix - lOutlineH) / 2; - long lX1 = ROUND(lX0 + f * aItem.lLeft ); - long lY1 = ROUND(lY0 + f * aItem.lUpper); + long lX1 = ROUND(lX0 + f * aItem.lLeft ); + long lY1 = ROUND(lY0 + f * aItem.lUpper); long lX2 = ROUND(lX0 + f * (aItem.lLeft + aItem.lWidth )); long lY2 = ROUND(lY0 + f * (aItem.lUpper + aItem.lHeight)); long lX3 = ROUND(lX0 + f * (aItem.lLeft + aItem.lHDist )); @@ -355,20 +355,20 @@ SwLabFmtPage::SwLabFmtPage(Window* pParent, const SfxItemSet& rSet) : aVDistField .SetModifyHdl( aLk ); aWidthField .SetModifyHdl( aLk ); aHeightField.SetModifyHdl( aLk ); - aLeftField .SetModifyHdl( aLk ); + aLeftField .SetModifyHdl( aLk ); aUpperField .SetModifyHdl( aLk ); - aColsField .SetModifyHdl( aLk ); - aRowsField .SetModifyHdl( aLk ); + aColsField .SetModifyHdl( aLk ); + aRowsField .SetModifyHdl( aLk ); aLk = LINK(this, SwLabFmtPage, LoseFocusHdl); aHDistField .SetLoseFocusHdl( aLk ); aVDistField .SetLoseFocusHdl( aLk ); aWidthField .SetLoseFocusHdl( aLk ); aHeightField.SetLoseFocusHdl( aLk ); - aLeftField .SetLoseFocusHdl( aLk ); + aLeftField .SetLoseFocusHdl( aLk ); aUpperField .SetLoseFocusHdl( aLk ); - aColsField .SetLoseFocusHdl( aLk ); - aRowsField .SetLoseFocusHdl( aLk ); + aColsField .SetLoseFocusHdl( aLk ); + aRowsField .SetLoseFocusHdl( aLk ); aSavePB.SetClickHdl( LINK (this, SwLabFmtPage, SaveHdl)); // Timer einstellen @@ -437,7 +437,7 @@ void SwLabFmtPage::ChangeMinMax() lHDist = static_cast< long >(GETFLDVAL(aHDistField)), lVDist = static_cast< long >(GETFLDVAL(aVDistField)); - long nMinSize = 10; // 0,1cm + long nMinSize = 10; // 0,1cm aHDistField .SetMin(nMinSize, FUNIT_CM); aVDistField .SetMin(nMinSize, FUNIT_CM); @@ -451,11 +451,11 @@ void SwLabFmtPage::ChangeMinMax() aWidthField .SetMax((long) 100 * (lHDist), FUNIT_TWIP); aHeightField.SetMax((long) 100 * (lVDist), FUNIT_TWIP); - aLeftField .SetMax((long) 100 * (lMax - (long) aColsField.GetValue() * GETFLDVAL(aHDistField)), FUNIT_TWIP); + aLeftField .SetMax((long) 100 * (lMax - (long) aColsField.GetValue() * GETFLDVAL(aHDistField)), FUNIT_TWIP); aUpperField .SetMax((long) 100 * (lMax - (long) aRowsField.GetValue() * GETFLDVAL(aVDistField)), FUNIT_TWIP); - aColsField .SetMax((lMax - lLeft ) / Max(1L, lHDist)); - aRowsField .SetMax((lMax - lUpper) / Max(1L, lVDist)); + aColsField .SetMax((lMax - lLeft ) / Max(1L, lHDist)); + aRowsField .SetMax((lMax - lUpper) / Max(1L, lVDist)); // First und Last @@ -471,20 +471,20 @@ void SwLabFmtPage::ChangeMinMax() aWidthField .SetLast (aWidthField .GetMax()); aHeightField.SetLast (aHeightField.GetMax()); - aLeftField .SetLast (aLeftField .GetMax()); + aLeftField .SetLast (aLeftField .GetMax()); aUpperField .SetLast (aUpperField .GetMax()); - aColsField .SetLast (aColsField .GetMax()); - aRowsField .SetLast (aRowsField .GetMax()); + aColsField .SetLast (aColsField .GetMax()); + aRowsField .SetLast (aRowsField .GetMax()); aHDistField .Reformat(); aVDistField .Reformat(); aWidthField .Reformat(); aHeightField.Reformat(); - aLeftField .Reformat(); + aLeftField .Reformat(); aUpperField .Reformat(); - aColsField .Reformat(); - aRowsField .Reformat(); + aColsField .Reformat(); + aRowsField .Reformat(); } // -------------------------------------------------------------------------- @@ -535,8 +535,8 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem) rItem.lHeight = rRec.lHeight = static_cast< long >(GETFLDVAL(aHeightField)); rItem.lLeft = rRec.lLeft = static_cast< long >(GETFLDVAL(aLeftField )); rItem.lUpper = rRec.lUpper = static_cast< long >(GETFLDVAL(aUpperField )); - rItem.nCols = rRec.nCols = (USHORT) aColsField.GetValue(); - rItem.nRows = rRec.nRows = (USHORT) aRowsField.GetValue(); + rItem.nCols = rRec.nCols = (USHORT) aColsField.GetValue(); + rItem.nRows = rRec.nRows = (USHORT) aRowsField.GetValue(); } } @@ -562,7 +562,7 @@ void SwLabFmtPage::Reset(const SfxItemSet& ) aVDistField .SetMax(100 * aItem.lVDist , FUNIT_TWIP); aWidthField .SetMax(100 * aItem.lWidth , FUNIT_TWIP); aHeightField.SetMax(100 * aItem.lHeight, FUNIT_TWIP); - aLeftField .SetMax(100 * aItem.lLeft , FUNIT_TWIP); + aLeftField .SetMax(100 * aItem.lLeft , FUNIT_TWIP); aUpperField .SetMax(100 * aItem.lUpper , FUNIT_TWIP); SETFLDVAL(aHDistField , aItem.lHDist ); @@ -575,8 +575,8 @@ void SwLabFmtPage::Reset(const SfxItemSet& ) aColsField.SetMax(aItem.nCols); aRowsField.SetMax(aItem.nRows); - aColsField .SetValue(aItem.nCols); - aRowsField .SetValue(aItem.nRows); + aColsField .SetValue(aItem.nCols); + aRowsField .SetValue(aItem.nRows); aMakeFI.SetText(aItem.aMake); aTypeFI.SetText(aItem.aType); PreviewHdl(0); @@ -594,8 +594,8 @@ IMPL_LINK( SwLabFmtPage, SaveHdl, PushButton *, EMPTYARG ) aRec.lHeight = static_cast< long >(GETFLDVAL(aHeightField)); aRec.lLeft = static_cast< long >(GETFLDVAL(aLeftField )); aRec.lUpper = static_cast< long >(GETFLDVAL(aUpperField )); - aRec.nCols = (USHORT) aColsField.GetValue(); - aRec.nRows = (USHORT) aRowsField.GetValue(); + aRec.nCols = (USHORT) aColsField.GetValue(); + aRec.nRows = (USHORT) aRowsField.GetValue(); aRec.bCont = aItem.bCont; SwSaveLabelDlg* pSaveDlg = new SwSaveLabelDlg(this, aRec); pSaveDlg->SetLabel(aItem.aLstMake, aItem.aLstType); diff --git a/sw/source/ui/envelp/labfmt.hrc b/sw/source/ui/envelp/labfmt.hrc index ae6786dce3a9..96e511038f3c 100644 --- a/sw/source/ui/envelp/labfmt.hrc +++ b/sw/source/ui/envelp/labfmt.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 @@ -52,9 +52,9 @@ #define TXT_ROWS 16 #define FLD_ROWS 17 #define FL_NONAME 18 -#define PB_SAVE 19 +#define PB_SAVE 19 #define FI_MAKE 20 -#define FI_TYPE 21 +#define FI_TYPE 21 #define FL_OPTIONS 1 #define FT_MAKE 2 @@ -64,7 +64,7 @@ #define PB_OK 6 #define PB_CANCEL 7 #define PB_HELP 8 -#define MB_QUERY 9 +#define MB_QUERY 9 // Globale Resourcen ******************************************************** diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index ebe7ab46dc81..8b3be95f5ece 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -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 @@ -85,31 +85,31 @@ public: class SwLabFmtPage : public SfxTabPage { - FixedInfo aMakeFI; - FixedInfo aTypeFI; + FixedInfo aMakeFI; + FixedInfo aTypeFI; SwLabPreview aPreview; - FixedText aHDistText; - MetricField aHDistField; - FixedText aVDistText; - MetricField aVDistField; - FixedText aWidthText; - MetricField aWidthField; - FixedText aHeightText; - MetricField aHeightField; - FixedText aLeftText; - MetricField aLeftField; - FixedText aUpperText; - MetricField aUpperField; - FixedText aColsText; + FixedText aHDistText; + MetricField aHDistField; + FixedText aVDistText; + MetricField aVDistField; + FixedText aWidthText; + MetricField aWidthField; + FixedText aHeightText; + MetricField aHeightField; + FixedText aLeftText; + MetricField aLeftField; + FixedText aUpperText; + MetricField aUpperField; + FixedText aColsText; NumericField aColsField; - FixedText aRowsText; + FixedText aRowsText; NumericField aRowsField; - PushButton aSavePB; + PushButton aSavePB; Timer aPreviewTimer; BOOL bModified; - SwLabItem aItem; + SwLabItem aItem; SwLabFmtPage(Window* pParent, const SfxItemSet& rSet); ~SwLabFmtPage(); @@ -143,20 +143,20 @@ public: class SwSaveLabelDlg : public ModalDialog { FixedLine aOptionsFL; - FixedText aMakeFT; - ComboBox aMakeCB; - FixedText aTypeFT; - Edit aTypeED; + FixedText aMakeFT; + ComboBox aMakeCB; + FixedText aTypeFT; + Edit aTypeED; - OKButton aOKPB; - CancelButton aCancelPB; - HelpButton aHelpPB; + OKButton aOKPB; + CancelButton aCancelPB; + HelpButton aHelpPB; - QueryBox aQueryMB; + QueryBox aQueryMB; - sal_Bool bSuccess; - SwLabFmtPage* pLabPage; - SwLabRec& rLabRec; + sal_Bool bSuccess; + SwLabFmtPage* pLabPage; + SwLabRec& rLabRec; DECL_LINK(OkHdl, OKButton*); DECL_LINK(ModifyHdl, Edit*); @@ -164,7 +164,7 @@ class SwSaveLabelDlg : public ModalDialog public: SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec); - void SetLabel(const rtl::OUString& rMake, const rtl::OUString& rType) + void SetLabel(const rtl::OUString& rMake, const rtl::OUString& rType) { aMakeCB.SetText(String(rMake)); aTypeED.SetText(String(rType)); diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src index 890df1220250..8d39f44b5893 100644 --- a/sw/source/ui/envelp/labfmt.src +++ b/sw/source/ui/envelp/labfmt.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 @@ -214,7 +214,7 @@ TabPage TP_LAB_FMT Minimum = 1 ; First = 1 ; }; - PushButton PB_SAVE + PushButton PB_SAVE { Pos = MAP_APPFONT ( 50 , 148 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx index 0be179372ca5..2b436c9e7b67 100644 --- a/sw/source/ui/envelp/labimg.cxx +++ b/sw/source/ui/envelp/labimg.cxx @@ -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 @@ -61,9 +61,9 @@ SwLabItem::SwLabItem() : { bAddr = bCont = bSynchron = FALSE; bPage = TRUE; - lHDist = - lVDist = - lWidth = + lHDist = + lVDist = + lWidth = lHeight = 5669; // 10 cm } @@ -76,31 +76,31 @@ SwLabItem::SwLabItem(const SwLabItem& rItem) : // ---------------------------------------------------------------------------- SwLabItem& SwLabItem::operator =(const SwLabItem& rItem) { - bAddr = rItem.bAddr; + bAddr = rItem.bAddr; aWriting = rItem.aWriting; - bCont = rItem.bCont; + bCont = rItem.bCont; sDBName = rItem.sDBName; aLstMake = rItem.aLstMake; aLstType = rItem.aLstType; - aMake = rItem.aMake; - aType = rItem.aType; - bPage = rItem.bPage; + aMake = rItem.aMake; + aType = rItem.aType; + bPage = rItem.bPage; bSynchron = rItem.bSynchron; - aBin = rItem.aBin; - nCol = rItem.nCol; - nRow = rItem.nRow; - lHDist = rItem.lHDist; - lVDist = rItem.lVDist; - lWidth = rItem.lWidth; + aBin = rItem.aBin; + nCol = rItem.nCol; + nRow = rItem.nRow; + lHDist = rItem.lHDist; + lVDist = rItem.lVDist; + lWidth = rItem.lWidth; lHeight = rItem.lHeight; - lLeft = rItem.lLeft; - lUpper = rItem.lUpper; - nCols = rItem.nCols; - nRows = rItem.nRows; - aPrivFirstName = rItem.aPrivFirstName; + lLeft = rItem.lLeft; + lUpper = rItem.lUpper; + nCols = rItem.nCols; + nRows = rItem.nRows; + aPrivFirstName = rItem.aPrivFirstName; aPrivName = rItem.aPrivName; aPrivShortCut = rItem.aPrivShortCut; - aPrivFirstName2 = rItem.aPrivFirstName2; + aPrivFirstName2 = rItem.aPrivFirstName2; aPrivName2 = rItem.aPrivName2; aPrivShortCut2 = rItem.aPrivShortCut2; aPrivStreet = rItem.aPrivStreet; @@ -142,31 +142,31 @@ int SwLabItem::operator ==(const SfxPoolItem& rItem) const { const SwLabItem& rLab = (const SwLabItem&) rItem; - return bAddr == rLab.bAddr && - bCont == rLab.bCont && - bPage == rLab.bPage && + return bAddr == rLab.bAddr && + bCont == rLab.bCont && + bPage == rLab.bPage && bSynchron == rLab.bSynchron && - aBin == rLab.aBin && - nCol == rLab.nCol && - nRow == rLab.nRow && - lHDist == rLab.lHDist && - lVDist == rLab.lVDist && - lWidth == rLab.lWidth && - lHeight == rLab.lHeight && - lLeft == rLab.lLeft && - lUpper == rLab.lUpper && - nCols == rLab.nCols && - nRows == rLab.nRows && + aBin == rLab.aBin && + nCol == rLab.nCol && + nRow == rLab.nRow && + lHDist == rLab.lHDist && + lVDist == rLab.lVDist && + lWidth == rLab.lWidth && + lHeight == rLab.lHeight && + lLeft == rLab.lLeft && + lUpper == rLab.lUpper && + nCols == rLab.nCols && + nRows == rLab.nRows && aWriting == rLab.aWriting&& - aMake == rLab.aMake && - aType == rLab.aType && - aLstMake == rLab.aLstMake&& - aLstType == rLab.aLstType&& + aMake == rLab.aMake && + aType == rLab.aType && + aLstMake == rLab.aLstMake&& + aLstType == rLab.aLstType&& sDBName == rLab.sDBName && - aPrivFirstName == rLab.aPrivFirstName&& + aPrivFirstName == rLab.aPrivFirstName&& aPrivName == rLab.aPrivName&& aPrivShortCut == rLab.aPrivShortCut&& - aPrivFirstName2 == rLab.aPrivFirstName2&& + aPrivFirstName2 == rLab.aPrivFirstName2&& aPrivName2 == rLab.aPrivName2&& aPrivShortCut2 == rLab.aPrivShortCut2&& aPrivStreet == rLab.aPrivStreet&& @@ -212,61 +212,61 @@ Sequence<rtl::OUString> SwLabCfgItem::GetPropertyNames() { static const char* aLabelPropNames[] = { - "Medium/Continous", // 0 - "Medium/Brand", // 1 - "Medium/Type", // 2 - "Format/Column", // 3 - "Format/Row", // 4 + "Medium/Continous", // 0 + "Medium/Brand", // 1 + "Medium/Type", // 2 + "Format/Column", // 3 + "Format/Row", // 4 "Format/HorizontalDistance",// 5 - "Format/VerticalDistance", // 6 - "Format/Width", // 7 - "Format/Height", // 8 - "Format/LeftMargin", // 9 - "Format/TopMargin", //10 - "Option/Synchronize", //11 - "Option/Page", //12 - "Option/Column", //13 - "Option/Row", //14 - "Inscription/UseAddress", //15 - "Inscription/Address", //16 - "Inscription/Database" //17 + "Format/VerticalDistance", // 6 + "Format/Width", // 7 + "Format/Height", // 8 + "Format/LeftMargin", // 9 + "Format/TopMargin", //10 + "Option/Synchronize", //11 + "Option/Page", //12 + "Option/Column", //13 + "Option/Row", //14 + "Inscription/UseAddress", //15 + "Inscription/Address", //16 + "Inscription/Database" //17 }; static const char* aBusinessPropNames[] = { - "PrivateAddress/FirstName", // 0 - "PrivateAddress/Name", // 1 - "PrivateAddress/ShortCut", // 2 - "PrivateAddress/SecondFirstName", // 3 - "PrivateAddress/SecondName", // 4 - "PrivateAddress/SecondShortCut", // 5 - "PrivateAddress/Street", // 6 - "PrivateAddress/Zip", // 7 - "PrivateAddress/City", // 8 - "PrivateAddress/Country", // 9 - "PrivateAddress/State", // 10 - "PrivateAddress/Title", // 11 - "PrivateAddress/Profession", // 12 - "PrivateAddress/Phone", // 13 - "PrivateAddress/Mobile", // 14 - "PrivateAddress/Fax", // 15 - "PrivateAddress/WebAddress", // 16 - "PrivateAddress/Email", // 17 - "BusinessAddress/Company", // 18 - "BusinessAddress/CompanyExt", // 19 - "BusinessAddress/Slogan", // 20 - "BusinessAddress/Street", // 21 - "BusinessAddress/Zip", // 22 - "BusinessAddress/City", // 23 - "BusinessAddress/Country", // 24 - "BusinessAddress/State", // 25 - "BusinessAddress/Position", // 26 - "BusinessAddress/Phone", // 27 - "BusinessAddress/Mobile", // 28 - "BusinessAddress/Fax", // 29 - "BusinessAddress/WebAddress", // 30 - "BusinessAddress/Email", // 31 - "AutoText/Group", // 32 - "AutoText/Block" // 33 + "PrivateAddress/FirstName", // 0 + "PrivateAddress/Name", // 1 + "PrivateAddress/ShortCut", // 2 + "PrivateAddress/SecondFirstName", // 3 + "PrivateAddress/SecondName", // 4 + "PrivateAddress/SecondShortCut", // 5 + "PrivateAddress/Street", // 6 + "PrivateAddress/Zip", // 7 + "PrivateAddress/City", // 8 + "PrivateAddress/Country", // 9 + "PrivateAddress/State", // 10 + "PrivateAddress/Title", // 11 + "PrivateAddress/Profession", // 12 + "PrivateAddress/Phone", // 13 + "PrivateAddress/Mobile", // 14 + "PrivateAddress/Fax", // 15 + "PrivateAddress/WebAddress", // 16 + "PrivateAddress/Email", // 17 + "BusinessAddress/Company", // 18 + "BusinessAddress/CompanyExt", // 19 + "BusinessAddress/Slogan", // 20 + "BusinessAddress/Street", // 21 + "BusinessAddress/Zip", // 22 + "BusinessAddress/City", // 23 + "BusinessAddress/Country", // 24 + "BusinessAddress/State", // 25 + "BusinessAddress/Position", // 26 + "BusinessAddress/Phone", // 27 + "BusinessAddress/Mobile", // 28 + "BusinessAddress/Fax", // 29 + "BusinessAddress/WebAddress", // 30 + "BusinessAddress/Email", // 31 + "AutoText/Group", // 32 + "AutoText/Block" // 33 }; const int nBusinessCount = bIsLabel ? 0 : 34; const int nLabelCount = bIsLabel ? 18 : 15; @@ -307,10 +307,10 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) : switch(nProperty) { case 0: aItem.bCont = *(sal_Bool*)pValues[nProp].getValue(); break;// "Medium/Continous", - case 1: pValues[nProp] >>= aItem.aMake; break;// "Medium/Brand", - case 2: pValues[nProp] >>= aItem.aType; break;// "Medium/Type", - case 3: pValues[nProp] >>= aItem.nCols; break;// "Format/Column", - case 4: pValues[nProp] >>= aItem.nRows; break;// "Format/Row", + case 1: pValues[nProp] >>= aItem.aMake; break;// "Medium/Brand", + case 2: pValues[nProp] >>= aItem.aType; break;// "Medium/Type", + case 3: pValues[nProp] >>= aItem.nCols; break;// "Format/Column", + case 4: pValues[nProp] >>= aItem.nRows; break;// "Format/Row", case 5: pValues[nProp] >>= aItem.lHDist; aItem.lHDist = MM100_TO_TWIP(aItem.lHDist); @@ -337,44 +337,44 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) : break;// "Format/TopMargin", case 11: aItem.bSynchron = *(sal_Bool*)pValues[nProp].getValue(); break;// "Option/Synchronize", case 12: aItem.bPage = *(sal_Bool*)pValues[nProp].getValue(); break;// "Option/Page", - case 13: pValues[nProp] >>= aItem.nCol; break;// "Option/Column", - case 14: pValues[nProp] >>= aItem.nRow; break;// "Option/Row" - case 15: aItem.bAddr = *(sal_Bool*)pValues[nProp].getValue(); break;// "Inscription/UseAddress", - case 16: pValues[nProp] >>= aItem.aWriting; break;// "Inscription/Address", - case 17: pValues[nProp] >>= aItem.sDBName; break;// "Inscription/Database" - case 18: pValues[nProp] >>= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName", - case 19: pValues[nProp] >>= aItem.aPrivName; break;// "PrivateAddress/Name", - case 20: pValues[nProp] >>= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut", - case 21: pValues[nProp] >>= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName", - case 22: pValues[nProp] >>= aItem.aPrivName2; break;// "PrivateAddress/SecondName", - case 23: pValues[nProp] >>= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut", - case 24: pValues[nProp] >>= aItem.aPrivStreet; break;// "PrivateAddress/Street", - case 25: pValues[nProp] >>= aItem.aPrivZip; break;// "PrivateAddress/Zip", - case 26: pValues[nProp] >>= aItem.aPrivCity; break;// "PrivateAddress/City", - case 27: pValues[nProp] >>= aItem.aPrivCountry; break;// "PrivateAddress/Country", - case 28: pValues[nProp] >>= aItem.aPrivState; break;// "PrivateAddress/State", - case 29: pValues[nProp] >>= aItem.aPrivTitle; break;// "PrivateAddress/Title", - case 30: pValues[nProp] >>= aItem.aPrivProfession; break;// "PrivateAddress/Profession", - case 31: pValues[nProp] >>= aItem.aPrivPhone; break;// "PrivateAddress/Phone", - case 32: pValues[nProp] >>= aItem.aPrivMobile; break;// "PrivateAddress/Mobile", - case 33: pValues[nProp] >>= aItem.aPrivFax; break;// "PrivateAddress/Fax", - case 34: pValues[nProp] >>= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress", - case 35: pValues[nProp] >>= aItem.aPrivMail; break;// "PrivateAddress/Email", - case 36: pValues[nProp] >>= aItem.aCompCompany; break;// "BusinessAddress/Company", - case 37: pValues[nProp] >>= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt", - case 38: pValues[nProp] >>= aItem.aCompSlogan; break;// "BusinessAddress/Slogan", - case 39: pValues[nProp] >>= aItem.aCompStreet; break;// "BusinessAddress/Street", - case 40: pValues[nProp] >>= aItem.aCompZip; break;// "BusinessAddress/Zip", - case 41: pValues[nProp] >>= aItem.aCompCity; break;// "BusinessAddress/City", - case 42: pValues[nProp] >>= aItem.aCompCountry; break;// "BusinessAddress/Country", - case 43: pValues[nProp] >>= aItem.aCompState; break;// "BusinessAddress/State", - case 44: pValues[nProp] >>= aItem.aCompPosition; break;// "BusinessAddress/Position", - case 45: pValues[nProp] >>= aItem.aCompPhone; break;// "BusinessAddress/Phone", - case 46: pValues[nProp] >>= aItem.aCompMobile; break;// "BusinessAddress/Mobile", - case 47: pValues[nProp] >>= aItem.aCompFax; break;// "BusinessAddress/Fax", - case 48: pValues[nProp] >>= aItem.aCompWWW; break;// "BusinessAddress/WebAddress", - case 49: pValues[nProp] >>= aItem.aCompMail; break;// "BusinessAddress/Email", - case 50: pValues[nProp] >>= aItem.sGlossaryGroup; break;// "AutoText/Group" + case 13: pValues[nProp] >>= aItem.nCol; break;// "Option/Column", + case 14: pValues[nProp] >>= aItem.nRow; break;// "Option/Row" + case 15: aItem.bAddr = *(sal_Bool*)pValues[nProp].getValue(); break;// "Inscription/UseAddress", + case 16: pValues[nProp] >>= aItem.aWriting; break;// "Inscription/Address", + case 17: pValues[nProp] >>= aItem.sDBName; break;// "Inscription/Database" + case 18: pValues[nProp] >>= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName", + case 19: pValues[nProp] >>= aItem.aPrivName; break;// "PrivateAddress/Name", + case 20: pValues[nProp] >>= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut", + case 21: pValues[nProp] >>= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName", + case 22: pValues[nProp] >>= aItem.aPrivName2; break;// "PrivateAddress/SecondName", + case 23: pValues[nProp] >>= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut", + case 24: pValues[nProp] >>= aItem.aPrivStreet; break;// "PrivateAddress/Street", + case 25: pValues[nProp] >>= aItem.aPrivZip; break;// "PrivateAddress/Zip", + case 26: pValues[nProp] >>= aItem.aPrivCity; break;// "PrivateAddress/City", + case 27: pValues[nProp] >>= aItem.aPrivCountry; break;// "PrivateAddress/Country", + case 28: pValues[nProp] >>= aItem.aPrivState; break;// "PrivateAddress/State", + case 29: pValues[nProp] >>= aItem.aPrivTitle; break;// "PrivateAddress/Title", + case 30: pValues[nProp] >>= aItem.aPrivProfession; break;// "PrivateAddress/Profession", + case 31: pValues[nProp] >>= aItem.aPrivPhone; break;// "PrivateAddress/Phone", + case 32: pValues[nProp] >>= aItem.aPrivMobile; break;// "PrivateAddress/Mobile", + case 33: pValues[nProp] >>= aItem.aPrivFax; break;// "PrivateAddress/Fax", + case 34: pValues[nProp] >>= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress", + case 35: pValues[nProp] >>= aItem.aPrivMail; break;// "PrivateAddress/Email", + case 36: pValues[nProp] >>= aItem.aCompCompany; break;// "BusinessAddress/Company", + case 37: pValues[nProp] >>= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt", + case 38: pValues[nProp] >>= aItem.aCompSlogan; break;// "BusinessAddress/Slogan", + case 39: pValues[nProp] >>= aItem.aCompStreet; break;// "BusinessAddress/Street", + case 40: pValues[nProp] >>= aItem.aCompZip; break;// "BusinessAddress/Zip", + case 41: pValues[nProp] >>= aItem.aCompCity; break;// "BusinessAddress/City", + case 42: pValues[nProp] >>= aItem.aCompCountry; break;// "BusinessAddress/Country", + case 43: pValues[nProp] >>= aItem.aCompState; break;// "BusinessAddress/State", + case 44: pValues[nProp] >>= aItem.aCompPosition; break;// "BusinessAddress/Position", + case 45: pValues[nProp] >>= aItem.aCompPhone; break;// "BusinessAddress/Phone", + case 46: pValues[nProp] >>= aItem.aCompMobile; break;// "BusinessAddress/Mobile", + case 47: pValues[nProp] >>= aItem.aCompFax; break;// "BusinessAddress/Fax", + case 48: pValues[nProp] >>= aItem.aCompWWW; break;// "BusinessAddress/WebAddress", + case 49: pValues[nProp] >>= aItem.aCompMail; break;// "BusinessAddress/Email", + case 50: pValues[nProp] >>= aItem.sGlossaryGroup; break;// "AutoText/Group" case 51: pValues[nProp] >>= aItem.sGlossaryBlockName; break;// "AutoText/Block" } } @@ -409,7 +409,7 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) : ---------------------------------------------------------------------------*/ void SwLabCfgItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} -void SwLabCfgItem::Commit() +void SwLabCfgItem::Commit() { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -424,56 +424,56 @@ void SwLabCfgItem::Commit() switch(nProperty) { case 0: pValues[nProp].setValue(&aItem.bCont, rType); break;// "Medium/Continous", - case 1: pValues[nProp] <<= aItem.aMake; break;// "Medium/Brand", - case 2: pValues[nProp] <<= aItem.aType; break;// "Medium/Type", - case 3: pValues[nProp] <<= aItem.nCols; break;// "Format/Column", - case 4: pValues[nProp] <<= aItem.nRows; break;// "Format/Row", + case 1: pValues[nProp] <<= aItem.aMake; break;// "Medium/Brand", + case 2: pValues[nProp] <<= aItem.aType; break;// "Medium/Type", + case 3: pValues[nProp] <<= aItem.nCols; break;// "Format/Column", + case 4: pValues[nProp] <<= aItem.nRows; break;// "Format/Row", case 5: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lHDist));break;// "Format/HorizontalDistance", case 6: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lVDist));break;// "Format/VerticalDistance", - case 7: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lWidth)); break;// "Format/Width", - case 8: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lHeight)); break;// "Format/Height", - case 9: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lLeft)); break;// "Format/LeftMargin", - case 10: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lUpper)); break;// "Format/TopMargin", + case 7: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lWidth)); break;// "Format/Width", + case 8: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lHeight)); break;// "Format/Height", + case 9: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lLeft)); break;// "Format/LeftMargin", + case 10: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lUpper)); break;// "Format/TopMargin", case 11: pValues[nProp].setValue(&aItem.bSynchron, rType); break;// "Option/Synchronize", case 12: pValues[nProp].setValue(&aItem.bPage, rType); break;// "Option/Page", - case 13: pValues[nProp] <<= aItem.nCol; break;// "Option/Column", - case 14: pValues[nProp] <<= aItem.nRow; break;// "Option/Row" - case 15: pValues[nProp].setValue(&aItem.bAddr, rType); break;// "Inscription/UseAddress", - case 16: pValues[nProp] <<= aItem.aWriting; break;// "Inscription/Address", - case 17: pValues[nProp] <<= aItem.sDBName; break;// "Inscription/Database" - case 18: pValues[nProp] <<= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName", - case 19: pValues[nProp] <<= aItem.aPrivName; break;// "PrivateAddress/Name", - case 20: pValues[nProp] <<= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut", - case 21: pValues[nProp] <<= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName", - case 22: pValues[nProp] <<= aItem.aPrivName2; break;// "PrivateAddress/SecondName", - case 23: pValues[nProp] <<= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut", - case 24: pValues[nProp] <<= aItem.aPrivStreet; break;// "PrivateAddress/Street", - case 25: pValues[nProp] <<= aItem.aPrivZip; break;// "PrivateAddress/Zip", - case 26: pValues[nProp] <<= aItem.aPrivCity; break;// "PrivateAddress/City", - case 27: pValues[nProp] <<= aItem.aPrivCountry; break;// "PrivateAddress/Country", - case 28: pValues[nProp] <<= aItem.aPrivState; break;// "PrivateAddress/State", - case 29: pValues[nProp] <<= aItem.aPrivTitle; break;// "PrivateAddress/Title", - case 30: pValues[nProp] <<= aItem.aPrivProfession; break;// "PrivateAddress/Profession", - case 31: pValues[nProp] <<= aItem.aPrivPhone; break;// "PrivateAddress/Phone", - case 32: pValues[nProp] <<= aItem.aPrivMobile; break;// "PrivateAddress/Mobile", - case 33: pValues[nProp] <<= aItem.aPrivFax; break;// "PrivateAddress/Fax", - case 34: pValues[nProp] <<= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress", - case 35: pValues[nProp] <<= aItem.aPrivMail; break;// "PrivateAddress/Email", - case 36: pValues[nProp] <<= aItem.aCompCompany; break;// "BusinessAddress/Company", - case 37: pValues[nProp] <<= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt", - case 38: pValues[nProp] <<= aItem.aCompSlogan; break;// "BusinessAddress/Slogan", - case 39: pValues[nProp] <<= aItem.aCompStreet; break;// "BusinessAddress/Street", - case 40: pValues[nProp] <<= aItem.aCompZip; break;// "BusinessAddress/Zip", - case 41: pValues[nProp] <<= aItem.aCompCity; break;// "BusinessAddress/City", - case 42: pValues[nProp] <<= aItem.aCompCountry; break;// "BusinessAddress/Country", - case 43: pValues[nProp] <<= aItem.aCompState; break;// "BusinessAddress/State", - case 44: pValues[nProp] <<= aItem.aCompPosition; break;// "BusinessAddress/Position", - case 45: pValues[nProp] <<= aItem.aCompPhone; break;// "BusinessAddress/Phone", - case 46: pValues[nProp] <<= aItem.aCompMobile; break;// "BusinessAddress/Mobile", - case 47: pValues[nProp] <<= aItem.aCompFax; break;// "BusinessAddress/Fax", - case 48: pValues[nProp] <<= aItem.aCompWWW; break;// "BusinessAddress/WebAddress", - case 49: pValues[nProp] <<= aItem.aCompMail; break;// "BusinessAddress/Email", - case 50: pValues[nProp] <<= aItem.sGlossaryGroup; break;// "AutoText/Group" + case 13: pValues[nProp] <<= aItem.nCol; break;// "Option/Column", + case 14: pValues[nProp] <<= aItem.nRow; break;// "Option/Row" + case 15: pValues[nProp].setValue(&aItem.bAddr, rType); break;// "Inscription/UseAddress", + case 16: pValues[nProp] <<= aItem.aWriting; break;// "Inscription/Address", + case 17: pValues[nProp] <<= aItem.sDBName; break;// "Inscription/Database" + case 18: pValues[nProp] <<= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName", + case 19: pValues[nProp] <<= aItem.aPrivName; break;// "PrivateAddress/Name", + case 20: pValues[nProp] <<= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut", + case 21: pValues[nProp] <<= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName", + case 22: pValues[nProp] <<= aItem.aPrivName2; break;// "PrivateAddress/SecondName", + case 23: pValues[nProp] <<= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut", + case 24: pValues[nProp] <<= aItem.aPrivStreet; break;// "PrivateAddress/Street", + case 25: pValues[nProp] <<= aItem.aPrivZip; break;// "PrivateAddress/Zip", + case 26: pValues[nProp] <<= aItem.aPrivCity; break;// "PrivateAddress/City", + case 27: pValues[nProp] <<= aItem.aPrivCountry; break;// "PrivateAddress/Country", + case 28: pValues[nProp] <<= aItem.aPrivState; break;// "PrivateAddress/State", + case 29: pValues[nProp] <<= aItem.aPrivTitle; break;// "PrivateAddress/Title", + case 30: pValues[nProp] <<= aItem.aPrivProfession; break;// "PrivateAddress/Profession", + case 31: pValues[nProp] <<= aItem.aPrivPhone; break;// "PrivateAddress/Phone", + case 32: pValues[nProp] <<= aItem.aPrivMobile; break;// "PrivateAddress/Mobile", + case 33: pValues[nProp] <<= aItem.aPrivFax; break;// "PrivateAddress/Fax", + case 34: pValues[nProp] <<= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress", + case 35: pValues[nProp] <<= aItem.aPrivMail; break;// "PrivateAddress/Email", + case 36: pValues[nProp] <<= aItem.aCompCompany; break;// "BusinessAddress/Company", + case 37: pValues[nProp] <<= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt", + case 38: pValues[nProp] <<= aItem.aCompSlogan; break;// "BusinessAddress/Slogan", + case 39: pValues[nProp] <<= aItem.aCompStreet; break;// "BusinessAddress/Street", + case 40: pValues[nProp] <<= aItem.aCompZip; break;// "BusinessAddress/Zip", + case 41: pValues[nProp] <<= aItem.aCompCity; break;// "BusinessAddress/City", + case 42: pValues[nProp] <<= aItem.aCompCountry; break;// "BusinessAddress/Country", + case 43: pValues[nProp] <<= aItem.aCompState; break;// "BusinessAddress/State", + case 44: pValues[nProp] <<= aItem.aCompPosition; break;// "BusinessAddress/Position", + case 45: pValues[nProp] <<= aItem.aCompPhone; break;// "BusinessAddress/Phone", + case 46: pValues[nProp] <<= aItem.aCompMobile; break;// "BusinessAddress/Mobile", + case 47: pValues[nProp] <<= aItem.aCompFax; break;// "BusinessAddress/Fax", + case 48: pValues[nProp] <<= aItem.aCompWWW; break;// "BusinessAddress/WebAddress", + case 49: pValues[nProp] <<= aItem.aCompMail; break;// "BusinessAddress/Email", + case 50: pValues[nProp] <<= aItem.sGlossaryGroup; break;// "AutoText/Group" case 51: pValues[nProp] <<= aItem.sGlossaryBlockName; break;// "AutoText/Block" } } diff --git a/sw/source/ui/envelp/labimp.hxx b/sw/source/ui/envelp/labimp.hxx index 5176394e8249..be3fa2c53703 100644 --- a/sw/source/ui/envelp/labimp.hxx +++ b/sw/source/ui/envelp/labimp.hxx @@ -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 @@ -83,7 +83,7 @@ #include <label.hxx> #include <labimg.hxx> -#define GETFLDVAL(rField) (rField).Denormalize((rField).GetValue(FUNIT_TWIP)) +#define GETFLDVAL(rField) (rField).Denormalize((rField).GetValue(FUNIT_TWIP)) #define SETFLDVAL(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FUNIT_TWIP) class SwNewDBMgr; @@ -96,17 +96,17 @@ public: void SetFromItem( const SwLabItem& rItem ); void FillItem( SwLabItem& rItem ) const; - String aMake; - String aType; - long lHDist; - long lVDist; - long lWidth; - long lHeight; - long lLeft; - long lUpper; - sal_Int32 nCols; - sal_Int32 nRows; - sal_Bool bCont; + String aMake; + String aType; + long lHDist; + long lVDist; + long lWidth; + long lHeight; + long lLeft; + long lUpper; + sal_Int32 nCols; + sal_Int32 nRows; + sal_Bool bCont; }; /* -------------------------------------------------- diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 633e40a5d146..59b4d9684cb7 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -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 @@ -63,14 +63,14 @@ SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) : pPrinter( 0 ), aPageButton (this, SW_RES(BTN_PAGE )), aSingleButton (this, SW_RES(BTN_SINGLE )), - aColText (this, SW_RES(TXT_COL )), - aColField (this, SW_RES(FLD_COL )), - aRowText (this, SW_RES(TXT_ROW )), - aRowField (this, SW_RES(FLD_ROW )), - aSynchronCB (this, SW_RES(CB_SYNCHRON)), + aColText (this, SW_RES(TXT_COL )), + aColField (this, SW_RES(FLD_COL )), + aRowText (this, SW_RES(TXT_ROW )), + aRowField (this, SW_RES(FLD_ROW )), + aSynchronCB (this, SW_RES(CB_SYNCHRON)), aFLDontKnow (this, SW_RES(FL_DONTKNOW)), aPrinterInfo (this, SW_RES(INF_PRINTER)), - aPrtSetup (this, SW_RES(BTN_PRTSETUP)), + aPrtSetup (this, SW_RES(BTN_PRTSETUP)), aFLPrinter (this, SW_RES(FL_PRINTER )) { @@ -178,8 +178,8 @@ int SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet) void SwLabPrtPage::FillItem(SwLabItem& rItem) { rItem.bPage = aPageButton.IsChecked(); - rItem.nCol = (USHORT) aColField.GetValue(); - rItem.nRow = (USHORT) aRowField.GetValue(); + rItem.nCol = (USHORT) aColField.GetValue(); + rItem.nRow = (USHORT) aRowField.GetValue(); rItem.bSynchron = aSynchronCB.IsChecked() && aSynchronCB.IsEnabled(); } @@ -206,8 +206,8 @@ void SwLabPrtPage::Reset(const SfxItemSet& ) SwLabItem aItem; GetParent()->GetLabItem(aItem); - aColField.SetValue (aItem.nCol); - aRowField.SetValue (aItem.nRow); + aColField.SetValue (aItem.nCol); + aRowField.SetValue (aItem.nRow); if (aItem.bPage) { diff --git a/sw/source/ui/envelp/labprt.hrc b/sw/source/ui/envelp/labprt.hrc index 07453cb01e89..56cc1e09cdfc 100644 --- a/sw/source/ui/envelp/labprt.hrc +++ b/sw/source/ui/envelp/labprt.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 @@ -44,7 +44,7 @@ #define BTN_PRTSETUP 8 #define FL_PRINTER 9 #define FL_DONTKNOW 10 -#define CB_SYNCHRON 11 +#define CB_SYNCHRON 11 // Ueberlaufpruefung ******************************************************** diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 1f8ff491423d..e64f7d739dde 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -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 @@ class SwLabItem; class SwLabPrtPage : public SfxTabPage { - Printer* pPrinter; //Fuer die Schachteinstellug - leider. + Printer* pPrinter; //Fuer die Schachteinstellug - leider. RadioButton aPageButton; RadioButton aSingleButton; @@ -51,7 +51,7 @@ class SwLabPrtPage : public SfxTabPage NumericField aColField; FixedText aRowText; NumericField aRowField; - CheckBox aSynchronCB; + CheckBox aSynchronCB; FixedLine aFLDontKnow; FixedInfo aPrinterInfo; diff --git a/sw/source/ui/envelp/labprt.src b/sw/source/ui/envelp/labprt.src index 6ace6002d7f6..b6452f56cef1 100644 --- a/sw/source/ui/envelp/labprt.src +++ b/sw/source/ui/envelp/labprt.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/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 141adf35ddf0..a80438afe8cd 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -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 @@ -168,20 +168,20 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, pBeamerWin (new Window(this, SW_RES(WIN_BEAMER))), aAllRB (this, SW_RES(RB_ALL)), - aMarkedRB (this, SW_RES(RB_MARKED)), - aFromRB (this, SW_RES(RB_FROM)), - aFromNF (this, SW_RES(NF_FROM)), - aBisFT (this, SW_RES(FT_BIS)), - aToNF (this, SW_RES(NF_TO)), + aMarkedRB (this, SW_RES(RB_MARKED)), + aFromRB (this, SW_RES(RB_FROM)), + aFromNF (this, SW_RES(NF_FROM)), + aBisFT (this, SW_RES(FT_BIS)), + aToNF (this, SW_RES(NF_TO)), aRecordFL (this, SW_RES(FL_RECORD)), aSeparatorFL (this, SW_RES(FL_SEPARATOR)), aPrinterRB (this, SW_RES(RB_PRINTER)), - aMailingRB (this, SW_RES(RB_MAILING)), - aFileRB (this, SW_RES(RB_FILE)), + aMailingRB (this, SW_RES(RB_MAILING)), + aFileRB (this, SW_RES(RB_FILE)), - aSingleJobsCB (this, SW_RES(CB_SINGLE_JOBS)), + aSingleJobsCB (this, SW_RES(CB_SINGLE_JOBS)), aSaveMergedDocumentFL(this, SW_RES( FL_SAVE_MERGED_DOCUMENT)), aSaveSingleDocRB(this, SW_RES( RB_SAVE_SINGLE_DOC )), @@ -192,34 +192,34 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, aColumnLB (this, SW_RES(LB_COLUMN)), aPathFT (this, SW_RES(FT_PATH)), - aPathED (this, SW_RES(ED_PATH)), - aPathPB (this, SW_RES(PB_PATH)), + aPathED (this, SW_RES(ED_PATH)), + aPathPB (this, SW_RES(PB_PATH)), aFilterFT (this, SW_RES(FT_FILTER)), aFilterLB (this, SW_RES(LB_FILTER)), - aAddressFldLB (this, SW_RES(LB_ADDRESSFLD)), - aSubjectFT (this, SW_RES(FT_SUBJECT)), - aSubjectED (this, SW_RES(ED_SUBJECT)), - aFormatFT (this, SW_RES(FT_FORMAT)), - aAttachFT (this, SW_RES(FT_ATTACH)), - aAttachED (this, SW_RES(ED_ATTACH)), - aAttachPB (this, SW_RES(PB_ATTACH)), - aFormatHtmlCB (this, SW_RES(CB_FORMAT_HTML)), - aFormatRtfCB (this, SW_RES(CB_FORMAT_RTF)), + aAddressFldLB (this, SW_RES(LB_ADDRESSFLD)), + aSubjectFT (this, SW_RES(FT_SUBJECT)), + aSubjectED (this, SW_RES(ED_SUBJECT)), + aFormatFT (this, SW_RES(FT_FORMAT)), + aAttachFT (this, SW_RES(FT_ATTACH)), + aAttachED (this, SW_RES(ED_ATTACH)), + aAttachPB (this, SW_RES(PB_ATTACH)), + aFormatHtmlCB (this, SW_RES(CB_FORMAT_HTML)), + aFormatRtfCB (this, SW_RES(CB_FORMAT_RTF)), aFormatSwCB (this, SW_RES(CB_FORMAT_SW)), aDestFL (this, SW_RES(FL_DEST)), aBottomSeparatorFL(this, SW_RES(FL_BOTTOM_SEPARATOR)), - aOkBTN (this, SW_RES(BTN_OK)), - aCancelBTN (this, SW_RES(BTN_CANCEL)), - aHelpBTN (this, SW_RES(BTN_HELP)), + aOkBTN (this, SW_RES(BTN_OK)), + aCancelBTN (this, SW_RES(BTN_CANCEL)), + aHelpBTN (this, SW_RES(BTN_HELP)), pImpl (new SwMailMergeDlg_Impl), rSh (rShell), - rDBName (rSourceName), - rTableName (rTblName), + rDBName (rSourceName), + rTableName (rTblName), nMergeType (DBMGR_MERGE_MAILING), m_aDialogSize( GetSizePixel() ) { @@ -768,7 +768,7 @@ bool SwMailMergeDlg::ExecQryShell() pMgr->SetSubject(sPath); } - if (aFromRB.IsChecked()) // Liste Einfuegen + if (aFromRB.IsChecked()) // Liste Einfuegen { // Safe: the maximal value of the fields is limited sal_Int32 nStart = sal::static_int_cast<sal_Int32>(aFromNF.GetValue()); @@ -783,7 +783,7 @@ bool SwMailMergeDlg::ExecQryShell() *pSelection <<= i; } else if (aAllRB.IsChecked() ) - m_aSelection.realloc(0); // Leere Selektion = Alles einfuegen + m_aSelection.realloc(0); // Leere Selektion = Alles einfuegen else { if(pImpl->xSelSupp.is()) diff --git a/sw/source/ui/envelp/mailmrge.hrc b/sw/source/ui/envelp/mailmrge.hrc index f03c42663fe6..f98c69c75be3 100644 --- a/sw/source/ui/envelp/mailmrge.hrc +++ b/sw/source/ui/envelp/mailmrge.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 @@ -35,33 +35,33 @@ // Elemente ----------------------------------------------------------------- #define FL_RECORD 1 -#define RB_ALL 2 -#define RB_MARKED 3 -#define RB_FROM 4 -#define NF_FROM 5 -#define FT_BIS 6 -#define NF_TO 7 -#define BTN_OK 8 -#define BTN_CANCEL 9 -#define BTN_HELP 10 -#define RB_PRINTER 11 -#define RB_MAILING 12 -#define FT_ADDRESS 13 -#define LB_ADDRESSFLD 14 -#define FT_SUBJECT 15 -#define ED_SUBJECT 16 +#define RB_ALL 2 +#define RB_MARKED 3 +#define RB_FROM 4 +#define NF_FROM 5 +#define FT_BIS 6 +#define NF_TO 7 +#define BTN_OK 8 +#define BTN_CANCEL 9 +#define BTN_HELP 10 +#define RB_PRINTER 11 +#define RB_MAILING 12 +#define FT_ADDRESS 13 +#define LB_ADDRESSFLD 14 +#define FT_SUBJECT 15 +#define ED_SUBJECT 16 #define FL_DEST 17 -#define CB_SINGLE_JOBS 18 -#define FT_FORMAT 19 -#define CB_FORMAT_SW 20 -#define CB_FORMAT_HTML 21 -#define CB_FORMAT_RTF 22 -#define RB_FILE 23 -#define FT_PATH 24 -#define ED_PATH 25 -#define PB_PATH 26 -#define LB_COLUMN 30 -#define FT_ATTACH 32 +#define CB_SINGLE_JOBS 18 +#define FT_FORMAT 19 +#define CB_FORMAT_SW 20 +#define CB_FORMAT_HTML 21 +#define CB_FORMAT_RTF 22 +#define RB_FILE 23 +#define FT_PATH 24 +#define ED_PATH 25 +#define PB_PATH 26 +#define LB_COLUMN 30 +#define FT_ATTACH 32 #define ED_ATTACH 33 #define PB_ATTACH 34 #define WIN_BEAMER 35 @@ -72,7 +72,7 @@ #define RB_SAVE_INDIVIDUAL 40 #define RB_GENERATE_FROM_DATABASE 41 #define FT_COLUMN 42 -#define FT_FILTER 43 +#define FT_FILTER 43 #define LB_FILTER 44 #define FL_CREATEFROM 1 diff --git a/sw/source/ui/envelp/mailmrge.src b/sw/source/ui/envelp/mailmrge.src index ec6888e2c0e1..f87f08478ac6 100644 --- a/sw/source/ui/envelp/mailmrge.src +++ b/sw/source/ui/envelp/mailmrge.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,7 +31,7 @@ #include "helpid.h" #define _MAIL_MERGE_STRING_ \ - Text [ en-US ] = "Mail Merge" ; \ + Text [ en-US ] = "Mail Merge" ; \ ModalDialog DLG_MAILMERGE { @@ -136,14 +136,14 @@ ModalDialog DLG_MAILMERGE Size = MAP_APPFONT ( 156 , 8 ) ; Text [ en-US ] = "Save merged document" ; }; - RadioButton RB_SAVE_SINGLE_DOC + RadioButton RB_SAVE_SINGLE_DOC { Pos = MAP_APPFONT ( 150, 139 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "S~ave as single document"; }; - RadioButton RB_SAVE_INDIVIDUAL + RadioButton RB_SAVE_INDIVIDUAL { Pos = MAP_APPFONT ( 150, 152 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; @@ -301,7 +301,7 @@ ModalDialog DLG_MAILMERGE Size = MAP_APPFONT ( 162 , 8 ) ; Text [ en-US ] = "Output" ; }; - FixedLine FL_BOTTOM_SEPARATOR + FixedLine FL_BOTTOM_SEPARATOR { Pos = MAP_APPFONT ( 0, 232 ) ; Size = MAP_APPFONT ( 312 , 8 ) ; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 2bfcc7e27cae..49e12d001792 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -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 @@ -32,32 +32,32 @@ class SwLabPage : public SfxTabPage { SwNewDBMgr* pNewDBMgr; String sActDBName; - SwLabItem aItem; + SwLabItem aItem; - FixedText aWritingText; - CheckBox aAddrBox; + FixedText aWritingText; + CheckBox aAddrBox; MultiLineEdit aWritingEdit; - FixedText aDatabaseFT; - ListBox aDatabaseLB; - FixedText aTableFT; - ListBox aTableLB; + FixedText aDatabaseFT; + ListBox aDatabaseLB; + FixedText aTableFT; + ListBox aTableLB; ImageButton aInsertBT; - FixedText aDBFieldFT; - ListBox aDBFieldLB; -// PushButton aDatabaseButton; + FixedText aDBFieldFT; + ListBox aDBFieldLB; +// PushButton aDatabaseButton; FixedLine aWritingFL; RadioButton aContButton; RadioButton aSheetButton; - FixedText aMakeText; - ListBox aMakeBox; - FixedText aTypeText; - ListBox aTypeBox; + FixedText aMakeText; + ListBox aMakeBox; + FixedText aTypeText; + ListBox aTypeBox; ListBox aHiddenSortTypeBox; FixedInfo aFormatInfo; FixedLine aFormatFL; - sal_Bool m_bLabel; + sal_Bool m_bLabel; SwLabPage(Window* pParent, const SfxItemSet& rSet); ~SwLabPage(); @@ -70,7 +70,7 @@ class SwLabPage : public SfxTabPage DECL_LINK( MakeHdl, ListBox * ); DECL_LINK( TypeHdl, ListBox * ); - void DisplayFormat (); + void DisplayFormat (); SwLabRec* GetSelectedEntryPos(); using TabPage::ActivatePage; @@ -89,7 +89,7 @@ public: SwLabDlg* GetParent() {return (SwLabDlg*) SfxTabPage::GetParent()->GetParent();} - void SetToBusinessCard(); + void SetToBusinessCard(); void InitDatabaseBox(); inline void SetNewDBMgr(SwNewDBMgr* pDBMgr) { pNewDBMgr = pDBMgr; } @@ -102,33 +102,33 @@ public: class SwOneExampleFrame; class SwVisitingCardPage : public SfxTabPage { - SvTreeListBox aAutoTextLB; - FixedText aAutoTextGroupFT; - ListBox aAutoTextGroupLB; + SvTreeListBox aAutoTextLB; + FixedText aAutoTextGroupFT; + ListBox aAutoTextGroupLB; FixedLine aContentFL; - Window aExampleWIN; + Window aExampleWIN; - String sVisCardGroup; - String sTempURL; + String sVisCardGroup; + String sTempURL; - SwLabItem aLabItem; + SwLabItem aLabItem; - SwOneExampleFrame* pExampleFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > _xAutoText; + SwOneExampleFrame* pExampleFrame; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > _xAutoText; DECL_LINK( AutoTextSelectHdl, void* ); DECL_LINK( FrameControlInitializedHdl, void* ); - void InitFrameControl(); - void UpdateFields(); - - void ClearUserData(); + void InitFrameControl(); + void UpdateFields(); + void ClearUserData(); + using SfxTabPage::SetUserData; - void SetUserData( sal_uInt32 nCnt, + void SetUserData( sal_uInt32 nCnt, const rtl::OUString* pNames, const rtl::OUString* pValues ); @@ -154,35 +154,35 @@ class SwPrivateDataPage : public SfxTabPage { FixedLine aDataFL; - FixedText aNameFT; - Edit aFirstNameED; - Edit aNameED; - Edit aShortCutED; - - FixedText aName2FT; - Edit aFirstName2ED; - Edit aName2ED; - Edit aShortCut2ED; - - FixedText aStreetFT; - Edit aStreetED; - FixedText aZipCityFT; - Edit aZipED; - Edit aCityED; - FixedText aCountryStateFT; - Edit aCountryED; - Edit aStateED; - FixedText aTitleProfessionFT; - Edit aTitleED; - Edit aProfessionED; - FixedText aPhoneFT; - Edit aPhoneED; - Edit aMobilePhoneED; - FixedText aFaxFT; - Edit aFaxED; - FixedText aWWWMailFT; - Edit aHomePageED; - Edit aMailED; + FixedText aNameFT; + Edit aFirstNameED; + Edit aNameED; + Edit aShortCutED; + + FixedText aName2FT; + Edit aFirstName2ED; + Edit aName2ED; + Edit aShortCut2ED; + + FixedText aStreetFT; + Edit aStreetED; + FixedText aZipCityFT; + Edit aZipED; + Edit aCityED; + FixedText aCountryStateFT; + Edit aCountryED; + Edit aStateED; + FixedText aTitleProfessionFT; + Edit aTitleED; + Edit aProfessionED; + FixedText aPhoneFT; + Edit aPhoneED; + Edit aMobilePhoneED; + FixedText aFaxFT; + Edit aFaxED; + FixedText aWWWMailFT; + Edit aHomePageED; + Edit aMailED; SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet); ~SwPrivateDataPage(); @@ -205,34 +205,34 @@ public: class SwBusinessDataPage : public SfxTabPage { FixedLine aDataFL; - FixedText aCompanyFT; - Edit aCompanyED; - FixedText aCompanyExtFT; - Edit aCompanyExtED; - FixedText aSloganFT; - Edit aSloganED; - - FixedText aStreetFT; - Edit aStreetED; - FixedText aZipCityFT; - Edit aZipED; - Edit aCityED; - FixedText aCountryStateFT; - Edit aCountryED; - Edit aStateED; - - FixedText aPositionFT; - Edit aPositionED; - - FixedText aPhoneFT; - Edit aPhoneED; - Edit aMobilePhoneED; - FixedText aFaxFT; - Edit aFaxED; - - FixedText aWWWMailFT; - Edit aHomePageED; - Edit aMailED; + FixedText aCompanyFT; + Edit aCompanyED; + FixedText aCompanyExtFT; + Edit aCompanyExtED; + FixedText aSloganFT; + Edit aSloganED; + + FixedText aStreetFT; + Edit aStreetED; + FixedText aZipCityFT; + Edit aZipED; + Edit aCityED; + FixedText aCountryStateFT; + Edit aCountryED; + Edit aStateED; + + FixedText aPositionFT; + Edit aPositionED; + + FixedText aPhoneFT; + Edit aPhoneED; + Edit aMobilePhoneED; + FixedText aFaxFT; + Edit aFaxED; + + FixedText aWWWMailFT; + Edit aHomePageED; + Edit aMailED; SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet); ~SwBusinessDataPage(); diff --git a/sw/source/ui/envelp/syncbtn.cxx b/sw/source/ui/envelp/syncbtn.cxx index a0e7c0ac659e..dba0170d2062 100644 --- a/sw/source/ui/envelp/syncbtn.cxx +++ b/sw/source/ui/envelp/syncbtn.cxx @@ -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 @@ -85,7 +85,7 @@ SwSyncBtnDlg::SwSyncBtnDlg( SfxBindings* _pBindings, SfxChildWindow* pChild, Window *pParent) : SfxFloatingWindow(_pBindings, pChild, pParent, SW_RES(DLG_SYNC_BTN)), - aSyncBtn (this, SW_RES(BTN_SYNC )) + aSyncBtn (this, SW_RES(BTN_SYNC )) { FreeResource(); aSyncBtn.SetClickHdl(LINK(this, SwSyncBtnDlg, BtnHdl)); diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 68ce692f6a32..a32e6634b2dd 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -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/fldui/DropDownFieldDialog.hrc b/sw/source/ui/fldui/DropDownFieldDialog.hrc index dc63ae58e5ac..2d3f1955e06b 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.hrc +++ b/sw/source/ui/fldui/DropDownFieldDialog.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 @@ -26,7 +26,7 @@ ************************************************************************/ #ifndef _SW_DROPDOWNFIELDDIALOG_HRC #define _SW_DROPDOWNFIELDDIALOG_HRC -#define FL_ITEMS 1 +#define FL_ITEMS 1 #define LB_LISTITEMS 2 #define PB_OK 3 #define PB_CANCEL 4 diff --git a/sw/source/ui/fldui/DropDownFieldDialog.src b/sw/source/ui/fldui/DropDownFieldDialog.src index 407ee199a8ef..25f6c4ac153f 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.src +++ b/sw/source/ui/fldui/DropDownFieldDialog.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/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index 38910327754e..3d81ea70b311 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -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/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx index 92df954c8ddd..93867695bee0 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.hxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx @@ -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 @@ -32,7 +32,7 @@ class SwFldRefTreeListBox : public SvTreeListBox { protected: - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); public: SwFldRefTreeListBox(Window* pParent, const ResId& rResId); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 7d607b803536..bd35309e6808 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -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 @@ -87,18 +87,18 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) : SvxStandardDialog(&rVw.GetViewFrame()->GetWindow(), SW_RES(DLG_CHANGE_DB)), aDBListFL (this, SW_RES(FL_DBLIST )), - aUsedDBFT (this, SW_RES(FT_USEDDB )), - aAvailDBFT (this, SW_RES(FT_AVAILDB )), - aUsedDBTLB (this, SW_RES(TLB_USEDDB )), + aUsedDBFT (this, SW_RES(FT_USEDDB )), + aAvailDBFT (this, SW_RES(FT_AVAILDB )), + aUsedDBTLB (this, SW_RES(TLB_USEDDB )), aAvailDBTLB (this, SW_RES(TLB_AVAILDB ), 0), aAddDBPB (this, SW_RES(PB_ADDDB)), aDescFT (this, SW_RES(FT_DESC )), - aDocDBTextFT(this, SW_RES(FT_DOCDBTEXT )), - aDocDBNameFT(this, SW_RES(FT_DOCDBNAME )), - aOKBT (this, SW_RES(BT_OK )), - aCancelBT (this, SW_RES(BT_CANCEL )), - aHelpBT (this, SW_RES(BT_HELP )), -// aChangeBT (this, SW_RES(BT_CHANGEDB )), + aDocDBTextFT(this, SW_RES(FT_DOCDBTEXT )), + aDocDBNameFT(this, SW_RES(FT_DOCDBNAME )), + aOKBT (this, SW_RES(BT_OK )), + aCancelBT (this, SW_RES(BT_CANCEL )), + aHelpBT (this, SW_RES(BT_HELP )), +// aChangeBT (this, SW_RES(BT_CHANGEDB )), aImageList (SW_RES(ILIST_DB_DLG )), aImageListHC (SW_RES(ILIST_DB_DLG_HC )), @@ -248,7 +248,7 @@ __EXPORT SwChangeDBDlg::~SwChangeDBDlg() } /*-------------------------------------------------------------------- - Beschreibung: Schliessen + Beschreibung: Schliessen --------------------------------------------------------------------*/ void __EXPORT SwChangeDBDlg::Apply() { diff --git a/sw/source/ui/fldui/changedb.hrc b/sw/source/ui/fldui/changedb.hrc index 7bccd2fa9363..7ab2765eab48 100644 --- a/sw/source/ui/fldui/changedb.hrc +++ b/sw/source/ui/fldui/changedb.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 @@ -33,16 +33,16 @@ // Elemente ----------------------------------------------------------------- #define FT_DESC 1 -#define FT_DOCDBTEXT 2 -#define FT_DOCDBNAME 3 -#define BT_CHANGEDB 4 -#define FT_USEDDB 5 -#define FT_AVAILDB 6 -#define TLB_USEDDB 7 -#define TLB_AVAILDB 8 +#define FT_DOCDBTEXT 2 +#define FT_DOCDBNAME 3 +#define BT_CHANGEDB 4 +#define FT_USEDDB 5 +#define FT_AVAILDB 6 +#define TLB_USEDDB 7 +#define TLB_AVAILDB 8 #define FL_DBLIST 9 -#define BT_OK 10 -#define BT_CANCEL 11 +#define BT_OK 10 +#define BT_CANCEL 11 #define BT_HELP 12 #define PB_ADDDB 13 diff --git a/sw/source/ui/fldui/changedb.src b/sw/source/ui/fldui/changedb.src index babf0b5bba13..a461a1d7ac19 100644 --- a/sw/source/ui/fldui/changedb.src +++ b/sw/source/ui/fldui/changedb.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 @@ -34,7 +34,7 @@ ModalDialog DLG_CHANGE_DB OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 286 , 175 ) ; - + Text [ en-US ] = "Exchange Databases" ; Moveable = TRUE ; FixedLine FL_DBLIST diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 3c67cdb6afe7..274bbdf12f28 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -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 @@ -60,7 +60,7 @@ #include <dbmgr.hxx> #endif -#define USER_DATA_VERSION_1 "1" +#define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 /*-------------------------------------------------------------------- Beschreibung: @@ -68,20 +68,20 @@ SwFldDBPage::SwFldDBPage(Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage( pParent, SW_RES( TP_FLD_DB ), rCoreSet ), - aTypeFT (this, SW_RES(FT_DBTYPE)), - aTypeLB (this, SW_RES(LB_DBTYPE)), + aTypeFT (this, SW_RES(FT_DBTYPE)), + aTypeLB (this, SW_RES(LB_DBTYPE)), aSelectionFT(this, SW_RES(FT_DBSELECTION)), aDatabaseTLB(this, SW_RES(TLB_DBLIST), 0, aEmptyStr, FALSE), aAddDBFT(this, SW_RES(FT_ADDDB)), aAddDBPB(this, SW_RES(PB_ADDDB)), aConditionFT(this, SW_RES(FT_DBCONDITION)), aConditionED(this, SW_RES(ED_DBCONDITION)), - aValueFT (this, SW_RES(FT_DBSETNUMBER)), - aValueED (this, SW_RES(ED_DBSETNUMBER)), - aDBFormatRB (this, SW_RES(RB_DBOWNFORMAT)), + aValueFT (this, SW_RES(FT_DBSETNUMBER)), + aValueED (this, SW_RES(ED_DBSETNUMBER)), + aDBFormatRB (this, SW_RES(RB_DBOWNFORMAT)), aNewFormatRB(this, SW_RES(RB_DBFORMAT)), aNumFormatLB(this, SW_RES(LB_DBNUMFORMAT)), - aFormatLB (this, SW_RES(LB_DBFORMAT)), + aFormatLB (this, SW_RES(LB_DBFORMAT)), aFormatFL (this, SW_RES(FL_DBFORMAT)), aFormatVertFL (this, SW_RES(FL_DBFORMAT_VERT)) { @@ -111,7 +111,7 @@ __EXPORT SwFldDBPage::~SwFldDBPage() void __EXPORT SwFldDBPage::Reset(const SfxItemSet&) { - Init(); // Allgemeine initialisierung + Init(); // Allgemeine initialisierung aTypeLB.SetUpdateMode(FALSE); USHORT nOldPos = aTypeLB.GetSelectEntryPos(); @@ -231,7 +231,7 @@ BOOL __EXPORT SwFldDBPage::FillItemSet(SfxItemSet& ) if (!aData.sDataSource.getLength()) aData = pSh->GetDBData(); - if(aData.sDataSource.getLength()) // Ohne Datenbank kein neuer Feldbefehl + if(aData.sDataSource.getLength()) // Ohne Datenbank kein neuer Feldbefehl { USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); String aVal(aValueED.GetText()); @@ -289,7 +289,7 @@ BOOL __EXPORT SwFldDBPage::FillItemSet(SfxItemSet& ) Beschreibung: --------------------------------------------------------------------*/ -SfxTabPage* __EXPORT SwFldDBPage::Create( Window* pParent, +SfxTabPage* __EXPORT SwFldDBPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldDBPage( pParent, rAttrSet ) ); @@ -356,7 +356,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox ) aNumFormatLB.Show(); aFormatLB.Hide(); - if (pBox) // Typ wurde vom User geaendert + if (pBox) // Typ wurde vom User geaendert aDBFormatRB.Check(); if (IsFldEdit()) @@ -549,7 +549,7 @@ IMPL_LINK( SwFldDBPage, ModifyHdl, Edit *, EMPTYARG ) /* -----------------12.01.99 11:21------------------- * * --------------------------------------------------*/ -void SwFldDBPage::FillUserData() +void SwFldDBPage::FillUserData() { String sData( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 2472031777a1..88ffe343ab50 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -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 @@ -46,31 +46,31 @@ class SwFldDBPage : public SwFldPage { - FixedText aTypeFT; - ListBox aTypeLB; - FixedText aSelectionFT; - SwDBTreeList aDatabaseTLB; + FixedText aTypeFT; + ListBox aTypeLB; + FixedText aSelectionFT; + SwDBTreeList aDatabaseTLB; FixedText aAddDBFT; PushButton aAddDBPB; - - FixedText aConditionFT; - ConditionEdit aConditionED; - FixedText aValueFT; - Edit aValueED; - RadioButton aDBFormatRB; - RadioButton aNewFormatRB; - NumFormatListBox aNumFormatLB; - ListBox aFormatLB; + + FixedText aConditionFT; + ConditionEdit aConditionED; + FixedText aValueFT; + Edit aValueED; + RadioButton aDBFormatRB; + RadioButton aNewFormatRB; + NumFormatListBox aNumFormatLB; + ListBox aFormatLB; FixedLine aFormatFL; FixedLine aFormatVertFL; - String sOldDBName; - String sOldTableName; - String sOldColumnName; - ULONG nOldFormat; - USHORT nOldSubType; - Link aOldNumSelectHdl; + String sOldDBName; + String sOldTableName; + String sOldColumnName; + ULONG nOldFormat; + USHORT nOldSubType; + Link aOldNumSelectHdl; DECL_LINK( TypeHdl, ListBox* ); DECL_LINK( NumSelectHdl, NumFormatListBox* pLB = 0); @@ -78,12 +78,12 @@ class SwFldDBPage : public SwFldPage DECL_LINK( ModifyHdl, Edit *pED = 0 ); DECL_LINK( AddDBHdl, PushButton* ); - void CheckInsert(); + void CheckInsert(); using SwFldPage::SetWrtShell; protected: - virtual USHORT GetGroup(); + virtual USHORT GetGroup(); public: SwFldDBPage(Window* pParent, const SfxItemSet& rSet); @@ -95,9 +95,9 @@ public: virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual void FillUserData(); void ActivateMailMergeAddress(); - + void SetWrtShell(SwWrtShell& rSh); }; diff --git a/sw/source/ui/fldui/flddb.src b/sw/source/ui/fldui/flddb.src index ce9f3dd8a09a..e7bc8b99f944 100644 --- a/sw/source/ui/fldui/flddb.src +++ b/sw/source/ui/fldui/flddb.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/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 07ab852e199e..dabb6b91e5ec 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -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 @@ -74,13 +74,13 @@ using namespace com::sun::star; SwFldDokInfPage::SwFldDokInfPage(Window* pWindow, const SfxItemSet& rCoreSet ) : SwFldPage( pWindow, SW_RES( TP_FLD_DOKINF ), rCoreSet ), - aTypeFT (this, SW_RES(FT_DOKINFTYPE)), - aTypeTLB (this, SW_RES(TLB_DOKINFTYPE)), + aTypeFT (this, SW_RES(FT_DOKINFTYPE)), + aTypeTLB (this, SW_RES(TLB_DOKINFTYPE)), aSelectionFT(this, SW_RES(FT_DOKINFSELECTION)), aSelectionLB(this, SW_RES(LB_DOKINFSELECTION)), - aFormatFT (this, SW_RES(FT_DOKINFFORMAT)), - aFormatLB (this, SW_RES(LB_DOKINFFORMAT)), - aFixedCB (this, SW_RES(CB_DOKINFFIXEDCONTENT)), + aFormatFT (this, SW_RES(FT_DOKINFFORMAT)), + aFormatLB (this, SW_RES(LB_DOKINFFORMAT)), + aFixedCB (this, SW_RES(CB_DOKINFFIXEDCONTENT)), pSelEntry (0), aInfoStr (SW_RES(STR_DOKINF_INFO)) @@ -117,7 +117,7 @@ __EXPORT SwFldDokInfPage::~SwFldDokInfPage() void __EXPORT SwFldDokInfPage::Reset(const SfxItemSet& ) { - Init(); // Allgemeine initialisierung + Init(); // Allgemeine initialisierung // TypeListBox initialisieren aTypeTLB.SetUpdateMode(FALSE); @@ -285,7 +285,7 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) aFormatFT.Enable(FALSE); if( nSubType == DI_CUSTOM ) { - //find out which type the custom field has - for a start set to DATE format + //find out which type the custom field has - for a start set to DATE format ::rtl::OUString sName = aTypeTLB.GetEntryText(pSelEntry); try { @@ -306,7 +306,7 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) } catch( const uno::Exception& ) { - } + } } else return 0; @@ -379,7 +379,7 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) if (nNewType == NUMBERFORMAT_DATE) nFormat = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_SHORT, eLang); else if (nNewType == NUMBERFORMAT_TIME) - nFormat = pFormatter->GetFormatIndex( NF_TIME_HHMM, eLang); + nFormat = pFormatter->GetFormatIndex( NF_TIME_HHMM, eLang); } } aFormatLB.SetDefFormat(nFormat); @@ -413,7 +413,7 @@ USHORT SwFldDokInfPage::FillSelectionLB(USHORT nSubType) EnableInsert(nSubType != USHRT_MAX); - if (nSubType == USHRT_MAX) // Info-Text + if (nSubType == USHRT_MAX) // Info-Text nSubType = DI_SUBTYPE_BEGIN; aSelectionLB.Clear(); @@ -505,7 +505,7 @@ BOOL __EXPORT SwFldDokInfPage::FillItemSet(SfxItemSet& ) Beschreibung: --------------------------------------------------------------------*/ -SfxTabPage* __EXPORT SwFldDokInfPage::Create( Window* pParent, +SfxTabPage* __EXPORT SwFldDokInfPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldDokInfPage( pParent, rAttrSet ) ); @@ -522,7 +522,7 @@ USHORT SwFldDokInfPage::GetGroup() /* -----------------12.01.99 11:21------------------- * * --------------------------------------------------*/ -void SwFldDokInfPage::FillUserData() +void SwFldDokInfPage::FillUserData() { String sData( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 20f9ebf3b786..3c86b53c1b43 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -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 @@ -39,37 +39,37 @@ namespace com{namespace sun{ namespace star{ namespace beans{ class XPropertySet; -}}}} +}}}} /*-------------------------------------------------------------------- Beschreibung: --------------------------------------------------------------------*/ class SwFldDokInfPage : public SwFldPage { - FixedText aTypeFT; - SvTreeListBox aTypeTLB; - FixedText aSelectionFT; - ListBox aSelectionLB; - FixedText aFormatFT; - NumFormatListBox aFormatLB; - CheckBox aFixedCB; - - SvLBoxEntry* pSelEntry; + FixedText aTypeFT; + SvTreeListBox aTypeTLB; + FixedText aSelectionFT; + ListBox aSelectionLB; + FixedText aFormatFT; + NumFormatListBox aFormatLB; + CheckBox aFixedCB; + + SvLBoxEntry* pSelEntry; com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > xCustomPropertySet; - String aInfoStr; + String aInfoStr; - USHORT nOldSel; - ULONG nOldFormat; + USHORT nOldSel; + ULONG nOldFormat; ::rtl::OUString m_sOldCustomFieldName; DECL_LINK( TypeHdl, ListBox* pLB = 0 ); DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); - USHORT FillSelectionLB(USHORT nSubTypeId); + USHORT FillSelectionLB(USHORT nSubTypeId); protected: - virtual USHORT GetGroup(); + virtual USHORT GetGroup(); public: SwFldDokInfPage(Window* pWindow, const SfxItemSet& rSet); @@ -81,7 +81,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual void FillUserData(); }; diff --git a/sw/source/ui/fldui/flddinf.src b/sw/source/ui/fldui/flddinf.src index 8a3e86c4548b..9f65b88fa313 100644 --- a/sw/source/ui/fldui/flddinf.src +++ b/sw/source/ui/fldui/flddinf.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/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 12d71b6f4577..9437b1d514d1 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -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 @@ -67,24 +67,24 @@ SwFldDokPage::SwFldDokPage(Window* pWindow, const SfxItemSet& rCoreSet ) : SwFldPage( pWindow, SW_RES( TP_FLD_DOK ), rCoreSet ), - aTypeFT (this, SW_RES(FT_DOKTYPE)), - aTypeLB (this, SW_RES(LB_DOKTYPE)), - aSelectionFT (this, SW_RES(FT_DOKSELECTION)), - aSelectionLB (this, SW_RES(LB_DOKSELECTION)), - aValueFT (this, SW_RES(FT_DOKVALUE)), - aValueED (this, SW_RES(ED_DOKVALUE)), - aLevelED (this, SW_RES(ED_DOKLEVEL)), + aTypeFT (this, SW_RES(FT_DOKTYPE)), + aTypeLB (this, SW_RES(LB_DOKTYPE)), + aSelectionFT (this, SW_RES(FT_DOKSELECTION)), + aSelectionLB (this, SW_RES(LB_DOKSELECTION)), + aValueFT (this, SW_RES(FT_DOKVALUE)), + aValueED (this, SW_RES(ED_DOKVALUE)), + aLevelED (this, SW_RES(ED_DOKLEVEL)), aDateOffsetED (this, SW_RES(ED_DOKDATEOFF)), - aFormatFT (this, SW_RES(FT_DOKFORMAT)), - aFormatLB (this, SW_RES(LB_DOKFORMAT)), - aNumFormatLB (this, SW_RES(LB_DOKNUMFORMAT)), - aFixedCB (this, SW_RES(CB_DOKFIXEDCONTENT)), + aFormatFT (this, SW_RES(FT_DOKFORMAT)), + aFormatLB (this, SW_RES(LB_DOKFORMAT)), + aNumFormatLB (this, SW_RES(LB_DOKNUMFORMAT)), + aFixedCB (this, SW_RES(CB_DOKFIXEDCONTENT)), - sDateOffset (SW_RES(STR_DOKDATEOFF)), - sTimeOffset (SW_RES(STR_DOKTIMEOFF)), - aRootOpened (SW_RES(BMP_DOKROOT_OPENED)), - aRootClosed (SW_RES(BMP_DOKROOT_CLOSED)) + sDateOffset (SW_RES(STR_DOKDATEOFF)), + sTimeOffset (SW_RES(STR_DOKTIMEOFF)), + aRootOpened (SW_RES(BMP_DOKROOT_OPENED)), + aRootClosed (SW_RES(BMP_DOKROOT_CLOSED)) { FreeResource(); @@ -114,7 +114,7 @@ __EXPORT SwFldDokPage::~SwFldDokPage() void __EXPORT SwFldDokPage::Reset(const SfxItemSet& ) { SavePos(&aTypeLB); - Init(); // Allgemeine initialisierung + Init(); // Allgemeine initialisierung // TypeListBox initialisieren const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup()); @@ -345,7 +345,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) nFmtType = NUMBERFORMAT_DATE; aValueFT.SetText(sDateOffset); - aDateOffsetED.SetFirst(-31); // Ein Monat + aDateOffsetED.SetFirst(-31); // Ein Monat aDateOffsetED.SetLast(31); if (IsFldEdit()) @@ -357,7 +357,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) nFmtType = NUMBERFORMAT_TIME; aValueFT.SetText(sTimeOffset); - aDateOffsetED.SetFirst(-1440); // Ein Tag + aDateOffsetED.SetFirst(-1440); // Ein Tag aDateOffsetED.SetLast(1440); if (IsFldEdit()) @@ -696,7 +696,7 @@ BOOL __EXPORT SwFldDokPage::FillItemSet(SfxItemSet& ) Beschreibung: --------------------------------------------------------------------*/ -SfxTabPage* __EXPORT SwFldDokPage::Create( Window* pParent, +SfxTabPage* __EXPORT SwFldDokPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldDokPage( pParent, rAttrSet ) ); @@ -714,7 +714,7 @@ USHORT SwFldDokPage::GetGroup() /* -----------------12.01.99 10:09------------------- * * --------------------------------------------------*/ -void SwFldDokPage::FillUserData() +void SwFldDokPage::FillUserData() { String sData( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index bd46111c0b8e..655a1e730f0f 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -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 @@ -46,36 +46,36 @@ class SwFldDokPage : public SwFldPage { - FixedText aTypeFT; - ListBox aTypeLB; - FixedText aSelectionFT; - ListBox aSelectionLB; - FixedText aValueFT; - Edit aValueED; - NumericField aLevelED; - NumericField aDateOffsetED; - FixedText aFormatFT; - ListBox aFormatLB; - NumFormatListBox aNumFormatLB; - CheckBox aFixedCB; - - String sDateOffset; - String sTimeOffset; - Bitmap aRootOpened; - Bitmap aRootClosed; - - USHORT nOldSel; - ULONG nOldFormat; + FixedText aTypeFT; + ListBox aTypeLB; + FixedText aSelectionFT; + ListBox aSelectionLB; + FixedText aValueFT; + Edit aValueED; + NumericField aLevelED; + NumericField aDateOffsetED; + FixedText aFormatFT; + ListBox aFormatLB; + NumFormatListBox aNumFormatLB; + CheckBox aFixedCB; + + String sDateOffset; + String sTimeOffset; + Bitmap aRootOpened; + Bitmap aRootClosed; + + USHORT nOldSel; + ULONG nOldFormat; DECL_LINK( TypeHdl, ListBox* pLB = 0 ); DECL_LINK( FormatHdl, ListBox* pLB = 0 ); DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); - void AddSubType(USHORT nTypeId); - USHORT FillFormatLB(USHORT nTypeId); + void AddSubType(USHORT nTypeId); + USHORT FillFormatLB(USHORT nTypeId); protected: - virtual USHORT GetGroup(); + virtual USHORT GetGroup(); public: SwFldDokPage(Window* pWindow, const SfxItemSet& rSet); @@ -87,7 +87,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual void FillUserData(); }; diff --git a/sw/source/ui/fldui/flddok.src b/sw/source/ui/fldui/flddok.src index f566ab716362..6a60f8b53fe1 100644 --- a/sw/source/ui/fldui/flddok.src +++ b/sw/source/ui/fldui/flddok.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/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 2c354551f1f3..76f0fbcfc77c 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -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 @@ -94,8 +94,8 @@ namespace swui SwFldEditDlg::SwFldEditDlg(SwView& rVw) : SfxSingleTabDialog(&rVw.GetViewFrame()->GetWindow(), 0, 0), - pSh (rVw.GetWrtShellPtr()), - aPrevBT (this, SW_RES(BTN_FLDEDT_PREV)), + pSh (rVw.GetWrtShellPtr()), + aPrevBT (this, SW_RES(BTN_FLDEDT_PREV)), aNextBT (this, SW_RES(BTN_FLDEDT_NEXT)), aAddressBT (this, SW_RES(PB_FLDEDT_ADDRESS)) { @@ -383,30 +383,30 @@ IMPL_LINK( SwFldEditDlg, AddressHdl, PushButton *, EMPTYARG ) switch(pCurFld->GetSubType()) { - case EU_FIRSTNAME: nEditPos = FIRSTNAME_EDIT; break; - case EU_NAME: nEditPos = LASTNAME_EDIT; break; - case EU_SHORTCUT: nEditPos = SHORTNAME_EDIT; break; - case EU_COMPANY: nEditPos = COMPANY_EDIT; break; - case EU_STREET: nEditPos = STREET_EDIT; break; - case EU_TITLE: nEditPos = TITLE_EDIT; break; - case EU_POSITION: nEditPos = POSITION_EDIT; break; - case EU_PHONE_PRIVATE:nEditPos = TELPRIV_EDIT; break; - case EU_PHONE_COMPANY:nEditPos = TELCOMPANY_EDIT; break; - case EU_FAX: nEditPos = FAX_EDIT; break; - case EU_EMAIL: nEditPos = EMAIL_EDIT; break; - case EU_COUNTRY: nEditPos = COUNTRY_EDIT; break; - case EU_ZIP: nEditPos = PLZ_EDIT; break; - case EU_CITY: nEditPos = CITY_EDIT; break; - case EU_STATE: nEditPos = STATE_EDIT; break; - - default: nEditPos = UNKNOWN_EDIT; break; + case EU_FIRSTNAME: nEditPos = FIRSTNAME_EDIT; break; + case EU_NAME: nEditPos = LASTNAME_EDIT; break; + case EU_SHORTCUT: nEditPos = SHORTNAME_EDIT; break; + case EU_COMPANY: nEditPos = COMPANY_EDIT; break; + case EU_STREET: nEditPos = STREET_EDIT; break; + case EU_TITLE: nEditPos = TITLE_EDIT; break; + case EU_POSITION: nEditPos = POSITION_EDIT; break; + case EU_PHONE_PRIVATE:nEditPos = TELPRIV_EDIT; break; + case EU_PHONE_COMPANY:nEditPos = TELCOMPANY_EDIT; break; + case EU_FAX: nEditPos = FAX_EDIT; break; + case EU_EMAIL: nEditPos = EMAIL_EDIT; break; + case EU_COUNTRY: nEditPos = COUNTRY_EDIT; break; + case EU_ZIP: nEditPos = PLZ_EDIT; break; + case EU_CITY: nEditPos = CITY_EDIT; break; + case EU_STATE: nEditPos = STATE_EDIT; break; + + default: nEditPos = UNKNOWN_EDIT; break; } aSet.Put(SfxUInt16Item(SID_FIELD_GRABFOCUS, nEditPos)); SwAbstractDialogFactory* pFact = swui::GetFactory(); DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!"); - SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aSet, + SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aSet, pSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RC_DLG_ADDR ); DBG_ASSERT(pDlg, "Dialogdiet fail!"); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index ae05a35681a7..21b8e84cc71f 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -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 @@ -72,20 +72,20 @@ using rtl::OUString; SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage( pParent, SW_RES( TP_FLD_FUNC ), rCoreSet ), - aTypeFT (this, SW_RES(FT_FUNCTYPE)), - aTypeLB (this, SW_RES(LB_FUNCTYPE)), + aTypeFT (this, SW_RES(FT_FUNCTYPE)), + aTypeLB (this, SW_RES(LB_FUNCTYPE)), aSelectionFT(this, SW_RES(FT_FUNCSELECTION)), aSelectionLB(this, SW_RES(LB_FUNCSELECTION)), - aFormatFT (this, SW_RES(FT_FUNCFORMAT)), - aFormatLB (this, SW_RES(LB_FUNCFORMAT)), - aNameFT (this, SW_RES(FT_FUNCNAME)), - aNameED (this, SW_RES(ED_FUNCNAME)), - aValueFT (this, SW_RES(FT_FUNCVALUE)), - aValueED (this, SW_RES(ED_FUNCVALUE)), - aCond1FT (this, SW_RES(FT_FUNCCOND1)), - aCond1ED (this, SW_RES(ED_FUNCCOND1)), - aCond2FT (this, SW_RES(FT_FUNCCOND2)), - aCond2ED (this, SW_RES(ED_FUNCCOND2)), + aFormatFT (this, SW_RES(FT_FUNCFORMAT)), + aFormatLB (this, SW_RES(LB_FUNCFORMAT)), + aNameFT (this, SW_RES(FT_FUNCNAME)), + aNameED (this, SW_RES(ED_FUNCNAME)), + aValueFT (this, SW_RES(FT_FUNCVALUE)), + aValueED (this, SW_RES(ED_FUNCVALUE)), + aCond1FT (this, SW_RES(FT_FUNCCOND1)), + aCond1ED (this, SW_RES(ED_FUNCCOND1)), + aCond2FT (this, SW_RES(FT_FUNCCOND2)), + aCond2ED (this, SW_RES(ED_FUNCCOND2)), aMacroBT (this, SW_RES(BT_FUNCMACRO)), aListItemFT( this, SW_RES( FT_LISTITEM )), aListItemED( this, SW_RES( ED_LISTITEM )), @@ -111,7 +111,7 @@ SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) : aCond1ED.ShowBrackets(FALSE); aCond2ED.ShowBrackets(FALSE); -// SwWrtShell* pSh = (SwWrtShell*)ViewShell::GetCurrShell(); +// SwWrtShell* pSh = (SwWrtShell*)ViewShell::GetCurrShell(); } /*-------------------------------------------------------------------- @@ -129,7 +129,7 @@ SwFldFuncPage::~SwFldFuncPage() void SwFldFuncPage::Reset(const SfxItemSet& ) { SavePos(&aTypeLB); - Init(); // Allgemeine initialisierung + Init(); // Allgemeine initialisierung aTypeLB.SetUpdateMode(FALSE); aTypeLB.Clear(); @@ -165,12 +165,12 @@ void SwFldFuncPage::Reset(const SfxItemSet& ) // alte Pos selektieren RestorePos(&aTypeLB); - aTypeLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl)); - aTypeLB.SetSelectHdl (LINK(this, SwFldFuncPage, TypeHdl)); - aSelectionLB.SetSelectHdl (LINK(this, SwFldFuncPage, SelectHdl)); - aSelectionLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertMacroHdl)); - aFormatLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl)); - aMacroBT.SetClickHdl (LINK(this, SwFldFuncPage, MacroHdl)); + aTypeLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl)); + aTypeLB.SetSelectHdl (LINK(this, SwFldFuncPage, TypeHdl)); + aSelectionLB.SetSelectHdl (LINK(this, SwFldFuncPage, SelectHdl)); + aSelectionLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertMacroHdl)); + aFormatLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl)); + aMacroBT.SetClickHdl (LINK(this, SwFldFuncPage, MacroHdl)); Link aListModifyLk( LINK(this, SwFldFuncPage, ListModifyHdl)); aListAddPB.SetClickHdl(aListModifyLk); aListRemovePB.SetClickHdl(aListModifyLk); @@ -652,7 +652,7 @@ BOOL SwFldFuncPage::FillItemSet(SfxItemSet& ) InsertFld( nTypeId, nSubType, aName, aVal, nFormat ); } - ModifyHdl(); // Insert ggf enablen/disablen + ModifyHdl(); // Insert ggf enablen/disablen return FALSE; } @@ -690,7 +690,7 @@ String SwFldFuncPage::TurnMacroString(const String &rMacro) Beschreibung: --------------------------------------------------------------------*/ -SfxTabPage* SwFldFuncPage::Create( Window* pParent, +SfxTabPage* SwFldFuncPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldFuncPage( pParent, rAttrSet ) ); @@ -708,7 +708,7 @@ USHORT SwFldFuncPage::GetGroup() /* -----------------12.01.99 10:09------------------- * * --------------------------------------------------*/ -void SwFldFuncPage::FillUserData() +void SwFldFuncPage::FillUserData() { String sData( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 7a63385a5935..baa011fea80e 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -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 @@ -45,21 +45,21 @@ class SwFldFuncPage : public SwFldPage { - FixedText aTypeFT; - ListBox aTypeLB; - FixedText aSelectionFT; - ListBox aSelectionLB; - FixedText aFormatFT; - ListBox aFormatLB; - FixedText aNameFT; - ConditionEdit aNameED; - FixedText aValueFT; - Edit aValueED; - FixedText aCond1FT; - ConditionEdit aCond1ED; - FixedText aCond2FT; - ConditionEdit aCond2ED; - PushButton aMacroBT; + FixedText aTypeFT; + ListBox aTypeLB; + FixedText aSelectionFT; + ListBox aSelectionLB; + FixedText aFormatFT; + ListBox aFormatLB; + FixedText aNameFT; + ConditionEdit aNameED; + FixedText aValueFT; + Edit aValueED; + FixedText aCond1FT; + ConditionEdit aCond1ED; + FixedText aCond2FT; + ConditionEdit aCond2ED; + PushButton aMacroBT; //controls of "Input list" FixedText aListItemFT; @@ -73,10 +73,10 @@ class SwFldFuncPage : public SwFldPage FixedText aListNameFT; Edit aListNameED; - String sOldValueFT; - String sOldNameFT; + String sOldValueFT; + String sOldNameFT; - ULONG nOldFormat; + ULONG nOldFormat; bool bDropDownLBChanged; DECL_LINK( TypeHdl, ListBox* pLB = 0 ); @@ -89,11 +89,11 @@ class SwFldFuncPage : public SwFldPage // Macro ausw„hlen DECL_LINK( MacroHdl, Button * ); - void UpdateSubType(); - String TurnMacroString(const String &rMacro); + void UpdateSubType(); + String TurnMacroString(const String &rMacro); protected: - virtual USHORT GetGroup(); + virtual USHORT GetGroup(); public: SwFldFuncPage(Window* pParent, const SfxItemSet& rSet); @@ -105,7 +105,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual void FillUserData(); }; diff --git a/sw/source/ui/fldui/fldfunc.src b/sw/source/ui/fldui/fldfunc.src index 312299fac02d..ca67c448fb3f 100644 --- a/sw/source/ui/fldui/fldfunc.src +++ b/sw/source/ui/fldui/fldfunc.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/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 95001f897702..4e707ce6ce94 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -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 @@ -59,9 +59,9 @@ #include <svl/zformat.hxx> #include <vcl/mnemonic.hxx> #include <view.hxx> -#include <wrtsh.hxx> // Actives Fenster -#include <doc.hxx> // Actives Fenster -#include <docsh.hxx> // Actives Fenster +#include <wrtsh.hxx> // Actives Fenster +#include <doc.hxx> // Actives Fenster +#include <docsh.hxx> // Actives Fenster #include <swmodule.hxx> #include <charatr.hxx> #include <fmtinfmt.hxx> @@ -100,44 +100,44 @@ using namespace nsSwDocInfoSubType; --------------------------------------------------------------------*/ enum { - GRP_DOC_BEGIN = 0, - GRP_DOC_END = GRP_DOC_BEGIN + 11, + GRP_DOC_BEGIN = 0, + GRP_DOC_END = GRP_DOC_BEGIN + 11, - GRP_FKT_BEGIN = GRP_DOC_END, + GRP_FKT_BEGIN = GRP_DOC_END, GRP_FKT_END = GRP_FKT_BEGIN + 8, - GRP_REF_BEGIN = GRP_FKT_END, - GRP_REF_END = GRP_REF_BEGIN + 2, + GRP_REF_BEGIN = GRP_FKT_END, + GRP_REF_END = GRP_REF_BEGIN + 2, - GRP_REG_BEGIN = GRP_REF_END, + GRP_REG_BEGIN = GRP_REF_END, GRP_REG_END = GRP_REG_BEGIN + 1, - GRP_DB_BEGIN = GRP_REG_END, - GRP_DB_END = GRP_DB_BEGIN + 5, + GRP_DB_BEGIN = GRP_REG_END, + GRP_DB_END = GRP_DB_BEGIN + 5, - GRP_VAR_BEGIN = GRP_DB_END, - GRP_VAR_END = GRP_VAR_BEGIN + 9 + GRP_VAR_BEGIN = GRP_DB_END, + GRP_VAR_END = GRP_VAR_BEGIN + 9 }; enum { - GRP_WEB_DOC_BEGIN = 0, - GRP_WEB_DOC_END = GRP_WEB_DOC_BEGIN + 9, + GRP_WEB_DOC_BEGIN = 0, + GRP_WEB_DOC_END = GRP_WEB_DOC_BEGIN + 9, - GRP_WEB_FKT_BEGIN = GRP_WEB_DOC_END + 2, - GRP_WEB_FKT_END = GRP_WEB_FKT_BEGIN + 0, // Die Gruppe ist leer! + GRP_WEB_FKT_BEGIN = GRP_WEB_DOC_END + 2, + GRP_WEB_FKT_END = GRP_WEB_FKT_BEGIN + 0, // Die Gruppe ist leer! - GRP_WEB_REF_BEGIN = GRP_WEB_FKT_END + 6, // Die Gruppe ist leer! - GRP_WEB_REF_END = GRP_WEB_REF_BEGIN + 0, + GRP_WEB_REF_BEGIN = GRP_WEB_FKT_END + 6, // Die Gruppe ist leer! + GRP_WEB_REF_END = GRP_WEB_REF_BEGIN + 0, - GRP_WEB_REG_BEGIN = GRP_WEB_REF_END + 2, + GRP_WEB_REG_BEGIN = GRP_WEB_REF_END + 2, GRP_WEB_REG_END = GRP_WEB_REG_BEGIN + 1, - GRP_WEB_DB_BEGIN = GRP_WEB_REG_END, // Die Gruppe ist leer! - GRP_WEB_DB_END = GRP_WEB_DB_BEGIN + 0, + GRP_WEB_DB_BEGIN = GRP_WEB_REG_END, // Die Gruppe ist leer! + GRP_WEB_DB_END = GRP_WEB_DB_BEGIN + 0, - GRP_WEB_VAR_BEGIN = GRP_WEB_DB_END + 5, - GRP_WEB_VAR_END = GRP_WEB_VAR_BEGIN + 1 + GRP_WEB_VAR_BEGIN = GRP_WEB_DB_END + 5, + GRP_WEB_VAR_END = GRP_WEB_VAR_BEGIN + 1 }; /*-------------------------------------------------------------------- @@ -173,9 +173,9 @@ static const USHORT __FAR_DATA aDBFmt[] = nsSwExtendedSubType::SUB_OWN_FMT }; -static const USHORT VF_COUNT = sizeof(aGetFmt) / sizeof(USHORT); -static const USHORT VF_USR_COUNT = sizeof(aUsrFmt) / sizeof(USHORT); -static const USHORT VF_DB_COUNT = sizeof(aDBFmt) / sizeof(USHORT); +static const USHORT VF_COUNT = sizeof(aGetFmt) / sizeof(USHORT); +static const USHORT VF_USR_COUNT = sizeof(aUsrFmt) / sizeof(USHORT); +static const USHORT VF_DB_COUNT = sizeof(aDBFmt) / sizeof(USHORT); /*-------------------------------------------------------------------- Beschreibung: Feldtypen und Subtypes @@ -184,11 +184,11 @@ struct SwFldPack { USHORT nTypeId; - USHORT nSubTypeStart; + USHORT nSubTypeStart; USHORT nSubTypeEnd; - ULONG nFmtBegin; - ULONG nFmtEnd; + ULONG nFmtBegin; + ULONG nFmtEnd; }; /*-------------------------------------------------------------------- @@ -197,54 +197,54 @@ struct SwFldPack static const SwFldPack __FAR_DATA aSwFlds[] = { // Dokument - { TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0, 0 }, - { TYP_AUTHORFLD, 0, 0, FMT_AUTHOR_BEGIN, FMT_AUTHOR_END }, - { TYP_DATEFLD, FLD_DATE_BEGIN, FLD_DATE_END, 0, 0 }, - { TYP_TIMEFLD, FLD_TIME_BEGIN, FLD_TIME_END, 0, 0 }, - { TYP_PAGENUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 }, - { TYP_NEXTPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END }, - { TYP_PREVPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END }, - { TYP_FILENAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END }, - { TYP_DOCSTATFLD, FLD_STAT_BEGIN, FLD_STAT_END, FMT_NUM_BEGIN, FMT_NUM_END-1 }, - - { TYP_CHAPTERFLD, 0, 0, FMT_CHAPTER_BEGIN, FMT_CHAPTER_END }, - { TYP_TEMPLNAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END }, + { TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0, 0 }, + { TYP_AUTHORFLD, 0, 0, FMT_AUTHOR_BEGIN, FMT_AUTHOR_END }, + { TYP_DATEFLD, FLD_DATE_BEGIN, FLD_DATE_END, 0, 0 }, + { TYP_TIMEFLD, FLD_TIME_BEGIN, FLD_TIME_END, 0, 0 }, + { TYP_PAGENUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 }, + { TYP_NEXTPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END }, + { TYP_PREVPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END }, + { TYP_FILENAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END }, + { TYP_DOCSTATFLD, FLD_STAT_BEGIN, FLD_STAT_END, FMT_NUM_BEGIN, FMT_NUM_END-1 }, + + { TYP_CHAPTERFLD, 0, 0, FMT_CHAPTER_BEGIN, FMT_CHAPTER_END }, + { TYP_TEMPLNAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END }, // Funktion - { TYP_CONDTXTFLD, 0, 0, 0, 0 }, - { TYP_DROPDOWN, 0, 0, 0, 0 }, - { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 }, - { TYP_MACROFLD, 0, 0, 0, 0 }, - { TYP_JUMPEDITFLD, 0, 0, FMT_MARK_BEGIN, FMT_MARK_END }, - { TYP_COMBINED_CHARS, 0, 0, 0, 0 }, - { TYP_HIDDENTXTFLD, 0, 0, 0, 0 }, - { TYP_HIDDENPARAFLD, 0, 0, 0, 0 }, + { TYP_CONDTXTFLD, 0, 0, 0, 0 }, + { TYP_DROPDOWN, 0, 0, 0, 0 }, + { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 }, + { TYP_MACROFLD, 0, 0, 0, 0 }, + { TYP_JUMPEDITFLD, 0, 0, FMT_MARK_BEGIN, FMT_MARK_END }, + { TYP_COMBINED_CHARS, 0, 0, 0, 0 }, + { TYP_HIDDENTXTFLD, 0, 0, 0, 0 }, + { TYP_HIDDENPARAFLD, 0, 0, 0, 0 }, // Referenzen - { TYP_SETREFFLD, 0, 0, 0, 0 }, - { TYP_GETREFFLD, 0, 0, FMT_REF_BEGIN, FMT_REF_END }, + { TYP_SETREFFLD, 0, 0, 0, 0 }, + { TYP_GETREFFLD, 0, 0, FMT_REF_BEGIN, FMT_REF_END }, // Ablage - { TYP_DOCINFOFLD, 0, 0, FMT_REG_BEGIN, FMT_REG_END }, + { TYP_DOCINFOFLD, 0, 0, FMT_REG_BEGIN, FMT_REG_END }, // Datenbank - { TYP_DBFLD, 0, 0, FMT_DBFLD_BEGIN, FMT_DBFLD_END }, - { TYP_DBNEXTSETFLD, 0, 0, 0, 0 }, - { TYP_DBNUMSETFLD, 0, 0, 0, 0 }, - { TYP_DBSETNUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 }, - { TYP_DBNAMEFLD, 0, 0, 0, 0 }, + { TYP_DBFLD, 0, 0, FMT_DBFLD_BEGIN, FMT_DBFLD_END }, + { TYP_DBNEXTSETFLD, 0, 0, 0, 0 }, + { TYP_DBNUMSETFLD, 0, 0, 0, 0 }, + { TYP_DBSETNUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 }, + { TYP_DBNAMEFLD, 0, 0, 0, 0 }, // Variablen - { TYP_SETFLD, 0, 0, FMT_SETVAR_BEGIN, FMT_SETVAR_END }, - - { TYP_GETFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END }, - { TYP_DDEFLD, 0, 0, FMT_DDE_BEGIN, FMT_DDE_END }, - { TYP_FORMELFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END }, - { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 }, - { TYP_SEQFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 }, - { TYP_SETREFPAGEFLD, FLD_PAGEREF_BEGIN, FLD_PAGEREF_END,0, 0 }, - { TYP_GETREFPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 }, - { TYP_USERFLD, 0, 0, FMT_USERVAR_BEGIN, FMT_USERVAR_END } + { TYP_SETFLD, 0, 0, FMT_SETVAR_BEGIN, FMT_SETVAR_END }, + + { TYP_GETFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END }, + { TYP_DDEFLD, 0, 0, FMT_DDE_BEGIN, FMT_DDE_END }, + { TYP_FORMELFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END }, + { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 }, + { TYP_SEQFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 }, + { TYP_SETREFPAGEFLD, FLD_PAGEREF_BEGIN, FLD_PAGEREF_END,0, 0 }, + { TYP_GETREFPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 }, + { TYP_USERFLD, 0, 0, FMT_USERVAR_BEGIN, FMT_USERVAR_END } }; /*-------------------------------------------------------------------- @@ -260,7 +260,7 @@ static SwWrtShell* lcl_GetShell() return 0; } -inline USHORT GetPackCount() { return sizeof(aSwFlds) / sizeof(SwFldPack); } +inline USHORT GetPackCount() { return sizeof(aSwFlds) / sizeof(SwFldPack); } /*-------------------------------------------------------------------- Beschreibung: FieldManager regelt das Einfuegen und Updaten @@ -366,9 +366,9 @@ SwField* SwFldMgr::GetCurFld() // const USHORT nTypeId = pCurFld->GetTypeId(); - nCurFmt = pCurFld->GetFormat(); - aCurPar1 = pCurFld->GetPar1(); - aCurPar2 = pCurFld->GetPar2(); + nCurFmt = pCurFld->GetFormat(); + aCurPar1 = pCurFld->GetPar1(); + aCurPar2 = pCurFld->GetPar2(); switch( nTypeId ) { @@ -392,21 +392,21 @@ const SwFldGroupRgn& SwFldMgr::GetGroupRange(BOOL bHtmlMode, USHORT nGrpId) cons { static SwFldGroupRgn __READONLY_DATA aRanges[] = { - { /* Dokument */ GRP_DOC_BEGIN, GRP_DOC_END }, - { /* Funktionen */ GRP_FKT_BEGIN, GRP_FKT_END }, - { /* Referenzen */ GRP_REF_BEGIN, GRP_REF_END }, - { /* Ablage */ GRP_REG_BEGIN, GRP_REG_END }, - { /* DB */ GRP_DB_BEGIN, GRP_DB_END }, - { /* User */ GRP_VAR_BEGIN, GRP_VAR_END } + { /* Dokument */ GRP_DOC_BEGIN, GRP_DOC_END }, + { /* Funktionen */ GRP_FKT_BEGIN, GRP_FKT_END }, + { /* Referenzen */ GRP_REF_BEGIN, GRP_REF_END }, + { /* Ablage */ GRP_REG_BEGIN, GRP_REG_END }, + { /* DB */ GRP_DB_BEGIN, GRP_DB_END }, + { /* User */ GRP_VAR_BEGIN, GRP_VAR_END } }; static SwFldGroupRgn __READONLY_DATA aWebRanges[] = { - { /* Dokument */ GRP_WEB_DOC_BEGIN, GRP_WEB_DOC_END }, - { /* Funktionen */ GRP_WEB_FKT_BEGIN, GRP_WEB_FKT_END }, - { /* Referenzen */ GRP_WEB_REF_BEGIN, GRP_WEB_REF_END }, - { /* Ablage */ GRP_WEB_REG_BEGIN, GRP_WEB_REG_END }, - { /* DB */ GRP_WEB_DB_BEGIN, GRP_WEB_DB_END }, - { /* User */ GRP_WEB_VAR_BEGIN, GRP_WEB_VAR_END } + { /* Dokument */ GRP_WEB_DOC_BEGIN, GRP_WEB_DOC_END }, + { /* Funktionen */ GRP_WEB_FKT_BEGIN, GRP_WEB_FKT_END }, + { /* Referenzen */ GRP_WEB_REF_BEGIN, GRP_WEB_REF_END }, + { /* Ablage */ GRP_WEB_REG_BEGIN, GRP_WEB_REG_END }, + { /* DB */ GRP_WEB_DB_BEGIN, GRP_WEB_DB_END }, + { /* User */ GRP_WEB_VAR_BEGIN, GRP_WEB_VAR_END } }; if (bHtmlMode) @@ -488,10 +488,10 @@ USHORT SwFldMgr::GetPos(USHORT nTypeId) { switch( nTypeId ) { - case TYP_FIXDATEFLD: nTypeId = TYP_DATEFLD; break; - case TYP_FIXTIMEFLD: nTypeId = TYP_TIMEFLD; break; - case TYP_SETINPFLD: nTypeId = TYP_SETFLD; break; - case TYP_USRINPFLD: nTypeId = TYP_USERFLD; break; + case TYP_FIXDATEFLD: nTypeId = TYP_DATEFLD; break; + case TYP_FIXTIMEFLD: nTypeId = TYP_TIMEFLD; break; + case TYP_SETINPFLD: nTypeId = TYP_SETFLD; break; + case TYP_USRINPFLD: nTypeId = TYP_USERFLD; break; } for(USHORT i = 0; i < GetPackCount(); i++) @@ -633,14 +633,14 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co return 2; if (nTypeId == TYP_FILENAMEFLD) - nEnd -= 2; // Kein Bereich oder Vorlage + nEnd -= 2; // Kein Bereich oder Vorlage switch(nStart) { case FMT_GETVAR_BEGIN: - case FMT_SETVAR_BEGIN: return VF_COUNT; - case FMT_USERVAR_BEGIN: return VF_USR_COUNT; - case FMT_DBFLD_BEGIN: return VF_DB_COUNT; + case FMT_SETVAR_BEGIN: return VF_COUNT; + case FMT_USERVAR_BEGIN: return VF_USR_COUNT; + case FMT_DBFLD_BEGIN: return VF_DB_COUNT; case FMT_NUM_BEGIN: { USHORT nCount = (USHORT)(nEnd - nStart); @@ -669,7 +669,7 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co } /*-------------------------------------------------------------------- - Beschreibung: FormatString zu einem Typ ermitteln + Beschreibung: FormatString zu einem Typ ermitteln --------------------------------------------------------------------*/ @@ -688,7 +688,7 @@ String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const nStart = aSwFlds[nPos].nFmtBegin; if (TYP_AUTHORFLD == nTypeId|| TYP_FILENAMEFLD == nTypeId) - nFormatId &= ~FF_FIXED; // Fixed-Flag ausmaskieren + nFormatId &= ~FF_FIXED; // Fixed-Flag ausmaskieren if((nStart + nFormatId) < aSwFlds[nPos].nFmtEnd) aRet = SW_RESSTR((USHORT)(nStart + nFormatId)); @@ -720,7 +720,7 @@ String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const } /*-------------------------------------------------------------------- - Beschreibung: FormatId aus Pseudo-ID ermitteln + Beschreibung: FormatId aus Pseudo-ID ermitteln --------------------------------------------------------------------*/ USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const @@ -732,9 +732,9 @@ USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const case TYP_DOCINFOFLD: switch( aSwFlds[ GetPos( nTypeId ) ].nFmtBegin + nFormatId ) { - case FMT_REG_AUTHOR: nId = DI_SUB_AUTHOR; break; - case FMT_REG_TIME: nId = DI_SUB_TIME; break; - case FMT_REG_DATE: nId = DI_SUB_DATE; break; + case FMT_REG_AUTHOR: nId = DI_SUB_AUTHOR; break; + case FMT_REG_TIME: nId = DI_SUB_TIME; break; + case FMT_REG_DATE: nId = DI_SUB_DATE; break; } break; @@ -753,15 +753,15 @@ USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const { switch( nBegin + nFormatId ) { - case FMT_NUM_ABC: nId = SVX_NUM_CHARS_UPPER_LETTER; break; - case FMT_NUM_SABC: nId = SVX_NUM_CHARS_LOWER_LETTER; break; - case FMT_NUM_ROMAN: nId = SVX_NUM_ROMAN_UPPER; break; - case FMT_NUM_SROMAN: nId = SVX_NUM_ROMAN_LOWER; break; - case FMT_NUM_ARABIC: nId = SVX_NUM_ARABIC; break; - case FMT_NUM_PAGEDESC: nId = SVX_NUM_PAGEDESC; break; - case FMT_NUM_PAGESPECIAL: nId = SVX_NUM_CHAR_SPECIAL; break; - case FMT_NUM_ABC_N: nId = SVX_NUM_CHARS_UPPER_LETTER_N; break; - case FMT_NUM_SABC_N: nId = SVX_NUM_CHARS_LOWER_LETTER_N; break; + case FMT_NUM_ABC: nId = SVX_NUM_CHARS_UPPER_LETTER; break; + case FMT_NUM_SABC: nId = SVX_NUM_CHARS_LOWER_LETTER; break; + case FMT_NUM_ROMAN: nId = SVX_NUM_ROMAN_UPPER; break; + case FMT_NUM_SROMAN: nId = SVX_NUM_ROMAN_LOWER; break; + case FMT_NUM_ARABIC: nId = SVX_NUM_ARABIC; break; + case FMT_NUM_PAGEDESC: nId = SVX_NUM_PAGEDESC; break; + case FMT_NUM_PAGESPECIAL: nId = SVX_NUM_CHAR_SPECIAL; break; + case FMT_NUM_ABC_N: nId = SVX_NUM_CHARS_UPPER_LETTER_N; break; + case FMT_NUM_SABC_N: nId = SVX_NUM_CHARS_LOWER_LETTER_N; break; } } else if(xNumberingInfo.is()) @@ -980,13 +980,13 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) break; } case TYP_DOCSTATFLD: - { SwDocStatFieldType* pTyp = + { SwDocStatFieldType* pTyp = (SwDocStatFieldType*)pCurShell->GetFldType(0, RES_DOCSTATFLD); pFld = new SwDocStatField(pTyp, nSubType, nFormatId); break; } case TYP_AUTHORFLD: - { SwAuthorFieldType* pTyp = + { SwAuthorFieldType* pTyp = (SwAuthorFieldType*)pCurShell->GetFldType(0, RES_AUTHORFLD); pFld = new SwAuthorField(pTyp, nFormatId); break; @@ -1029,7 +1029,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) case TYP_DDEFLD: { //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren - // Namen haben! Wird hier noch nicht beachtet. + // Namen haben! Wird hier noch nicht beachtet. String sCmd( rData.sPar2 ); USHORT nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator ); sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); @@ -1189,7 +1189,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pCurShell->GetFldType(0, RES_DBSETNUMBERFLD); pFld = new SwDBSetNumberField( pTyp, aDBData, nFormatId); bExp = TRUE; - break; + break; } } break; @@ -1335,7 +1335,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pCurShell->EndAllAction(); return TRUE; -/* // In der Tabelle Tabellenformeln einfuegen +/* // In der Tabelle Tabellenformeln einfuegen SwTblFieldType* pTyp = (SwTblFieldType*)pCurShell->GetFldType( 0, RES_TABLEFLD); pFld = new SwTblField(pTyp, rData.sPar2, nsSwGetSetExpType::GSE_EXPR, nFormatId); @@ -1376,7 +1376,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) } break; default: - { ASSERT(!this, "Falscher Feldtyp"); + { ASSERT(!this, "Falscher Feldtyp"); return FALSE; } } @@ -1428,7 +1428,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, ASSERT(pCurFld, "kein Feld an der CursorPos"); bool bDelete = false; - SwField *pTmpFld; // mb: fixed memory leak + SwField *pTmpFld; // mb: fixed memory leak if (NULL != _pTmpFld) { pTmpFld = _pTmpFld; @@ -1459,7 +1459,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, case TYP_DDEFLD: { //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren - // Namen haben! Wird hier noch nicht beachtet. + // Namen haben! Wird hier noch nicht beachtet. USHORT nTmpPos = sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator ); sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); break; @@ -1541,7 +1541,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, } break; case TYP_AUTHORITY : - { + { //#i99069# changes to a bibliography field should change the field type SwAuthorityField* pAuthorityField = static_cast<SwAuthorityField*>(pTmpFld); SwAuthorityFieldType* pAuthorityType = static_cast<SwAuthorityFieldType*>(pType); @@ -1554,10 +1554,10 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, pType->UpdateFlds(); pSh->SetModified(); } - - if( aTempEntry.GetAuthorField( AUTH_FIELD_IDENTIFIER ) == - pAuthorityField->GetFieldText( AUTH_FIELD_IDENTIFIER ) ) - bSetPar1 = FALSE; //otherwise it's a new or changed entry, the field needs to be updated + + if( aTempEntry.GetAuthorField( AUTH_FIELD_IDENTIFIER ) == + pAuthorityField->GetFieldText( AUTH_FIELD_IDENTIFIER ) ) + bSetPar1 = FALSE; //otherwise it's a new or changed entry, the field needs to be updated bSetPar2 = FALSE; } break; @@ -1617,7 +1617,7 @@ USHORT SwFldMgr::GetCurrLanguage() const void SwFieldType::_GetFldName() { - static const USHORT coFldCnt = STR_TYPE_END - STR_TYPE_BEGIN; + static const USHORT coFldCnt = STR_TYPE_END - STR_TYPE_BEGIN; static USHORT __READONLY_DATA coFldNms[ coFldCnt ] = { FLD_DATE_STD, diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index 265a53dc6646..6c9ded39aaed 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -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 @@ -74,7 +74,7 @@ SwFldPage::SwFldPage( Window *pParent, const ResId &rId, m_bRefresh (FALSE), m_bFirstHTMLInit (TRUE) { -// FreeResource(); +// FreeResource(); } /*-------------------------------------------------------------------- @@ -160,7 +160,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, SwView* pView = GetActiveView(); SwWrtShell *pSh = m_pWrtShell ? m_pWrtShell : pView->GetWrtShellPtr(); - if (!IsFldEdit()) // Neues Feld einfuegen + if (!IsFldEdit()) // Neues Feld einfuegen { SwInsertFld_Data aData(nTypeId, nSubType, rPar1, rPar2, nFormatId, 0, cSeparator, bIsAutomaticLanguage ); //#i26566# provide parent for SwWrtShell::StartInputFldDlg @@ -204,7 +204,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, } } - else // Feld aendern + else // Feld aendern { SwField *const pTmpFld = m_pCurFld->CopyField(); @@ -256,7 +256,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, { if( pFmtFld->GetFld() == m_pCurFld) { - pTyp->Add(pFmtFld); // Feld auf neuen Typ umhaengen + pTyp->Add(pFmtFld); // Feld auf neuen Typ umhaengen pTmpFld->ChgTyp(pTyp); break; } @@ -279,7 +279,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, { // User- oder SetField ? if (m_aMgr.GetFldType(RES_USERFLD, sPar1) == 0 && - !(pTmpFld->GetSubType() & INP_TXT)) // SETEXPFLD + !(pTmpFld->GetSubType() & INP_TXT)) // SETEXPFLD { SwSetExpField* pFld = (SwSetExpField*)pTmpFld; pFld->SetPromptText(sPar2); @@ -368,7 +368,7 @@ IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn ) pDlg->InsertHdl(); if (pBtn) - pBtn->GrabFocus(); // Wegen InputField-Dlg + pBtn->GrabFocus(); // Wegen InputField-Dlg } else { diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index f2dc85e07f7c..c7f07e3d143f 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -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 @@ -67,17 +67,17 @@ protected: DECL_LINK( InsertHdl, Button *pBtn = 0 ); DECL_LINK( NumFormatHdl, ListBox *pBtn = 0 ); - void Init(); - void SavePos( const ListBox* pLst1, + void Init(); + void SavePos( const ListBox* pLst1, const ListBox* pLst2 = 0, const ListBox* pLst3 = 0); - void RestorePos( ListBox* pLst1, ListBox* pLst2 = 0, + void RestorePos( ListBox* pLst1, ListBox* pLst2 = 0, ListBox* pLst3 = 0 ); - void EnableInsert(BOOL bEnable = TRUE); + void EnableInsert(BOOL bEnable = TRUE); inline BOOL IsFldEdit() const { return m_bFldEdit; } // Feld einfuegen - BOOL InsertFld( USHORT nTypeId, + BOOL InsertFld( USHORT nTypeId, USHORT nSubType, const String& rPar1, const String& rPar2, @@ -88,18 +88,18 @@ protected: using SfxTabPage::ActivatePage; public: - SwFldPage( Window *pParent, + SwFldPage( Window *pParent, const ResId &rId, const SfxItemSet &rAttrSet ); virtual ~SwFldPage(); - virtual void ActivatePage(); + virtual void ActivatePage(); inline SwFldMgr& GetFldMgr() { return m_aMgr; } void SetWrtShell( SwWrtShell* m_pWrtShell ); - void EditNewField( BOOL bOnlyActivate = FALSE ); - virtual USHORT GetGroup() = 0; + void EditNewField( BOOL bOnlyActivate = FALSE ); + virtual USHORT GetGroup() = 0; }; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 1c7ff9e09564..10ee25b4775c 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -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 @@ -63,16 +63,16 @@ // sw/inc/expfld.hxx SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* ) -#define REFFLDFLAG 0x4000 -#define REFFLDFLAG_BOOKMARK 0x4800 -#define REFFLDFLAG_FOOTNOTE 0x5000 -#define REFFLDFLAG_ENDNOTE 0x6000 +#define REFFLDFLAG 0x4000 +#define REFFLDFLAG_BOOKMARK 0x4800 +#define REFFLDFLAG_FOOTNOTE 0x5000 +#define REFFLDFLAG_ENDNOTE 0x6000 // --> OD 2007-11-09 #i83479# #define REFFLDFLAG_HEADING 0x7100 #define REFFLDFLAG_NUMITEM 0x7200 // <-- -USHORT nFldDlgFmtSel = 0; +USHORT nFldDlgFmtSel = 0; #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 @@ -85,22 +85,22 @@ USHORT nFldDlgFmtSel = 0; SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage( pParent, SW_RES( TP_FLD_REF ), rCoreSet ), - aTypeFT (this, SW_RES(FT_REFTYPE)), - aTypeLB (this, SW_RES(LB_REFTYPE)), - aSelectionFT (this, SW_RES(FT_REFSELECTION)), - aSelectionLB (this, SW_RES(LB_REFSELECTION)), + aTypeFT (this, SW_RES(FT_REFTYPE)), + aTypeLB (this, SW_RES(LB_REFTYPE)), + aSelectionFT (this, SW_RES(FT_REFSELECTION)), + aSelectionLB (this, SW_RES(LB_REFSELECTION)), // --> OD 2007-11-21 #i83479# aSelectionToolTipLB( this, SW_RES(LB_REFSELECTION_TOOLTIP) ), // <-- - aFormatFT (this, SW_RES(FT_REFFORMAT)), - aFormatLB (this, SW_RES(LB_REFFORMAT)), - aNameFT (this, SW_RES(FT_REFNAME)), - aNameED (this, SW_RES(ED_REFNAME)), - aValueFT (this, SW_RES(FT_REFVALUE)), - aValueED (this, SW_RES(ED_REFVALUE)), - - sBookmarkTxt (SW_RES(STR_REFBOOKMARK)), - sFootnoteTxt (SW_RES(STR_REFFOOTNOTE)), + aFormatFT (this, SW_RES(FT_REFFORMAT)), + aFormatLB (this, SW_RES(LB_REFFORMAT)), + aNameFT (this, SW_RES(FT_REFNAME)), + aNameED (this, SW_RES(ED_REFNAME)), + aValueFT (this, SW_RES(FT_REFVALUE)), + aValueED (this, SW_RES(ED_REFVALUE)), + + sBookmarkTxt (SW_RES(STR_REFBOOKMARK)), + sFootnoteTxt (SW_RES(STR_REFFOOTNOTE)), sEndnoteTxt (SW_RES(STR_REFENDNOTE)), // --> OD 2007-11-09 #i83479# sHeadingTxt (SW_RES(STR_REFHEADING)), @@ -201,7 +201,7 @@ void SwFldRefPage::Reset(const SfxItemSet& ) } SetSelectionSel(LISTBOX_ENTRY_NOTFOUND); SetTypeSel(LISTBOX_ENTRY_NOTFOUND); - Init(); // Allgemeine initialisierung + Init(); // Allgemeine initialisierung // TypeListBox initialisieren aTypeLB.SetUpdateMode(FALSE); @@ -377,7 +377,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) break; } - if (aTypeLB.GetEntryPos(sName) == LISTBOX_ENTRY_NOTFOUND) // Referenz zu gel?schter Marke + if (aTypeLB.GetEntryPos(sName) == LISTBOX_ENTRY_NOTFOUND) // Referenz zu gel?schter Marke { USHORT nPos = aTypeLB.InsertEntry(sName); aTypeLB.SetEntryData(nPos, reinterpret_cast<void*>(nFlag)); @@ -876,7 +876,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) { SwFieldType* pType = GetFldMgr().GetFldType(RES_SETEXPFLD, aName); - if(!pType) // Nur einfuegen, wenn es den Namen noch nicht gibt + if(!pType) // Nur einfuegen, wenn es den Namen noch nicht gibt { aSelectionLB.InsertEntry(aName); aSelectionLB.Enable(); @@ -895,13 +895,13 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) { pSh = ::GetActiveWrtShell(); } - if (nTypeId == REFFLDFLAG_BOOKMARK) // TextMarken! + if (nTypeId == REFFLDFLAG_BOOKMARK) // TextMarken! { aName = aNameED.GetText(); nTypeId = TYP_GETREFFLD; nSubType = REF_BOOKMARK; } - else if (REFFLDFLAG_FOOTNOTE == nTypeId) // Fussnoten + else if (REFFLDFLAG_FOOTNOTE == nTypeId) // Fussnoten { SwSeqFldList aArr; _SeqFldLstElem aElem( aSelectionLB.GetSelectEntry(), 0 ); @@ -922,7 +922,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) else if (IsFldEdit()) aVal = String::CreateFromInt32( pRefFld->GetSeqNo() ); } - else if (REFFLDFLAG_ENDNOTE == nTypeId) // Endnoten + else if (REFFLDFLAG_ENDNOTE == nTypeId) // Endnoten { SwSeqFldList aArr; _SeqFldLstElem aElem( aSelectionLB.GetSelectEntry(), 0 ); @@ -1030,7 +1030,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) InsertFld( nTypeId, nSubType, aName, aVal, nFormat ); } - ModifyHdl(); // Insert ggf enablen/disablen + ModifyHdl(); // Insert ggf enablen/disablen return FALSE; } @@ -1039,7 +1039,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) Beschreibung: --------------------------------------------------------------------*/ -SfxTabPage* SwFldRefPage::Create( Window* pParent, +SfxTabPage* SwFldRefPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldRefPage( pParent, rAttrSet ) ); @@ -1057,7 +1057,7 @@ USHORT SwFldRefPage::GetGroup() /* -----------------12.01.99 10:09------------------- * * --------------------------------------------------*/ -void SwFldRefPage::FillUserData() +void SwFldRefPage::FillUserData() { String sData( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 0facb24bf823..b7024d653173 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -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 @@ -50,19 +50,19 @@ class SwTxtNode; class SwFldRefPage : public SwFldPage { - FixedText aTypeFT; - ListBox aTypeLB; - FixedText aSelectionFT; - ListBox aSelectionLB; + FixedText aTypeFT; + ListBox aTypeLB; + FixedText aSelectionFT; + ListBox aSelectionLB; // --> OD 2007-11-21 #i83479# SwFldRefTreeListBox aSelectionToolTipLB; // <-- - FixedText aFormatFT; - ListBox aFormatLB; - FixedText aNameFT; - Edit aNameED; - FixedText aValueFT; - Edit aValueED; + FixedText aFormatFT; + ListBox aFormatLB; + FixedText aNameFT; + Edit aNameED; + FixedText aValueFT; + Edit aValueED; const String sBookmarkTxt; const String sFootnoteTxt; const String sEndnoteTxt; @@ -84,8 +84,8 @@ class SwFldRefPage : public SwFldPage DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); DECL_LINK( ModifyHdl, Edit *pEd = 0 ); - void UpdateSubType(); - USHORT FillFormatLB(USHORT nTypeId); + void UpdateSubType(); + USHORT FillFormatLB(USHORT nTypeId); // --> OD 2007-12-05 #i83479# void SaveSelectedTxtNode(); @@ -94,7 +94,7 @@ class SwFldRefPage : public SwFldPage // <-- protected: - virtual USHORT GetGroup(); + virtual USHORT GetGroup(); public: SwFldRefPage(Window* pParent, const SfxItemSet& rSet); @@ -106,7 +106,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual void FillUserData(); }; diff --git a/sw/source/ui/fldui/fldref.src b/sw/source/ui/fldui/fldref.src index 847c9358db69..8abf02e980c6 100644 --- a/sw/source/ui/fldui/fldref.src +++ b/sw/source/ui/fldui/fldref.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/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 308bc379d4f4..7aa6cb0ad752 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -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 @@ -68,7 +68,7 @@ /*-------------------------------------------------------------------- - Beschreibung: Der Traeger des Dialoges + Beschreibung: Der Traeger des Dialoges --------------------------------------------------------------------*/ @@ -85,11 +85,11 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) GetOKButton().SetText(String(SW_RES(STR_FLD_INSERT))); GetOKButton().SetHelpId(HID_FIELD_INSERT); - GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird + GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird GetCancelButton().SetText(String(SW_RES(STR_FLD_CLOSE))); GetCancelButton().SetHelpId(HID_FIELD_CLOSE); - GetCancelButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird + GetCancelButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird FreeResource(); @@ -233,10 +233,10 @@ IMPL_LINK( SwFldDlg, OKHdl, Button *, EMPTYARG ) { if (GetOKButton().IsEnabled()) { - SfxTabPage* pPage = GetTabPage(GetCurPageId()); + SfxTabPage* pPage = GetTabPage(GetCurPageId()); pPage->FillItemSet(*(SfxItemSet*)0); - GetOKButton().GrabFocus(); // Wegen InputField-Dlg + GetOKButton().GrabFocus(); // Wegen InputField-Dlg } return 0; @@ -288,7 +288,7 @@ void SwFldDlg::ReInitTabPage( USHORT nPageId, BOOL bOnlyActivate ) SwFldPage* pPage = (SwFldPage* )GetTabPage(nPageId); if ( pPage ) - pPage->EditNewField( bOnlyActivate ); // TabPage neu initialisieren + pPage->EditNewField( bOnlyActivate ); // TabPage neu initialisieren } /*-------------------------------------------------------------------- diff --git a/sw/source/ui/fldui/fldtdlg.hrc b/sw/source/ui/fldui/fldtdlg.hrc index 221b943779c0..eaa88e5d1dcf 100644 --- a/sw/source/ui/fldui/fldtdlg.hrc +++ b/sw/source/ui/fldui/fldtdlg.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 @@ -32,104 +32,104 @@ // #define ------------------------------------------------------------------ -#define RC_FLDTDLG_BEGIN 0 +#define RC_FLDTDLG_BEGIN 0 // Datenbankfeld-TabPage: -#define RC_TP_DB_START (RC_FLDTDLG_BEGIN) -#define FT_DBTYPE (RC_TP_DB_START + 1) -#define LB_DBTYPE (RC_TP_DB_START + 2) +#define RC_TP_DB_START (RC_FLDTDLG_BEGIN) +#define FT_DBTYPE (RC_TP_DB_START + 1) +#define LB_DBTYPE (RC_TP_DB_START + 2) #define FL_DBFORMAT (RC_TP_DB_START + 3) -#define FT_DBSELECTION (RC_TP_DB_START + 4) -#define TLB_DBLIST (RC_TP_DB_START + 5) -#define FT_DBCONDITION (RC_TP_DB_START + 6) -#define FT_DBSETNUMBER (RC_TP_DB_START + 7) -#define ED_DBCONDITION (RC_TP_DB_START + 8) -#define ED_DBSETNUMBER (RC_TP_DB_START + 9) -#define LB_DBFORMAT (RC_TP_DB_START + 10) -#define LB_DBNUMFORMAT (RC_TP_DB_START + 11) -#define RB_DBFORMAT (RC_TP_DB_START + 12) -#define RB_DBOWNFORMAT (RC_TP_DB_START + 13) -#define RC_TP_DB_END (RC_TP_DB_START + 14) +#define FT_DBSELECTION (RC_TP_DB_START + 4) +#define TLB_DBLIST (RC_TP_DB_START + 5) +#define FT_DBCONDITION (RC_TP_DB_START + 6) +#define FT_DBSETNUMBER (RC_TP_DB_START + 7) +#define ED_DBCONDITION (RC_TP_DB_START + 8) +#define ED_DBSETNUMBER (RC_TP_DB_START + 9) +#define LB_DBFORMAT (RC_TP_DB_START + 10) +#define LB_DBNUMFORMAT (RC_TP_DB_START + 11) +#define RB_DBFORMAT (RC_TP_DB_START + 12) +#define RB_DBOWNFORMAT (RC_TP_DB_START + 13) +#define RC_TP_DB_END (RC_TP_DB_START + 14) #define FL_DBFORMAT_VERT (RC_TP_DB_START + 15) #define FT_ADDDB (RC_TP_DB_START + 16) #define PB_ADDDB (RC_TP_DB_START + 17) // Dokumentinfo-TabPage: -#define RC_TP_DOCINF_START (RC_TP_DB_END) -#define FT_DOKINFTYPE (RC_TP_DOCINF_START + 1) -#define TLB_DOKINFTYPE (RC_TP_DOCINF_START + 2) +#define RC_TP_DOCINF_START (RC_TP_DB_END) +#define FT_DOKINFTYPE (RC_TP_DOCINF_START + 1) +#define TLB_DOKINFTYPE (RC_TP_DOCINF_START + 2) #define FT_DOKINFSELECTION (RC_TP_DOCINF_START + 3) -#define LB_DOKINFSELECTION (RC_TP_DOCINF_START + 4) -#define FT_DOKINFFORMAT (RC_TP_DOCINF_START + 5) -#define LB_DOKINFFORMAT (RC_TP_DOCINF_START + 6) -#define CB_DOKINFFIXEDCONTENT (RC_TP_DOCINF_START + 7) -#define BMP_DOKINFROOT_OPENED (RC_TP_DOCINF_START + 8) -#define BMP_DOKINFROOT_CLOSED (RC_TP_DOCINF_START + 9) -#define STR_DOKINF_INFO (RC_TP_DOCINF_START + 10) -#define RC_TP_DOCINF_END (RC_TP_DOCINF_START + 11) +#define LB_DOKINFSELECTION (RC_TP_DOCINF_START + 4) +#define FT_DOKINFFORMAT (RC_TP_DOCINF_START + 5) +#define LB_DOKINFFORMAT (RC_TP_DOCINF_START + 6) +#define CB_DOKINFFIXEDCONTENT (RC_TP_DOCINF_START + 7) +#define BMP_DOKINFROOT_OPENED (RC_TP_DOCINF_START + 8) +#define BMP_DOKINFROOT_CLOSED (RC_TP_DOCINF_START + 9) +#define STR_DOKINF_INFO (RC_TP_DOCINF_START + 10) +#define RC_TP_DOCINF_END (RC_TP_DOCINF_START + 11) // Variablen-TabPage: -#define RC_TP_VAR_START (RC_TP_DOCINF_END) -#define FT_VARTYPE (RC_TP_VAR_START + 1) -#define LB_VARTYPE (RC_TP_VAR_START + 2) -#define FT_VARSELECTION (RC_TP_VAR_START + 3) -#define LB_VARSELECTION (RC_TP_VAR_START + 4) -#define FT_VARNAME (RC_TP_VAR_START + 5) -#define ED_VARNAME (RC_TP_VAR_START + 6) -#define FT_VARVALUE (RC_TP_VAR_START + 7) -#define ED_VARVALUE (RC_TP_VAR_START + 8) -#define FT_VARFORMAT (RC_TP_VAR_START + 9) -#define LB_VARNUMFORMAT (RC_TP_VAR_START + 10) -#define LB_VARFORMAT (RC_TP_VAR_START + 11) +#define RC_TP_VAR_START (RC_TP_DOCINF_END) +#define FT_VARTYPE (RC_TP_VAR_START + 1) +#define LB_VARTYPE (RC_TP_VAR_START + 2) +#define FT_VARSELECTION (RC_TP_VAR_START + 3) +#define LB_VARSELECTION (RC_TP_VAR_START + 4) +#define FT_VARNAME (RC_TP_VAR_START + 5) +#define ED_VARNAME (RC_TP_VAR_START + 6) +#define FT_VARVALUE (RC_TP_VAR_START + 7) +#define ED_VARVALUE (RC_TP_VAR_START + 8) +#define FT_VARFORMAT (RC_TP_VAR_START + 9) +#define LB_VARNUMFORMAT (RC_TP_VAR_START + 10) +#define LB_VARFORMAT (RC_TP_VAR_START + 11) #define FT_VARCHAPTERHEADER (RC_TP_VAR_START + 12) #define FT_VARCHAPTERLEVEL (RC_TP_VAR_START + 13) #define LB_VARCHAPTERLEVEL (RC_TP_VAR_START + 14) -#define CB_VARINVISIBLE (RC_TP_VAR_START + 15) -#define FT_VARSEPARATOR (RC_TP_VAR_START + 16) -#define ED_VARSEPARATOR (RC_TP_VAR_START + 17) -#define TBX_VARNEWDEL (RC_TP_VAR_START + 18) -#define BT_VARAPPLY (RC_TP_VAR_START + 19) -#define BT_VARDELETE (RC_TP_VAR_START + 20) -#define RC_TP_VAR_END (RC_TP_VAR_START + 21) +#define CB_VARINVISIBLE (RC_TP_VAR_START + 15) +#define FT_VARSEPARATOR (RC_TP_VAR_START + 16) +#define ED_VARSEPARATOR (RC_TP_VAR_START + 17) +#define TBX_VARNEWDEL (RC_TP_VAR_START + 18) +#define BT_VARAPPLY (RC_TP_VAR_START + 19) +#define BT_VARDELETE (RC_TP_VAR_START + 20) +#define RC_TP_VAR_END (RC_TP_VAR_START + 21) // Dokument-TabPage: -#define RC_TP_DOC_START (RC_TP_VAR_END) -#define FT_DOKTYPE (RC_TP_DOC_START + 1) -#define LB_DOKTYPE (RC_TP_DOC_START + 2) -#define FT_DOKSELECTION (RC_TP_DOC_START + 3) -#define LB_DOKSELECTION (RC_TP_DOC_START + 4) -#define LB_DOKNUMFORMAT (RC_TP_DOC_START + 5) -#define LB_DOKFORMAT (RC_TP_DOC_START + 6) -#define FT_DOKFORMAT (RC_TP_DOC_START + 7) -#define FT_DOKVALUE (RC_TP_DOC_START + 8) -#define ED_DOKVALUE (RC_TP_DOC_START + 9) -#define ED_DOKLEVEL (RC_TP_DOC_START + 10) -#define ED_DOKDATEOFF (RC_TP_DOC_START + 11) -#define CB_DOKFIXEDCONTENT (RC_TP_DOC_START + 12) -#define STR_DOKDATEOFF (RC_TP_DOC_START + 13) -#define STR_DOKTIMEOFF (RC_TP_DOC_START + 14) -#define BMP_DOKROOT_OPENED (RC_TP_DOC_START + 15) -#define BMP_DOKROOT_CLOSED (RC_TP_DOC_START + 16) -#define RC_TP_DOC_END (RC_TP_DOC_START + 17) +#define RC_TP_DOC_START (RC_TP_VAR_END) +#define FT_DOKTYPE (RC_TP_DOC_START + 1) +#define LB_DOKTYPE (RC_TP_DOC_START + 2) +#define FT_DOKSELECTION (RC_TP_DOC_START + 3) +#define LB_DOKSELECTION (RC_TP_DOC_START + 4) +#define LB_DOKNUMFORMAT (RC_TP_DOC_START + 5) +#define LB_DOKFORMAT (RC_TP_DOC_START + 6) +#define FT_DOKFORMAT (RC_TP_DOC_START + 7) +#define FT_DOKVALUE (RC_TP_DOC_START + 8) +#define ED_DOKVALUE (RC_TP_DOC_START + 9) +#define ED_DOKLEVEL (RC_TP_DOC_START + 10) +#define ED_DOKDATEOFF (RC_TP_DOC_START + 11) +#define CB_DOKFIXEDCONTENT (RC_TP_DOC_START + 12) +#define STR_DOKDATEOFF (RC_TP_DOC_START + 13) +#define STR_DOKTIMEOFF (RC_TP_DOC_START + 14) +#define BMP_DOKROOT_OPENED (RC_TP_DOC_START + 15) +#define BMP_DOKROOT_CLOSED (RC_TP_DOC_START + 16) +#define RC_TP_DOC_END (RC_TP_DOC_START + 17) // Funktion-TabPage: -#define RC_TP_FUNC_START (RC_TP_DOC_END) -#define FT_FUNCTYPE (RC_TP_FUNC_START + 1) -#define LB_FUNCTYPE (RC_TP_FUNC_START + 2) -#define LB_FUNCSELECTION (RC_TP_FUNC_START + 3) -#define FT_FUNCSELECTION (RC_TP_FUNC_START + 4) -#define FT_FUNCFORMAT (RC_TP_FUNC_START + 5) -#define LB_FUNCFORMAT (RC_TP_FUNC_START + 6) -#define FT_FUNCNAME (RC_TP_FUNC_START + 7) -#define ED_FUNCNAME (RC_TP_FUNC_START + 8) -#define FT_FUNCVALUE (RC_TP_FUNC_START + 9) -#define ED_FUNCVALUE (RC_TP_FUNC_START + 10) -#define FT_FUNCCOND1 (RC_TP_FUNC_START + 11) -#define ED_FUNCCOND1 (RC_TP_FUNC_START + 12) -#define FT_FUNCCOND2 (RC_TP_FUNC_START + 13) -#define ED_FUNCCOND2 (RC_TP_FUNC_START + 14) -#define BT_FUNCMACRO (RC_TP_FUNC_START + 15) -#define RC_TP_FUNC_END (RC_TP_FUNC_START + 16) +#define RC_TP_FUNC_START (RC_TP_DOC_END) +#define FT_FUNCTYPE (RC_TP_FUNC_START + 1) +#define LB_FUNCTYPE (RC_TP_FUNC_START + 2) +#define LB_FUNCSELECTION (RC_TP_FUNC_START + 3) +#define FT_FUNCSELECTION (RC_TP_FUNC_START + 4) +#define FT_FUNCFORMAT (RC_TP_FUNC_START + 5) +#define LB_FUNCFORMAT (RC_TP_FUNC_START + 6) +#define FT_FUNCNAME (RC_TP_FUNC_START + 7) +#define ED_FUNCNAME (RC_TP_FUNC_START + 8) +#define FT_FUNCVALUE (RC_TP_FUNC_START + 9) +#define ED_FUNCVALUE (RC_TP_FUNC_START + 10) +#define FT_FUNCCOND1 (RC_TP_FUNC_START + 11) +#define ED_FUNCCOND1 (RC_TP_FUNC_START + 12) +#define FT_FUNCCOND2 (RC_TP_FUNC_START + 13) +#define ED_FUNCCOND2 (RC_TP_FUNC_START + 14) +#define BT_FUNCMACRO (RC_TP_FUNC_START + 15) +#define RC_TP_FUNC_END (RC_TP_FUNC_START + 16) #define FT_LISTITEM (RC_TP_FUNC_START + 17) #define ED_LISTITEM (RC_TP_FUNC_START + 18) #define PB_LISTADD (RC_TP_FUNC_START + 19) @@ -142,10 +142,10 @@ #define ED_LISTNAME (RC_TP_FUNC_START + 26) // Referenz-TabPage: -#define RC_TP_REF_START (RC_TP_FUNC_END) -#define FT_REFTYPE (RC_TP_REF_START + 1) -#define LB_REFTYPE (RC_TP_REF_START + 2) -#define FT_REFSELECTION (RC_TP_REF_START + 3) +#define RC_TP_REF_START (RC_TP_FUNC_END) +#define FT_REFTYPE (RC_TP_REF_START + 1) +#define LB_REFTYPE (RC_TP_REF_START + 2) +#define FT_REFSELECTION (RC_TP_REF_START + 3) #define LB_REFSELECTION (RC_TP_REF_START + 4) #define LB_REFSELECTION_TOOLTIP (RC_TP_REF_START + 5) #define LB_REFFORMAT (RC_TP_REF_START + 6) @@ -161,11 +161,11 @@ #define STR_REFNUMITEM (RC_TP_REF_START + 16) #define RC_TP_REF_END (RC_TP_REF_START + 17) -#define RC_TP_END (RC_TP_REF_END) +#define RC_TP_END (RC_TP_REF_END) // Strings ------------------------------------------------------------------ -#define STR_FLD_INSERT (RC_TP_END + 1) -#define STR_FLD_CLOSE (RC_TP_END + 2) +#define STR_FLD_INSERT (RC_TP_END + 1) +#define STR_FLD_CLOSE (RC_TP_END + 2) #endif diff --git a/sw/source/ui/fldui/fldtdlg.src b/sw/source/ui/fldui/fldtdlg.src index 3034146466e3..c83c0b0e9e88 100644 --- a/sw/source/ui/fldui/fldtdlg.src +++ b/sw/source/ui/fldui/fldtdlg.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/fldui/fldui.src b/sw/source/ui/fldui/fldui.src index 7fb6a2e730c8..142e45077382 100644 --- a/sw/source/ui/fldui/fldui.src +++ b/sw/source/ui/fldui/fldui.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/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 6aee7bba2cf3..c3a2f6dd473b 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -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 @@ -67,26 +67,26 @@ --------------------------------------------------------------------*/ SwFldVarPage::SwFldVarPage(Window* pParent, const SfxItemSet& rCoreSet ) : - SwFldPage ( pParent, SW_RES( TP_FLD_VAR ), rCoreSet ), - aTypeFT (this, SW_RES(FT_VARTYPE)), - aTypeLB (this, SW_RES(LB_VARTYPE)), - aSelectionFT (this, SW_RES(FT_VARSELECTION)), - aSelectionLB (this, SW_RES(LB_VARSELECTION)), - aNameFT (this, SW_RES(FT_VARNAME)), - aNameED (this, SW_RES(ED_VARNAME)), - aValueFT (this, SW_RES(FT_VARVALUE)), - aValueED (this, SW_RES(ED_VARVALUE)), - aFormatFT (this, SW_RES(FT_VARFORMAT)), - aNumFormatLB (this, SW_RES(LB_VARNUMFORMAT)), - aFormatLB (this, SW_RES(LB_VARFORMAT)), + SwFldPage ( pParent, SW_RES( TP_FLD_VAR ), rCoreSet ), + aTypeFT (this, SW_RES(FT_VARTYPE)), + aTypeLB (this, SW_RES(LB_VARTYPE)), + aSelectionFT (this, SW_RES(FT_VARSELECTION)), + aSelectionLB (this, SW_RES(LB_VARSELECTION)), + aNameFT (this, SW_RES(FT_VARNAME)), + aNameED (this, SW_RES(ED_VARNAME)), + aValueFT (this, SW_RES(FT_VARVALUE)), + aValueED (this, SW_RES(ED_VARVALUE)), + aFormatFT (this, SW_RES(FT_VARFORMAT)), + aNumFormatLB (this, SW_RES(LB_VARNUMFORMAT)), + aFormatLB (this, SW_RES(LB_VARFORMAT)), aChapterHeaderFT(this, SW_RES(FT_VARCHAPTERHEADER)), - aChapterLevelFT (this, SW_RES(FT_VARCHAPTERLEVEL)), - aChapterLevelLB (this, SW_RES(LB_VARCHAPTERLEVEL)), - aInvisibleCB (this, SW_RES(CB_VARINVISIBLE)), - aSeparatorFT (this, SW_RES(FT_VARSEPARATOR)), - aSeparatorED (this, SW_RES(ED_VARSEPARATOR)), - aNewDelTBX (this, SW_RES(TBX_VARNEWDEL)), - bInit (TRUE) + aChapterLevelFT (this, SW_RES(FT_VARCHAPTERLEVEL)), + aChapterLevelLB (this, SW_RES(LB_VARCHAPTERLEVEL)), + aInvisibleCB (this, SW_RES(CB_VARINVISIBLE)), + aSeparatorFT (this, SW_RES(FT_VARSEPARATOR)), + aSeparatorED (this, SW_RES(ED_VARSEPARATOR)), + aNewDelTBX (this, SW_RES(TBX_VARNEWDEL)), + bInit (TRUE) { FreeResource(); @@ -125,7 +125,7 @@ void SwFldVarPage::Reset(const SfxItemSet& ) { SavePos(&aTypeLB); - Init(); // Allgemeine initialisierung + Init(); // Allgemeine initialisierung aTypeLB.SetUpdateMode(FALSE); aTypeLB.Clear(); @@ -167,17 +167,17 @@ void SwFldVarPage::Reset(const SfxItemSet& ) // alte Pos selektieren RestorePos(&aTypeLB); - aTypeLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); - aTypeLB.SetSelectHdl (LINK(this, SwFldVarPage, TypeHdl)); - aSelectionLB.SetSelectHdl (LINK(this, SwFldVarPage, SubTypeHdl)); - aSelectionLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); - aFormatLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); - aNumFormatLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); - aNameED.SetModifyHdl (LINK(this, SwFldVarPage, ModifyHdl)); - aValueED.SetModifyHdl (LINK(this, SwFldVarPage, ModifyHdl)); - aNewDelTBX.SetClickHdl (LINK(this, SwFldVarPage, TBClickHdl)); - aChapterLevelLB.SetSelectHdl (LINK(this, SwFldVarPage, ChapterHdl)); - aSeparatorED.SetModifyHdl (LINK(this, SwFldVarPage, SeparatorHdl)); + aTypeLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); + aTypeLB.SetSelectHdl (LINK(this, SwFldVarPage, TypeHdl)); + aSelectionLB.SetSelectHdl (LINK(this, SwFldVarPage, SubTypeHdl)); + aSelectionLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); + aFormatLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); + aNumFormatLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); + aNameED.SetModifyHdl (LINK(this, SwFldVarPage, ModifyHdl)); + aValueED.SetModifyHdl (LINK(this, SwFldVarPage, ModifyHdl)); + aNewDelTBX.SetClickHdl (LINK(this, SwFldVarPage, TBClickHdl)); + aChapterLevelLB.SetSelectHdl (LINK(this, SwFldVarPage, ChapterHdl)); + aSeparatorED.SetModifyHdl (LINK(this, SwFldVarPage, SeparatorHdl)); if( !IsRefresh() ) { @@ -242,7 +242,7 @@ IMPL_LINK( SwFldVarPage, TypeHdl, ListBox *, EMPTYARG ) } aValueED.SetDropEnable(FALSE); - UpdateSubType(); // Auswahl-Listboxen initialisieren + UpdateSubType(); // Auswahl-Listboxen initialisieren } bInit = FALSE; @@ -297,7 +297,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) { if (!IsFldEdit()) { - if (pBox || (bInit && !IsRefresh())) // Nur bei Interaktion mit Maus + if (pBox || (bInit && !IsRefresh())) // Nur bei Interaktion mit Maus { aNameED.SetText(pType->GetName()); @@ -308,7 +308,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) } else aValueED.SetText(pType->GetContent()); -// aValueED.SetText(pType->GetContent(aNumFormatLB.GetFormat())); +// aValueED.SetText(pType->GetContent(aNumFormatLB.GetFormat())); } } else @@ -316,7 +316,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) } else { - if (pBox) // Nur bei Interaktion mit Maus + if (pBox) // Nur bei Interaktion mit Maus { aNameED.SetText(aEmptyStr); aValueED.SetText(aEmptyStr); @@ -343,7 +343,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) aNumFormatLB.SelectEntryPos(0); } // gibt es ein entprechendes SetField - if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus + if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus { if (nSelPos != LISTBOX_ENTRY_NOTFOUND) { @@ -442,7 +442,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) USHORT nInpType = 0; nInpType = static_cast< USHORT >(GetFldMgr().GetFldType(RES_USERFLD, sName) ? 0 : TYP_SETINPFLD); - if (nInpType) // SETEXPFLD + if (nInpType) // SETEXPFLD { // gibt es ein entprechendes SetField SwSetExpFieldType* pSetTyp = (SwSetExpFieldType*) @@ -450,7 +450,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) if(pSetTyp) { - if (pSetTyp->GetType() == nsSwGetSetExpType::GSE_STRING) // Textuell? + if (pSetTyp->GetType() == nsSwGetSetExpType::GSE_STRING) // Textuell? { aNumFormatLB.Clear(); @@ -462,7 +462,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) if (IsFldEdit() && (!pBox || bInit) ) aValueED.SetText(((SwSetExpField*)GetCurField())->GetPromptText()); } - else // USERFLD + else // USERFLD bFormat = bNumFmt = FALSE; } break; @@ -470,7 +470,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) case TYP_DDEFLD: aValueFT.SetText(SW_RESSTR(STR_DDE_CMD)); - if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus + if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus { if (nSelPos != LISTBOX_ENTRY_NOTFOUND) { @@ -482,7 +482,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) aNameED.SetText(pType->GetName()); //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren - // Namen haben! Wird hier noch nicht beachtet + // Namen haben! Wird hier noch nicht beachtet String sCmd( pType->GetCmd() ); USHORT nTmpPos = sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ' ); sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ', nTmpPos ); @@ -517,7 +517,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) aValueED.SetText( ((SwSetExpField*)GetCurField())-> GetFormula() ); - if( IsFldEdit() || pBox ) // Nur bei Interaktion mit Maus + if( IsFldEdit() || pBox ) // Nur bei Interaktion mit Maus aNameED.SetText( aSelectionLB.GetSelectEntry() ); if( pFldTyp ) @@ -539,12 +539,12 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) bValue = FALSE; aValueFT.SetText( SW_RESSTR( STR_OFFSET )); - if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus + if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus aNameED.SetText(aEmptyStr); if (nSelPos != 0 && nSelPos != LISTBOX_ENTRY_NOTFOUND) { - bValue = TRUE; // SubType OFF - kennt keinen Offset + bValue = TRUE; // SubType OFF - kennt keinen Offset if (IsFldEdit()) aValueED.SetText(String::CreateFromInt32(((SwRefPageSetField*)GetCurField())->GetOffset())); } @@ -587,7 +587,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) aChapterLevelLB.Show(bChapterLevel); aInvisibleCB.Enable(bInvisible); - ModifyHdl(); // Anwenden/Einfuegen/Loeschen Status update + ModifyHdl(); // Anwenden/Einfuegen/Loeschen Status update aNumFormatLB.SetUpdateMode(TRUE); aFormatLB.SetUpdateMode(TRUE); @@ -714,7 +714,7 @@ void SwFldVarPage::UpdateSubType() if (!aSelectionLB.GetSelectEntryCount()) { aSelectionLB.SelectEntryPos(0); - pLB = &aSelectionLB; // Alle Controls neu initialisieren + pLB = &aSelectionLB; // Alle Controls neu initialisieren } } @@ -884,7 +884,7 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG ) nLen = sName.Len(); Selection aSel(aNameED.GetSelection()); aNameED.SetText( sName ); - aNameED.SetSelection( aSel ); // Cursorpos restaurieren + aNameED.SetSelection( aSel ); // Cursorpos restaurieren } break; } @@ -922,7 +922,7 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG ) bDelete = !pSh->IsUsed( *pType ); pType = GetFldMgr().GetFldType(RES_SETEXPFLD, sName); - if (!pType) // Kein Namenskonflikt mit Variablen + if (!pType) // Kein Namenskonflikt mit Variablen { // Benutzerfelder duerfen auch ohne Inhalt eingefuegt werden! // Bug #56845 @@ -1040,9 +1040,9 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) switch (nTypeId) { - case TYP_USERFLD: nId = RES_USERFLD; break; - case TYP_DDEFLD: nId = RES_DDEFLD; break; - case TYP_SETFLD: nId = RES_SETEXPFLD;break; + case TYP_USERFLD: nId = RES_USERFLD; break; + case TYP_DDEFLD: nId = RES_DDEFLD; break; + case TYP_SETFLD: nId = RES_SETEXPFLD;break; } pType = GetFldMgr().GetFldType(nId, sName); @@ -1050,7 +1050,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) if (nFormat != LISTBOX_ENTRY_NOTFOUND) nFormat = (ULONG)aFormatLB.GetEntryData((USHORT)nFormat); - if (pType) // Aendern + if (pType) // Aendern { SwWrtShell *pSh = GetWrtShell(); if(!pSh) @@ -1092,7 +1092,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) pSh->EndAllAction(); } } - else // Neu + else // Neu { if(nTypeId == TYP_USERFLD) { @@ -1118,19 +1118,19 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) if (nFormat != LISTBOX_ENTRY_NOTFOUND) { //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren - // Namen haben! Wird hier noch nicht beachtet. + // Namen haben! Wird hier noch nicht beachtet. USHORT nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator ); sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); SwDDEFieldType aType(sName, sValue, (USHORT)nFormat); aSelectionLB.InsertEntry(sName); aSelectionLB.SelectEntry(sName); - GetFldMgr().InsertFldType(aType); // DDE-Feld Neu + GetFldMgr().InsertFldType(aType); // DDE-Feld Neu } } } if (IsFldEdit()) - GetFldMgr().GetCurFld(); // FieldManager Updaten + GetFldMgr().GetCurFld(); // FieldManager Updaten UpdateSubType(); } @@ -1265,7 +1265,7 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& ) } case TYP_SEQFLD: { - // nSubType = nsSwGetSetExpType::GSE_SEQ; // nsSwGetSetExpType::GSE_SEQ wird im Fldmgr fest gesetzt, kann also entfallen + // nSubType = nsSwGetSetExpType::GSE_SEQ; // nsSwGetSetExpType::GSE_SEQ wird im Fldmgr fest gesetzt, kann also entfallen nSubType = aChapterLevelLB.GetSelectEntryPos(); if (nSubType == 0) nSubType = 0x7f; @@ -1308,7 +1308,7 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& ) Beschreibung: --------------------------------------------------------------------*/ -SfxTabPage* SwFldVarPage::Create( Window* pParent, +SfxTabPage* SwFldVarPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldVarPage( pParent, rAttrSet ) ); @@ -1328,8 +1328,8 @@ USHORT SwFldVarPage::GetGroup() --------------------------------------------------------------------*/ SelectionListBox::SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId ) : - ListBox (pDialog, rResId), - pDlg (pDialog), + ListBox (pDialog, rResId), + pDlg (pDialog), bCallAddSelection(FALSE) { } @@ -1348,20 +1348,20 @@ long SelectionListBox::PreNotify( NotifyEvent& rNEvt ) const KeyCode aKeyCode = pKEvt->GetKeyCode(); const USHORT nModifier = aKeyCode.GetModifier(); if( aKeyCode.GetCode() == KEY_SPACE && !nModifier) -// bAddSel = TRUE; +// bAddSel = TRUE; bCallAddSelection = TRUE; } if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) { const MouseEvent* pMEvt = rNEvt.GetMouseEvent(); - if (pMEvt && (pMEvt->IsMod1() || pMEvt->IsMod2())) // Alt oder Ctrl + if (pMEvt && (pMEvt->IsMod1() || pMEvt->IsMod2())) // Alt oder Ctrl //bAddSel = TRUE; bCallAddSelection = TRUE; } -// if (bAddSel) -// pDlg->AddSelection(this); +// if (bAddSel) +// pDlg->AddSelection(this); return nHandled; } diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index dd4665198589..01d07e898e0b 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -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 @@ -49,17 +49,17 @@ class SwFldVarPage; class SelectionListBox : public ListBox { - SwFldVarPage* pDlg; - BOOL bCallAddSelection; + SwFldVarPage* pDlg; + BOOL bCallAddSelection; - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); public: SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId ); - // Selektieren per Ctrl oder Alt erkennen und mit SelectHdl auswerten - BOOL IsCallAddSelection() const {return bCallAddSelection;} - void ResetCallAddSelection() {bCallAddSelection = FALSE;} + // Selektieren per Ctrl oder Alt erkennen und mit SelectHdl auswerten + BOOL IsCallAddSelection() const {return bCallAddSelection;} + void ResetCallAddSelection() {bCallAddSelection = FALSE;} }; /*-------------------------------------------------------------------- @@ -70,30 +70,30 @@ class SwFldVarPage : public SwFldPage { friend class SelectionListBox; - FixedText aTypeFT; - ListBox aTypeLB; - FixedText aSelectionFT; - SelectionListBox aSelectionLB; - FixedText aNameFT; - Edit aNameED; - FixedText aValueFT; - ConditionEdit aValueED; - FixedText aFormatFT; - NumFormatListBox aNumFormatLB; - ListBox aFormatLB; - FixedText aChapterHeaderFT; - FixedText aChapterLevelFT; - ListBox aChapterLevelLB; - CheckBox aInvisibleCB; - FixedText aSeparatorFT; - Edit aSeparatorED; - ToolBox aNewDelTBX; - - String sOldValueFT; - String sOldNameFT; - - ULONG nOldFormat; - BOOL bInit; + FixedText aTypeFT; + ListBox aTypeLB; + FixedText aSelectionFT; + SelectionListBox aSelectionLB; + FixedText aNameFT; + Edit aNameED; + FixedText aValueFT; + ConditionEdit aValueED; + FixedText aFormatFT; + NumFormatListBox aNumFormatLB; + ListBox aFormatLB; + FixedText aChapterHeaderFT; + FixedText aChapterLevelFT; + ListBox aChapterLevelLB; + CheckBox aInvisibleCB; + FixedText aSeparatorFT; + Edit aSeparatorED; + ToolBox aNewDelTBX; + + String sOldValueFT; + String sOldNameFT; + + ULONG nOldFormat; + BOOL bInit; DECL_LINK( TypeHdl, ListBox* pLB = 0 ); DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); @@ -102,11 +102,11 @@ class SwFldVarPage : public SwFldPage DECL_LINK( ChapterHdl, ListBox *pLB = 0); DECL_LINK( SeparatorHdl, Edit *pED = 0 ); - void UpdateSubType(); - USHORT FillFormatLB(USHORT nTypeId); + void UpdateSubType(); + USHORT FillFormatLB(USHORT nTypeId); protected: - virtual USHORT GetGroup(); + virtual USHORT GetGroup(); public: SwFldVarPage(Window* pParent, const SfxItemSet& rSet); @@ -118,7 +118,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual void FillUserData(); }; diff --git a/sw/source/ui/fldui/fldvar.src b/sw/source/ui/fldui/fldvar.src index 7405a2956849..eda28b7fb40d 100644 --- a/sw/source/ui/fldui/fldvar.src +++ b/sw/source/ui/fldui/fldvar.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/fldui/fldwrap.cxx b/sw/source/ui/fldui/fldwrap.cxx index 18f291d5b6e6..30d56623d844 100644 --- a/sw/source/ui/fldui/fldwrap.cxx +++ b/sw/source/ui/fldui/fldwrap.cxx @@ -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 @@ -82,7 +82,7 @@ SwChildWinWrapper::SwChildWinWrapper(Window *pParentWindow, USHORT nId) : IMPL_LINK( SwChildWinWrapper, UpdateHdl, void*, EMPTYARG ) { - GetWindow()->Activate(); // Dialog aktualisieren + GetWindow()->Activate(); // Dialog aktualisieren return 0; } @@ -98,7 +98,7 @@ BOOL SwChildWinWrapper::ReInitDlg(SwDocShell *) if (m_pDocSh != GetOldDocShell()) { m_aUpdateTimer.Stop(); - bRet = TRUE; // Sofortiges Update + bRet = TRUE; // Sofortiges Update } else m_aUpdateTimer.Start(); @@ -129,7 +129,7 @@ SwFldDlgWrapper::SwFldDlgWrapper( Window* _pParent, USHORT nId, { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!"); - + AbstractSwFldDlg* pDlg = pFact->CreateSwFldDlg(pB, this, _pParent, DLG_FLD_INSERT ); DBG_ASSERT(pDlg, "Dialogdiet fail!"); pDlgInterface = pDlg; @@ -146,7 +146,7 @@ BOOL SwFldDlgWrapper::ReInitDlg(SwDocShell *pDocSh) { BOOL bRet; - if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel + if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel { pDlgInterface->ReInitDlg(); } @@ -186,11 +186,11 @@ SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* _pParent, USHORT nId, { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!"); - + AbstractSwFldDlg* pDlg = pFact->CreateSwFldDlg(pB, this, _pParent, DLG_FLD_INSERT ); DBG_ASSERT(pDlg, "Dialogdiet fail!"); - pDlgInterface = pDlg; - + pDlgInterface = pDlg; + pWindow = pDlg->GetWindow(); pDlg->ActivateDatabasePage(); pDlg->Start(); diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index 46c05c4ac63b..002b312af8cd 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -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 @@ -63,7 +63,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, SwField* pField, BOOL bNextButton ) : - SvxStandardDialog(pParent, SW_RES(DLG_FLD_INPUT)), + SvxStandardDialog(pParent, SW_RES(DLG_FLD_INPUT)), rSh( rS ), pInpFld(0), @@ -71,12 +71,12 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, pUsrType(0), aLabelED (this, SW_RES(ED_LABEL )), - aEditED (this, SW_RES(ED_EDIT )), + aEditED (this, SW_RES(ED_EDIT )), aEditFL (this, SW_RES(FL_EDIT )), aOKBT (this, SW_RES(BT_OK )), - aCancelBT (this, SW_RES(BT_CANCEL )), - aNextBT (this, SW_RES(PB_NEXT )), + aCancelBT (this, SW_RES(BT_CANCEL )), + aNextBT (this, SW_RES(PB_NEXT )), aHelpBT (this, SW_RES(PB_HELP )) { // Font fuers Edit umschalten @@ -100,7 +100,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, // Auswertung hier String aStr; if( RES_INPUTFLD == pField->GetTyp()->Which() ) - { // Es ist eine Eingabefeld + { // Es ist eine Eingabefeld // pInpFld = (SwInputField*)pField; aLabelED.SetText( pInpFld->GetPar2() ); @@ -135,7 +135,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, } // JP 31.3.00: Inputfields in readonly regions must be allowed to - // input any content. - 74639 + // input any content. - 74639 BOOL bEnable = !rSh.IsCrsrReadonly(); /*!rSh.IsReadOnlyAvailable() || !rSh.HasReadonlySel()*/; aOKBT.Enable( bEnable ); @@ -158,7 +158,7 @@ void SwFldInputDlg::StateChanged( StateChangedType nType ) } /*-------------------------------------------------------------------- - Beschreibung: Schliessen + Beschreibung: Schliessen --------------------------------------------------------------------*/ void SwFldInputDlg::Apply() diff --git a/sw/source/ui/fldui/inpdlg.hrc b/sw/source/ui/fldui/inpdlg.hrc index bbd04c092010..8a7a3eea9073 100644 --- a/sw/source/ui/fldui/inpdlg.hrc +++ b/sw/source/ui/fldui/inpdlg.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_LABEL 1 -#define ED_EDIT 3 +#define FT_LABEL 1 +#define ED_EDIT 3 #define FL_EDIT 4 -#define BT_OK 5 -#define BT_CANCEL 6 -#define ED_LABEL 7 -#define PB_NEXT 8 -#define PB_HELP 9 +#define BT_OK 5 +#define BT_CANCEL 6 +#define ED_LABEL 7 +#define PB_NEXT 8 +#define PB_HELP 9 diff --git a/sw/source/ui/fldui/inpdlg.src b/sw/source/ui/fldui/inpdlg.src index 8b60525dfe5c..f615b68f4899 100644 --- a/sw/source/ui/fldui/inpdlg.src +++ b/sw/source/ui/fldui/inpdlg.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/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 443bc075b7db..3d24c5d09580 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -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 @@ -76,20 +76,20 @@ SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) : SvxStandardDialog(pParent, SW_RES(DLG_JAVAEDIT)), - aTypeFT ( this, SW_RES( FT_TYPE ) ), - aTypeED ( this, SW_RES( ED_TYPE ) ), - aUrlRB ( this, SW_RES( RB_URL ) ), + aTypeFT ( this, SW_RES( FT_TYPE ) ), + aTypeED ( this, SW_RES( ED_TYPE ) ), + aUrlRB ( this, SW_RES( RB_URL ) ), aEditRB ( this, SW_RES( RB_EDIT ) ), aUrlPB ( this, SW_RES( PB_URL ) ), - aUrlED ( this, SW_RES( ED_URL ) ), - aEditED ( this, SW_RES( ED_EDIT ) ), + aUrlED ( this, SW_RES( ED_URL ) ), + aEditED ( this, SW_RES( ED_EDIT ) ), aPostItFL ( this, SW_RES( FL_POSTIT ) ), aOKBtn ( this, SW_RES( BTN_POST_OK ) ), - aCancelBtn ( this, SW_RES( BTN_POST_CANCEL ) ), - aPrevBtn ( this, SW_RES( BTN_PREV ) ), - aNextBtn ( this, SW_RES( BTN_NEXT ) ), - aHelpBtn ( this, SW_RES( BTN_POST_HELP ) ), + aCancelBtn ( this, SW_RES( BTN_POST_CANCEL ) ), + aPrevBtn ( this, SW_RES( BTN_PREV ) ), + aNextBtn ( this, SW_RES( BTN_NEXT ) ), + aHelpBtn ( this, SW_RES( BTN_POST_HELP ) ), bNew(TRUE), bIsUrl(FALSE), diff --git a/sw/source/ui/fldui/javaedit.hrc b/sw/source/ui/fldui/javaedit.hrc index d7448936d4cb..7c996e832e0b 100644 --- a/sw/source/ui/fldui/javaedit.hrc +++ b/sw/source/ui/fldui/javaedit.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 @@ -29,22 +29,22 @@ // defines ------------------------------------------------------------------ -#define FT_TYPE 10 -#define ED_TYPE 11 -#define RB_EDIT 12 -#define ED_EDIT 13 +#define FT_TYPE 10 +#define ED_TYPE 11 +#define RB_EDIT 12 +#define ED_EDIT 13 #define FL_POSTIT 14 -#define BTN_PREV 15 -#define BTN_NEXT 16 -#define STR_JAVA_EDIT 17 -#define STR_JAVA_INSERT 18 -#define RB_URL 19 -#define ED_URL 20 -#define PB_URL 21 +#define BTN_PREV 15 +#define BTN_NEXT 16 +#define STR_JAVA_EDIT 17 +#define STR_JAVA_INSERT 18 +#define RB_URL 19 +#define ED_URL 20 +#define PB_URL 21 -#define BTN_POST_OK 30 -#define BTN_POST_CANCEL 31 -#define BTN_POST_HELP 32 +#define BTN_POST_OK 30 +#define BTN_POST_CANCEL 31 +#define BTN_POST_HELP 32 #endif diff --git a/sw/source/ui/fldui/javaedit.src b/sw/source/ui/fldui/javaedit.src index 45dbf468e7ae..ffeb2b84e899 100644 --- a/sw/source/ui/fldui/javaedit.src +++ b/sw/source/ui/fldui/javaedit.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/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx index a86a78943711..b5765c3fb3de 100644 --- a/sw/source/ui/fldui/xfldui.cxx +++ b/sw/source/ui/fldui/xfldui.cxx @@ -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 @@ #ifndef _DBMGR_HXX #include <dbmgr.hxx> #endif -#include <wrtsh.hxx> // Actives Fenster +#include <wrtsh.hxx> // Actives Fenster #ifndef _VIEW_HXX #include <view.hxx> #endif diff --git a/sw/source/ui/fmtui/fmtui.src b/sw/source/ui/fmtui/fmtui.src index 63067902178f..2f68cbdc56ba 100644 --- a/sw/source/ui/fmtui/fmtui.src +++ b/sw/source/ui/fmtui/fmtui.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 @@ -35,21 +35,21 @@ String STR_TEMPLATE_WILDCARD { TEXT = "*.vor" ; }; - //String STR_NONAME //!! VB + //String STR_NONAME //!! VB //{ - // TEXT = "Unbenannt "; - // TEXT [English] = "Noname "; - // TEXT [norwegian] = "Noname "; - // TEXT [italian] = "Senza nome"; - // TEXT [portuguese_brazilian] = "Semnome "; - // TEXT [portuguese] = "Semnome "; - // TEXT [finnish] = "Nimetön "; - // TEXT [danish] = "Intet navn"; - // TEXT [french] = "Sansnom "; - // TEXT [swedish] = "Namnlös"; - // TEXT [dutch] = "Naamloos"; - // TEXT [spanish] = "Sin nombre "; - // TEXT [english_us] = "Noname "; + // TEXT = "Unbenannt "; + // TEXT [English] = "Noname "; + // TEXT [norwegian] = "Noname "; + // TEXT [italian] = "Senza nome"; + // TEXT [portuguese_brazilian] = "Semnome "; + // TEXT [portuguese] = "Semnome "; + // TEXT [finnish] = "Nimetön "; + // TEXT [danish] = "Intet navn"; + // TEXT [french] = "Sansnom "; + // TEXT [swedish] = "Namnlös"; + // TEXT [dutch] = "Naamloos"; + // TEXT [spanish] = "Sin nombre "; + // TEXT [english_us] = "Noname "; //}; String STR_OVERWRITE { diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index c78f51f4796f..644565b9bb61 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -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 @@ -50,7 +50,7 @@ #include <fmtclds.hxx> #include <swtypes.hxx> #include <swmodule.hxx> -#include <errhdl.hxx> // fuer Create-Methoden +#include <errhdl.hxx> // fuer Create-Methoden #include <wrtsh.hxx> #ifndef _VIEW_HXX #include <view.hxx> @@ -62,18 +62,18 @@ #include <pggrid.hxx> #endif #ifndef _TMPDLG_HXX -#include <tmpdlg.hxx> // der Dialog +#include <tmpdlg.hxx> // der Dialog #endif -#include <column.hxx> // Spalten -#include <drpcps.hxx> // Initialen -#include <frmpage.hxx> // Rahmen -#include <wrap.hxx> // Rahmen -#include <frmmgr.hxx> // Rahmen -#include <ccoll.hxx> // CondColl +#include <column.hxx> // Spalten +#include <drpcps.hxx> // Initialen +#include <frmpage.hxx> // Rahmen +#include <wrap.hxx> // Rahmen +#include <frmmgr.hxx> // Rahmen +#include <ccoll.hxx> // CondColl #include <swuiccoll.hxx> -#include <docstyle.hxx> // -#include <fmtcol.hxx> // -#include <macassgn.hxx> // +#include <docstyle.hxx> // +#include <fmtcol.hxx> // +#include <macassgn.hxx> // #include <poolfmt.hxx> #include <uitool.hxx> #include <shellres.hxx> @@ -104,16 +104,16 @@ extern SW_DLLPUBLIC SwWrtShell* GetActiveWrtShell(); /*-------------------------------------------------------------------- - Beschreibung: Der Traeger des Dialoges + Beschreibung: Der Traeger des Dialoges --------------------------------------------------------------------*/ -SwTemplateDlg::SwTemplateDlg(Window* pParent, +SwTemplateDlg::SwTemplateDlg(Window* pParent, SfxStyleSheetBase& rBase, - USHORT nRegion, - BOOL bColumn, - SwWrtShell* pActShell, - BOOL bNew ) : - SfxStyleDialog( pParent, + USHORT nRegion, + BOOL bColumn, + SwWrtShell* pActShell, + BOOL bNew ) : + SfxStyleDialog( pParent, SW_RES(DLG_TEMPLATE_BASE + nRegion), rBase, FALSE, @@ -163,19 +163,19 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, { DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_STD, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) ); + AddTabPage( TP_PARA_STD, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) ); DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_ALIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH) ); + AddTabPage( TP_PARA_ALIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH) ); DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_EXT, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) ); + AddTabPage( TP_PARA_EXT, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) ); DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) ); + AddTabPage( TP_PARA_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) ); DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageRangesFunc fail!"); @@ -196,12 +196,12 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_TABULATOR, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) ); + AddTabPage( TP_TABULATOR, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) ); AddTabPage(TP_NUMPARA, SwParagraphNumTabPage::Create, SwParagraphNumTabPage::GetRanges); - AddTabPage(TP_DROPCAPS, SwDropCapsPage::Create, + AddTabPage(TP_DROPCAPS, SwDropCapsPage::Create, SwDropCapsPage::GetRanges ); DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); @@ -246,11 +246,11 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, // Rahmenvorlagen case SFX_STYLE_FAMILY_FRAME: { - AddTabPage(TP_FRM_STD, SwFrmPage::Create, + AddTabPage(TP_FRM_STD, SwFrmPage::Create, SwFrmPage::GetRanges ); - AddTabPage(TP_FRM_ADD, SwFrmAddPage::Create, + AddTabPage(TP_FRM_ADD, SwFrmAddPage::Create, SwFrmAddPage::GetRanges ); - AddTabPage(TP_FRM_WRAP, SwWrapTabPage::Create, + AddTabPage(TP_FRM_WRAP, SwWrapTabPage::Create, SwWrapTabPage::GetRanges ); DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); @@ -259,13 +259,13 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); - AddTabPage(TP_COLUMN, SwColumnPage::Create, + AddTabPage(TP_COLUMN, SwColumnPage::Create, SwColumnPage::GetRanges ); AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0); // Auskommentiert wegen Bug #45776 (per default keine Breite&Groesse in Rahmenvorlagen) -/* SwFmtFrmSize aSize( (const SwFmtFrmSize&)rBase. +/* SwFmtFrmSize aSize( (const SwFmtFrmSize&)rBase. GetItemSet().Get(RES_FRM_SIZE)); if( !aSize.GetWidth() ) { @@ -281,10 +281,10 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); - AddTabPage(TP_HEADER_PAGE, String(SW_RES(STR_PAGE_HEADER)), + AddTabPage(TP_HEADER_PAGE, String(SW_RES(STR_PAGE_HEADER)), SvxHeaderPage::Create, SvxHeaderPage::GetRanges ); - AddTabPage(TP_FOOTER_PAGE, String(SW_RES(STR_PAGE_FOOTER)), + AddTabPage(TP_FOOTER_PAGE, String(SW_RES(STR_PAGE_FOOTER)), SvxFooterPage::Create, SvxFooterPage::GetRanges ); if(bColumn) @@ -292,7 +292,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_PAGE_STD, String(SW_RES(STR_PAGE_STD)), + AddTabPage(TP_PAGE_STD, String(SW_RES(STR_PAGE_STD)), pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), FALSE, @@ -301,12 +301,12 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, { DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BORDER, String(SW_RES(STR_PAGE_BORDER)), + AddTabPage(TP_BORDER, String(SW_RES(STR_PAGE_BORDER)), pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); - AddTabPage(TP_COLUMN, String(SW_RES(STR_PAGE_COLUMN)), + AddTabPage(TP_COLUMN, String(SW_RES(STR_PAGE_COLUMN)), SwColumnPage::Create, SwColumnPage::GetRanges ); - AddTabPage(TP_FOOTNOTE_PAGE, String(SW_RES(STR_PAGE_FOOTNOTE)), + AddTabPage(TP_FOOTNOTE_PAGE, String(SW_RES(STR_PAGE_FOOTNOTE)), SwFootNotePage::Create, SwFootNotePage::GetRanges ); AddTabPage(TP_TEXTGRID_PAGE, String(SW_RES(STR_PAGE_TEXTGRID)), @@ -331,11 +331,11 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, AddTabPage( RID_SVXPAGE_NUM_POSITION ); -/* const SfxPoolItem* pItem; +/* const SfxPoolItem* pItem; if(SFX_ITEM_SET == rBase.GetItemSet().GetItemState( FN_PARAM_ACT_NUMBER, FALSE, &pItem )) { -// pActNum = (ActNumberFormat*)((const SwPtrItem*)pItem)->GetValue(); +// pActNum = (ActNumberFormat*)((const SwPtrItem*)pItem)->GetValue(); } */ } @@ -589,7 +589,7 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) rCharFmtLB.Clear(); rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone ); SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell(); - ::FillCharStyleListBox(rCharFmtLB, pDocShell); + ::FillCharStyleListBox(rCharFmtLB, pDocShell); List aList; for(USHORT j = 0; j < rCharFmtLB.GetEntryCount(); j++) { diff --git a/sw/source/ui/fmtui/tmpdlg.src b/sw/source/ui/fmtui/tmpdlg.src index da2479717373..3d9e8df617a9 100644 --- a/sw/source/ui/fmtui/tmpdlg.src +++ b/sw/source/ui/fmtui/tmpdlg.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 @@ -177,16 +177,16 @@ TabDialog DLG_TEMPLATE_4 { OutputSize = TRUE ; SVLook = TRUE ; - // Text[norwegian_wrong] = "Sidetyper"; - // Text[italian_wrong] = "Stili pagina"; - // Text[portuguese_brazilian_wrong] = "Estilos da Página "; - // Text[portuguese_wrong] = "Estilos da Página "; - // Text[finnish_wrong] = "Sivutyylit"; - // Text[danish_wrong] = "Sidelayout"; - // Text[french_wrong] = "Styles de page"; - // Text[swedish_wrong] = "Sidformat"; - // Text[dutch_wrong] = "Pagina-opmaakprofielen"; - // Text[spanish_wrong] = "Estilos de página"; + // Text[norwegian_wrong] = "Sidetyper"; + // Text[italian_wrong] = "Stili pagina"; + // Text[portuguese_brazilian_wrong] = "Estilos da Página "; + // Text[portuguese_wrong] = "Estilos da Página "; + // Text[finnish_wrong] = "Sivutyylit"; + // Text[danish_wrong] = "Sidelayout"; + // Text[french_wrong] = "Styles de page"; + // Text[swedish_wrong] = "Sidformat"; + // Text[dutch_wrong] = "Pagina-opmaakprofielen"; + // Text[spanish_wrong] = "Estilos de página"; Text [ en-US ] = "Page Style" ; Moveable = TRUE ; TabControl 1 @@ -273,16 +273,16 @@ TabDialog DLG_TEMPLATE_3 { OutputSize = TRUE ; SVLook = TRUE ; - // Text[norwegian_wrong] = "Rammemaler"; - // Text[italian_wrong] = "Stili cornice"; - // Text[portuguese_brazilian_wrong] = "Estilos de Moldura"; - // Text[portuguese_wrong] = "Estilos de Moldura"; - // Text[finnish_wrong] = "Kehystyylit"; - // Text[danish_wrong] = "Rammelayout"; - // Text[french_wrong] = "Styles d'encadrement"; - // Text[swedish_wrong] = "Ramformat"; - // Text[dutch_wrong] = "Kaderopmaakprofielen"; - // Text[spanish_wrong] = "Estilos de marco"; + // Text[norwegian_wrong] = "Rammemaler"; + // Text[italian_wrong] = "Stili cornice"; + // Text[portuguese_brazilian_wrong] = "Estilos de Moldura"; + // Text[portuguese_wrong] = "Estilos de Moldura"; + // Text[finnish_wrong] = "Kehystyylit"; + // Text[danish_wrong] = "Rammelayout"; + // Text[french_wrong] = "Styles d'encadrement"; + // Text[swedish_wrong] = "Ramformat"; + // Text[dutch_wrong] = "Kaderopmaakprofielen"; + // Text[spanish_wrong] = "Estilos de marco"; Text [ en-US ] = "Frame Style" ; Moveable = TRUE ; TabControl 1 diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx index 2cdc9fb014f0..9054ca38fd01 100644 --- a/sw/source/ui/frmdlg/colex.cxx +++ b/sw/source/ui/frmdlg/colex.cxx @@ -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 @@ -517,7 +517,7 @@ void SwPageGridExample::DrawPage( const Point& rOrg, Rectangle aRect; aRect.Right() = rOrg.X() + GetSize().Width() - nR; aRect.Left() = rOrg.X() + nL; - aRect.Top() = rOrg.Y() + GetTop() + aRect.Top() = rOrg.Y() + GetTop() + GetHdHeight() + GetHdDist(); aRect.Bottom()= rOrg.Y() + GetSize().Height() - GetBottom() - GetFtHeight() - GetFtDist(); diff --git a/sw/source/ui/frmdlg/colmgr.cxx b/sw/source/ui/frmdlg/colmgr.cxx index 0e18946af778..5346a1fa4165 100644 --- a/sw/source/ui/frmdlg/colmgr.cxx +++ b/sw/source/ui/frmdlg/colmgr.cxx @@ -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 @@ -40,7 +40,7 @@ // PRIVATE METHODES ------------------------------------------------------ /*------------------------------------------------------------------------ - Beschreibung: Spaltenbreite auf aktuelle Breite einstellen + Beschreibung: Spaltenbreite auf aktuelle Breite einstellen ------------------------------------------------------------------------*/ @@ -59,7 +59,7 @@ void FitToActualSize(SwFmtCol& rCol, USHORT nWidth) // PUBLIC METHODES ------------------------------------------------------- /*------------------------------------------------------------------------ - Beschreibung: Setzen Spaltenanzahl und Gutterwidth + Beschreibung: Setzen Spaltenanzahl und Gutterwidth ------------------------------------------------------------------------*/ @@ -107,7 +107,7 @@ void SwColMgr::SetGutterWidth(USHORT nGutterWidth, USHORT nPos ) } /*------------------------------------------------------------------------ - Beschreibung: Hoehe Trennlinie + Beschreibung: Hoehe Trennlinie ------------------------------------------------------------------------*/ @@ -125,7 +125,7 @@ void SwColMgr::SetLineHeightPercent(short nPercent) aFmtCol.SetLineHeight((BYTE)nPercent); } /*------------------------------------------------------------------------ - Beschreibung: Spaltenbreite + Beschreibung: Spaltenbreite ------------------------------------------------------------------------*/ @@ -146,7 +146,7 @@ void SwColMgr::SetColWidth(USHORT nIdx, USHORT nWd) } /*-------------------------------------------------------------------- - Beschreibung: Groesse neu setzen + Beschreibung: Groesse neu setzen --------------------------------------------------------------------*/ diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 0a3c8cc33623..79f727aa086d 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -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 @@ -102,9 +102,9 @@ inline BOOL IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect ) SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) : SfxModalDialog(pParent, SW_RES(DLG_COLUMN)), - aOK(this, SW_RES(PB_OK)), - aCancel(this, SW_RES(PB_CANCEL)), - aHelp(this, SW_RES(PB_HELP)), + aOK(this, SW_RES(PB_OK)), + aCancel(this, SW_RES(PB_CANCEL)), + aHelp(this, SW_RES(PB_HELP)), aApplyToFT(this, SW_RES(FT_APPLY_TO)), aApplyToLB(this, SW_RES(LB_APPLY_TO)), rWrtShell(rSh), @@ -254,15 +254,15 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox) case LISTBOX_SELECTION : pSet = pSelectionSet; break; - case LISTBOX_SECTION : + case LISTBOX_SECTION : pSet = pSectionSet; bSectionChanged = TRUE; break; - case LISTBOX_SECTIONS : + case LISTBOX_SECTIONS : pSet = pSectionSet; bSelSectionChanged = TRUE; break; - case LISTBOX_PAGE : + case LISTBOX_PAGE : pSet = pPageSet; bPageChanged = TRUE; break; @@ -284,12 +284,12 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox) if( pSelectionSet ) pSet->Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth, nWidth)); break; - case LISTBOX_SECTION : - case LISTBOX_SECTIONS : + case LISTBOX_SECTION : + case LISTBOX_SECTIONS : pSet = pSectionSet; pSet->Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth, nWidth)); break; - case LISTBOX_PAGE : + case LISTBOX_PAGE : nWidth = nPageWidth; pSet = pPageSet; pSet->Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth, nWidth)); @@ -320,15 +320,15 @@ IMPL_LINK(SwColumnDlg, OkHdl, OKButton*, EMPTYARG) case LISTBOX_SELECTION : pSet = pSelectionSet; break; - case LISTBOX_SECTION : + case LISTBOX_SECTION : pSet = pSectionSet; bSectionChanged = TRUE; break; - case LISTBOX_SECTIONS : + case LISTBOX_SECTIONS : pSet = pSectionSet; bSelSectionChanged = TRUE; break; - case LISTBOX_PAGE : + case LISTBOX_PAGE : pSet = pPageSet; bPageChanged = TRUE; break; @@ -442,7 +442,7 @@ void SwColumnPage::ResetColWidth() } /*-------------------------------------------------------------------- - Beschreibung: Jetzt als TabPage + Beschreibung: Jetzt als TabPage --------------------------------------------------------------------*/ @@ -605,7 +605,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet) delete pColMgr; pColMgr = new SwColMgr(rSet); - nCols = pColMgr->GetCount() ; + nCols = pColMgr->GetCount() ; aCLNrEdt.SetMax(Max((USHORT)aCLNrEdt.GetMax(), (USHORT)nCols)); aCLNrEdt.SetLast(Max(nCols,(USHORT)aCLNrEdt.GetMax())); @@ -644,7 +644,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: TabPage erzeugen + Beschreibung: TabPage erzeugen --------------------------------------------------------------------*/ @@ -655,7 +655,7 @@ SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: Attribute in den Set stopfen bei OK + Beschreibung: Attribute in den Set stopfen bei OK --------------------------------------------------------------------*/ @@ -690,7 +690,7 @@ BOOL SwColumnPage::FillItemSet(SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: ColumnManager updaten + Beschreibung: ColumnManager updaten --------------------------------------------------------------------*/ @@ -783,7 +783,7 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ ) } /*------------------------------------------------------------------------ - Beschreibung: Initialisierung + Beschreibung: Initialisierung ------------------------------------------------------------------------*/ @@ -816,7 +816,7 @@ void SwColumnPage::Init() nColWidth[i] = nColumnWidthSum; } SwColLineAdj eAdj = pColMgr->GetAdjust(); - if( COLADJ_NONE == eAdj ) // der Dialog kennt kein NONE! + if( COLADJ_NONE == eAdj ) // der Dialog kennt kein NONE! { eAdj = COLADJ_TOP; //ohne Adjust auch kein Linientyp @@ -847,7 +847,7 @@ void SwColumnPage::Init() } /*------------------------------------------------------------------------ - Beschreibung: Die Anzahl der Spalten hat sich veraendert -- hier werden + Beschreibung: Die Anzahl der Spalten hat sich veraendert -- hier werden die Controls fuer die Bearbeitung der Spalten entsprechend der Spaltenzahl en- oder disabled. Falls es mehr als nVisCols (= 3) Spalten gibt, werden @@ -862,8 +862,8 @@ void SwColumnPage::Init() void SwColumnPage::UpdateCols() { BOOL bEnableBtns= FALSE; - BOOL bEnable12 = FALSE; - BOOL bEnable3 = FALSE; + BOOL bEnable12 = FALSE; + BOOL bEnable3 = FALSE; const BOOL bEdit = !aAutoWidthBox.IsChecked(); if ( nCols > nVisCols ) { @@ -922,7 +922,7 @@ void SwColumnPage::SetLabels( USHORT nVis ) } /*------------------------------------------------------------------------ - Beschreibung: Handler, der bei einer Veraenderung der Spaltenzahl + Beschreibung: Handler, der bei einer Veraenderung der Spaltenzahl gerufen wird. Eine Aenderung der Spaltenzahl ueberschreibt eventuelle Breiteneinstellungen des Benutzers; alle Spalten sind @@ -956,7 +956,7 @@ IMPL_LINK( SwColumnPage, ColModify, NumericField *, pNF ) } /*------------------------------------------------------------------------ - Beschreibung: Modify- Handler fuer eine Aenderung der Spaltenbreite + Beschreibung: Modify- Handler fuer eine Aenderung der Spaltenbreite oder des Spaltenabstandes. Diese Aenderungen wirken sich erst zeitversetzt aus. Durch eine Aenderung der Spaltenbreite wird die automatische @@ -1051,7 +1051,7 @@ IMPL_LINK( SwColumnPage, EdModify, PercentField *, pField ) return 0; } /*------------------------------------------------------------------------ - Beschreibung: Handler hinter der Checkbox fuer automatische Breite. + Beschreibung: Handler hinter der Checkbox fuer automatische Breite. Ist die Box gecheckt, koennen keine expliziten Werte fuer die Spaltenbreite eingegeben werden. ------------------------------------------------------------------------*/ @@ -1076,7 +1076,7 @@ IMPL_LINK( SwColumnPage, AutoWidthHdl, CheckBox *, pBox ) } /*------------------------------------------------------------------------ - Beschreibung: Raufscrollen der Inhalte der Edits. + Beschreibung: Raufscrollen der Inhalte der Edits. ------------------------------------------------------------------------*/ IMPL_LINK( SwColumnPage, Up, Button *, EMPTYARG ) @@ -1090,7 +1090,7 @@ IMPL_LINK( SwColumnPage, Up, Button *, EMPTYARG ) return 0; } /*------------------------------------------------------------------------ - Beschreibung: Runterscrollen der Inhalte der Edits. + Beschreibung: Runterscrollen der Inhalte der Edits. ------------------------------------------------------------------------*/ IMPL_LINK( SwColumnPage, Down, Button *, EMPTYARG ) @@ -1104,8 +1104,8 @@ IMPL_LINK( SwColumnPage, Down, Button *, EMPTYARG ) return 0; } /*------------------------------------------------------------------------ - Beschreibung: Relikt aus alten Zeiten - jetzt direkt ohne time - * Timer- Handler; angetriggert durch eine Aenderung der + Beschreibung: Relikt aus alten Zeiten - jetzt direkt ohne time + * Timer- Handler; angetriggert durch eine Aenderung der Spaltenbreite oder des Spaltenabstandes. ------------------------------------------------------------------------*/ @@ -1155,7 +1155,7 @@ IMPL_LINK( SwColumnPage, Timeout, Timer *, EMPTYARG ) return 0; } /*------------------------------------------------------------------------ - Beschreibung: Aktualisierung der Anzeige + Beschreibung: Aktualisierung der Anzeige ------------------------------------------------------------------------*/ @@ -1191,7 +1191,7 @@ void SwColumnPage::Update() } /*-------------------------------------------------------------------- - Beschreibung: Update Bsp + Beschreibung: Update Bsp --------------------------------------------------------------------*/ @@ -1382,7 +1382,7 @@ void ColumnValueSet::UserDraw( const UserDrawEvent& rUDEvt ) const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); Rectangle aRect = rUDEvt.GetRect(); - USHORT nItemId = rUDEvt.GetItemId(); + USHORT nItemId = rUDEvt.GetItemId(); long nRectWidth = aRect.GetWidth(); long nRectHeight = aRect.GetHeight(); @@ -1410,11 +1410,11 @@ void ColumnValueSet::UserDraw( const UserDrawEvent& rUDEvt ) nEnds[1] = nRectWidth * 9 / 10; break; case 3: nCols = 3; - nEnds[0] = nRectWidth * 30 / 100; - nStarts[1] = nEnds[0] + nStep; - nEnds[1] = nRectWidth * 63 / 100; - nStarts[2] = nEnds[1] + nStep; - nEnds[2] = nRectWidth * 9 / 10; + nEnds[0] = nRectWidth * 30 / 100; + nStarts[1] = nEnds[0] + nStep; + nEnds[1] = nRectWidth * 63 / 100; + nStarts[2] = nEnds[1] + nStep; + nEnds[2] = nRectWidth * 9 / 10; break; case 4: nCols = 2; nEnds[0] = nRectWidth * 63 / 100; diff --git a/sw/source/ui/frmdlg/column.hrc b/sw/source/ui/frmdlg/column.hrc index dd8b81e0c91a..172674a6b3f6 100644 --- a/sw/source/ui/frmdlg/column.hrc +++ b/sw/source/ui/frmdlg/column.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,41 +24,41 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FT_NUMBER 1 -#define ED_NUMBER 2 -#define FT_DISTANCE 3 -#define ED_DISTANCE 4 -#define CB_AUTO_WIDTH 4 +#define FT_NUMBER 1 +#define ED_NUMBER 2 +#define FT_DISTANCE 3 +#define ED_DISTANCE 4 +#define CB_AUTO_WIDTH 4 #define FL_COLUMNS 6 -#define FT_1 20 -#define FT_2 21 -#define FT_3 22 +#define FT_1 20 +#define FT_2 21 +#define FT_3 22 -#define ED_1 25 -#define ED_2 26 -#define ED_3 27 +#define ED_1 25 +#define ED_2 26 +#define ED_3 27 -#define BTN_UP 30 -#define BTN_DOWN 31 -#define FL_LAYOUT 32 +#define BTN_UP 30 +#define BTN_DOWN 31 +#define FL_LAYOUT 32 -#define FT_STYLE 33 -#define LB_STYLE 34 -#define FT_HEIGHT 35 -#define ED_HEIGHT 36 -#define FT_POSITION 37 -#define LB_POSITION 38 -#define FL_LINETYPE 39 +#define FT_STYLE 33 +#define LB_STYLE 34 +#define FT_HEIGHT 35 +#define ED_HEIGHT 36 +#define FT_POSITION 37 +#define LB_POSITION 38 +#define FL_LINETYPE 39 -#define WN_BSP 41 +#define WN_BSP 41 -#define LB_REFERENCE 42 +#define LB_REFERENCE 42 #define CB_REGISTER 43 #define FL_REGISTER 44 -#define FT_REFERENCE 45 +#define FT_REFERENCE 45 #define ED_DIST1 46 #define ED_DIST2 47 @@ -67,21 +67,21 @@ #define FT_WIDTH 49 #define FT_DIST 50 #define VS_DEFAULTS 51 -#define IL_PRE_COLS 52 +#define IL_PRE_COLS 52 -#define FT_APPLY_TO 53 +#define FT_APPLY_TO 53 #define LB_APPLY_TO 54 -#define PB_HELP 55 +#define PB_HELP 55 #define PB_CANCEL 56 #define PB_OK 57 -#define CB_BALANCECOLS 58 +#define CB_BALANCECOLS 58 #define FL_PROPERTIES 59 #define FT_TEXTDIRECTION 60 #define LB_TEXTDIRECTION 61 #define FL_VERT 62 -#define LISTBOX_SELECTION 0 -#define LISTBOX_SECTION 1 -#define LISTBOX_SECTIONS 2 -#define LISTBOX_PAGE 3 -#define LISTBOX_FRAME 4 +#define LISTBOX_SELECTION 0 +#define LISTBOX_SECTION 1 +#define LISTBOX_SECTIONS 2 +#define LISTBOX_PAGE 3 +#define LISTBOX_FRAME 4 diff --git a/sw/source/ui/frmdlg/column.src b/sw/source/ui/frmdlg/column.src index 7f260501cbbe..449fbbf121ea 100644 --- a/sw/source/ui/frmdlg/column.src +++ b/sw/source/ui/frmdlg/column.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 @@ -391,11 +391,11 @@ ModalDialog DLG_COLUMN DropDown = TRUE ; StringList [ en-US ] = { - < "Selection" ; LISTBOX_SELECTION; > ; - < "Current Section" ; LISTBOX_SECTION ; > ; - < "Selected section" ; LISTBOX_SECTIONS ; > ; - < "Frame" ; LISTBOX_FRAME ; > ; - < "Page Style: " ; LISTBOX_PAGE ; > ; + < "Selection" ; LISTBOX_SELECTION; > ; + < "Current Section" ; LISTBOX_SECTION ; > ; + < "Selected section" ; LISTBOX_SECTIONS ; > ; + < "Frame" ; LISTBOX_FRAME ; > ; + < "Page Style: " ; LISTBOX_PAGE ; > ; }; }; Text [ en-US ] = "Columns"; diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 5e620ce6955c..5e7167b6bc31 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -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 @@ -78,14 +78,14 @@ extern String* GetOldDrwCat(); class SwSequenceOptionDialog : public SvxStandardDialog { FixedLine aFlHeader; - FixedText aFtLevel; - ListBox aLbLevel; - FixedText aFtDelim; - Edit aEdDelim; + FixedText aFtLevel; + ListBox aLbLevel; + FixedText aFtDelim; + Edit aEdDelim; FixedLine aFlCatAndFrame; - FixedText aFtCharStyle; - ListBox aLbCharStyle; + FixedText aFtCharStyle; + ListBox aLbCharStyle; CheckBox aApplyBorderAndShadowCB; //#i61007# order of captions @@ -94,11 +94,11 @@ class SwSequenceOptionDialog : public SvxStandardDialog ListBox aLbCaptionOrder; OKButton aOKButton; - CancelButton aCancelButton; - HelpButton aHelpButton; + CancelButton aCancelButton; + HelpButton aHelpButton; SwView& rView; - String aFldTypeName; + String aFldTypeName; public: SwSequenceOptionDialog( Window *pParent, SwView &rV, @@ -162,13 +162,13 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) : Link aLk = LINK( this, SwCaptionDialog, ModifyHdl ); aCategoryBox.SetModifyHdl( aLk ); - aTextEdit .SetModifyHdl( aLk ); + aTextEdit .SetModifyHdl( aLk ); aNumberingSeparatorED.SetModifyHdl ( aLk ); - aSepEdit .SetModifyHdl( aLk ); + aSepEdit .SetModifyHdl( aLk ); aLk = LINK(this, SwCaptionDialog, SelectHdl); aCategoryBox.SetSelectHdl( aLk ); - aFormatBox .SetSelectHdl( aLk ); + aFormatBox .SetSelectHdl( aLk ); aOptionButton.SetClickHdl( LINK( this, SwCaptionDialog, OptionHdl ) ); aAutoCaptionButton.SetClickHdl(LINK(this, SwCaptionDialog, CaptionHdl)); @@ -272,7 +272,7 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) : case nsSelectionType::SEL_FRM: case nsSelectionType::SEL_TXT: aPosBox.InsertEntry(SW_RESSTR(STR_BEGINNING)); - aPosBox.InsertEntry(SW_RESSTR(STR_END )); + aPosBox.InsertEntry(SW_RESSTR(STR_END )); break; } aPosBox.SelectEntryPos(1); @@ -372,7 +372,7 @@ IMPL_LINK( SwCaptionDialog, ModifyHdl, Edit *, EMPTYARG ) IMPL_LINK(SwCaptionDialog, CaptionHdl, PushButton*, EMPTYARG) { - SfxItemSet aSet( rView.GetDocShell()->GetDoc()->GetAttrPool() ); + SfxItemSet aSet( rView.GetDocShell()->GetDoc()->GetAttrPool() ); SwCaptionOptDlg aDlg( this, aSet ); aDlg.Execute(); @@ -497,9 +497,9 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV, aFlCaptionOrder(this, SW_RES( FL_ORDER )), //#i61007# order of captions aFtCaptionOrder(this, SW_RES( FT_ORDER )), aLbCaptionOrder(this, SW_RES( LB_ORDER )), - aOKButton (this, SW_RES(BTN_OK )), - aCancelButton (this, SW_RES(BTN_CANCEL )), - aHelpButton (this, SW_RES(BTN_HELP )), + aOKButton (this, SW_RES(BTN_OK )), + aCancelButton (this, SW_RES(BTN_CANCEL )), + aHelpButton (this, SW_RES(BTN_HELP )), rView( rV ), aFldTypeName( rSeqFldType ) diff --git a/sw/source/ui/frmdlg/cption.hrc b/sw/source/ui/frmdlg/cption.hrc index 1487171f0c01..b85b6215a5d1 100644 --- a/sw/source/ui/frmdlg/cption.hrc +++ b/sw/source/ui/frmdlg/cption.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 @@ -41,7 +41,7 @@ #define BOX_POS 11 #define FL_SETTINGS 12 #define BTN_HELP 13 -#define BTN_OPTION 14 +#define BTN_OPTION 14 #define FL_HEADER 15 #define FT_LEVEL 16 #define LB_LEVEL 17 @@ -66,11 +66,11 @@ #define FT_NUM_SEP 34 #define ED_NUM_SEP 35 -#define STR_BEGINNING 1 -#define STR_END 2 -#define STR_ABOVE 3 -#define STR_CP_BELOW 4 -#define STR_CATEGORY_NONE 5 +#define STR_BEGINNING 1 +#define STR_END 2 +#define STR_ABOVE 3 +#define STR_CP_BELOW 4 +#define STR_CATEGORY_NONE 5 #endif diff --git a/sw/source/ui/frmdlg/cption.src b/sw/source/ui/frmdlg/cption.src index 34c11633f815..da651a457386 100644 --- a/sw/source/ui/frmdlg/cption.src +++ b/sw/source/ui/frmdlg/cption.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/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 740d31c5e88c..413845f1eb3f 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -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 @@ -61,17 +61,17 @@ #include <svx/svxdlg.hxx> /*-------------------------------------------------------------------- - Beschreibung: Der Traeger des Dialoges + Beschreibung: Der Traeger des Dialoges --------------------------------------------------------------------*/ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, - Window* pParent, - const SfxItemSet& rCoreSet, - BOOL bNewFrm, - USHORT nResType, + Window* pParent, + const SfxItemSet& rCoreSet, + BOOL bNewFrm, + USHORT nResType, BOOL bFormat, - UINT16 nDefPage, - const String* pStr) : + UINT16 nDefPage, + const String* pStr) : SfxTabDialog(pViewFrame, pParent, SW_RES(nResType), &rCoreSet, pStr != 0), m_bFormat(bFormat), @@ -93,18 +93,18 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, aTmp += *pStr; aTmp += ')'; } - AddTabPage(TP_FRM_STD, SwFrmPage::Create, 0); - AddTabPage(TP_FRM_ADD, SwFrmAddPage::Create, 0); - AddTabPage(TP_FRM_WRAP, SwWrapTabPage::Create, 0); - AddTabPage(TP_FRM_URL, SwFrmURLPage::Create, 0); + AddTabPage(TP_FRM_STD, SwFrmPage::Create, 0); + AddTabPage(TP_FRM_ADD, SwFrmAddPage::Create, 0); + AddTabPage(TP_FRM_WRAP, SwWrapTabPage::Create, 0); + AddTabPage(TP_FRM_URL, SwFrmURLPage::Create, 0); if(m_nDlgType == DLG_FRM_GRF) { - AddTabPage( TP_GRF_EXT, SwGrfExtPage::Create, 0 ); + AddTabPage( TP_GRF_EXT, SwGrfExtPage::Create, 0 ); AddTabPage( RID_SVXPAGE_GRFCROP ); } if (m_nDlgType == DLG_FRM_STD) { - AddTabPage(TP_COLUMN, SwColumnPage::Create, 0); + AddTabPage(TP_COLUMN, SwColumnPage::Create, 0); } SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); @@ -190,7 +190,7 @@ void SwFrmDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) case TP_MACRO_ASSIGN: { SfxAllItemSet aNewSet(*aSet.GetPool()); - aNewSet.Put( SwMacroAssignDlg::AddEvents( + aNewSet.Put( SwMacroAssignDlg::AddEvents( DLG_FRM_GRF == m_nDlgType ? MACASSGN_GRAPHIC : DLG_FRM_OLE == m_nDlgType ? MACASSGN_OLE : MACASSGN_FRMURL ) ); if ( m_pWrtShell ) rPage.SetFrame( m_pWrtShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface() ); diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx index 302baebd0362..f5cd0763e20f 100644 --- a/sw/source/ui/frmdlg/frmmgr.cxx +++ b/sw/source/ui/frmdlg/frmmgr.cxx @@ -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 @@ -79,9 +79,9 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, BYTE nType ) : USHORT nId = 0; switch ( nType ) { - case FRMMGR_TYPE_TEXT: nId = RES_POOLFRM_FRAME; break; - case FRMMGR_TYPE_OLE: nId = RES_POOLFRM_OLE; break; - case FRMMGR_TYPE_GRF: nId = RES_POOLFRM_GRAPHIC; break; + case FRMMGR_TYPE_TEXT: nId = RES_POOLFRM_FRAME; break; + case FRMMGR_TYPE_OLE: nId = RES_POOLFRM_OLE; break; + case FRMMGR_TYPE_GRF: nId = RES_POOLFRM_GRAPHIC; break; } aSet.SetParent( &pOwnSh->GetFmtFromPool( nId )->GetAttrSet()); aSet.Put( SwFmtFrmSize( ATT_MIN_SIZE, DFLT_WIDTH, DFLT_HEIGHT )); @@ -113,7 +113,7 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, const SfxItemSet & /*-------------------------------------------------------------------- - Beschreibung: Initialisieren + Beschreibung: Initialisieren --------------------------------------------------------------------*/ void SwFlyFrmAttrMgr::UpdateAttrMgr() @@ -174,7 +174,7 @@ void SwFlyFrmAttrMgr::UpdateFlyFrm() } /*-------------------------------------------------------------------- - Beschreibung: Rahmen einfuegen + Beschreibung: Rahmen einfuegen --------------------------------------------------------------------*/ BOOL SwFlyFrmAttrMgr::InsertFlyFrm() @@ -195,15 +195,15 @@ BOOL SwFlyFrmAttrMgr::InsertFlyFrm() } /*------------------------------------------------------------------------ - Beschreibung: Rahmen des Typs eAnchorType einfuegen. Position und + Beschreibung: Rahmen des Typs eAnchorType einfuegen. Position und Groesse werden explizit angegeben. Nicht erlaubte Werte des Aufzaehlungstypes werden korrigiert. ------------------------------------------------------------------------*/ -void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType, - const Point &rPos, - const Size &rSize, +void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType, + const Point &rPos, + const Size &rSize, BOOL bAbs ) { ASSERT( eAnchorType == FLY_AT_PAGE || @@ -223,7 +223,7 @@ void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType, } /*-------------------------------------------------------------------- - Beschreibung: Anker setzen + Beschreibung: Anker setzen --------------------------------------------------------------------*/ void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId ) @@ -245,7 +245,7 @@ void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId ) } /*------------------------------------------------------------------------ - Beschreibung: Setzen des Attributs fuer Spalten + Beschreibung: Setzen des Attributs fuer Spalten ------------------------------------------------------------------------*/ void SwFlyFrmAttrMgr::SetCol( const SwFmtCol &rCol ) @@ -253,7 +253,7 @@ void SwFlyFrmAttrMgr::SetCol( const SwFmtCol &rCol ) aSet.Put( rCol ); } /*-------------------------------------------------------------------- - Beschreibung: Absolute Position setzen + Beschreibung: Absolute Position setzen --------------------------------------------------------------------*/ void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint ) @@ -355,11 +355,11 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal, if ( rVal.nHoriOrient != text::HoriOrientation::NONE ) nH = aBoundRect.Left(); - rVal.nMaxHPos = aBoundRect.Right() - rVal.nWidth; + rVal.nMaxHPos = aBoundRect.Right() - rVal.nWidth; rVal.nMaxHeight = aBoundRect.Bottom() - nV; - rVal.nMaxVPos = aBoundRect.Bottom() - rVal.nHeight; - rVal.nMaxWidth = aBoundRect.Right() - nH; + rVal.nMaxVPos = aBoundRect.Bottom() - rVal.nHeight; + rVal.nMaxWidth = aBoundRect.Right() - nH; } // OD 12.11.2003 #i22341# - handle to character anchored objects vertical // aligned at character or top of line in a special case @@ -425,7 +425,7 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal, ? aBoundRect.Top() : rVal.nVPos; rVal.nMaxHeight = rVal.nMaxVPos + rVal.nHeight - nV; - rVal.nMaxWidth = rVal.nMaxHPos + rVal.nWidth - nH; + rVal.nMaxWidth = rVal.nMaxHPos + rVal.nWidth - nH; } // OD 12.11.2003 #i22341# - special case for to character anchored objects // vertical aligned at character or top of line. @@ -484,10 +484,10 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal, rVal.nMaxHPos = 0; rVal.nMaxHeight = aBoundRect.Height(); - rVal.nMaxWidth = aBoundRect.Width(); + rVal.nMaxWidth = aBoundRect.Width(); - rVal.nMaxVPos = aBoundRect.Height(); - rVal.nMinVPos = -aBoundRect.Height() + rVal.nHeight; + rVal.nMaxVPos = aBoundRect.Height(); + rVal.nMinVPos = -aBoundRect.Height() + rVal.nHeight; if (rVal.nMaxVPos < rVal.nMinVPos) { rVal.nMinVPos = rVal.nMaxVPos; @@ -515,28 +515,28 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal, SwTwips SwFlyFrmAttrMgr::CalcTopSpace() { const SvxShadowItem& rShadow = GetShadow(); - const SvxBoxItem& rBox = GetBox(); + const SvxBoxItem& rBox = GetBox(); return rShadow.CalcShadowSpace(SHADOW_TOP ) + rBox.CalcLineSpace(BOX_LINE_TOP); } SwTwips SwFlyFrmAttrMgr::CalcBottomSpace() { const SvxShadowItem& rShadow = GetShadow(); - const SvxBoxItem& rBox = GetBox(); + const SvxBoxItem& rBox = GetBox(); return rShadow.CalcShadowSpace(SHADOW_BOTTOM) + rBox.CalcLineSpace(BOX_LINE_BOTTOM); } SwTwips SwFlyFrmAttrMgr::CalcLeftSpace() { const SvxShadowItem& rShadow = GetShadow(); - const SvxBoxItem& rBox = GetBox(); + const SvxBoxItem& rBox = GetBox(); return rShadow.CalcShadowSpace(SHADOW_LEFT) + rBox.CalcLineSpace(BOX_LINE_LEFT); } SwTwips SwFlyFrmAttrMgr::CalcRightSpace() { const SvxShadowItem& rShadow = GetShadow(); - const SvxBoxItem& rBox = GetBox(); + const SvxBoxItem& rBox = GetBox(); return rShadow.CalcShadowSpace(SHADOW_RIGHT) + rBox.CalcLineSpace(BOX_LINE_RIGHT); } @@ -578,10 +578,10 @@ void SwFlyFrmAttrMgr::SetPos( const Point& rPoint ) SwFmtVertOrient aVertOrient( GetVertOrient() ); SwFmtHoriOrient aHoriOrient( GetHoriOrient() ); - aHoriOrient.SetPos ( rPoint.X() ); + aHoriOrient.SetPos ( rPoint.X() ); aHoriOrient.SetHoriOrient( text::HoriOrientation::NONE ); - aVertOrient.SetPos ( rPoint.Y() ); + aVertOrient.SetPos ( rPoint.Y() ); aVertOrient.SetVertOrient( text::VertOrientation::NONE ); aSet.Put( aVertOrient ); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 5bff86b1a4c7..7939957c71ec 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -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 @@ -115,7 +115,7 @@ struct StringIdPair_Impl // OD 19.09.2003 #i18732# - change order of alignments #define LB_FRAME 0x00000001L // Textbereich des Absatzes -#define LB_PRTAREA 0x00000002L // Textbereich des Absatzes + Einzuege +#define LB_PRTAREA 0x00000002L // Textbereich des Absatzes + Einzuege #define LB_VERT_FRAME 0x00000004L // Vertikaler Textbereich des Absatzes #define LB_VERT_PRTAREA 0x00000008L // Vertikaler Textbereich des Absatzes + Einzuege #define LB_REL_FRM_LEFT 0x00000010L // Linker Absatzrand @@ -131,9 +131,9 @@ struct StringIdPair_Impl #define LB_FLY_REL_PG_FRAME 0x00001000L // Gesamte Rahmen #define LB_FLY_REL_PG_PRTAREA 0x00002000L // Rahmeninneres -#define LB_REL_BASE 0x00010000L // Zeichenausrichtung Basis -#define LB_REL_CHAR 0x00020000L // Zeichenausrichtung Zeichen -#define LB_REL_ROW 0x00040000L // Zeichenausrichtung Zeile +#define LB_REL_BASE 0x00010000L // Zeichenausrichtung Basis +#define LB_REL_CHAR 0x00020000L // Zeichenausrichtung Zeichen +#define LB_REL_ROW 0x00040000L // Zeichenausrichtung Zeile // OD 10.11.2003 #i22305# #define LB_FLY_VERT_FRAME 0x00100000L // vertical entire frame @@ -181,7 +181,7 @@ static RelationMap __FAR_DATA aAsCharRelationMap[] = Beschreibung: Seite verankert --------------------------------------------------------------------*/ -#define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \ +#define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \ LB_REL_PG_RIGHT) static FrmMap __FAR_DATA aHPageMap[] = @@ -197,7 +197,7 @@ static FrmMap __FAR_DATA aHPageHtmlMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, LB_REL_PG_FRAME} }; -#define VERT_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) +#define VERT_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) static FrmMap __FAR_DATA aVPageMap[] = { @@ -216,7 +216,7 @@ static FrmMap __FAR_DATA aVPageHtmlMap[] = Beschreibung: Rahmen verankert --------------------------------------------------------------------*/ -#define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \ +#define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \ LB_FLY_REL_PG_LEFT|LB_FLY_REL_PG_RIGHT) static FrmMap __FAR_DATA aHFrameMap[] = @@ -256,7 +256,7 @@ static FrmMap __FAR_DATA aVFlyHtmlMap[] = Beschreibung: Absatz verankert --------------------------------------------------------------------*/ -#define HORI_PARA_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \ +#define HORI_PARA_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \ LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \ LB_REL_FRM_RIGHT) @@ -268,7 +268,7 @@ static FrmMap __FAR_DATA aHParaMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, HORI_PARA_REL} }; -#define HTML_HORI_PARA_REL (LB_FRAME|LB_PRTAREA) +#define HTML_HORI_PARA_REL (LB_FRAME|LB_PRTAREA) static FrmMap __FAR_DATA aHParaHtmlMap[] = { @@ -303,7 +303,7 @@ static FrmMap __FAR_DATA aVParaHtmlMap[] = Beschreibung: Relativ zum Zeichen verankert --------------------------------------------------------------------*/ -#define HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \ +#define HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \ LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \ LB_REL_FRM_RIGHT|LB_REL_CHAR) @@ -315,7 +315,7 @@ static FrmMap __FAR_DATA aHCharMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, HORI_CHAR_REL} }; -#define HTML_HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_CHAR) +#define HTML_HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_CHAR) static FrmMap __FAR_DATA aHCharHtmlMap[] = { @@ -407,10 +407,10 @@ static USHORT __FAR_DATA aPageRg[] = { 0 }; static USHORT __FAR_DATA aAddPgRg[] = { - RES_PROTECT, RES_PROTECT, - RES_PRINT, RES_PRINT, - FN_SET_FRM_NAME, FN_SET_FRM_NAME, - FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME, + RES_PROTECT, RES_PROTECT, + RES_PRINT, RES_PRINT, + FN_SET_FRM_NAME, FN_SET_FRM_NAME, + FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME, 0 }; @@ -597,7 +597,7 @@ ULONG lcl_GetLBRelationsForStrID( const FrmMap* _pMap, } /*-------------------------------------------------------------------- - Beschreibung: StandardRahmenTabPage + Beschreibung: StandardRahmenTabPage --------------------------------------------------------------------*/ namespace @@ -611,41 +611,41 @@ namespace SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) : - SfxTabPage (pParent, SW_RES(TP_FRM_STD), rSet), + SfxTabPage (pParent, SW_RES(TP_FRM_STD), rSet), aWidthFT (this, SW_RES(FT_WIDTH)), - aWidthAutoFT (this, SW_RES(FT_WIDTH_AUTO)), - aWidthED (this, SW_RES(ED_WIDTH)), - aRelWidthCB (this, SW_RES(CB_REL_WIDTH)), - aAutoWidthCB (this, SW_RES(CB_AUTOWIDTH)), - aHeightFT (this, SW_RES(FT_HEIGHT)), - aHeightAutoFT (this, SW_RES(FT_HEIGHT_AUTO)), - aHeightED (this, SW_RES(ED_HEIGHT)), - aRelHeightCB (this, SW_RES(CB_REL_HEIGHT)), - aAutoHeightCB (this, SW_RES(CB_AUTOHEIGHT)), - aFixedRatioCB (this, SW_RES(CB_FIXEDRATIO)), + aWidthAutoFT (this, SW_RES(FT_WIDTH_AUTO)), + aWidthED (this, SW_RES(ED_WIDTH)), + aRelWidthCB (this, SW_RES(CB_REL_WIDTH)), + aAutoWidthCB (this, SW_RES(CB_AUTOWIDTH)), + aHeightFT (this, SW_RES(FT_HEIGHT)), + aHeightAutoFT (this, SW_RES(FT_HEIGHT_AUTO)), + aHeightED (this, SW_RES(ED_HEIGHT)), + aRelHeightCB (this, SW_RES(CB_REL_HEIGHT)), + aAutoHeightCB (this, SW_RES(CB_AUTOHEIGHT)), + aFixedRatioCB (this, SW_RES(CB_FIXEDRATIO)), aRealSizeBT (this, SW_RES(BT_REALSIZE)), aSizeFL (this, SW_RES(FL_SIZE)), aTypeFL (this, SW_RES(FL_TYPE)), aTypeSepFL (this, SW_RES(FL_TYPE_SEP)), aAnchorAtPageRB (this, SW_RES(RB_ANCHOR_PAGE)), - aAnchorAtParaRB (this, SW_RES(RB_ANCHOR_PARA)), - aAnchorAtCharRB (this, SW_RES(RB_ANCHOR_AT_CHAR)), - aAnchorAsCharRB (this, SW_RES(RB_ANCHOR_AS_CHAR)), + aAnchorAtParaRB (this, SW_RES(RB_ANCHOR_PARA)), + aAnchorAtCharRB (this, SW_RES(RB_ANCHOR_AT_CHAR)), + aAnchorAsCharRB (this, SW_RES(RB_ANCHOR_AS_CHAR)), aAnchorAtFrameRB(this, SW_RES(RB_ANCHOR_FRAME)), - aHorizontalFT (this, SW_RES(FT_HORIZONTAL)), - aHorizontalDLB (this, SW_RES(DLB_HORIZONTAL)), - aAtHorzPosFT (this, SW_RES(FT_AT_HORZ_POS)), - aAtHorzPosED (this, SW_RES(ED_AT_HORZ_POS)), + aHorizontalFT (this, SW_RES(FT_HORIZONTAL)), + aHorizontalDLB (this, SW_RES(DLB_HORIZONTAL)), + aAtHorzPosFT (this, SW_RES(FT_AT_HORZ_POS)), + aAtHorzPosED (this, SW_RES(ED_AT_HORZ_POS)), aHoriRelationFT (this, SW_RES(FT_HORI_RELATION)), aHoriRelationLB (this, SW_RES(LB_HORI_RELATION)), aMirrorPagesCB (this, SW_RES(CB_MIRROR)), - aVerticalFT (this, SW_RES(FT_VERTICAL)), - aVerticalDLB (this, SW_RES(DLB_VERTICAL)), - aAtVertPosFT (this, SW_RES(FT_AT_VERT_POS)), - aAtVertPosED (this, SW_RES(ED_AT_VERT_POS)), + aVerticalFT (this, SW_RES(FT_VERTICAL)), + aVerticalDLB (this, SW_RES(DLB_VERTICAL)), + aAtVertPosFT (this, SW_RES(FT_AT_VERT_POS)), + aAtVertPosED (this, SW_RES(ED_AT_VERT_POS)), aVertRelationFT (this, SW_RES(FT_VERT_RELATION)), aVertRelationLB (this, SW_RES(LB_VERT_RELATION)), // OD 19.09.2003 #i18732# - new checkbox @@ -683,16 +683,16 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) : SetExchangeSupport(); Link aLk = LINK(this, SwFrmPage, RangeModifyHdl); - aWidthED. SetLoseFocusHdl( aLk ); - aHeightED. SetLoseFocusHdl( aLk ); + aWidthED. SetLoseFocusHdl( aLk ); + aHeightED. SetLoseFocusHdl( aLk ); aAtHorzPosED.SetLoseFocusHdl( aLk ); aAtVertPosED.SetLoseFocusHdl( aLk ); // OD 25.09.2003 #i18732# - click handler for new checkbox aFollowTextFlowCB.SetClickHdl( aLk ); aLk = LINK(this, SwFrmPage, ModifyHdl); - aWidthED. SetModifyHdl( aLk ); - aHeightED. SetModifyHdl( aLk ); + aWidthED. SetModifyHdl( aLk ); + aHeightED. SetModifyHdl( aLk ); aAtHorzPosED.SetModifyHdl( aLk ); aAtVertPosED.SetModifyHdl( aLk ); @@ -720,7 +720,7 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) : } /*-------------------------------------------------------------------- - Beschreibung: Dtor + Beschreibung: Dtor --------------------------------------------------------------------*/ SwFrmPage::~SwFrmPage() @@ -824,7 +824,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) aRealSizeBT.SetClickHdl(LINK(this, SwFrmPage, RealSizeHdl)); EnableGraficMode(); } -// else +// else // aTypeFL.SetSizePixel(Size(aTypeFL.GetSizePixel().Width(), aSizeFL.GetSizePixel().Height())); if ( nDlgType == DLG_FRM_GRF ) @@ -892,8 +892,8 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) if(nDlgType == DLG_FRM_STD && 0 == (nHtmlMode & HTMLMODE_FULL_ABS_POS)) { - aHeightFT .Enable( FALSE ); - aHeightED .Enable( FALSE ); + aHeightFT .Enable( FALSE ); + aHeightED .Enable( FALSE ); aRelHeightCB.Enable( FALSE ); } if( 0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS)) @@ -949,7 +949,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) /*-------------------------------------------------------------------- - Beschreibung: Attribute in den Set stopfen bei OK + Beschreibung: Attribute in den Set stopfen bei OK --------------------------------------------------------------------*/ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet) @@ -1066,7 +1066,7 @@ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet) const SwFmtFrmSize& rOldSize = (const SwFmtFrmSize& )rOldSet.Get(RES_FRM_SIZE); SwFmtFrmSize aSz( rOldSize ); -/* // Folgende Zeilen nur zum debuggen: +/* // Folgende Zeilen nur zum debuggen: BOOL bModified = aWidthED.IsValueModified(); USHORT nOldWidth = rOldSize.GetWidth (); USHORT nWidth = aWidthED .GetValue(); @@ -1145,7 +1145,7 @@ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: Horizontale und vertikale Pos initialisieren + Beschreibung: Horizontale und vertikale Pos initialisieren --------------------------------------------------------------------*/ void SwFrmPage::InitPos(RndStdIds eId, @@ -1159,7 +1159,7 @@ void SwFrmPage::InitPos(RndStdIds eId, USHORT nPos = aVerticalDLB.GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND && pVMap ) { - nOldV = pVMap[nPos].nAlign; + nOldV = pVMap[nPos].nAlign; nPos = aVertRelationLB.GetSelectEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) @@ -1169,7 +1169,7 @@ void SwFrmPage::InitPos(RndStdIds eId, nPos = aHorizontalDLB.GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND && pHMap ) { - nOldH = pHMap[nPos].nAlign; + nOldH = pHMap[nPos].nAlign; nPos = aHoriRelationLB.GetSelectEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) @@ -1206,8 +1206,8 @@ void SwFrmPage::InitPos(RndStdIds eId, { if(bHtmlMode) { - pVMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aVCharHtmlAbsMap : aVCharHtmlMap; - pHMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aHCharHtmlAbsMap : aHCharHtmlMap; + pVMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aVCharHtmlAbsMap : aVCharHtmlMap; + pHMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aHCharHtmlAbsMap : aHCharHtmlMap; } else { @@ -1217,7 +1217,7 @@ void SwFrmPage::InitPos(RndStdIds eId, } else if ( eId == FLY_AS_CHAR ) { - pVMap = bHtmlMode ? aVAsCharHtmlMap : aVAsCharMap; + pVMap = bHtmlMode ? aVAsCharHtmlMap : aVAsCharMap; pHMap = 0; bEnable = FALSE; } @@ -1228,7 +1228,7 @@ void SwFrmPage::InitPos(RndStdIds eId, // Horizontal if ( nH == USHRT_MAX ) { - nH = nOldH; + nH = nOldH; nHRel = nOldHRel; } // OD 12.11.2003 #i22341# - pass <nHRel> as 3rd parameter to method <FillPosLB> @@ -1238,7 +1238,7 @@ void SwFrmPage::InitPos(RndStdIds eId, // Vertikal if ( nV == USHRT_MAX ) { - nV = nOldV; + nV = nOldV; nVRel = nOldVRel; } // OD 12.11.2003 #i22341# - pass <nVRel> as 3rd parameter to method <FillPosLB> @@ -1309,7 +1309,7 @@ USHORT SwFrmPage::FillPosLB(const FrmMap* _pMap, size_t nCount = ::lcl_GetFrmMapCount(_pMap); for (size_t i = 0; _pMap && i < nCount; ++i) { -// #61359# Warum nicht von links/von innen bzw. von oben? +// #61359# Warum nicht von links/von innen bzw. von oben? // if (!bFormat || (pMap[i].eStrId != SwFPos::FROMLEFT && pMap[i].eStrId != SwFPos::FROMTOP)) { SvxSwFramePosString::StringId eStrId = aMirrorPagesCB.IsChecked() ? _pMap[i].eMirrorStrId : _pMap[i].eStrId; @@ -1399,7 +1399,7 @@ ULONG SwFrmPage::FillRelLB( const FrmMap* _pMap, for (USHORT i = 0; i < _rLB.GetEntryCount(); i++) { RelationMap *pEntry = (RelationMap *)_rLB.GetEntryData(i); - if (pEntry->nLBRelation == LB_REL_CHAR) // Default + if (pEntry->nLBRelation == LB_REL_CHAR) // Default { _rLB.SelectEntryPos(i); break; @@ -1618,7 +1618,7 @@ RndStdIds SwFrmPage::GetAnchor() } /*-------------------------------------------------------------------- - Beschreibung: Bsp - Update + Beschreibung: Bsp - Update --------------------------------------------------------------------*/ void SwFrmPage::ActivatePage(const SfxItemSet& rSet) @@ -1685,8 +1685,8 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn ) aHeightED.MetricField::SetMax(MAX_PERCENT_HEIGHT); } - if (pBtn) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde - RangeModifyHdl(&aWidthED); // Werte wieder korrigieren + if (pBtn) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde + RangeModifyHdl(&aWidthED); // Werte wieder korrigieren if (pBtn == &aRelWidthCB) ModifyHdl(&aWidthED); @@ -1697,7 +1697,7 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn ) } /*-------------------------------------------------------------------- - Beschreibung: Bereichspruefung + Beschreibung: Bereichspruefung --------------------------------------------------------------------*/ IMPL_LINK( SwFrmPage, RangeModifyHdl, Edit *, EMPTYARG ) @@ -1880,7 +1880,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB ) aAtVertPosFT.Enable( bEnable ); } - if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde + if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde RangeModifyHdl( 0 ); USHORT nRel = 0; @@ -1962,7 +1962,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB ) } /*-------------------------------------------------------------------- - Beschreibung: Horizontale Pos + Beschreibung: Horizontale Pos --------------------------------------------------------------------*/ IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB ) @@ -1991,7 +1991,7 @@ IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB ) } } } - if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde + if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde RangeModifyHdl(0); return 0; @@ -2213,9 +2213,9 @@ void SwFrmPage::Init(const SfxItemSet& rSet, BOOL bReset) { const SwFmtHoriOrient& rHori = (const SwFmtHoriOrient&)rSet.Get(RES_HORI_ORIENT); const SwFmtVertOrient& rVert = (const SwFmtVertOrient&)rSet.Get(RES_VERT_ORIENT); - nOldH = rHori.GetHoriOrient(); + nOldH = rHori.GetHoriOrient(); nOldHRel = rHori.GetRelationOrient(); - nOldV = rVert.GetVertOrient(), + nOldV = rVert.GetVertOrient(), nOldVRel = rVert.GetRelationOrient(); if (eAnchorId == FLY_AT_PAGE) @@ -2254,7 +2254,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, BOOL bReset) } // ggf auf Prozent umschalten - RangeModifyHdl(&aWidthED); // Referenzwerte setzen (fuer 100%) + RangeModifyHdl(&aWidthED); // Referenzwerte setzen (fuer 100%) if (rSize.GetWidthPercent() == 0xff || rSize.GetHeightPercent() == 0xff) aFixedRatioCB.Check(TRUE); @@ -2285,7 +2285,7 @@ USHORT* SwFrmPage::GetRanges() ---------------------------------------------------------------------------*/ void SwFrmPage::SetFormatUsed(BOOL bFmt) { - bFormat = bFmt; + bFormat = bFmt; if(bFormat) { aAnchorAtPageRB.Hide(); @@ -2328,7 +2328,7 @@ SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet) : SetExchangeSupport(); aMirrorHorzBox.SetClickHdl( LINK(this, SwGrfExtPage, MirrorHdl)); aMirrorVertBox.SetClickHdl( LINK(this, SwGrfExtPage, MirrorHdl)); - aBrowseBT.SetClickHdl ( LINK(this, SwGrfExtPage, BrowseHdl)); + aBrowseBT.SetClickHdl ( LINK(this, SwGrfExtPage, BrowseHdl)); } /*-------------------------------------------------------------------- @@ -2411,14 +2411,14 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) switch (nPos) { - case 1: // Auf linken bzw geraden Seiten spiegeln + case 1: // Auf linken bzw geraden Seiten spiegeln aLeftPagesRB.Check(); aMirrorHorzBox.Check(TRUE); break; - case 2: // Auf allen Seiten spiegeln + case 2: // Auf allen Seiten spiegeln aAllPagesRB.Check(); break; - case 3: // Auf rechten bzw ungeraden Seiten spiegeln + case 3: // Auf rechten bzw ungeraden Seiten spiegeln aRightPagesRB.Check(); break; default: @@ -2530,7 +2530,7 @@ IMPL_LINK( SwGrfExtPage, BrowseHdl, Button *, EMPTYARG ) xCtrlAcc->setValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, aVal); if ( pGrfDlg->Execute() == ERRCODE_NONE ) - { // ausgewaehlten Filter merken + { // ausgewaehlten Filter merken aFilterName = pGrfDlg->GetCurrentFilter(); aNewGrfName = INetURLObject::decode( pGrfDlg->GetPath(), INET_HEX_ESCAPE, @@ -2658,18 +2658,18 @@ void BmpWindow::SetGraphic(const Graphic& rGrf) } /*************************************************************************** - Beschreibung: URL und ImageMap an Rahmen einstellen + Beschreibung: URL und ImageMap an Rahmen einstellen ***************************************************************************/ SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet &rSet ) : - SfxTabPage(pParent, SW_RES(TP_FRM_URL), rSet), + SfxTabPage(pParent, SW_RES(TP_FRM_URL), rSet), aHyperLinkFL (this, SW_RES( FL_HYPERLINK )), - aURLFT (this, SW_RES( FT_URL )), - aURLED (this, SW_RES( ED_URL )), + aURLFT (this, SW_RES( FT_URL )), + aURLED (this, SW_RES( ED_URL )), aSearchPB (this, SW_RES( PB_SEARCH )), - aNameFT (this, SW_RES( FT_NAME )), - aNameED (this, SW_RES( ED_NAME )), + aNameFT (this, SW_RES( FT_NAME )), + aNameED (this, SW_RES( ED_NAME )), aFrameFT (this, SW_RES( FT_FRAME )), aFrameCB (this, SW_RES( CB_FRAME )), @@ -2835,7 +2835,7 @@ void lcl_Move(Window& rWin, sal_Int32 nDiff) --------------------------------------------------*/ SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet ) : - SfxTabPage(pParent, SW_RES(TP_FRM_ADD), rSet), + SfxTabPage(pParent, SW_RES(TP_FRM_ADD), rSet), aNameFT (this, SW_RES(FT_NAME)), aNameED (this, SW_RES(ED_NAME)), @@ -2855,7 +2855,7 @@ SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet ) : aEditInReadonlyCB (this, SW_RES(CB_EDIT_IN_READONLY)), aPrintFrameCB (this, SW_RES(CB_PRINT_FRAME)), aTextFlowFT (this, SW_RES(FT_TEXTFLOW)), - aTextFlowLB (this, SW_RES(LB_TEXTFLOW)), + aTextFlowLB (this, SW_RES(LB_TEXTFLOW)), aExtFL (this, SW_RES(FL_EXT)), @@ -3053,11 +3053,11 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) aProtectSizeCB.Check(rProt.IsSizeProtected()); const SwFmtEditInReadonly& rEdit = (const SwFmtEditInReadonly& )rSet.Get(RES_EDIT_IN_READONLY); - aEditInReadonlyCB.Check(rEdit.GetValue()); aEditInReadonlyCB.SaveValue(); + aEditInReadonlyCB.Check(rEdit.GetValue()); aEditInReadonlyCB.SaveValue(); // drucken const SvxPrintItem& rPrt = (const SvxPrintItem&)rSet.Get(RES_PRINT); - aPrintFrameCB.Check(rPrt.GetValue()); aPrintFrameCB.SaveValue(); + aPrintFrameCB.Check(rPrt.GetValue()); aPrintFrameCB.SaveValue(); // textflow SfxItemState eState; @@ -3177,7 +3177,7 @@ IMPL_LINK(SwFrmAddPage, EditModifyHdl, Edit*, EMPTYARG) return 0; } //----------------------------------------------------------------------------- -void SwFrmAddPage::SetFormatUsed(BOOL bFmt) +void SwFrmAddPage::SetFormatUsed(BOOL bFmt) { bFormat = bFmt; if(bFormat) diff --git a/sw/source/ui/frmdlg/frmpage.hrc b/sw/source/ui/frmdlg/frmpage.hrc index 044d2fdd4e05..a1f213ee6b4c 100644 --- a/sw/source/ui/frmdlg/frmpage.hrc +++ b/sw/source/ui/frmdlg/frmpage.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 @@ -27,7 +27,7 @@ #include <svtools/controldims.hrc> -#define RB_ANCHOR_PAGE 1 +#define RB_ANCHOR_PAGE 1 #define RB_ANCHOR_PARA 2 #define RB_ANCHOR_AT_CHAR 3 #define RB_ANCHOR_AS_CHAR 4 @@ -48,63 +48,63 @@ #define DLB_HORIZONTAL 34 #define FT_AT_HORZ_POS 35 #define ED_AT_HORZ_POS 36 -#define FT_HORI_RELATION 1 -#define LB_HORI_RELATION 2 -#define CB_MIRROR 37 +#define FT_HORI_RELATION 1 +#define LB_HORI_RELATION 2 +#define CB_MIRROR 37 #define FT_VERTICAL 38 #define DLB_VERTICAL 39 #define FT_AT_VERT_POS 40 #define ED_AT_VERT_POS 41 -#define FT_VERT_RELATION 3 -#define LB_VERT_RELATION 4 +#define FT_VERT_RELATION 3 +#define LB_VERT_RELATION 4 #define FL_POSITION 43 -#define BT_REALSIZE 44 -#define BT_MANUAL 45 -#define CB_AUTOWIDTH 46 -#define FT_WIDTH_AUTO 47 -#define FT_HEIGHT_AUTO 48 +#define BT_REALSIZE 44 +#define BT_MANUAL 45 +#define CB_AUTOWIDTH 46 +#define FT_WIDTH_AUTO 47 +#define FT_HEIGHT_AUTO 48 // metrics -#define SWFRMPG_COL_0 RSC_SP_TBPG_INNERBORDER_LEFT -#define SWFRMPG_COL_1 (SWFRMPG_COL_0+RSC_SP_FLGR_INNERBORDER_LEFT) -#define SWFRMPG_COL_2 (SWFRMPG_COL_1+RSC_SP_FLGR_INNERBORDER_LEFT) -#define SWFRMPG_COL_3 76 -#define SWFRMPG_COL_4 109 +#define SWFRMPG_COL_0 RSC_SP_TBPG_INNERBORDER_LEFT +#define SWFRMPG_COL_1 (SWFRMPG_COL_0+RSC_SP_FLGR_INNERBORDER_LEFT) +#define SWFRMPG_COL_2 (SWFRMPG_COL_1+RSC_SP_FLGR_INNERBORDER_LEFT) +#define SWFRMPG_COL_3 76 +#define SWFRMPG_COL_4 109 -#define SWFRMPG_ROW_CONDENSE 1 -#define SWFRMPG_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP -#define SWFRMPG_ROW_1 (SWFRMPG_ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_INNERBORDER_TOP-SWFRMPG_ROW_CONDENSE) -#define SWFRMPG_ROW_2 (SWFRMPG_ROW_1+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)) -#define SWFRMPG_ROW_3 (SWFRMPG_ROW_1+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE) -#define SWFRMPG_ROW_4 (SWFRMPG_ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE) -#define SWFRMPG_ROW_5 (SWFRMPG_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE) -#define SWFRMPG_ROW_6 (SWFRMPG_ROW_5+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)) -#define SWFRMPG_ROW_7 (SWFRMPG_ROW_5+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE) -#define SWFRMPG_ROW_8 (SWFRMPG_ROW_7+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE) -#define SWFRMPG_ROW_9 (SWFRMPG_ROW_8+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define SWFRMPG_ROW_10 (SWFRMPG_ROW_9+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y-SWFRMPG_ROW_CONDENSE) -#define SWFRMPG_ROW_11 (SWFRMPG_ROW_10+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_INNERBORDER_TOP) -#define SWFRMPG_ROW_12 (SWFRMPG_ROW_11+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)) -#define SWFRMPG_ROW_13 (SWFRMPG_ROW_11+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define SWFRMPG_ROW_14 (SWFRMPG_ROW_13+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define SWFRMPG_ROW_15 (SWFRMPG_ROW_14+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)) -#define SWFRMPG_ROW_16 (SWFRMPG_ROW_14+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y) +#define SWFRMPG_ROW_CONDENSE 1 +#define SWFRMPG_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP +#define SWFRMPG_ROW_1 (SWFRMPG_ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_INNERBORDER_TOP-SWFRMPG_ROW_CONDENSE) +#define SWFRMPG_ROW_2 (SWFRMPG_ROW_1+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)) +#define SWFRMPG_ROW_3 (SWFRMPG_ROW_1+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE) +#define SWFRMPG_ROW_4 (SWFRMPG_ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE) +#define SWFRMPG_ROW_5 (SWFRMPG_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE) +#define SWFRMPG_ROW_6 (SWFRMPG_ROW_5+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)) +#define SWFRMPG_ROW_7 (SWFRMPG_ROW_5+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE) +#define SWFRMPG_ROW_8 (SWFRMPG_ROW_7+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE) +#define SWFRMPG_ROW_9 (SWFRMPG_ROW_8+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y) +#define SWFRMPG_ROW_10 (SWFRMPG_ROW_9+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y-SWFRMPG_ROW_CONDENSE) +#define SWFRMPG_ROW_11 (SWFRMPG_ROW_10+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_INNERBORDER_TOP) +#define SWFRMPG_ROW_12 (SWFRMPG_ROW_11+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)) +#define SWFRMPG_ROW_13 (SWFRMPG_ROW_11+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y) +#define SWFRMPG_ROW_14 (SWFRMPG_ROW_13+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y) +#define SWFRMPG_ROW_15 (SWFRMPG_ROW_14+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)) +#define SWFRMPG_ROW_16 (SWFRMPG_ROW_14+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define CB_HOR 46 -#define CB_VERT 47 -//#define LB_MIRROR_PAGES 49 -//#define FT_MIRROR_PAGES 50 +#define CB_HOR 46 +#define CB_VERT 47 +//#define LB_MIRROR_PAGES 49 +//#define FT_MIRROR_PAGES 50 #define FL_MIRROR 51 -#define WN_BMP 52 +#define WN_BMP 52 #define PB_BROWSE 53 #define ED_CONNECT 54 #define FL_CONNECT 55 -#define FT_CONNECT 57 -#define FT_URL 58 -#define ED_URL 59 +#define FT_CONNECT 57 +#define FT_URL 58 +#define ED_URL 59 -#define BMP_EXAMPLE 62 +#define BMP_EXAMPLE 62 #define BMP_EXAMPLE_HC 63 #define RB_MIRROR_ALL_PAGES 64 #define RB_MIRROR_LEFT_PAGES 65 @@ -117,14 +117,14 @@ #define CB_SERVER 98 #define CB_CLIENT 99 -#define CB_REL_WIDTH 100 -#define CB_REL_HEIGHT 101 -#define CB_FIXEDRATIO 102 -#define PB_SEARCH 103 +#define CB_REL_WIDTH 100 +#define CB_REL_HEIGHT 101 +#define CB_FIXEDRATIO 102 +#define PB_SEARCH 103 -#define CB_ANCHOR_ONLY 103 +#define CB_ANCHOR_ONLY 103 -#define FT_NAME 110 +#define FT_NAME 110 #define ED_NAME 111 #define FT_ALT_NAME 112 #define ED_ALT_NAME 113 diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src index 20a2d1702a46..5ce84d4552a5 100644 --- a/sw/source/ui/frmdlg/frmpage.src +++ b/sw/source/ui/frmdlg/frmpage.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/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src index 5e3abb1286e4..2b58742fc055 100644 --- a/sw/source/ui/frmdlg/frmui.src +++ b/sw/source/ui/frmdlg/frmui.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/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx index 9b2de83e8f59..e8b0ac664de6 100644 --- a/sw/source/ui/frmdlg/pattern.cxx +++ b/sw/source/ui/frmdlg/pattern.cxx @@ -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/frmdlg/pattern.hrc b/sw/source/ui/frmdlg/pattern.hrc index f9eabe9bb3c5..1a4750e23493 100644 --- a/sw/source/ui/frmdlg/pattern.hrc +++ b/sw/source/ui/frmdlg/pattern.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 @@ -25,22 +25,22 @@ * ************************************************************************/ -#define BRUSH_LBL 1 -#define BRUSH_LBOX 2 +#define BRUSH_LBL 1 +#define BRUSH_LBOX 2 -#define COLOR_LBL 3 -#define COLOR_LBOX 4 +#define COLOR_LBL 3 +#define COLOR_LBOX 4 -#define FILLIN_COLOR_LBL 5 -#define FILLIN_COLOR_LBOX 6 +#define FILLIN_COLOR_LBL 5 +#define FILLIN_COLOR_LBOX 6 -#define NO_PATTERN_BOX 7 +#define NO_PATTERN_BOX 7 -#define PATTERN_FRM 8 -#define EXAMPLE_FRM 9 -#define EXAMPLE_WIN 10 +#define PATTERN_FRM 8 +#define EXAMPLE_FRM 9 +#define EXAMPLE_WIN 10 -#define OK_BTN 11 -#define CANCEL_BTN 12 -#define RESET_BTN 13 +#define OK_BTN 11 +#define CANCEL_BTN 12 +#define RESET_BTN 13 diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx index 2add324b61ee..560961951ac1 100644 --- a/sw/source/ui/frmdlg/uiborder.cxx +++ b/sw/source/ui/frmdlg/uiborder.cxx @@ -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/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index b313ebd530eb..fcc37756ebc2 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -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 @@ -110,12 +110,12 @@ SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, SW_RES(TP_FRM_WRAP), rSet), aWrapFLC (this, SW_RES(C_WRAP_FL)), - aNoWrapRB (this, SW_RES(RB_NO_WRAP)), - aWrapLeftRB (this, SW_RES(RB_WRAP_LEFT)), - aWrapRightRB (this, SW_RES(RB_WRAP_RIGHT)), - aWrapParallelRB (this, SW_RES(RB_WRAP_PARALLEL)), - aWrapThroughRB (this, SW_RES(RB_WRAP_THROUGH)), - aIdealWrapRB (this, SW_RES(RB_WRAP_IDEAL)), + aNoWrapRB (this, SW_RES(RB_NO_WRAP)), + aWrapLeftRB (this, SW_RES(RB_WRAP_LEFT)), + aWrapRightRB (this, SW_RES(RB_WRAP_RIGHT)), + aWrapParallelRB (this, SW_RES(RB_WRAP_PARALLEL)), + aWrapThroughRB (this, SW_RES(RB_WRAP_THROUGH)), + aIdealWrapRB (this, SW_RES(RB_WRAP_IDEAL)), aMarginFL (this, SW_RES(FL_MARGIN)), aLeftMarginFT (this, SW_RES(FT_LEFT_MARGIN)), @@ -130,9 +130,9 @@ SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) : aOptionsSepFL (this, SW_RES(FL_OPTION_SEP)), aOptionsFL (this, SW_RES(FL_OPTION)), aWrapAnchorOnlyCB (this, SW_RES(CB_ANCHOR_ONLY)), - aWrapTransparentCB (this, SW_RES(CB_TRANSPARENT)), - aWrapOutlineCB (this, SW_RES(CB_OUTLINE)), - aWrapOutsideCB (this, SW_RES(CB_ONLYOUTSIDE)), + aWrapTransparentCB (this, SW_RES(CB_TRANSPARENT)), + aWrapOutlineCB (this, SW_RES(CB_OUTLINE)), + aWrapOutsideCB (this, SW_RES(CB_ONLYOUTSIDE)), aWrapIL (SW_RES(IL_WRAP)), aWrapILH (SW_RES(ILH_WRAP)), @@ -335,7 +335,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: Attribute in den Set stopfen bei OK + Beschreibung: Attribute in den Set stopfen bei OK --------------------------------------------------------------------*/ @@ -443,7 +443,7 @@ BOOL SwWrapTabPage::FillItemSet(SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: Bsp - Update + Beschreibung: Bsp - Update --------------------------------------------------------------------*/ @@ -510,10 +510,10 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) SwTwips nTop; SwTwips nBottom; - nLeft = aVal.nHPos - aVal.nMinHPos; - nRight = aVal.nMaxWidth - aVal.nWidth; - nTop = aVal.nVPos - aVal.nMinVPos; - nBottom = aVal.nMaxHeight - aVal.nHeight; + nLeft = aVal.nHPos - aVal.nMinHPos; + nRight = aVal.nMaxWidth - aVal.nWidth; + nTop = aVal.nVPos - aVal.nMinVPos; + nBottom = aVal.nMaxHeight - aVal.nHeight; if (bHtmlMode && 0 == (nHtmlMode & HTMLMODE_FULL_ABS_POS)) { @@ -531,7 +531,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) if (aVal.nVPos <= aVal.nMaxHeight) nTop = aVal.nMaxVPos - aVal.nHeight; else - nTop = nBottom = 0; // Kein Umlauf + nTop = nBottom = 0; // Kein Umlauf } else nTop = aVal.nMaxVPos - aVal.nHeight - aVal.nVPos; @@ -542,7 +542,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) nTop += nBottom; } - nBottom = nTop; + nBottom = nTop; nRight = nLeft; } @@ -653,7 +653,7 @@ int SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet) } /*-------------------------------------------------------------------- - Beschreibung: Bereichspruefung + Beschreibung: Bereichspruefung --------------------------------------------------------------------*/ diff --git a/sw/source/ui/frmdlg/wrap.hrc b/sw/source/ui/frmdlg/wrap.hrc index be19dbe702c2..077d8af65987 100644 --- a/sw/source/ui/frmdlg/wrap.hrc +++ b/sw/source/ui/frmdlg/wrap.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,40 +24,40 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define RB_NO_WRAP 2 -#define RB_WRAP_LEFT 3 -#define RB_WRAP_RIGHT 4 -#define RB_WRAP_PARALLEL 5 -#define RB_WRAP_THROUGH 6 -#define RB_WRAP_IDEAL 7 -#define CB_ANCHOR_ONLY 8 -#define FT_LEFT_MARGIN 13 -#define ED_LEFT_MARGIN 14 -#define FT_RIGHT_MARGIN 15 -#define ED_RIGHT_MARGIN 16 -#define FT_TOP_MARGIN 17 -#define ED_TOP_MARGIN 18 -#define ED_BOTTOM_MARGIN 19 -#define FT_BOTTOM_MARGIN 20 +#define RB_NO_WRAP 2 +#define RB_WRAP_LEFT 3 +#define RB_WRAP_RIGHT 4 +#define RB_WRAP_PARALLEL 5 +#define RB_WRAP_THROUGH 6 +#define RB_WRAP_IDEAL 7 +#define CB_ANCHOR_ONLY 8 +#define FT_LEFT_MARGIN 13 +#define ED_LEFT_MARGIN 14 +#define FT_RIGHT_MARGIN 15 +#define ED_RIGHT_MARGIN 16 +#define FT_TOP_MARGIN 17 +#define ED_TOP_MARGIN 18 +#define ED_BOTTOM_MARGIN 19 +#define FT_BOTTOM_MARGIN 20 #define FL_MARGIN 21 -#define CB_TRANSPARENT 22 -#define CB_OUTLINE 23 +#define CB_TRANSPARENT 22 +#define CB_OUTLINE 23 #define FL_OPTION 24 -#define CB_ONLYOUTSIDE 25 +#define CB_ONLYOUTSIDE 25 #define FL_OPTION_SEP 26 #define C_WRAP_FL 31 -#define IL_WRAP 32 +#define IL_WRAP 32 #define ILH_WRAP 33 // nur fuer die ImageList -#define IMG_BEGIN 1 -#define IMG_NONE (IMG_BEGIN) -#define IMG_LEFT (IMG_BEGIN + 1) +#define IMG_BEGIN 1 +#define IMG_NONE (IMG_BEGIN) +#define IMG_LEFT (IMG_BEGIN + 1) #define IMG_RIGHT (IMG_BEGIN + 2) #define IMG_PARALLEL (IMG_BEGIN + 3) #define IMG_THROUGH (IMG_BEGIN + 4) -#define IMG_IDEAL (IMG_BEGIN + 5) -#define IMG_KON_NONE (IMG_BEGIN + 6) +#define IMG_IDEAL (IMG_BEGIN + 5) +#define IMG_KON_NONE (IMG_BEGIN + 6) #define IMG_KON_LEFT (IMG_BEGIN + 7) #define IMG_KON_RIGHT (IMG_BEGIN + 8) #define IMG_KON_PARALLEL (IMG_BEGIN + 9) diff --git a/sw/source/ui/frmdlg/wrap.src b/sw/source/ui/frmdlg/wrap.src index bd779308178d..6810f55e1ade 100644 --- a/sw/source/ui/frmdlg/wrap.src +++ b/sw/source/ui/frmdlg/wrap.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/globdoc/globdoc.cxx b/sw/source/ui/globdoc/globdoc.cxx index a4572f0a16da..8bcc5d855304 100644 --- a/sw/source/ui/globdoc/globdoc.cxx +++ b/sw/source/ui/globdoc/globdoc.cxx @@ -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 @@ /*-------------------------------------------------------------------- - Beschreibung: Alle Filter registrieren + Beschreibung: Alle Filter registrieren --------------------------------------------------------------------*/ TYPEINIT1(SwGlobalDocShell, SwDocShell); @@ -79,8 +79,8 @@ void SwGlobalDocShell::FillClass( SvGlobalName * pClassName, } else if (nVersion == SOFFICE_FILEFORMAT_8) { - *pClassName = SvGlobalName( SO3_SWGLOB_CLASSID_60 ); - *pClipFormat = SOT_FORMATSTR_ID_STARWRITERGLOB_8; + *pClassName = SvGlobalName( SO3_SWGLOB_CLASSID_60 ); + *pClipFormat = SOT_FORMATSTR_ID_STARWRITERGLOB_8; *pLongUserName = SW_RESSTR(STR_WRITER_GLOBALDOC_FULLTYPE); } diff --git a/sw/source/ui/globdoc/globdoc.src b/sw/source/ui/globdoc/globdoc.src index 80cd202da1d3..9c8b19ac10e7 100644 --- a/sw/source/ui/globdoc/globdoc.src +++ b/sw/source/ui/globdoc/globdoc.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/inc/DropDownFieldDialog.hxx b/sw/source/ui/inc/DropDownFieldDialog.hxx index 26b01ae4accb..3308f5e4b1d7 100644 --- a/sw/source/ui/inc/DropDownFieldDialog.hxx +++ b/sw/source/ui/inc/DropDownFieldDialog.hxx @@ -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 @@ -42,7 +42,7 @@ class SwWrtShell; Dialog to edit drop down field selection --------------------------------------------------------------------*/ namespace sw -{ +{ class DropDownFieldDialog : public SvxStandardDialog { FixedLine aItemsFL; @@ -57,7 +57,7 @@ class DropDownFieldDialog : public SvxStandardDialog SwWrtShell &rSh; SwDropDownField* pDropField; - + DECL_LINK(ButtonHdl, PushButton*); virtual void Apply(); public: diff --git a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx index dd3e7e2dce9b..cc7462f6d80f 100644 --- a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx @@ -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 @@ -60,12 +60,12 @@ protected: public: SwSpellDialogChildWindow ( - Window*pParent, + Window*pParent, USHORT nId, - SfxBindings* pBindings, + SfxBindings* pBindings, SfxChildWinInfo* pInfo); ~SwSpellDialogChildWindow(); - + SFX_DECL_CHILDWINDOW(SwSpellDialogChildWindow); void InvalidateSpellDialog(); diff --git a/sw/source/ui/inc/SwXFilterOptions.hxx b/sw/source/ui/inc/SwXFilterOptions.hxx index c1dcc3676447..383d6f992f6e 100644 --- a/sw/source/ui/inc/SwXFilterOptions.hxx +++ b/sw/source/ui/inc/SwXFilterOptions.hxx @@ -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 @@ -68,7 +68,7 @@ public: // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -77,18 +77,18 @@ public: ::com::sun::star::uno::RuntimeException); // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException); // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); diff --git a/sw/source/ui/inc/abstract.hxx b/sw/source/ui/inc/abstract.hxx index 6700212aa0c3..2df6f6c0c9b8 100644 --- a/sw/source/ui/inc/abstract.hxx +++ b/sw/source/ui/inc/abstract.hxx @@ -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 @@ -48,14 +48,14 @@ class SwInsertAbstractDlg : public SfxModalDialog { FixedLine aFL; - FixedText aLevelFT; - NumericField aLevelNF; - FixedText aParaFT; - NumericField aParaNF; - FixedText aDescFT; - OKButton aOkPB; - CancelButton aCancelPB; - HelpButton aHelpPB; + FixedText aLevelFT; + NumericField aLevelNF; + FixedText aParaFT; + NumericField aParaNF; + FixedText aDescFT; + OKButton aOkPB; + CancelButton aCancelPB; + HelpButton aHelpPB; protected: @@ -63,8 +63,8 @@ public: SwInsertAbstractDlg( Window* pParent ); ~SwInsertAbstractDlg(); - BYTE GetLevel() const; - BYTE GetPara() const; + BYTE GetLevel() const; + BYTE GetPara() const; }; #endif diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx index d1e9a3d82907..30156673047e 100644 --- a/sw/source/ui/inc/actctrl.hxx +++ b/sw/source/ui/inc/actctrl.hxx @@ -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 @@ -33,7 +33,7 @@ #include "swdllapi.h" /*-------------------------------------------------------------------- - Beschreibung: numerische Eingabe + Beschreibung: numerische Eingabe --------------------------------------------------------------------*/ class SW_DLLPUBLIC NumEditAction: public NumericField @@ -41,14 +41,14 @@ class SW_DLLPUBLIC NumEditAction: public NumericField Link aActionLink; protected: - virtual void Action(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual void Action(); + virtual long Notify( NotifyEvent& rNEvt ); public: NumEditAction( Window* pParent, const ResId& rResId ) : NumericField(pParent, rResId) {} - void SetActionHdl( const Link& rLink ) { aActionLink = rLink;} - const Link& GetActionHdl() const { return aActionLink; } + void SetActionHdl( const Link& rLink ) { aActionLink = rLink;} + const Link& GetActionHdl() const { return aActionLink; } }; @@ -60,13 +60,13 @@ class SW_DLLPUBLIC NoSpaceEdit : public Edit String sForbiddenChars; protected: virtual void KeyInput( const KeyEvent& ); - virtual void Modify(); + virtual void Modify(); public: NoSpaceEdit( Window* pParent, const ResId& rResId); virtual ~NoSpaceEdit(); - void SetForbiddenChars(const String& rSet){sForbiddenChars = rSet;} - const String& GetForbiddenChars(){return sForbiddenChars;} + void SetForbiddenChars(const String& rSet){sForbiddenChars = rSet;} + const String& GetForbiddenChars(){return sForbiddenChars;} }; /* -----------------21.04.98 08:33------------------- @@ -93,6 +93,6 @@ public: void SetReturnActionLink(const Link& rLink) { aReturnActionLink = rLink;} -}; +}; #endif diff --git a/sw/source/ui/inc/addrdlg.hxx b/sw/source/ui/inc/addrdlg.hxx index 9e8370d1e2fc..7bc6d9b759da 100644 --- a/sw/source/ui/inc/addrdlg.hxx +++ b/sw/source/ui/inc/addrdlg.hxx @@ -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/inc/annotsh.hxx b/sw/source/ui/inc/annotsh.hxx index 979e1374e004..51bb596061d3 100755 --- a/sw/source/ui/inc/annotsh.hxx +++ b/sw/source/ui/inc/annotsh.hxx @@ -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 @@ -34,40 +34,40 @@ class SwView; class SwAnnotationShell: public SfxShell { - SwView& rView; + SwView& rView; public: SFX_DECL_INTERFACE(SW_ANNOTATIONSHELL) TYPEINFO(); SwAnnotationShell(SwView&); - virtual ~SwAnnotationShell(); + virtual ~SwAnnotationShell(); void StateDisableItems(SfxItemSet &); - void Exec(SfxRequest &); + void Exec(SfxRequest &); - void GetState(SfxItemSet &); - void StateInsert(SfxItemSet &rSet); + void GetState(SfxItemSet &); + void StateInsert(SfxItemSet &rSet); - void NoteExec(SfxRequest &); - void GetNoteState(SfxItemSet &); + void NoteExec(SfxRequest &); + void GetNoteState(SfxItemSet &); - void ExecLingu(SfxRequest &rReq); - void GetLinguState(SfxItemSet &); + void ExecLingu(SfxRequest &rReq); + void GetLinguState(SfxItemSet &); - void ExecClpbrd(SfxRequest &rReq); - void StateClpbrd(SfxItemSet &rSet); + void ExecClpbrd(SfxRequest &rReq); + void StateClpbrd(SfxItemSet &rSet); - void ExecTransliteration(SfxRequest &); + void ExecTransliteration(SfxRequest &); - void ExecUndo(SfxRequest &rReq); - void StateUndo(SfxItemSet &rSet); + void ExecUndo(SfxRequest &rReq); + void StateUndo(SfxItemSet &rSet); - void StateStatusLine(SfxItemSet &rSet); + void StateStatusLine(SfxItemSet &rSet); - void InsertSymbol(SfxRequest& rReq); + void InsertSymbol(SfxRequest& rReq); - void ExecSearch(SfxRequest&, BOOL bNoMessage = FALSE); + void ExecSearch(SfxRequest&, BOOL bNoMessage = FALSE); void StateSearch(SfxItemSet &); diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc index edf7014a4e4f..0ecc117ba9b5 100644 --- a/sw/source/ui/inc/app.hrc +++ b/sw/source/ui/inc/app.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 @@ -31,57 +31,57 @@ #include "rcid.hrc" // Default Bitmap fuer ToolBox -#define BMP_FEHLT (RC_APP_BEGIN + 1) +#define BMP_FEHLT (RC_APP_BEGIN + 1) // Document-Icon -#define RC_DOC_ICON (RC_APP_BEGIN + 2) +#define RC_DOC_ICON (RC_APP_BEGIN + 2) //Soll das Clipboard fuer andere Applikationen... -#define MSG_CLPBRD_CLEAR (RC_APP_BEGIN + 3) +#define MSG_CLPBRD_CLEAR (RC_APP_BEGIN + 3) -#define STR_CANTCREATE (RC_APP_BEGIN + 4) -#define STR_CANTOPEN (RC_APP_BEGIN + 5) +#define STR_CANTCREATE (RC_APP_BEGIN + 4) +#define STR_CANTOPEN (RC_APP_BEGIN + 5) // Messages -#define MSG_ERROR_SEND_MAIL ( RC_APP_BEGIN + 6) +#define MSG_ERROR_SEND_MAIL ( RC_APP_BEGIN + 6) #define MSG_SAVE_HTML_QUERY ( RC_APP_BEGIN + 7) //Fuer das Interface, weil der RID_APP_BEGIN jetzt Desktop ist. -#define RID_SW_NAME ( RC_APP_BEGIN + 8) +#define RID_SW_NAME ( RC_APP_BEGIN + 8) #define MSG_SAVEAS_HTML_QUERY ( RC_APP_BEGIN + 9) -#define STR_UNBENANNT (RC_APP_BEGIN + 13) -#define STR_VERSION (RC_APP_BEGIN + 14) -#define STR_PRINT_MERGE_MACRO (RC_APP_BEGIN + 15) -#define STR_PAGE_COUNT_MACRO (RC_APP_BEGIN + 16) +#define STR_UNBENANNT (RC_APP_BEGIN + 13) +#define STR_VERSION (RC_APP_BEGIN + 14) +#define STR_PRINT_MERGE_MACRO (RC_APP_BEGIN + 15) +#define STR_PAGE_COUNT_MACRO (RC_APP_BEGIN + 16) // Bitmap fuer die NumerierungsVorlagen im Organizer -#define BMP_STYLES_FAMILY_NUM (RC_APP_BEGIN + 17) -#define BMP_STYLES_FAMILY_NUM_HC (RC_APP_BEGIN + 18) +#define BMP_STYLES_FAMILY_NUM (RC_APP_BEGIN + 17) +#define BMP_STYLES_FAMILY_NUM_HC (RC_APP_BEGIN + 18) // Strings fuer Bereiche in der Konfiguration -#define STR_GRP_FILE (RC_APP_BEGIN + 56) -#define STR_GRP_EDIT (RC_APP_BEGIN + 57) -#define STR_GRP_TRAVELLING (RC_APP_BEGIN + 58) -#define STR_GRP_VIEW (RC_APP_BEGIN + 59) -#define STR_GRP_INSERT (RC_APP_BEGIN + 60) -#define STR_GRP_FORMAT (RC_APP_BEGIN + 61) -#define STR_GRP_STYLE (RC_APP_BEGIN + 62) -#define STR_GRP_TEXT (RC_APP_BEGIN + 63) -#define STR_GRP_FRAME (RC_APP_BEGIN + 64) -#define STR_GRP_GRAPHIC (RC_APP_BEGIN + 65) -#define STR_GRP_TABLE (RC_APP_BEGIN + 66) -#define STR_GRP_TOOLS (RC_APP_BEGIN + 67) -#define STR_GRP_NUMBERING (RC_APP_BEGIN + 68) -#define STR_GRP_WINDOW (RC_APP_BEGIN + 69) -#define STR_GRP_MISC (RC_APP_BEGIN + 70) -#define STR_GRP_MACRO (RC_APP_BEGIN + 71) -#define RES_EXT_HELP_STRING (RC_APP_BEGIN + 72) -#define RES_STD_HELP_STRING (RC_APP_BEGIN + 73) -#define STR_PAGEOFFSET (RC_APP_BEGIN + 74) -#define STR_PAGEBREAK (RC_APP_BEGIN + 75) -#define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76) +#define STR_GRP_FILE (RC_APP_BEGIN + 56) +#define STR_GRP_EDIT (RC_APP_BEGIN + 57) +#define STR_GRP_TRAVELLING (RC_APP_BEGIN + 58) +#define STR_GRP_VIEW (RC_APP_BEGIN + 59) +#define STR_GRP_INSERT (RC_APP_BEGIN + 60) +#define STR_GRP_FORMAT (RC_APP_BEGIN + 61) +#define STR_GRP_STYLE (RC_APP_BEGIN + 62) +#define STR_GRP_TEXT (RC_APP_BEGIN + 63) +#define STR_GRP_FRAME (RC_APP_BEGIN + 64) +#define STR_GRP_GRAPHIC (RC_APP_BEGIN + 65) +#define STR_GRP_TABLE (RC_APP_BEGIN + 66) +#define STR_GRP_TOOLS (RC_APP_BEGIN + 67) +#define STR_GRP_NUMBERING (RC_APP_BEGIN + 68) +#define STR_GRP_WINDOW (RC_APP_BEGIN + 69) +#define STR_GRP_MISC (RC_APP_BEGIN + 70) +#define STR_GRP_MACRO (RC_APP_BEGIN + 71) +#define RES_EXT_HELP_STRING (RC_APP_BEGIN + 72) +#define RES_STD_HELP_STRING (RC_APP_BEGIN + 73) +#define STR_PAGEOFFSET (RC_APP_BEGIN + 74) +#define STR_PAGEBREAK (RC_APP_BEGIN + 75) +#define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76) #define STR_WESTERN_FONT (RC_APP_BEGIN + 77) #define STR_CJK_FONT (RC_APP_BEGIN + 78) //#define MSG_INS_MERGE_FIELDS (RC_APP_BEGIN + 79) @@ -92,17 +92,17 @@ #define PB_MERGE_OK 2 #define PB_MERGE_CANCEL 3 #define IMG_MERGE 4 -#define SID_TOGGLETOOLBOX (RC_APP_BEGIN + 89) +#define SID_TOGGLETOOLBOX (RC_APP_BEGIN + 89) -#define STR_ENV_TITLE (RC_APP_BEGIN + 91) -#define STR_LAB_TITLE (RC_APP_BEGIN + 92) +#define STR_ENV_TITLE (RC_APP_BEGIN + 91) +#define STR_LAB_TITLE (RC_APP_BEGIN + 92) -#define STR_HUMAN_SWDOC_NAME (RC_APP_BEGIN + 93) +#define STR_HUMAN_SWDOC_NAME (RC_APP_BEGIN + 93) #define RID_SW_ERRHDL (RC_APP_BEGIN + 95) #define STR_FDLG_TEMPLATE_BUTTON (RC_APP_BEGIN + 1) -#define STR_FDLG_TEMPLATE_NAME (RC_APP_BEGIN + 2) +#define STR_FDLG_TEMPLATE_NAME (RC_APP_BEGIN + 2) // Ids fuer die einzelnen PopUpMenues @@ -170,8 +170,8 @@ #define STR_OUTLINE_NUMBERING (RC_APP_BEGIN + 104) // <-- //#outline level,zhaojianwei -#define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105) -#define STR_FDLG_STYLE (RC_APP_BEGIN + 106) +#define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105) +#define STR_FDLG_STYLE (RC_APP_BEGIN + 106) //<-end,zhaojianwei #define APP_ACT_END STR_FDLG_STYLE diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/ui/inc/ascfldlg.hxx index 18eb19228fee..0bdec40ba884 100644 --- a/sw/source/ui/inc/ascfldlg.hxx +++ b/sw/source/ui/inc/ascfldlg.hxx @@ -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,19 +43,19 @@ class SwDocShell; class SwAsciiFilterDlg : public SfxModalDialog { FixedLine aFL; - FixedText aCharSetFT; - SvxTextEncodingBox aCharSetLB; - FixedText aFontFT; - ListBox aFontLB; - FixedText aLanguageFT; - SvxLanguageBox aLanguageLB; - FixedText aCRLF_FT; - RadioButton aCRLF_RB, aCR_RB, aLF_RB; - OKButton aOkPB; - CancelButton aCancelPB; - HelpButton aHelpPB; - String sSystemCharSet; - BOOL bSaveLineStatus; + FixedText aCharSetFT; + SvxTextEncodingBox aCharSetLB; + FixedText aFontFT; + ListBox aFontLB; + FixedText aLanguageFT; + SvxLanguageBox aLanguageLB; + FixedText aCRLF_FT; + RadioButton aCRLF_RB, aCR_RB, aLF_RB; + OKButton aOkPB; + CancelButton aCancelPB; + HelpButton aHelpPB; + String sSystemCharSet; + BOOL bSaveLineStatus; DECL_LINK( CharSetSelHdl, SvxTextEncodingBox* ); DECL_LINK( LineEndHdl, RadioButton* ); @@ -63,8 +63,8 @@ class SwAsciiFilterDlg : public SfxModalDialog LineEnd GetCRLF() const; public: - // CTOR: for import - pStream is the inputstream - // for export - pStream must be 0 + // CTOR: for import - pStream is the inputstream + // for export - pStream must be 0 SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, SvStream* pStream ); virtual ~SwAsciiFilterDlg(); diff --git a/sw/source/ui/inc/autoedit.hxx b/sw/source/ui/inc/autoedit.hxx index 535bc04bf9ca..ab9a16fb6b0f 100644 --- a/sw/source/ui/inc/autoedit.hxx +++ b/sw/source/ui/inc/autoedit.hxx @@ -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/inc/barcfg.hxx b/sw/source/ui/inc/barcfg.hxx index 6b88039eddbe..1e55db402731 100644 --- a/sw/source/ui/inc/barcfg.hxx +++ b/sw/source/ui/inc/barcfg.hxx @@ -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/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx index 8c8b6eb98b7a..9a0e0b48d6d2 100644 --- a/sw/source/ui/inc/basesh.hxx +++ b/sw/source/ui/inc/basesh.hxx @@ -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 @@ -55,8 +55,8 @@ class SwBaseShell: public SfxShell static FlyMode eFrameMode; // Bug 75078 - if in GetState the asynch call of GetGraphic returns - // synch, the set the state directly into the itemset - SfxItemSet* pGetStateSet; + // synch, the set the state directly into the itemset + SfxItemSet* pGetStateSet; //Update-Timer fuer Graphic SvUShortsSort aGrfUpdateSlots; @@ -64,17 +64,17 @@ class SwBaseShell: public SfxShell DECL_LINK( GraphicArrivedHdl, SwCrsrShell* ); protected: - SwWrtShell& GetShell(); - SwWrtShell* GetShellPtr(); + SwWrtShell& GetShell(); + SwWrtShell* GetShellPtr(); - inline SwView& GetView() { return rView; } - inline void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; } - inline BOOL AddGrfUpdateSlot( USHORT nSlot ){ return aGrfUpdateSlots.Insert( nSlot ); } + inline SwView& GetView() { return rView; } + inline void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; } + inline BOOL AddGrfUpdateSlot( USHORT nSlot ){ return aGrfUpdateSlots.Insert( nSlot ); } - DECL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl* ); + DECL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl* ); - void InsertURLButton( const String& rURL, const String& rTarget, const String& rTxt ); - void InsertTable( SfxRequest& _rRequest ); + void InsertURLButton( const String& rURL, const String& rTarget, const String& rTxt ); + void InsertTable( SfxRequest& _rRequest ); public: SwBaseShell(SwView &rShell); @@ -95,8 +95,8 @@ public: void GetState(SfxItemSet &); void StateStyle(SfxItemSet &); - void ExecuteGallery(SfxRequest&); - void GetGalleryState(SfxItemSet&); + void ExecuteGallery(SfxRequest&); + void GetGalleryState(SfxItemSet&); void ExecDlg(SfxRequest &); @@ -104,18 +104,18 @@ public: void ExecTxtCtrl(SfxRequest& rReq); void GetTxtFontCtrlState(SfxItemSet& rSet); void GetTxtCtrlState(SfxItemSet& rSet); - void GetBorderState(SfxItemSet &rSet); + void GetBorderState(SfxItemSet &rSet); void GetBckColState(SfxItemSet &rSet); void ExecBckCol(SfxRequest& rReq); - void SetWrapMode( USHORT nSlot ); + void SetWrapMode( USHORT nSlot ); - void StateDisableItems(SfxItemSet &); + void StateDisableItems(SfxItemSet &); - void EditRegionDialog(SfxRequest& rReq); - void InsertRegionDialog(SfxRequest& rReq); + void EditRegionDialog(SfxRequest& rReq); + void InsertRegionDialog(SfxRequest& rReq); - void ExecField(SfxRequest& rReq); + void ExecField(SfxRequest& rReq); static void SetFrmMode( FlyMode eMode, SwWrtShell *pShell ); //Mit Update! static void _SetFrmMode( FlyMode eMode ) { eFrameMode = eMode; } diff --git a/sw/source/ui/inc/beziersh.hxx b/sw/source/ui/inc/beziersh.hxx index c9c88adb441e..e2f5dd5957f4 100644 --- a/sw/source/ui/inc/beziersh.hxx +++ b/sw/source/ui/inc/beziersh.hxx @@ -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 @@ -37,8 +37,8 @@ public: SwBezierShell(SwView &rView); - void GetState(SfxItemSet &); - void Execute(SfxRequest &); + void GetState(SfxItemSet &); + void Execute(SfxRequest &); }; #endif diff --git a/sw/source/ui/inc/bmpwin.hxx b/sw/source/ui/inc/bmpwin.hxx index e09ae625534d..8f60ed3e13f4 100644 --- a/sw/source/ui/inc/bmpwin.hxx +++ b/sw/source/ui/inc/bmpwin.hxx @@ -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 @@ -37,7 +37,7 @@ #include <vcl/window.hxx> /*-------------------------------------------------------------------- - Beschreibung: Extended Page fuer Grafiken + Beschreibung: Extended Page fuer Grafiken --------------------------------------------------------------------*/ class BmpWindow : public Window diff --git a/sw/source/ui/inc/bookctrl.hxx b/sw/source/ui/inc/bookctrl.hxx index a41fb5262e64..426aedf11daa 100644 --- a/sw/source/ui/inc/bookctrl.hxx +++ b/sw/source/ui/inc/bookctrl.hxx @@ -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 @@ -39,7 +39,7 @@ class SwBookmarkControl : public SfxStatusBarControl virtual void Command( const CommandEvent& rCEvt ); public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx index 29c3173787a9..b6678c4088c6 100644 --- a/sw/source/ui/inc/bookmark.hxx +++ b/sw/source/ui/inc/bookmark.hxx @@ -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 @@ -34,7 +34,7 @@ #include <vcl/button.hxx> #endif -#include "swlbox.hxx" // SwComboBox +#include "swlbox.hxx" // SwComboBox class SwWrtShell; class SfxRequest; @@ -45,16 +45,16 @@ class SfxRequest; class BookmarkCombo : public SwComboBox { - USHORT GetFirstSelEntryPos() const; - USHORT GetNextSelEntryPos(USHORT nPos) const; - USHORT GetSelEntryPos(USHORT nPos) const; + USHORT GetFirstSelEntryPos() const; + USHORT GetNextSelEntryPos(USHORT nPos) const; + USHORT GetSelEntryPos(USHORT nPos) const; - virtual long PreNotify(NotifyEvent& rNEvt); + virtual long PreNotify(NotifyEvent& rNEvt); public: BookmarkCombo( Window* pWin, const ResId& rResId ); - USHORT GetSelectEntryCount() const; - USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const; + USHORT GetSelectEntryCount() const; + USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const; static const String aForbiddenChars; }; @@ -65,14 +65,14 @@ public: class SwInsertBookmarkDlg: public SvxStandardDialog { - BookmarkCombo aBookmarkBox; + BookmarkCombo aBookmarkBox; FixedLine aBookmarkFl; - OKButton aOkBtn; - CancelButton aCancelBtn; - PushButton aDeleteBtn; + OKButton aOkBtn; + CancelButton aCancelBtn; + PushButton aDeleteBtn; - String sRemoveWarning; - SwWrtShell &rSh; + String sRemoveWarning; + SwWrtShell &rSh; SfxRequest& rReq; DECL_LINK( ModifyHdl, BookmarkCombo * ); diff --git a/sw/source/ui/inc/break.hxx b/sw/source/ui/inc/break.hxx index 447afd8ca567..eab0047edf09 100644 --- a/sw/source/ui/inc/break.hxx +++ b/sw/source/ui/inc/break.hxx @@ -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 @@ -49,25 +49,25 @@ class SwWrtShell; class SwBreakDlg: public SvxStandardDialog { - SwWrtShell &rSh; - RadioButton aLineBtn; - RadioButton aColumnBtn; - RadioButton aPageBtn; - FixedText aPageCollText; - ListBox aPageCollBox; - CheckBox aPageNumBox; - NumericField aPageNumEdit; + SwWrtShell &rSh; + RadioButton aLineBtn; + RadioButton aColumnBtn; + RadioButton aPageBtn; + FixedText aPageCollText; + ListBox aPageCollBox; + CheckBox aPageNumBox; + NumericField aPageNumEdit; FixedLine aBreakFL; - OKButton aOkBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOkBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; String aTemplate; USHORT nKind; USHORT nPgNum; - BOOL bHtmlMode; + BOOL bHtmlMode; DECL_LINK( ClickHdl, void * ); DECL_LINK( PageNumHdl, CheckBox * ); diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx index c56f70364596..ffadad152079 100644 --- a/sw/source/ui/inc/caption.hxx +++ b/sw/source/ui/inc/caption.hxx @@ -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 @@ -54,60 +54,60 @@ private: // sal_Unicode cSeparator; String sSeparator; String sCharacterStyle; - + BOOL bIgnoreSeqOpts; // wird nicht gespeichert - BOOL bCopyAttributes; // -""- + BOOL bCopyAttributes; // -""- public: InsCaptionOpt(const SwCapObjType eType = FRAME_CAP, const SvGlobalName* pOleId = 0); InsCaptionOpt(const InsCaptionOpt&); ~InsCaptionOpt(); - inline BOOL& UseCaption() { return bUseCaption; } - inline BOOL UseCaption() const { return bUseCaption; } + inline BOOL& UseCaption() { return bUseCaption; } + inline BOOL UseCaption() const { return bUseCaption; } - inline SwCapObjType GetObjType() const { return eObjType; } - inline void SetObjType(const SwCapObjType eType) { eObjType = eType; } + inline SwCapObjType GetObjType() const { return eObjType; } + inline void SetObjType(const SwCapObjType eType) { eObjType = eType; } - inline const SvGlobalName& GetOleId() const { return aOleId; } - inline void SetOleId(const SvGlobalName &rId) { aOleId = rId; } + inline const SvGlobalName& GetOleId() const { return aOleId; } + inline void SetOleId(const SvGlobalName &rId) { aOleId = rId; } - inline const String& GetCategory() const { return sCategory; } - inline void SetCategory(const String& rCat) { sCategory = rCat; } + inline const String& GetCategory() const { return sCategory; } + inline void SetCategory(const String& rCat) { sCategory = rCat; } - inline USHORT GetNumType() const { return nNumType; } - inline void SetNumType(const USHORT nNT) { nNumType = nNT; } + inline USHORT GetNumType() const { return nNumType; } + inline void SetNumType(const USHORT nNT) { nNumType = nNT; } const ::rtl::OUString& GetNumSeparator() const { return sNumberSeparator; } void SetNumSeparator(const ::rtl::OUString& rSet) {sNumberSeparator = rSet;} inline const String& GetCaption() const { return sCaption; } - inline void SetCaption(const String& rCap) { sCaption = rCap; } + inline void SetCaption(const String& rCap) { sCaption = rCap; } - inline USHORT GetPos() const { return nPos; } - inline void SetPos(const USHORT nP) { nPos = nP; } + inline USHORT GetPos() const { return nPos; } + inline void SetPos(const USHORT nP) { nPos = nP; } - inline USHORT GetLevel() const { return nLevel; } - inline void SetLevel(const USHORT nLvl) { nLevel = nLvl; } + inline USHORT GetLevel() const { return nLevel; } + inline void SetLevel(const USHORT nLvl) { nLevel = nLvl; } -// inline sal_Unicode GetSeparator() const { return cSeparator; } -// inline void SetSeparator(const sal_Unicode cSep){ cSeparator = cSep; } - inline const String& GetSeparator() const { return sSeparator; } - inline void SetSeparator(const String& rSep) { sSeparator = rSep; } +// inline sal_Unicode GetSeparator() const { return cSeparator; } +// inline void SetSeparator(const sal_Unicode cSep){ cSeparator = cSep; } + inline const String& GetSeparator() const { return sSeparator; } + inline void SetSeparator(const String& rSep) { sSeparator = rSep; } const String& GetCharacterStyle() const { return sCharacterStyle; } - void SetCharacterStyle(const String& rStyle) + void SetCharacterStyle(const String& rStyle) { sCharacterStyle = rStyle; } - inline BOOL& IgnoreSeqOpts() { return bIgnoreSeqOpts; } - inline BOOL IgnoreSeqOpts() const { return bIgnoreSeqOpts; } + inline BOOL& IgnoreSeqOpts() { return bIgnoreSeqOpts; } + inline BOOL IgnoreSeqOpts() const { return bIgnoreSeqOpts; } - inline BOOL& CopyAttributes() { return bCopyAttributes; } - inline BOOL CopyAttributes() const { return bCopyAttributes; } + inline BOOL& CopyAttributes() { return bCopyAttributes; } + inline BOOL CopyAttributes() const { return bCopyAttributes; } - BOOL operator==( const InsCaptionOpt& rOpt ) const; - InsCaptionOpt& operator= ( const InsCaptionOpt& rOpt ); - inline BOOL operator< ( const InsCaptionOpt & rObj ) const + BOOL operator==( const InsCaptionOpt& rOpt ) const; + InsCaptionOpt& operator= ( const InsCaptionOpt& rOpt ); + inline BOOL operator< ( const InsCaptionOpt & rObj ) const { return aOleId < rObj.aOleId; } // friend SvStream& operator>>( SvStream& rIStream, InsCaptionOpt& rCapOpt ); // friend SvStream& operator<<( SvStream& rOStream, const InsCaptionOpt& rCapOpt ); diff --git a/sw/source/ui/inc/cfgdesc.hxx b/sw/source/ui/inc/cfgdesc.hxx index 81732b05c208..8ea0b20e0e06 100644 --- a/sw/source/ui/inc/cfgdesc.hxx +++ b/sw/source/ui/inc/cfgdesc.hxx @@ -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 @@ -41,14 +41,14 @@ protected: ~SwCfgDesc(); public: - void SetEvent(USHORT nE); // inline - void SetFuncText(const String &rStr); // inline + void SetEvent(USHORT nE); // inline + void SetFuncText(const String &rStr); // inline void SetMacro(const String &rLib, const String &rMac); BOOL IsMacro() const; - USHORT GetEvent() const; // inline - String GetFuncText() const; // inline - String GetMacro() const; // inline - String GetLib() const; // inline + USHORT GetEvent() const; // inline + String GetFuncText() const; // inline + String GetMacro() const; // inline + String GetLib() const; // inline }; // INLINE METHODE -------------------------------------------------------- @@ -60,10 +60,10 @@ inline void SwCfgDesc::SetFuncText(const String &rStr) { aFuncText = rStr; } -inline USHORT SwCfgDesc::GetEvent() const { return nEvent; } -inline String SwCfgDesc::GetFuncText() const { return aFuncText; } -inline String SwCfgDesc::GetMacro() const { return aFuncText; } -inline String SwCfgDesc::GetLib() const { return aLibName; } +inline USHORT SwCfgDesc::GetEvent() const { return nEvent; } +inline String SwCfgDesc::GetFuncText() const { return aFuncText; } +inline String SwCfgDesc::GetMacro() const { return aFuncText; } +inline String SwCfgDesc::GetLib() const { return aLibName; } #endif diff --git a/sw/source/ui/inc/cfgid.h b/sw/source/ui/inc/cfgid.h index 71f061e7b094..9496aa637321 100644 --- a/sw/source/ui/inc/cfgid.h +++ b/sw/source/ui/inc/cfgid.h @@ -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 @@ -30,11 +30,11 @@ #include <sfx2/sfx.hrc> #define CFG_STATUSBAR (SFX_ITEMTYPE_SW_BEGIN +13) -#define CFG_SW_MENU (SFX_ITEMTYPE_SW_BEGIN +16) -#define CFG_SW_ACCEL (SFX_ITEMTYPE_SW_BEGIN +17) +#define CFG_SW_MENU (SFX_ITEMTYPE_SW_BEGIN +16) +#define CFG_SW_ACCEL (SFX_ITEMTYPE_SW_BEGIN +17) #define CFG_SWWEB_MENU (SFX_ITEMTYPE_SW_BEGIN +19) #define CFG_SWWEB_ACCEL (SFX_ITEMTYPE_SW_BEGIN +20) -#define CFG_INSERT_DBCOLUMN_ITEM (SFX_ITEMTYPE_SW_BEGIN +25) +#define CFG_INSERT_DBCOLUMN_ITEM (SFX_ITEMTYPE_SW_BEGIN +25) #define CFG_SWGLOBAL_MENU (SFX_ITEMTYPE_SW_BEGIN +29) #endif diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx index d80df8672cfd..04d43865cf7b 100644 --- a/sw/source/ui/inc/cfgitems.hxx +++ b/sw/source/ui/inc/cfgitems.hxx @@ -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 @@ -48,7 +48,7 @@ class SwShdwCrsrOptionsTabPage; class SwDocEditDialog; SfxPrinter* GetPrt( ViewShell* ); -void SetPrt( SfxPrinter* ); +void SetPrt( SfxPrinter* ); /*--------OS 12.01.95 ----------------------------------- @@ -82,10 +82,10 @@ public: USHORT nWhich ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - void operator=( const SwDocDisplayItem& ); - void FillViewOptions( SwViewOption& rVOpt) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + void operator=( const SwDocDisplayItem& ); + void FillViewOptions( SwViewOption& rVOpt) const; }; /*--------OS 12.01.95 ----------------------------------- Item fuer Einstellungsdialog, Elementeseite @@ -94,22 +94,22 @@ class SW_DLLPUBLIC SwElemItem : public SfxPoolItem { //view BOOL bHorzScrollbar :1; - BOOL bVertScrollbar :1; + BOOL bVertScrollbar :1; BOOL bAnyRuler : 1; BOOL bHorzRuler :1; - BOOL bVertRuler :1; + BOOL bVertRuler :1; BOOL bVertRulerRight:1; BOOL bSmoothScroll :1; //visual aids - BOOL bCrosshair :1; - BOOL bHandles :1; - BOOL bBigHandles :1; + BOOL bCrosshair :1; + BOOL bHandles :1; + BOOL bBigHandles :1; //display BOOL bTable :1; - BOOL bGraphic :1; - BOOL bDrawing :1; - BOOL bFieldName :1; - BOOL bNotes :1; + BOOL bGraphic :1; + BOOL bDrawing :1; + BOOL bFieldName :1; + BOOL bNotes :1; friend class SwContentOptPage; @@ -122,9 +122,9 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; - void operator=( const SwElemItem& ); + void operator=( const SwElemItem& ); - void FillViewOptions( SwViewOption& rVOpt) const; + void FillViewOptions( SwViewOption& rVOpt) const; }; /*--------OS 12.01.95 ----------------------------------- @@ -148,7 +148,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; const rtl::OUString &GetFax() const { return sFaxName; } - void SetFax( const String& rFax) { sFaxName = rFax; } + void SetFax( const String& rFax) { sFaxName = rFax; } BOOL IsPrintProspect() const { return bPrintProspect; } @@ -158,7 +158,7 @@ public: BOOL IsPrintGraphic () const { return bPrintGraphic; } BOOL IsPrintTable () const { return bPrintTable; } BOOL IsPrintDraw () const { return bPrintDraw; } - BOOL IsPrintControl () const { return bPrintControl; } + BOOL IsPrintControl () const { return bPrintControl; } BOOL IsPrintLeftPage () const { return bPrintLeftPages; } BOOL IsPrintRightPage() const { return bPrintRightPages; } BOOL IsPrintReverse () const { return bPrintReverse; } @@ -193,15 +193,15 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; - void operator=( const SwShadowCursorItem& ); + void operator=( const SwShadowCursorItem& ); void FillViewOptions( SwViewOption& rVOpt) const; - BYTE GetMode() const { return eMode; } - BOOL IsOn() const { return bOn; } + BYTE GetMode() const { return eMode; } + BOOL IsOn() const { return bOn; } - void SetMode( BYTE eM ) { eMode = eM; } - void SetOn( BOOL bFlag ) { bOn = bFlag; } + void SetMode( BYTE eM ) { eMode = eM; } + void SetOn( BOOL bFlag ) { bOn = bFlag; } }; #ifdef DBG_UTIL @@ -215,14 +215,14 @@ class SW_DLLPUBLIC SwTestItem : public SfxPoolItem friend class SwTestTabPage; friend class SwDocEditDialog; - BOOL bTest1:1; - BOOL bTest2:1; - BOOL bTest3:1; - BOOL bTest4:1; - BOOL bTest5:1; - BOOL bTest6:1; - BOOL bTest7:1; - BOOL bTest8:1; + BOOL bTest1:1; + BOOL bTest2:1; + BOOL bTest3:1; + BOOL bTest4:1; + BOOL bTest5:1; + BOOL bTest6:1; + BOOL bTest7:1; + BOOL bTest8:1; BOOL bTest9:1; BOOL bTest10:1; diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx index 210f81907cc5..7720f6e817ea 100644 --- a/sw/source/ui/inc/changedb.hxx +++ b/sw/source/ui/inc/changedb.hxx @@ -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 @@ -55,34 +55,34 @@ struct SwDBData; class SwChangeDBDlg: public SvxStandardDialog { FixedLine aDBListFL; - FixedText aUsedDBFT; - FixedText aAvailDBFT; - SvTreeListBox aUsedDBTLB; - SwDBTreeList aAvailDBTLB; + FixedText aUsedDBFT; + FixedText aAvailDBFT; + SvTreeListBox aUsedDBTLB; + SwDBTreeList aAvailDBTLB; PushButton aAddDBPB; - FixedInfo aDescFT; - FixedText aDocDBTextFT; - FixedText aDocDBNameFT; - OKButton aOKBT; - CancelButton aCancelBT; - HelpButton aHelpBT; -// PushButton aChangeBT; + FixedInfo aDescFT; + FixedText aDocDBTextFT; + FixedText aDocDBNameFT; + OKButton aOKBT; + CancelButton aCancelBT; + HelpButton aHelpBT; +// PushButton aChangeBT; ImageList aImageList; ImageList aImageListHC; SwWrtShell *pSh; - SwFldMgr *pMgr; + SwFldMgr *pMgr; DECL_LINK(TreeSelectHdl, SvTreeListBox* pBox = 0); DECL_LINK(ButtonHdl, Button* pBtn); DECL_LINK(AddDBHdl, PushButton*); - virtual void Apply(); - void UpdateFlds(); - void FillDBPopup(); - SvLBoxEntry* Insert(const String& rDBName); - void ShowDBName(const SwDBData& rDBData); + virtual void Apply(); + void UpdateFlds(); + void FillDBPopup(); + SvLBoxEntry* Insert(const String& rDBName); + void ShowDBName(const SwDBData& rDBData); public: SwChangeDBDlg(SwView& rVw); diff --git a/sw/source/ui/inc/chartins.hxx b/sw/source/ui/inc/chartins.hxx index 15050f946227..db4abe27a7d6 100644 --- a/sw/source/ui/inc/chartins.hxx +++ b/sw/source/ui/inc/chartins.hxx @@ -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/inc/chldwrap.hxx b/sw/source/ui/inc/chldwrap.hxx index 67009b0a8d2f..dd3023aab72b 100644 --- a/sw/source/ui/inc/chldwrap.hxx +++ b/sw/source/ui/inc/chldwrap.hxx @@ -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 @@ -44,7 +44,7 @@ protected: SwChildWinWrapper(Window *pParentWindow, USHORT nId); public: - virtual BOOL ReInitDlg(SwDocShell *pDocSh); + virtual BOOL ReInitDlg(SwDocShell *pDocSh); inline SwDocShell* GetOldDocShell() { return m_pDocSh; } inline void SetOldDocShell(SwDocShell *pDcSh) { m_pDocSh = pDcSh; } diff --git a/sw/source/ui/inc/chrdlg.hxx b/sw/source/ui/inc/chrdlg.hxx index 85248baeed8b..7381eb331b43 100644 --- a/sw/source/ui/inc/chrdlg.hxx +++ b/sw/source/ui/inc/chrdlg.hxx @@ -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 @@ -56,7 +56,7 @@ class SwView; class SvxMacroItem; /*-------------------------------------------------------------------- - Beschreibung: Der Tabdialog Traeger der TabPages + Beschreibung: Der Tabdialog Traeger der TabPages --------------------------------------------------------------------*/ class SwCharDlg: public SfxTabDialog @@ -81,24 +81,24 @@ class SwCharURLPage : public SfxTabPage { FixedLine aURLFL; - FixedText aURLFT; + FixedText aURLFT; Edit aURLED; - FixedText aTextFT; + FixedText aTextFT; Edit aTextED; - FixedText aNameFT; + FixedText aNameFT; Edit aNameED; - FixedText aTargetFrmFT; - ComboBox aTargetFrmLB; - PushButton aURLPB; - PushButton aEventPB; + FixedText aTargetFrmFT; + ComboBox aTargetFrmLB; + PushButton aURLPB; + PushButton aEventPB; FixedLine aStyleFL; - FixedText aVisitedFT; + FixedText aVisitedFT; ListBox aVisitedLB; FixedText aNotVisitedFT; ListBox aNotVisitedLB; - SvxMacroItem* pINetItem; - BOOL bModified; + SvxMacroItem* pINetItem; + BOOL bModified; DECL_LINK( InsertFileHdl, PushButton * ); DECL_LINK( EventHdl, PushButton * ); diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx index 852a2f705c68..9697900eafd3 100644 --- a/sw/source/ui/inc/cnttab.hxx +++ b/sw/source/ui/inc/cnttab.hxx @@ -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 @@ -61,8 +61,8 @@ struct CurTOXType { - TOXTypes eType; - USHORT nIndex; //for TOX_USER only + TOXTypes eType; + USHORT nIndex; //for TOX_USER only BOOL operator==(const CurTOXType aCmp) { @@ -77,13 +77,13 @@ struct CurTOXType class SwOLENames : public Resource { - ResStringArray aNamesAry; + ResStringArray aNamesAry; public: SwOLENames(const ResId& rResId) : Resource(rResId), aNamesAry(ResId(1,*rResId.GetResMgr())){FreeResource();} - ResStringArray& GetNames() { return aNamesAry;} + ResStringArray& GetNames() { return aNamesAry;} }; diff --git a/sw/source/ui/inc/colex.hxx b/sw/source/ui/inc/colex.hxx index 39778f503d2a..9d2e666309d4 100644 --- a/sw/source/ui/inc/colex.hxx +++ b/sw/source/ui/inc/colex.hxx @@ -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 @@ -74,8 +74,8 @@ public: class SW_DLLPUBLIC SwColExample : public SwPageExample { - SwColMgr* pColMgr; - + SwColMgr* pColMgr; + using SwPageExample::UpdateExample; protected: diff --git a/sw/source/ui/inc/colmgr.hxx b/sw/source/ui/inc/colmgr.hxx index 641c48e9bb66..78117429aa96 100644 --- a/sw/source/ui/inc/colmgr.hxx +++ b/sw/source/ui/inc/colmgr.hxx @@ -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 @@ -41,48 +41,48 @@ public: ~SwColMgr(); - inline USHORT GetCount() const; - void SetCount(USHORT nCount, USHORT nGutterWidth); - USHORT GetGutterWidth(USHORT nPos = USHRT_MAX) const; - void SetGutterWidth(USHORT nWidth, USHORT nPos = USHRT_MAX); + inline USHORT GetCount() const; + void SetCount(USHORT nCount, USHORT nGutterWidth); + USHORT GetGutterWidth(USHORT nPos = USHRT_MAX) const; + void SetGutterWidth(USHORT nWidth, USHORT nPos = USHRT_MAX); - USHORT GetColWidth(USHORT nIdx) const; - void SetColWidth(USHORT nIdx, USHORT nWidth); + USHORT GetColWidth(USHORT nIdx) const; + void SetColWidth(USHORT nIdx, USHORT nWidth); - inline BOOL IsAutoWidth() const; - void SetAutoWidth(BOOL bOn = TRUE, USHORT lGutterWidth = 0); + inline BOOL IsAutoWidth() const; + void SetAutoWidth(BOOL bOn = TRUE, USHORT lGutterWidth = 0); - inline BOOL HasLine() const; - inline void SetNoLine(); + inline BOOL HasLine() const; + inline void SetNoLine(); - inline void SetLineWidthAndColor(ULONG nWidth, const Color& rCol); - inline ULONG GetLineWidth() const; + inline void SetLineWidthAndColor(ULONG nWidth, const Color& rCol); + inline ULONG GetLineWidth() const; inline const Color& GetLineColor() const; inline SwColLineAdj GetAdjust() const; - inline void SetAdjust(SwColLineAdj); + inline void SetAdjust(SwColLineAdj); - short GetLineHeightPercent() const; - void SetLineHeightPercent(short nPercent); + short GetLineHeightPercent() const; + void SetLineHeightPercent(short nPercent); - inline void NoCols(); - void Update(); + inline void NoCols(); + void Update(); - const SwFmtCol& GetColumns() const { return aFmtCol; } + const SwFmtCol& GetColumns() const { return aFmtCol; } - void SetActualWidth(USHORT nW); - USHORT GetActualSize() const { return nWidth; } + void SetActualWidth(USHORT nW); + USHORT GetActualSize() const { return nWidth; } private: - SwFmtCol aFmtCol; - USHORT nWidth; + SwFmtCol aFmtCol; + USHORT nWidth; }; // INLINE METHODE -------------------------------------------------------- -inline USHORT SwColMgr::GetCount() const +inline USHORT SwColMgr::GetCount() const { return aFmtCol.GetNumCols(); } @@ -91,7 +91,7 @@ inline void SwColMgr::SetLineWidthAndColor(ULONG nLWidth, const Color& r aFmtCol.SetLineWidth(nLWidth); aFmtCol.SetLineColor(rCol); } -inline ULONG SwColMgr::GetLineWidth() const +inline ULONG SwColMgr::GetLineWidth() const { return aFmtCol.GetLineWidth(); } @@ -99,11 +99,11 @@ inline const Color& SwColMgr::GetLineColor() const { return aFmtCol.GetLineColor(); } -inline SwColLineAdj SwColMgr::GetAdjust() const +inline SwColLineAdj SwColMgr::GetAdjust() const { return aFmtCol.GetLineAdj(); } -inline void SwColMgr::SetAdjust(SwColLineAdj eAdj) +inline void SwColMgr::SetAdjust(SwColLineAdj eAdj) { aFmtCol.SetLineAdj(eAdj); } @@ -115,7 +115,7 @@ inline void SwColMgr::SetAutoWidth(BOOL bOn, USHORT nGutterWidth) { aFmtCol.SetOrtho(bOn, nGutterWidth, nWidth); } -inline void SwColMgr::NoCols() +inline void SwColMgr::NoCols() { aFmtCol.GetColumns().DeleteAndDestroy(0, aFmtCol.GetColumns().Count()); } diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index 1cc6ecf33cb9..7da371213a64 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.hxx @@ -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 @@ -69,28 +69,28 @@ class SwColumnPage; class SwColumnDlg : public SfxModalDialog { - OKButton aOK; - CancelButton aCancel; - HelpButton aHelp; + OKButton aOK; + CancelButton aCancel; + HelpButton aHelp; - FixedText aApplyToFT; - ListBox aApplyToLB; + FixedText aApplyToFT; + ListBox aApplyToLB; - SwWrtShell& rWrtShell; - SwColumnPage* pTabPage; - SfxItemSet* pPageSet; - SfxItemSet* pSectionSet; - SfxItemSet* pSelectionSet; - SfxItemSet* pFrameSet; + SwWrtShell& rWrtShell; + SwColumnPage* pTabPage; + SfxItemSet* pPageSet; + SfxItemSet* pSectionSet; + SfxItemSet* pSelectionSet; + SfxItemSet* pFrameSet; - long nOldSelection; - long nSelectionWidth; - long nPageWidth; + long nOldSelection; + long nSelectionWidth; + long nPageWidth; - BOOL bPageChanged : 1; - BOOL bSectionChanged : 1; - BOOL bSelSectionChanged : 1; - BOOL bFrameChanged : 1; + BOOL bPageChanged : 1; + BOOL bSectionChanged : 1; + BOOL bSelSectionChanged : 1; + BOOL bFrameChanged : 1; DECL_LINK(ObjectHdl, ListBox*); @@ -100,7 +100,7 @@ public: SwColumnDlg(Window* pParent, SwWrtShell& rSh); virtual ~SwColumnDlg(); - SwWrtShell& GetWrtShell() { return rWrtShell; } + SwWrtShell& GetWrtShell() { return rWrtShell; } }; /*-----------------07.03.97 08.26------------------- @@ -113,46 +113,46 @@ class ColumnValueSet : public ValueSet ValueSet(pParent, rResId){} ~ColumnValueSet(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; /*-------------------------------------------------------------------- - Beschreibung: Spaltendialog jetzt als TabPage + Beschreibung: Spaltendialog jetzt als TabPage --------------------------------------------------------------------*/ class SwColumnPage : public SfxTabPage { - FixedText aClNrLbl; - NumericField aCLNrEdt; - ColumnValueSet aDefaultVS; - ImageList aPreColsIL; - CheckBox aBalanceColsCB; - FixedLine aFLGroup; - - ImageButton aBtnUp; + FixedText aClNrLbl; + NumericField aCLNrEdt; + ColumnValueSet aDefaultVS; + ImageList aPreColsIL; + CheckBox aBalanceColsCB; + FixedLine aFLGroup; + + ImageButton aBtnUp; FixedText aColumnFT; - FixedText aWidthFT; - FixedText aDistFT; + FixedText aWidthFT; + FixedText aDistFT; FixedText aLbl1; - PercentField aEd1; - PercentField aDistEd1; + PercentField aEd1; + PercentField aDistEd1; FixedText aLbl2; - PercentField aEd2; - PercentField aDistEd2; + PercentField aEd2; + PercentField aDistEd2; FixedText aLbl3; - PercentField aEd3; - ImageButton aBtnDown; - CheckBox aAutoWidthBox; + PercentField aEd3; + ImageButton aBtnDown; + CheckBox aAutoWidthBox; - FixedLine aFLLayout; + FixedLine aFLLayout; - FixedText aLineTypeLbl; - LineListBox aLineTypeDLB; - FixedText aLineHeightLbl; - MetricField aLineHeightEdit; - FixedText aLinePosLbl; - ListBox aLinePosDLB; - FixedLine aFLLineType; + FixedText aLineTypeLbl; + LineListBox aLineTypeDLB; + FixedText aLineHeightLbl; + MetricField aLineHeightEdit; + FixedText aLinePosLbl; + ListBox aLinePosDLB; + FixedLine aFLLineType; FixedLine aVertFL; FixedLine aPropertiesFL; @@ -160,21 +160,21 @@ class SwColumnPage : public SfxTabPage ListBox aTextDirectionLB; // Example - SwColExample aPgeExampleWN; - SwColumnOnlyExample aFrmExampleWN; + SwColExample aPgeExampleWN; + SwColumnOnlyExample aFrmExampleWN; SwColMgr* pColMgr; - USHORT nFirstVis; - USHORT nCols; - long nColWidth[nMaxCols]; - long nColDist[nMaxCols]; - USHORT nMinWidth; - PercentField *pModifiedField; - BOOL bFormat; - BOOL bFrm; - BOOL bHtmlMode; - BOOL bLockUpdate; + USHORT nFirstVis; + USHORT nCols; + long nColWidth[nMaxCols]; + long nColDist[nMaxCols]; + USHORT nMinWidth; + PercentField *pModifiedField; + BOOL bFormat; + BOOL bFrm; + BOOL bHtmlMode; + BOOL bLockUpdate; // Handler DECL_LINK( ColModify, NumericField * ); @@ -186,20 +186,20 @@ class SwColumnPage : public SfxTabPage DECL_LINK( Up, Button * ); DECL_LINK( Down, Button * ); - void Apply(Button *); + void Apply(Button *); DECL_LINK( UpdateColMgr, void* ); - void Update(); - void UpdateCols(); - void Init(); - void ResetColWidth(); - void SetLabels( USHORT nVis ); + void Update(); + void UpdateCols(); + void Init(); + void ResetColWidth(); + void SetLabels( USHORT nVis ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); SwColumnPage(Window *pParent, const SfxItemSet &rSet); @@ -209,8 +209,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static USHORT* GetRanges(); - virtual BOOL FillItemSet(SfxItemSet &rSet); - virtual void Reset(const SfxItemSet &rSet); + virtual BOOL FillItemSet(SfxItemSet &rSet); + virtual void Reset(const SfxItemSet &rSet); void SetFrmMode(BOOL bMod); void SetPageWidth(long nPageWidth); diff --git a/sw/source/ui/inc/conarc.hxx b/sw/source/ui/inc/conarc.hxx index 4b8d01f8d5c3..98d941306251 100644 --- a/sw/source/ui/inc/conarc.hxx +++ b/sw/source/ui/inc/conarc.hxx @@ -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 @@ -44,14 +44,14 @@ public: ConstArc(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); + virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Funktion aktivieren - virtual void Deactivate(); + virtual void Activate(const USHORT nSlotId); // Funktion aktivieren + virtual void Deactivate(); }; -#endif // _CONARC_HXX +#endif // _CONARC_HXX diff --git a/sw/source/ui/inc/concustomshape.hxx b/sw/source/ui/inc/concustomshape.hxx index 5ff08952f28d..ba87a0a414d1 100644 --- a/sw/source/ui/inc/concustomshape.hxx +++ b/sw/source/ui/inc/concustomshape.hxx @@ -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 @@ -55,7 +55,7 @@ class ConstCustomShape : public SwDrawBase virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const USHORT nSlotId); // Function aktivieren rtl::OUString GetShapeType() const; static rtl::OUString GetShapeTypeFromRequest( SfxRequest& rReq ); @@ -68,5 +68,5 @@ class ConstCustomShape : public SwDrawBase -#endif // _SW_CONRECT_HXX +#endif // _SW_CONRECT_HXX diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/ui/inc/condedit.hxx index bce44192ae68..ad8c9b1e8df6 100644 --- a/sw/source/ui/inc/condedit.hxx +++ b/sw/source/ui/inc/condedit.hxx @@ -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 @@ -41,16 +41,16 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper { BOOL bBrackets, bEnableDrop; - SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - SW_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + SW_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); public: ConditionEdit( Window* pParent, const ResId& rResId ); - inline void ShowBrackets(BOOL bShow) { bBrackets = bShow; } + inline void ShowBrackets(BOOL bShow) { bBrackets = bShow; } - inline void SetDropEnable( BOOL bFlag ) { bEnableDrop = bFlag; } - inline BOOL IsDropEnable() const { return bEnableDrop; } + inline void SetDropEnable( BOOL bFlag ) { bEnableDrop = bFlag; } + inline BOOL IsDropEnable() const { return bEnableDrop; } }; #endif diff --git a/sw/source/ui/inc/conform.hxx b/sw/source/ui/inc/conform.hxx index 1117da12dc25..e9a0dc8f5409 100644 --- a/sw/source/ui/inc/conform.hxx +++ b/sw/source/ui/inc/conform.hxx @@ -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 @@ -37,7 +37,7 @@ public: // Mouse- & Key-Events virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const USHORT nSlotId); // Function aktivieren virtual void CreateDefaultObject(); }; diff --git a/sw/source/ui/inc/conpoly.hxx b/sw/source/ui/inc/conpoly.hxx index 7fc528fd4d93..9f14b9a138e6 100644 --- a/sw/source/ui/inc/conpoly.hxx +++ b/sw/source/ui/inc/conpoly.hxx @@ -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 @@ -47,9 +47,9 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const USHORT nSlotId); // Function aktivieren }; -#endif // _CONPOLY_HXX +#endif // _CONPOLY_HXX diff --git a/sw/source/ui/inc/conrect.hxx b/sw/source/ui/inc/conrect.hxx index 3490aa4d9faa..dd143f342545 100644 --- a/sw/source/ui/inc/conrect.hxx +++ b/sw/source/ui/inc/conrect.hxx @@ -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 @@ -42,7 +42,7 @@ class ConstRectangle : public SwDrawBase BOOL bCapVertical; // #93382# - sal_Bool mbVertical; + sal_Bool mbVertical; public: ConstRectangle(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); @@ -51,10 +51,10 @@ class ConstRectangle : public SwDrawBase virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const USHORT nSlotId); // Function aktivieren }; -#endif // _SW_CONRECT_HXX +#endif // _SW_CONRECT_HXX diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx index bfcd31dcba87..12d4f3557ffb 100644 --- a/sw/source/ui/inc/content.hxx +++ b/sw/source/ui/inc/content.hxx @@ -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 @@ -26,7 +26,7 @@ ************************************************************************/ #ifndef _CONTENT_HXX #define _CONTENT_HXX -#include <limits.h> // USHRT_MAX +#include <limits.h> // USHRT_MAX #include "swcont.hxx" #ifndef _MENU_HXX //autogen @@ -42,12 +42,12 @@ class SwTOXBase; class SwRedline; //---------------------------------------------------------------------------- -// Hilfsklassen +// Hilfsklassen //---------------------------------------------------------------------------- class SwPopup : public PopupMenu { - USHORT nCurId; + USHORT nCurId; virtual void Select(){nCurId = GetCurItemId();} public: @@ -55,7 +55,7 @@ public: PopupMenu(), nCurId(USHRT_MAX){} - USHORT GetCurId() const { return nCurId; } + USHORT GetCurId() const { return nCurId; } }; @@ -63,38 +63,38 @@ public: class SwOutlineContent : public SwContent { - USHORT nOutlinePos; - BYTE nOutlineLevel; - BOOL bIsMoveable; + USHORT nOutlinePos; + BYTE nOutlineLevel; + BOOL bIsMoveable; public: - SwOutlineContent( const SwContentType* pCnt, + SwOutlineContent( const SwContentType* pCnt, const String& rName, USHORT nArrPos, BYTE nLevel, BOOL bMove, long nYPos) : - SwContent(pCnt, rName, nYPos), + SwContent(pCnt, rName, nYPos), nOutlinePos(nArrPos), nOutlineLevel(nLevel), bIsMoveable(bMove) {} - USHORT GetPos(){return nOutlinePos;} - BYTE GetOutlineLevel(){return nOutlineLevel;} - BOOL IsMoveable(){return bIsMoveable;}; + USHORT GetPos(){return nOutlinePos;} + BYTE GetOutlineLevel(){return nOutlineLevel;} + BOOL IsMoveable(){return bIsMoveable;}; }; //---------------------------------------------------------------------------- class SwRegionContent : public SwContent { - BYTE nRegionLevel; + BYTE nRegionLevel; public: - SwRegionContent( const SwContentType* pCnt, + SwRegionContent( const SwContentType* pCnt, const String& rName, BYTE nLevel, long nYPos) : SwContent(pCnt, rName, nYPos), nRegionLevel(nLevel){} - BYTE GetRegionLevel() const {return nRegionLevel;} + BYTE GetRegionLevel() const {return nRegionLevel;} }; //---------------------------------------------------------------------------- @@ -104,7 +104,7 @@ class SwURLFieldContent : public SwContent const SwTxtINetFmt* pINetAttr; public: - SwURLFieldContent( const SwContentType* pCnt, + SwURLFieldContent( const SwContentType* pCnt, const String& rName, const String& rURL, const SwTxtINetFmt* pAttr, @@ -112,17 +112,17 @@ public: : SwContent( pCnt, rName, nYPos ), sURL( rURL ), pINetAttr( pAttr ) {} - virtual BOOL IsProtect() const; - const String& GetURL() { return sURL; } - const SwTxtINetFmt* GetINetAttr() { return pINetAttr; } + virtual BOOL IsProtect() const; + const String& GetURL() { return sURL; } + const SwTxtINetFmt* GetINetAttr() { return pINetAttr; } }; //---------------------------------------------------------------------------- class SwPostItContent : public SwContent { - const SwFmtFld* pFld; - SwRedline* pRedline; - bool mbPostIt; + const SwFmtFld* pFld; + SwRedline* pRedline; + bool mbPostIt; public: SwPostItContent( const SwContentType* pCnt, const String& rName, @@ -137,24 +137,24 @@ public: : SwContent( pCnt, rName, nYPos ), pRedline( pRed ),mbPostIt(false) {} - const SwFmtFld* GetPostIt() { return pFld; } - SwRedline* GetRedline() { return pRedline; } - virtual BOOL IsProtect() const; - bool IsPostIt() {return mbPostIt; } + const SwFmtFld* GetPostIt() { return pFld; } + SwRedline* GetRedline() { return pRedline; } + virtual BOOL IsProtect() const; + bool IsPostIt() {return mbPostIt; } }; //---------------------------------------------------------------------------- class SwGraphicContent : public SwContent { - String sLink; + String sLink; public: SwGraphicContent(const SwContentType* pCnt, const String& rName, const String& rLink, long nYPos) : SwContent( pCnt, rName, nYPos ), sLink( rLink ) {} virtual ~SwGraphicContent(); - const String& GetLink() const {return sLink;} + const String& GetLink() const {return sLink;} }; //---------------------------------------------------------------------------- @@ -180,45 +180,45 @@ public: class SwContentType : public SwTypeNumber { - SwWrtShell* pWrtShell; - SwContentArr* pMember; // Array fuer Inhalte - String sContentTypeName; // Name der Inhaltsform - String sSingleContentTypeName; // Name der Inhaltsform, Singular - String sTypeToken; // Anhaengsel fuer URL - USHORT nMemberCount; // Inhaltsanzahl - USHORT nContentType; // Id der Inhaltsform - BYTE nOutlineLevel; - BOOL bMemberFilled : 1; // wurden die Inhalte bereits eingefuegt? - BOOL bIsInternalDrag:1; // koennen die Inhalte verschoben werden? - BOOL bDataValid : 1; // - BOOL bEdit: 1; // kann diese Type bearbeitet werden ? - BOOL bDelete: 1; // kann diese Type geloescht werden ? + SwWrtShell* pWrtShell; + SwContentArr* pMember; // Array fuer Inhalte + String sContentTypeName; // Name der Inhaltsform + String sSingleContentTypeName; // Name der Inhaltsform, Singular + String sTypeToken; // Anhaengsel fuer URL + USHORT nMemberCount; // Inhaltsanzahl + USHORT nContentType; // Id der Inhaltsform + BYTE nOutlineLevel; + BOOL bMemberFilled : 1; // wurden die Inhalte bereits eingefuegt? + BOOL bIsInternalDrag:1; // koennen die Inhalte verschoben werden? + BOOL bDataValid : 1; // + BOOL bEdit: 1; // kann diese Type bearbeitet werden ? + BOOL bDelete: 1; // kann diese Type geloescht werden ? protected: - void RemoveNewline(String&); + void RemoveNewline(String&); public: SwContentType(SwWrtShell* pParent, USHORT nType, BYTE nLevel ); ~SwContentType(); - void Init(BOOL* pbInvalidateWindow = 0); - void FillMemberList(BOOL* pbLevelChanged = NULL); - USHORT GetMemberCount() const + void Init(BOOL* pbInvalidateWindow = 0); + void FillMemberList(BOOL* pbLevelChanged = NULL); + USHORT GetMemberCount() const {return nMemberCount;}; - USHORT GetType() const {return nContentType;} - const SwContent* GetMember(USHORT nIndex); - const String& GetName() {return sContentTypeName;} - const String& GetSingleName() const {return sSingleContentTypeName;} - const String& GetTypeToken() const{return sTypeToken;} + USHORT GetType() const {return nContentType;} + const SwContent* GetMember(USHORT nIndex); + const String& GetName() {return sContentTypeName;} + const String& GetSingleName() const {return sSingleContentTypeName;} + const String& GetTypeToken() const{return sTypeToken;} - void SetOutlineLevel(BYTE nNew) + void SetOutlineLevel(BYTE nNew) { nOutlineLevel = nNew; Invalidate(); } - void Invalidate(); // nur nMemberCount wird neu gelesen + void Invalidate(); // nur nMemberCount wird neu gelesen - BOOL IsEditable() const {return bEdit;} - BOOL IsDeletable() const {return bDelete;} + BOOL IsEditable() const {return bEdit;} + BOOL IsDeletable() const {return bDelete;} }; #endif diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx index d3a84b0bdb78..1b56866e4d8d 100644 --- a/sw/source/ui/inc/conttree.hxx +++ b/sw/source/ui/inc/conttree.hxx @@ -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 @@ -30,6 +30,9 @@ #include <svtools/svtreebx.hxx> #include "swcont.hxx" +#include<map> +//using namespace std; + class SwWrtShell; class SwContentType; class SwNavigationPI; @@ -41,60 +44,62 @@ class SwGlblDocContent; class SfxObjectShell; -#define EDIT_MODE_EDIT 0 -#define EDIT_MODE_UPD_IDX 1 -#define EDIT_MODE_RMV_IDX 2 -#define EDIT_UNPROTECT_TABLE 3 -#define EDIT_MODE_DELETE 4 -#define EDIT_MODE_RENAME 5 +#define EDIT_MODE_EDIT 0 +#define EDIT_MODE_UPD_IDX 1 +#define EDIT_MODE_RMV_IDX 2 +#define EDIT_UNPROTECT_TABLE 3 +#define EDIT_MODE_DELETE 4 +#define EDIT_MODE_RENAME 5 //---------------------------------------------------------------------------- //---------------------------------------------------------------------------- class SwContentTree : public SvTreeListBox { - ImageList aEntryImages; - String sSpace; - AutoTimer aUpdTimer; + ImageList aEntryImages; + String sSpace; + AutoTimer aUpdTimer; - SwContentType* aActiveContentArr[CONTENT_TYPE_MAX]; - SwContentType* aHiddenContentArr[CONTENT_TYPE_MAX]; - String aContextStrings[CONTEXT_COUNT + 1]; + SwContentType* aActiveContentArr[CONTENT_TYPE_MAX]; + SwContentType* aHiddenContentArr[CONTENT_TYPE_MAX]; + String aContextStrings[CONTEXT_COUNT + 1]; String sRemoveIdx; String sUpdateIdx; String sUnprotTbl; - String sRename; - String sReadonlyIdx; - String sInvisible; - String sPostItShow; - String sPostItHide; - String sPostItDelete; + String sRename; + String sReadonlyIdx; + String sInvisible; + String sPostItShow; + String sPostItHide; + String sPostItDelete; - SwWrtShell* pHiddenShell; // gedropptes Doc - SwWrtShell* pActiveShell; // die aktive oder eine konst. offene View - SwNavigationConfig* pConfig; + SwWrtShell* pHiddenShell; // gedropptes Doc + SwWrtShell* pActiveShell; // die aktive oder eine konst. offene View + SwNavigationConfig* pConfig; + + std::map< void*, sal_Bool > mOutLineNodeMap; sal_Int32 nActiveBlock; - USHORT nHiddenBlock; - USHORT nRootType; - USHORT nLastSelType; - BYTE nOutlineLevel; - - BOOL bIsActive :1; - BOOL bIsConstant :1; - BOOL bIsHidden :1; - BOOL bDocChgdInDragging :1; - BOOL bIsInternalDrag :1; - BOOL bIsRoot :1; - BOOL bIsIdleClear :1; - BOOL bIsLastReadOnly :1; - BOOL bIsOutlineMoveable :1; - BOOL bViewHasChanged :1; - BOOL bIsImageListInitialized : 1; - - static BOOL bIsInDrag; - - void FindActiveTypeAndRemoveUserData(); + USHORT nHiddenBlock; + USHORT nRootType; + USHORT nLastSelType; + BYTE nOutlineLevel; + + BOOL bIsActive :1; + BOOL bIsConstant :1; + BOOL bIsHidden :1; + BOOL bDocChgdInDragging :1; + BOOL bIsInternalDrag :1; + BOOL bIsRoot :1; + BOOL bIsIdleClear :1; + BOOL bIsLastReadOnly :1; + BOOL bIsOutlineMoveable :1; + BOOL bViewHasChanged :1; + BOOL bIsImageListInitialized : 1; + + static BOOL bIsInDrag; + + void FindActiveTypeAndRemoveUserData(); using SvLBox::ExecuteDrop; using SvTreeListBox::EditEntry; @@ -104,22 +109,22 @@ class SwContentTree : public SvTreeListBox protected: // virtual void Command( const CommandEvent& rCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); virtual void DataChanged( const DataChangedEvent& rDCEvt ); SwNavigationPI* GetParentWindow(){return (SwNavigationPI*)Window::GetParent();} - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual void DragFinished( sal_Int8 ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void DragFinished( sal_Int8 ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - sal_Bool FillTransferData( TransferDataContainer& rTransfer, + sal_Bool FillTransferData( TransferDataContainer& rTransfer, sal_Int8& rDragMode ); - BOOL HasContentChanged(); + BOOL HasContentChanged(); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* ); @@ -137,10 +142,10 @@ protected: ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); - void EditEntry( SvLBoxEntry* pEntry, BYTE nMode ); - - void GotoContent(SwContent* pCnt); - static void SetInDrag(BOOL bSet) {bIsInDrag = bSet;} + void EditEntry( SvLBoxEntry* pEntry, BYTE nMode ); + + void GotoContent(SwContent* pCnt); + static void SetInDrag(BOOL bSet) {bIsInDrag = bSet;} virtual PopupMenu* CreateContextMenu( void ); virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ); @@ -149,57 +154,57 @@ public: SwContentTree(Window* pParent, const ResId& rResId); ~SwContentTree(); - BOOL ToggleToRoot(); - BOOL IsRoot() const {return bIsRoot;} - USHORT GetRootType() const {return nRootType;} - void SetRootType(USHORT nType); - void Display( BOOL bActiveView ); - void Clear(); - void SetHiddenShell(SwWrtShell* pSh); - void ShowHiddenShell(); - void ShowActualView(); - void SetActiveShell(SwWrtShell* pSh); - void SetConstantShell(SwWrtShell* pSh); - - SwWrtShell* GetWrtShell() + BOOL ToggleToRoot(); + BOOL IsRoot() const {return bIsRoot;} + USHORT GetRootType() const {return nRootType;} + void SetRootType(USHORT nType); + void Display( BOOL bActiveView ); + void Clear(); + void SetHiddenShell(SwWrtShell* pSh); + void ShowHiddenShell(); + void ShowActualView(); + void SetActiveShell(SwWrtShell* pSh); + void SetConstantShell(SwWrtShell* pSh); + + SwWrtShell* GetWrtShell() {return bIsActive||bIsConstant ? pActiveShell : pHiddenShell;} - static BOOL IsInDrag() {return bIsInDrag;} - BOOL IsInternalDrag() const {return bIsInternalDrag != 0;} + static BOOL IsInDrag() {return bIsInDrag;} + BOOL IsInternalDrag() const {return bIsInternalDrag != 0;} sal_Int32 GetActiveBlock() const {return nActiveBlock;} - BYTE GetOutlineLevel()const {return nOutlineLevel;} - void SetOutlineLevel(BYTE nSet); - - BOOL Expand( SvLBoxEntry* pParent ); - - BOOL Collapse( SvLBoxEntry* pParent ); - - void ExecCommand(USHORT nCmd, BOOL bModifier); - - void ShowTree(); - void HideTree(); - - BOOL IsConstantView() {return bIsConstant;} - BOOL IsActiveView() {return bIsActive;} - BOOL IsHiddenView() {return bIsHidden;} - - const SwWrtShell* GetActiveWrtShell() {return pActiveShell;} - SwWrtShell* GetHiddenWrtShell() {return pHiddenShell;} + BYTE GetOutlineLevel()const {return nOutlineLevel;} + void SetOutlineLevel(BYTE nSet); + + BOOL Expand( SvLBoxEntry* pParent ); + + BOOL Collapse( SvLBoxEntry* pParent ); + + void ExecCommand(USHORT nCmd, BOOL bModifier); + + void ShowTree(); + void HideTree(); + + BOOL IsConstantView() {return bIsConstant;} + BOOL IsActiveView() {return bIsActive;} + BOOL IsHiddenView() {return bIsHidden;} + + const SwWrtShell* GetActiveWrtShell() {return pActiveShell;} + SwWrtShell* GetHiddenWrtShell() {return pHiddenShell;} DECL_LINK( ContentDoubleClickHdl, SwContentTree * ); // DECL_LINK( PopupHdl, Menu* ); DECL_LINK( TimerUpdate, Timer * ); virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); - virtual void RequestingChilds( SvLBoxEntry* pParent ); + virtual void RequestingChilds( SvLBoxEntry* pParent ); virtual void GetFocus(); virtual void KeyInput(const KeyEvent& rKEvt); - - virtual BOOL Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE ); + + virtual BOOL Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE ); }; @@ -226,10 +231,10 @@ namespace sfx2 { class FileDialogHelper; } class SwGlobalTree : public SvTreeListBox { private: - AutoTimer aUpdateTimer; - String aContextStrings[GLOBAL_CONTEXT_COUNT]; + AutoTimer aUpdateTimer; + String aContextStrings[GLOBAL_CONTEXT_COUNT]; - ImageList aEntryImages; + ImageList aEntryImages; SwWrtShell* pActiveShell; // SvLBoxEntry* pEmphasisEntry; // Drag'n Drop-Emphasis @@ -240,9 +245,9 @@ private: SwGlblDocContent* pDocContent; sfx2::DocumentInserter* pDocInserter; - BOOL bIsInternalDrag :1; - BOOL bLastEntryEmphasis :1; // Drag'n Drop - BOOL bIsImageListInitialized : 1; + BOOL bIsInternalDrag :1; + BOOL bLastEntryEmphasis :1; // Drag'n Drop + BOOL bIsImageListInitialized : 1; static const SfxObjectShell* pShowShell; @@ -258,12 +263,12 @@ private: protected: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - + virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); virtual BOOL NotifyMoving( SvLBoxEntry* pTarget, @@ -277,8 +282,8 @@ protected: ULONG& rNewChildPos ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual void DragFinished( sal_Int8 ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void DragFinished( sal_Int8 ); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* ); virtual BOOL NotifyAcceptDrop( SvLBoxEntry* ); @@ -286,26 +291,26 @@ protected: virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void KeyInput(const KeyEvent& rKEvt); virtual void GetFocus(); - virtual void SelectHdl(); - virtual void DeselectHdl(); + virtual void SelectHdl(); + virtual void DeselectHdl(); virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); - void Clear(); + void Clear(); - DECL_LINK( PopupHdl, Menu* ); - DECL_LINK( Timeout, Timer* ); - DECL_LINK( DoubleClickHdl, SwGlobalTree * ); + DECL_LINK( PopupHdl, Menu* ); + DECL_LINK( Timeout, Timer* ); + DECL_LINK( DoubleClickHdl, SwGlobalTree * ); - BOOL IsInternalDrag() const {return bIsInternalDrag != 0;} + BOOL IsInternalDrag() const {return bIsInternalDrag != 0;} SwNavigationPI* GetParentWindow() { return (SwNavigationPI*)Window::GetParent(); } - void OpenDoc(const SwGlblDocContent*); - void GotoContent(const SwGlblDocContent*); - USHORT GetEnableFlags() const; + void OpenDoc(const SwGlblDocContent*); + void GotoContent(const SwGlblDocContent*); + USHORT GetEnableFlags() const; - static const SfxObjectShell* GetShowShell() {return pShowShell;} - static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;} + static const SfxObjectShell* GetShowShell() {return pShowShell;} + static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;} DECL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*); virtual PopupMenu* CreateContextMenu( void ); @@ -315,19 +320,19 @@ public: SwGlobalTree(Window* pParent, const ResId& rResId); virtual ~SwGlobalTree(); - void TbxMenuHdl(USHORT nTbxId, ToolBox* pBox); - void InsertRegion( const SwGlblDocContent* pCont, + void TbxMenuHdl(USHORT nTbxId, ToolBox* pBox); + void InsertRegion( const SwGlblDocContent* pCont, const String* pFileName = 0 ); - void EditContent(const SwGlblDocContent* pCont ); - - void ShowTree(); - void HideTree(); - - void ExecCommand(USHORT nCmd); + void EditContent(const SwGlblDocContent* pCont ); + + void ShowTree(); + void HideTree(); - void Display(BOOL bOnlyUpdateUserData = FALSE); + void ExecCommand(USHORT nCmd); - BOOL Update(BOOL bHard); + void Display(BOOL bOnlyUpdateUserData = FALSE); + + BOOL Update(BOOL bHard); }; #endif diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx index fc1879bc4f2d..5b80bdc2b7f4 100644 --- a/sw/source/ui/inc/convert.hxx +++ b/sw/source/ui/inc/convert.hxx @@ -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,35 +43,35 @@ struct SwInsertTableOptions; class SwConvertTableDlg: public SfxModalDialog { - RadioButton aTabBtn; - RadioButton aSemiBtn; - RadioButton aParaBtn; - RadioButton aOtherBtn; - Edit aOtherEd; - CheckBox aKeepColumn; + RadioButton aTabBtn; + RadioButton aSemiBtn; + RadioButton aParaBtn; + RadioButton aOtherBtn; + Edit aOtherEd; + CheckBox aKeepColumn; FixedLine aDelimFL; - CheckBox aHeaderCB; - CheckBox aRepeatHeaderCB; - + CheckBox aHeaderCB; + CheckBox aRepeatHeaderCB; + FixedText aRepeatHeaderFT; // "dummy" to build before and after FT FixedText aRepeatHeaderBeforeFT; NumericField aRepeatHeaderNF; FixedText aRepeatHeaderAfterFT; TextControlCombo aRepeatHeaderCombo; - + FixedLine aOptionsFL; CheckBox aDontSplitCB; - CheckBox aBorderCB; + CheckBox aBorderCB; PushButton aAutoFmtBtn; - OKButton aOkBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOkBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; - String sConvertTextTable; - SwTableAutoFmt* pTAutoFmt; - SwWrtShell* pShell; + String sConvertTextTable; + SwTableAutoFmt* pTAutoFmt; + SwWrtShell* pShell; DECL_LINK( AutoFmtHdl, PushButton* ); DECL_LINK( BtnHdl, Button* ); diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx index edb8590d5c8f..96b0bd091196 100644 --- a/sw/source/ui/inc/cption.hxx +++ b/sw/source/ui/inc/cption.hxx @@ -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 @@ -77,28 +77,28 @@ class SwCaptionDialog : public SvxStandardDialog : ComboBox( pParent, rResId ) {} - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); }; - FixedText aTextText; - Edit aTextEdit; + FixedText aTextText; + Edit aTextEdit; FixedLine aSettingsFL; - FixedText aCategoryText; - CategoryBox aCategoryBox; - FixedText aFormatText; - ListBox aFormatBox; - //#i61007# order of captions + FixedText aCategoryText; + CategoryBox aCategoryBox; + FixedText aFormatText; + ListBox aFormatBox; + //#i61007# order of captions FixedText aNumberingSeparatorFT; Edit aNumberingSeparatorED; FixedText aSepText; Edit aSepEdit; - FixedText aPosText; - ListBox aPosBox; - OKButton aOKButton; + FixedText aPosText; + ListBox aPosBox; + OKButton aOKButton; CancelButton aCancelButton; - HelpButton aHelpButton; + HelpButton aHelpButton; PushButton aAutoCaptionButton; - PushButton aOptionButton; + PushButton aOptionButton; String sNone; @@ -110,11 +110,11 @@ class SwCaptionDialog : public SvxStandardDialog String sCharacterStyle; String sObjectName; - bool bCopyAttributes; + bool bCopyAttributes; bool bOrderNumberingFirst; //#i61007# order of captions - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xNameAccess; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > xNamed; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xNameAccess; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > xNamed; DECL_LINK( SelectHdl, ListBox * ); DECL_LINK( ModifyHdl, Edit * ); @@ -125,7 +125,7 @@ class SwCaptionDialog : public SvxStandardDialog void DrawSample(); void CheckButtonWidth(); - void ApplyCaptionOrder(); //#i61007# order of captions + void ApplyCaptionOrder(); //#i61007# order of captions public: SwCaptionDialog( Window *pParent, SwView &rV ); diff --git a/sw/source/ui/inc/dbconfig.hxx b/sw/source/ui/inc/dbconfig.hxx index 2e82249b84b9..39efabdef450 100644 --- a/sw/source/ui/inc/dbconfig.hxx +++ b/sw/source/ui/inc/dbconfig.hxx @@ -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,8 +43,8 @@ public: SwDBConfig(); virtual ~SwDBConfig(); - void Load(); - const SwDBData& GetAddressSource(); + void Load(); + const SwDBData& GetAddressSource(); const SwDBData& GetBibliographySource(); virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx index c0a530de9f3a..737825f3b543 100644 --- a/sw/source/ui/inc/dbinsdlg.hxx +++ b/sw/source/ui/inc/dbinsdlg.hxx @@ -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 @@ -98,59 +98,59 @@ SV_DECL_PTRARR_SORT_DEL( SwInsDBColumns, SwInsDBColumnPtr, 32, 32 ) class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem { - FixedText aFtInsertData; - RadioButton aRbAsTable; - RadioButton aRbAsField; - RadioButton aRbAsText; + FixedText aFtInsertData; + RadioButton aRbAsTable; + RadioButton aRbAsField; + RadioButton aRbAsText; FixedLine aFlHead; - FixedText aFtDbColumn; + FixedText aFtDbColumn; - ListBox aLbTblDbColumn; - ListBox aLbTxtDbColumn; + ListBox aLbTblDbColumn; + ListBox aLbTxtDbColumn; FixedLine aFlFormat; - RadioButton aRbDbFmtFromDb; - RadioButton aRbDbFmtFromUsr; + RadioButton aRbDbFmtFromDb; + RadioButton aRbDbFmtFromUsr; NumFormatListBox aLbDbFmtFromUsr; /* ----- Page Text/Field ------- */ ImageButton aIbDbcolToEdit; - MultiLineEdit aEdDbText; - FixedText aFtDbParaColl; - ListBox aLbDbParaColl; + MultiLineEdit aEdDbText; + FixedText aFtDbParaColl; + ListBox aLbDbParaColl; /* ----- Page Table ------------ */ ImageButton aIbDbcolAllTo; ImageButton aIbDbcolOneTo; ImageButton aIbDbcolOneFrom; ImageButton aIbDbcolAllFrom; - FixedText aFtTableCol; - ListBox aLbTableCol; - CheckBox aCbTableHeadon; - RadioButton aRbHeadlColnms; - RadioButton aRbHeadlEmpty; - PushButton aPbTblFormat; - PushButton aPbTblAutofmt; - - OKButton aBtOk; - CancelButton aBtCancel; - HelpButton aBtHelp; + FixedText aFtTableCol; + ListBox aLbTableCol; + CheckBox aCbTableHeadon; + RadioButton aRbHeadlColnms; + RadioButton aRbHeadlEmpty; + PushButton aPbTblFormat; + PushButton aPbTblAutofmt; + + OKButton aBtOk; + CancelButton aBtCancel; + HelpButton aBtHelp; FixedLine aFlBottom; SwInsDBColumns aDBColumns; - const SwDBData aDBData; + const SwDBData aDBData; - Link aOldNumFmtLnk; - String sNoTmpl; + Link aOldNumFmtLnk; + String sNoTmpl; - SwView* pView; - SwTableAutoFmt* pTAutoFmt; + SwView* pView; + SwTableAutoFmt* pTAutoFmt; - SfxItemSet* pTblSet; - SwTableRep* pRep; - USHORT nGBFmtLen; + SfxItemSet* pTblSet; + SwTableRep* pRep; + USHORT nGBFmtLen; DECL_LINK( PageHdl, Button* ); DECL_LINK( AutoFmtHdl, PushButton* ); @@ -164,8 +164,8 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem BOOL SplitTextToColArr( const String& rTxt, _DB_Columns& rColArr, BOOL bInsField ); using SfxModalDialog::Notify; virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - virtual void Commit(); - void Load(); + virtual void Commit(); + void Load(); // setze die Tabellen - Eigenschaften void SetTabSet(); diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx index d6c81e2e5ce8..70403bd34308 100644 --- a/sw/source/ui/inc/dbtree.hxx +++ b/sw/source/ui/inc/dbtree.hxx @@ -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 @@ -44,23 +44,23 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox { ImageList aImageList; ImageList aImageListHC; - Image aDBBMP; - Image aTableBMP; - Image aQueryBMP; + Image aDBBMP; + Image aTableBMP; + Image aQueryBMP; - String sDefDBName; - BOOL bInitialized; - BOOL bShowColumns; + String sDefDBName; + BOOL bInitialized; + BOOL bShowColumns; SwDBTreeList_Impl* pImpl; SW_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* ); - SW_DLLPRIVATE void InitTreeList(); - SW_DLLPRIVATE virtual void RequestingChilds( SvLBoxEntry* pParent ); + SW_DLLPRIVATE void InitTreeList(); + SW_DLLPRIVATE virtual void RequestingChilds( SvLBoxEntry* pParent ); SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - SW_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + SW_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); using SvTreeListBox::Select; @@ -73,12 +73,12 @@ public: String GetDBName( String& rTableName, String& rColumnName, BOOL* pbIsTable = 0); - void Select( const String& rDBName, const String& rTableName, + void Select( const String& rDBName, const String& rTableName, const String& rColumnName ); - void ShowColumns(BOOL bShowCol); + void ShowColumns(BOOL bShowCol); void SetWrtShell(SwWrtShell& rSh); - + void AddDataSource(const String& rSource); }; diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/ui/inc/dbui.hxx index 2c8e9cdf02c7..fda482126ae8 100644 --- a/sw/source/ui/inc/dbui.hxx +++ b/sw/source/ui/inc/dbui.hxx @@ -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 @@ -44,14 +44,14 @@ public: MONITOR_TYPE_MAIL, MONITOR_TYPE_SAVE }; - FixedText aDocName; - FixedText aPrinting; - FixedText aPrinter; - FixedText aPrintInfo; - CancelButton aCancel; + FixedText aDocName; + FixedText aPrinting; + FixedText aPrinter; + FixedText aPrintInfo; + CancelButton aCancel; PrintMonitor( Window *pParent, PrintMonitorType eType ); - + void ResizeControls(); }; @@ -69,11 +69,11 @@ private: //methods void UpdateCountingText(); private: //member - FixedText m_aStatus; - FixedText m_aProgress; - FixedText m_aCreateDocuments; - FixedText m_aCounting; - CancelButton m_aCancelButton; + FixedText m_aStatus; + FixedText m_aProgress; + FixedText m_aCreateDocuments; + FixedText m_aCounting; + CancelButton m_aCancelButton; String m_sCountingPattern; String m_sVariable_Total; diff --git a/sw/source/ui/inc/dialmgr.hxx b/sw/source/ui/inc/dialmgr.hxx index ebd9731c5e0a..a5e8bb8864ab 100644 --- a/sw/source/ui/inc/dialmgr.hxx +++ b/sw/source/ui/inc/dialmgr.hxx @@ -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 @@ -36,13 +36,13 @@ class ResMgr; struct SwDialogsResMgr { - static ResMgr* GetResMgr(); + static ResMgr* GetResMgr(); }; -#define SWDIALOG_MGR() SwDialogsResMgr::GetResMgr() -#define SW_RES(i) ResId(i,SWDIALOG_MGR()) -#define SW_RESSTR(i) UniString(ResId(i,SWDIALOG_MGR())) -#define SW_RESSSTR(i) String(ResId(i,SWDIALOG_MGR())) +#define SWDIALOG_MGR() SwDialogsResMgr::GetResMgr() +#define SW_RES(i) ResId(i,SWDIALOG_MGR()) +#define SW_RESSTR(i) UniString(ResId(i,SWDIALOG_MGR())) +#define SW_RESSSTR(i) String(ResId(i,SWDIALOG_MGR())) #endif diff --git a/sw/source/ui/inc/docfnote.hxx b/sw/source/ui/inc/docfnote.hxx index b3ffde863596..678ee196d708 100644 --- a/sw/source/ui/inc/docfnote.hxx +++ b/sw/source/ui/inc/docfnote.hxx @@ -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/inc/docstdlg.hxx b/sw/source/ui/inc/docstdlg.hxx index f269693975cc..db7d707e233d 100644 --- a/sw/source/ui/inc/docstdlg.hxx +++ b/sw/source/ui/inc/docstdlg.hxx @@ -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 @@ -73,11 +73,11 @@ private: FixedInfo aCharNo; FixedInfo aLineNo; - PushButton aUpdatePB; + PushButton aUpdatePB; SwDocStat aDocStat; void Update(); - + using Window::SetData; void SetData(const SwDocStat &rStat); }; diff --git a/sw/source/ui/inc/drawbase.hxx b/sw/source/ui/inc/drawbase.hxx index 783bd730a86d..1d1543b42c4e 100644 --- a/sw/source/ui/inc/drawbase.hxx +++ b/sw/source/ui/inc/drawbase.hxx @@ -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 @@ -35,7 +35,7 @@ class SwEditWin; class KeyEvent; class MouseEvent; -#define MIN_FREEHAND_DISTANCE 10 +#define MIN_FREEHAND_DISTANCE 10 /************************************************************************* |* @@ -60,8 +60,8 @@ public: SwDrawBase(SwWrtShell *pSh, SwEditWin* pWin, SwView* pView); virtual ~SwDrawBase(); - void SetDrawPointer(); - void EnterSelectMode(const MouseEvent& rMEvt); + void SetDrawPointer(); + void EnterSelectMode(const MouseEvent& rMEvt); inline BOOL IsInsertForm() const { return m_bInsForm; } inline BOOL IsCreateObj() const { return m_bCreateObj; } @@ -71,12 +71,12 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - void BreakCreate(); + void BreakCreate(); void SetSlotId(USHORT nSlot) {m_nSlotId = nSlot;} USHORT GetSlotId() { return m_nSlotId;} - virtual void Activate(const USHORT nSlotId); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren virtual void CreateDefaultObject(); @@ -86,5 +86,5 @@ public: -#endif // _SW_DRAWBASE_HXX +#endif // _SW_DRAWBASE_HXX diff --git a/sw/source/ui/inc/drawsh.hxx b/sw/source/ui/inc/drawsh.hxx index deb0849d66a0..13f5c6a0714d 100644 --- a/sw/source/ui/inc/drawsh.hxx +++ b/sw/source/ui/inc/drawsh.hxx @@ -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 @@ -39,14 +39,14 @@ public: SwDrawShell(SwView &rView); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); - void ExecDrawDlg(SfxRequest& rReq); - void ExecDrawAttrArgs(SfxRequest& rReq); - void GetDrawAttrState(SfxItemSet &rSet); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); + void ExecDrawDlg(SfxRequest& rReq); + void ExecDrawAttrArgs(SfxRequest& rReq); + void GetDrawAttrState(SfxItemSet &rSet); - void ExecFormText(SfxRequest& rReq); - void GetFormTextState(SfxItemSet& rSet); + void ExecFormText(SfxRequest& rReq); + void GetFormTextState(SfxItemSet& rSet); }; #endif diff --git a/sw/source/ui/inc/drformsh.hxx b/sw/source/ui/inc/drformsh.hxx index 8648742b1f99..863f88f6a4bc 100644 --- a/sw/source/ui/inc/drformsh.hxx +++ b/sw/source/ui/inc/drformsh.hxx @@ -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 @@ -38,10 +38,10 @@ public: TYPEINFO(); SwDrawFormShell(SwView &rView); - virtual ~SwDrawFormShell(); + virtual ~SwDrawFormShell(); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); }; #endif diff --git a/sw/source/ui/inc/drpcps.hxx b/sw/source/ui/inc/drpcps.hxx index 50140443f726..42132634e79a 100644 --- a/sw/source/ui/inc/drpcps.hxx +++ b/sw/source/ui/inc/drpcps.hxx @@ -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 @@ -72,27 +72,27 @@ class SwDropCapsPage : public SfxTabPage { friend class SwDropCapsPict; - CheckBox aDropCapsBox; - CheckBox aWholeWordCB; - FixedText aSwitchText; - NumericField aDropCapsField; - FixedText aLinesText; - NumericField aLinesField; - FixedText aDistanceText; - MetricField aDistanceField; + CheckBox aDropCapsBox; + CheckBox aWholeWordCB; + FixedText aSwitchText; + NumericField aDropCapsField; + FixedText aLinesText; + NumericField aLinesField; + FixedText aDistanceText; + MetricField aDistanceField; FixedLine aSettingsFL; - FixedText aTextText; - Edit aTextEdit; - FixedText aTemplateText; - ListBox aTemplateBox; + FixedText aTextText; + Edit aTextEdit; + FixedText aTemplateText; + ListBox aTemplateBox; FixedLine aContentFL; - SwDropCapsPict *pPict; + SwDropCapsPict *pPict; - BOOL bModified; - BOOL bFormat; - BOOL bHtmlMode; + BOOL bModified; + BOOL bFormat; + BOOL bHtmlMode; SwWrtShell &rSh; @@ -100,7 +100,7 @@ friend class SwDropCapsPict; ~SwDropCapsPage(); virtual int DeactivatePage(SfxItemSet *pSet); - void FillSet( SfxItemSet &rSet ); + void FillSet( SfxItemSet &rSet ); DECL_LINK( ClickHdl, Button * ); DECL_LINK( ModifyHdl, Edit * ); @@ -118,7 +118,7 @@ public: virtual BOOL FillItemSet( SfxItemSet &rSet); virtual void Reset (const SfxItemSet &rSet); - void SetFormat(BOOL bSet){bFormat = bSet;} + void SetFormat(BOOL bSet){bFormat = bSet;} }; #endif diff --git a/sw/source/ui/inc/drwbassh.hxx b/sw/source/ui/inc/drwbassh.hxx index dcdd1c1b427d..5b74d23af66a 100644 --- a/sw/source/ui/inc/drwbassh.hxx +++ b/sw/source/ui/inc/drwbassh.hxx @@ -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 @@ -36,11 +36,11 @@ struct SvxSwFrameValidation; class SwDrawBaseShell: public SwBaseShell { - SwDrawBase* pDrawActual; + SwDrawBase* pDrawActual; - UINT16 eDrawMode; - BOOL bRotate : 1; - BOOL bSelMove: 1; + UINT16 eDrawMode; + BOOL bRotate : 1; + BOOL bSelMove: 1; DECL_LINK( CheckGroupShapeNameHdl, AbstractSvxNameDialog* ); DECL_LINK(ValidatePosition, SvxSwFrameValidation* ); @@ -51,12 +51,12 @@ public: SFX_DECL_INTERFACE(SW_DRAWBASESHELL) TYPEINFO(); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); - void DisableState(SfxItemSet &rSet) { Disable(rSet);} - BOOL Disable(SfxItemSet& rSet, USHORT nWhich = 0); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); + void DisableState(SfxItemSet &rSet) { Disable(rSet);} + BOOL Disable(SfxItemSet& rSet, USHORT nWhich = 0); - void StateStatusline(SfxItemSet &rSet); + void StateStatusline(SfxItemSet &rSet); }; diff --git a/sw/source/ui/inc/drwtxtsh.hxx b/sw/source/ui/inc/drwtxtsh.hxx index 79aebc4e016a..93b1fbc57916 100644 --- a/sw/source/ui/inc/drwtxtsh.hxx +++ b/sw/source/ui/inc/drwtxtsh.hxx @@ -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 @@ -37,49 +37,49 @@ class SfxModule; class SwDrawTextShell: public SfxShell { - SwView &rView; + SwView &rView; - SdrView *pSdrView; + SdrView *pSdrView; - BOOL bRotate : 1; - BOOL bSelMove: 1; + BOOL bRotate : 1; + BOOL bSelMove: 1; - void SetAttrToMarked(const SfxItemSet& rAttr); + void SetAttrToMarked(const SfxItemSet& rAttr); void InsertSymbol(SfxRequest& rReq); - BOOL IsTextEdit(); + BOOL IsTextEdit(); public: SFX_DECL_INTERFACE(SW_DRWTXTSHELL) TYPEINFO(); - SwView &GetView() { return rView; } + SwView &GetView() { return rView; } SwWrtShell &GetShell(); SwDrawTextShell(SwView &rView); - virtual ~SwDrawTextShell(); + virtual ~SwDrawTextShell(); virtual SfxUndoManager* GetUndoManager(); void StateDisableItems(SfxItemSet &); - void Execute(SfxRequest &); - void ExecDraw(SfxRequest &); - void GetState(SfxItemSet &); - void GetDrawTxtCtrlState(SfxItemSet&); + void Execute(SfxRequest &); + void ExecDraw(SfxRequest &); + void GetState(SfxItemSet &); + void GetDrawTxtCtrlState(SfxItemSet&); - void ExecFontWork(SfxRequest& rReq); - void StateFontWork(SfxItemSet& rSet); - void ExecFormText(SfxRequest& rReq); - void GetFormTextState(SfxItemSet& rSet); - void ExecDrawLingu(SfxRequest &rReq); - void ExecUndo(SfxRequest &rReq); - void StateUndo(SfxItemSet &rSet); - void ExecClpbrd(SfxRequest &rReq); - void StateClpbrd(SfxItemSet &rSet); - void StateInsert(SfxItemSet &rSet); - void ExecTransliteration(SfxRequest &); + void ExecFontWork(SfxRequest& rReq); + void StateFontWork(SfxItemSet& rSet); + void ExecFormText(SfxRequest& rReq); + void GetFormTextState(SfxItemSet& rSet); + void ExecDrawLingu(SfxRequest &rReq); + void ExecUndo(SfxRequest &rReq); + void StateUndo(SfxItemSet &rSet); + void ExecClpbrd(SfxRequest &rReq); + void StateClpbrd(SfxItemSet &rSet); + void StateInsert(SfxItemSet &rSet); + void ExecTransliteration(SfxRequest &); - void Init(); - void StateStatusline(SfxItemSet &rSet); + void Init(); + void StateStatusline(SfxItemSet &rSet); }; #endif diff --git a/sw/source/ui/inc/dselect.hxx b/sw/source/ui/inc/dselect.hxx index 37d3d84832bb..81579d2539e4 100644 --- a/sw/source/ui/inc/dselect.hxx +++ b/sw/source/ui/inc/dselect.hxx @@ -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,10 +43,10 @@ class DrawSelection : public SwDrawBase // Mouse- & Key-Events virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const USHORT nSlotId); // Function aktivieren }; -#endif // _SW_DSELECT_HXX +#endif // _SW_DSELECT_HXX diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index b70a3f75aa96..1e557a294903 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -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 @@ -37,47 +37,47 @@ #define _SVSTDARR_STRINGSISORTDTOR #include <svl/svstdarr.hxx> -class SwWrtShell; -class SwView; -class SwRect; -class ViewShell; -class SwAnchorMarker; -class SdrObject; -class SwShadowCursor; -class DataChangedEvent; +class SwWrtShell; +class SwView; +class SwRect; +class ViewShell; +class SwAnchorMarker; +class SdrObject; +class SwShadowCursor; +class DataChangedEvent; class SvxAutoCorrCfg; class SvxAutoCorrect; class SwPaM; -struct SwApplyTemplate; -struct QuickHelpData; +struct SwApplyTemplate; +struct QuickHelpData; class SdrDropMarkerOverlay; /*-------------------------------------------------------------------- - Beschreibung: Eingabe-Fenster + Beschreibung: Eingabe-Fenster --------------------------------------------------------------------*/ class SwEditWin: public Window, public DropTargetHelper, public DragSourceHelper { -friend void ScrollMDI(ViewShell* pVwSh, const SwRect&, +friend void ScrollMDI(ViewShell* pVwSh, const SwRect&, USHORT nRangeX, USHORT nRangeY); -friend BOOL IsScrollMDI(ViewShell* pVwSh, const SwRect&); +friend BOOL IsScrollMDI(ViewShell* pVwSh, const SwRect&); -friend void SizeNotify(ViewShell* pVwSh, const Size &); +friend void SizeNotify(ViewShell* pVwSh, const Size &); -friend void PageNumNotify( ViewShell* pVwSh, +friend void PageNumNotify( ViewShell* pVwSh, USHORT nPhyNum, USHORT nVirtNum, const String& rPg ); static QuickHelpData* pQuickHlpData; - static BOOL bReplaceQuote; - static long nDDStartPosX, nDDStartPosY; + static BOOL bReplaceQuote; + static long nDDStartPosX, nDDStartPosY; - static Color aTextColor; //Textfarbe, fuer die Giesskanne - static BOOL bTransparentBackColor; // Hintergrund transparent - static Color aTextBackColor; //Texthintergrundfarbe, fuer die Giesskanne + static Color aTextColor; //Textfarbe, fuer die Giesskanne + static BOOL bTransparentBackColor; // Hintergrund transparent + static Color aTextBackColor; //Texthintergrundfarbe, fuer die Giesskanne /* * Timer und Handler fuer das Weiterscrollen, wenn der @@ -85,82 +85,82 @@ friend void PageNumNotify( ViewShell* pVwSh, * EditWin stehen bleibt. In regelmaessigen Intervallen wird * die Selektion in Richtung der Mausposition vergroessert. */ - AutoTimer aTimer; + AutoTimer aTimer; // Timer fuer verschachtelte KeyInputs (z.B. fuer Tabellen) - Timer aKeyInputTimer; + Timer aKeyInputTimer; // timer for ANY-KeyInut question without a following KeyInputEvent - Timer aKeyInputFlushTimer; + Timer aKeyInputFlushTimer; - String aInBuffer; + String aInBuffer; LanguageType eBufferLanguage; - Point aStartPos; - Point aMovePos; - Point aRszMvHdlPt; - Timer aTemplateTimer; + Point aStartPos; + Point aMovePos; + Point aRszMvHdlPt; + Timer aTemplateTimer; // Type/Objecte ueber dem der MousePointer steht SwCallMouseEvent aSaveCallEvent; - SwApplyTemplate *pApplyTempl; - SwAnchorMarker *pAnchorMarker; // zum Verschieben eines Ankers + SwApplyTemplate *pApplyTempl; + SwAnchorMarker *pAnchorMarker; // zum Verschieben eines Ankers - SdrDropMarkerOverlay *pUserMarker; - SdrObject *pUserMarkerObj; - SwShadowCursor *pShadCrsr; - Point *pRowColumnSelectionStart; // save position where table row/column selection has been started + SdrDropMarkerOverlay *pUserMarker; + SdrObject *pUserMarkerObj; + SwShadowCursor *pShadCrsr; + Point *pRowColumnSelectionStart; // save position where table row/column selection has been started - SwView &rView; + SwView &rView; - int aActHitType; // aktueller Mauspointer + int aActHitType; // aktueller Mauspointer ULONG m_nDropFormat; //Format aus dem letzten QueryDrop USHORT m_nDropAction; //Action aus dem letzten QueryDrop USHORT m_nDropDestination; //Ziel aus dem letzten QueryDrop - UINT16 eBezierMode; - UINT16 nInsFrmColCount; //Spaltenzahl fuer interaktiven Rahmen - SdrObjKind eDrawMode; - BOOL bLinkRemoved : 1, - bMBPressed : 1, - bInsDraw : 1, - bInsFrm : 1, - bIsInMove : 1, - bIsInDrag : 1, //StartExecuteDrag nich doppelt ausfuehren - bOldIdle : 1, //Zum abschalten des Idle'ns - bOldIdleSet : 1, //waehrend QeueryDrop - bTblInsDelMode : 1, // - bTblIsInsMode : 1, // - bTblIsColMode : 1, // - bChainMode : 1, //Rahmen verbinden - bWasShdwCrsr : 1, //ShadowCrsr war im MouseButtonDown an + UINT16 eBezierMode; + UINT16 nInsFrmColCount; //Spaltenzahl fuer interaktiven Rahmen + SdrObjKind eDrawMode; + BOOL bLinkRemoved : 1, + bMBPressed : 1, + bInsDraw : 1, + bInsFrm : 1, + bIsInMove : 1, + bIsInDrag : 1, //StartExecuteDrag nich doppelt ausfuehren + bOldIdle : 1, //Zum abschalten des Idle'ns + bOldIdleSet : 1, //waehrend QeueryDrop + bTblInsDelMode : 1, // + bTblIsInsMode : 1, // + bTblIsColMode : 1, // + bChainMode : 1, //Rahmen verbinden + bWasShdwCrsr : 1, //ShadowCrsr war im MouseButtonDown an bLockInput : 1, //Lock waehrend die Rechenleiste aktiv ist bIsRowDrag : 1, //selection of rows is used, in combination with pRowColumnSelectionStart /** #i42732# display status of font size/name depending on either the input language or the selection position depending on what has changed lately */ bUseInputLanguage: 1, - bObjectSelect : 1; + bObjectSelect : 1; USHORT nKS_NUMDOWN_Count; // #i23725# USHORT nKS_NUMINDENTINC_Count; - void LeaveArea(const Point &); - void JustifyAreaTimer(); - inline void EnterArea(); + void LeaveArea(const Point &); + void JustifyAreaTimer(); + inline void EnterArea(); - void RstMBDownFlags(); + void RstMBDownFlags(); - void ChangeFly( BYTE nDir, BOOL bWeb = FALSE ); + void ChangeFly( BYTE nDir, BOOL bWeb = FALSE ); void ChangeDrawing( BYTE nDir ); - BOOL EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos); + BOOL EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos); BOOL RulerColumnDrag( const MouseEvent& rMEvt, BOOL bVerticalMode); //Hilfsfunktionen fuer D&D - void DropCleanup(); - void CleanupDropUserMarker(); - USHORT GetDropDestination( const Point& rPixPnt, + void DropCleanup(); + void CleanupDropUserMarker(); + USHORT GetDropDestination( const Point& rPixPnt, SdrObject ** ppObj = 0 ); //select the object/cursor at the mouse position of the context menu request BOOL SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ); @@ -172,8 +172,8 @@ friend void PageNumNotify( ViewShell* pVwSh, * vergroessert. */ DECL_LINK( TimerHandler, Timer * ); - void StartDDTimer(); - void StopDDTimer(SwWrtShell *, const Point &); + void StartDDTimer(); + void StopDDTimer(SwWrtShell *, const Point &); DECL_LINK( DDHandler, Timer * ); // timer for ANY-KeyInut question without a following KeyInputEvent @@ -189,90 +189,90 @@ friend void PageNumNotify( ViewShell* pVwSh, protected: - virtual void DataChanged( const DataChangedEvent& ); - virtual void PrePaint(); - virtual void Paint( const Rectangle& rRect ); - virtual void KeyInput(const KeyEvent &rKEvt); + virtual void DataChanged( const DataChangedEvent& ); + virtual void PrePaint(); + virtual void Paint( const Rectangle& rRect ); + virtual void KeyInput(const KeyEvent &rKEvt); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void GetFocus(); + virtual void LoseFocus(); - virtual void MouseMove(const MouseEvent& rMEvt); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void MouseButtonUp(const MouseEvent& rMEvt); - virtual void RequestHelp(const HelpEvent& rEvt); + virtual void MouseMove(const MouseEvent& rMEvt); + virtual void MouseButtonDown(const MouseEvent& rMEvt); + virtual void MouseButtonUp(const MouseEvent& rMEvt); + virtual void RequestHelp(const HelpEvent& rEvt); - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ); // Drag & Drop Interface - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); virtual XubString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; - + void ShowAutoTextCorrectQuickHelp( const String& rWord, SvxAutoCorrCfg* pACfg, SvxAutoCorrect* pACorr, sal_Bool bFromIME = sal_False ); public: - void UpdatePointer(const Point &, USHORT nButtons = 0); + void UpdatePointer(const Point &, USHORT nButtons = 0); - BOOL IsDrawSelMode(); - BOOL IsDrawAction() { return (bInsDraw); } - void SetDrawAction(BOOL bFlag) { bInsDraw = bFlag; } + BOOL IsDrawSelMode(); + BOOL IsDrawAction() { return (bInsDraw); } + void SetDrawAction(BOOL bFlag) { bInsDraw = bFlag; } - void SetObjectSelect( BOOL bVal ) { bObjectSelect = bVal; } - BOOL IsObjectSelect() const { return bObjectSelect; } + void SetObjectSelect( BOOL bVal ) { bObjectSelect = bVal; } + BOOL IsObjectSelect() const { return bObjectSelect; } - inline SdrObjKind GetSdrDrawMode(/*BOOL bBuf = FALSE*/) const { return eDrawMode; } - inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { eDrawMode = eSdrObjectKind; SetObjectSelect( FALSE ); } - void StdDrawMode( SdrObjKind eSdrObjectKind, BOOL bObjSelect ); + inline SdrObjKind GetSdrDrawMode(/*BOOL bBuf = FALSE*/) const { return eDrawMode; } + inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { eDrawMode = eSdrObjectKind; SetObjectSelect( FALSE ); } + void StdDrawMode( SdrObjKind eSdrObjectKind, BOOL bObjSelect ); - BOOL IsFrmAction() { return (bInsFrm); } - inline UINT16 GetBezierMode() { return eBezierMode; } - void SetBezierMode(UINT16 eBezMode) { eBezierMode = eBezMode; } - void EnterDrawTextMode(const Point& aDocPos); // DrawTextEditMode einschalten - void InsFrm(USHORT nCols); - void StopInsFrm(); - UINT16 GetFrmColCount() const {return nInsFrmColCount;} //Spaltenzahl fuer interaktiven Rahmen + BOOL IsFrmAction() { return (bInsFrm); } + inline UINT16 GetBezierMode() { return eBezierMode; } + void SetBezierMode(UINT16 eBezMode) { eBezierMode = eBezMode; } + void EnterDrawTextMode(const Point& aDocPos); // DrawTextEditMode einschalten + void InsFrm(USHORT nCols); + void StopInsFrm(); + UINT16 GetFrmColCount() const {return nInsFrmColCount;} //Spaltenzahl fuer interaktiven Rahmen - void SetChainMode( BOOL bOn ); - BOOL IsChainMode() const { return bChainMode; } + void SetChainMode( BOOL bOn ); + BOOL IsChainMode() const { return bChainMode; } void FlushInBuffer(); BOOL IsInputSequenceCheckingRequired( const String &rText, const SwPaM& rCrsr ) const; - static void SetReplaceQuote(BOOL bOn = TRUE) { bReplaceQuote = bOn; } - static BOOL IsReplaceQuote() { return bReplaceQuote; } + static void SetReplaceQuote(BOOL bOn = TRUE) { bReplaceQuote = bOn; } + static BOOL IsReplaceQuote() { return bReplaceQuote; } - void SetApplyTemplate(const SwApplyTemplate &); + void SetApplyTemplate(const SwApplyTemplate &); SwApplyTemplate* GetApplyTemplate() const { return pApplyTempl; } - void StartExecuteDrag(); - void DragFinished(); + void StartExecuteDrag(); + void DragFinished(); USHORT GetDropAction() const { return m_nDropAction; } ULONG GetDropFormat() const { return m_nDropFormat; } - Color GetTextColor() { return aTextColor; } + Color GetTextColor() { return aTextColor; } - void SetTextColor(const Color& rCol ) { aTextColor = rCol; } + void SetTextColor(const Color& rCol ) { aTextColor = rCol; } - Color GetTextBackColor() + Color GetTextBackColor() { return aTextBackColor; } - void SetTextBackColor(const Color& rCol ) + void SetTextBackColor(const Color& rCol ) { aTextBackColor = rCol; } - void SetTextBackColorTransparent(BOOL bSet) + void SetTextBackColorTransparent(BOOL bSet) { bTransparentBackColor = bSet; } - BOOL IsTextBackColorTransparent() + BOOL IsTextBackColorTransparent() { return bTransparentBackColor; } - void LockKeyInput(BOOL bSet){bLockInput = bSet;} + void LockKeyInput(BOOL bSet){bLockInput = bSet;} const SwView &GetView() const { return rView; } - SwView &GetView() { return rView; } + SwView &GetView() { return rView; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); @@ -282,8 +282,8 @@ public: static inline long GetDDStartPosX() { return nDDStartPosX; } static inline long GetDDStartPosY() { return nDDStartPosY; } - static void _InitStaticData(); - static void _FinitStaticData(); + static void _InitStaticData(); + static void _FinitStaticData(); //#i3370# remove quick help to prevent saving of autocorrection suggestions void StopQuickHelp(); diff --git a/sw/source/ui/inc/envimg.hxx b/sw/source/ui/inc/envimg.hxx index a7cb66199100..ed767d2552cd 100644 --- a/sw/source/ui/inc/envimg.hxx +++ b/sw/source/ui/inc/envimg.hxx @@ -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 @@ -54,16 +54,16 @@ class SW_DLLPUBLIC SwEnvItem : public SfxPoolItem public: rtl::OUString aAddrText; // Text fuer Empfaenger - sal_Bool bSend; // Absender? - rtl::OUString aSendText; // Text fuer Absender + sal_Bool bSend; // Absender? + rtl::OUString aSendText; // Text fuer Absender sal_Int32 lAddrFromLeft; // Linker Abstand fuer Empfaenger (twips) sal_Int32 lAddrFromTop; // Oberer Abstand fuer Empfaenger (twips) sal_Int32 lSendFromLeft; // Linker Abstand fuer Absender (twips) sal_Int32 lSendFromTop; // Oberer Abstand fuer Absender (twips) sal_Int32 lWidth; // Breite des Umschlags (twips) sal_Int32 lHeight; // Hoehe des Umschlags (twips) - SwEnvAlign eAlign; // Ausrichtung beim Einzug - sal_Bool bPrintFromAbove; // Von oben drucken? + SwEnvAlign eAlign; // Ausrichtung beim Einzug + sal_Bool bPrintFromAbove; // Von oben drucken? sal_Int32 lShiftRight; // Verschiebung nach rechts (twips) sal_Int32 lShiftDown; // Verschiebung nach unten (twips) @@ -78,7 +78,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; // class SwEnvCfgItem ------------------------------------------------------- @@ -93,7 +93,7 @@ public: SwEnvItem& GetItem() {return aEnvItem;} - virtual void Commit(); + virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); }; #endif diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx index b7ae315a9beb..0e9f5847340e 100644 --- a/sw/source/ui/inc/envlop.hxx +++ b/sw/source/ui/inc/envlop.hxx @@ -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 @@ -82,16 +82,16 @@ friend class SwEnvFmtPage; friend class SwEnvPrtPage; friend class SwEnvPreview; - String sInsert; - String sChange; - SwEnvItem aEnvItem; - SwWrtShell *pSh; - Printer *pPrinter; - SfxItemSet *pAddresseeSet; - SfxItemSet *pSenderSet; + String sInsert; + String sChange; + SwEnvItem aEnvItem; + SwWrtShell *pSh; + Printer *pPrinter; + SfxItemSet *pAddresseeSet; + SfxItemSet *pSenderSet; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); - virtual short Ok(); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual short Ok(); public: SwEnvDlg(Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, BOOL bInsert); @@ -104,13 +104,13 @@ class SwEnvPage : public SfxTabPage { FixedText aAddrText; MultiLineEdit aAddrEdit; - FixedText aDatabaseFT; - ListBox aDatabaseLB; - FixedText aTableFT; - ListBox aTableLB; + FixedText aDatabaseFT; + ListBox aDatabaseLB; + FixedText aTableFT; + ListBox aTableLB; ImageButton aInsertBT; - FixedText aDBFieldFT; - ListBox aDBFieldLB; + FixedText aDBFieldFT; + ListBox aDBFieldLB; CheckBox aSenderBox; MultiLineEdit aSenderEdit; SwEnvPreview aPreview; diff --git a/sw/source/ui/inc/fldedt.hxx b/sw/source/ui/inc/fldedt.hxx index cb27672de865..118cabd3e16d 100644 --- a/sw/source/ui/inc/fldedt.hxx +++ b/sw/source/ui/inc/fldedt.hxx @@ -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 @@ -41,13 +41,13 @@ class SwFldEditDlg : public SfxSingleTabDialog SwWrtShell* pSh; ImageButton aPrevBT; ImageButton aNextBT; - PushButton aAddressBT; + PushButton aAddressBT; DECL_LINK( AddressHdl, PushButton *pBt = 0 ); DECL_LINK( NextPrevHdl, Button *pBt = 0 ); - void Init(); - SfxTabPage* CreatePage(USHORT nGroup); + void Init(); + SfxTabPage* CreatePage(USHORT nGroup); public: @@ -56,10 +56,10 @@ public: DECL_LINK( OKHdl, Button * ); - virtual short Execute(); + virtual short Execute(); - void EnableInsert(BOOL bEnable); - void InsertHdl(); + void EnableInsert(BOOL bEnable); + void InsertHdl(); }; diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx index 33070131ae58..5f92d302e0a1 100644 --- a/sw/source/ui/inc/fldmgr.hxx +++ b/sw/source/ui/inc/fldmgr.hxx @@ -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 @@ -113,21 +113,21 @@ struct SwInsertFld_Data class SW_DLLPUBLIC SwFldMgr { private: - SwField* pCurFld; - SbModule* pModule; - const SvxMacroItem* pMacroItem; - SwWrtShell* pWrtShell; // darf auch NULL sein! - String aCurPar1; - String aCurPar2; - String sCurFrame; + SwField* pCurFld; + SbModule* pModule; + const SvxMacroItem* pMacroItem; + SwWrtShell* pWrtShell; // darf auch NULL sein! + String aCurPar1; + String aCurPar2; + String sCurFrame; String sMacroPath; String sMacroName; - ULONG nCurFmt; - BOOL bEvalExp; + ULONG nCurFmt; + BOOL bEvalExp; - SW_DLLPRIVATE USHORT GetCurrLanguage() const; + SW_DLLPRIVATE USHORT GetCurrLanguage() const; com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> xDBContext; com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> xNumberingInfo; @@ -138,13 +138,13 @@ public: ~SwFldMgr(); void SetWrtShell( SwWrtShell* pShell ) - { pWrtShell = pShell; } - + { pWrtShell = pShell; } + // Feld einfuegen ueber TypeId (TYP_ ...) BOOL InsertFld( const SwInsertFld_Data& rData ); // Direkt das aktuelle Feld aendern - void UpdateCurFld(ULONG nFormat, + void UpdateCurFld(ULONG nFormat, const String& rPar1, const String& rPar2, SwField * _pField = 0); // #111840# @@ -154,44 +154,44 @@ public: inline ULONG GetCurFldFmt() const; // Ein Feld ermitteln - SwField* GetCurFld(); + SwField* GetCurFld(); - void InsertFldType(SwFieldType& rType); + void InsertFldType(SwFieldType& rType); - BOOL ChooseMacro(const String &rSelMacro = aEmptyStr); - void SetMacroPath(const String& rPath); - inline const String& GetMacroPath() const { return (sMacroPath); } - inline const String& GetMacroName() const { return (sMacroName); } - inline void SetMacroModule(SbModule* pMod) { pModule = pMod; } + BOOL ChooseMacro(const String &rSelMacro = aEmptyStr); + void SetMacroPath(const String& rPath); + inline const String& GetMacroPath() const { return (sMacroPath); } + inline const String& GetMacroName() const { return (sMacroName); } + inline void SetMacroModule(SbModule* pMod) { pModule = pMod; } // Vorheriger Naechster gleichen Typ BOOL GoNextPrev( BOOL bNext = TRUE, SwFieldType* pTyp = 0 ); - BOOL GoNext( SwFieldType* pTyp = 0 ) { return GoNextPrev( TRUE, pTyp ); } - BOOL GoPrev( SwFieldType* pTyp = 0 ) { return GoNextPrev( FALSE, pTyp ); } + BOOL GoNext( SwFieldType* pTyp = 0 ) { return GoNextPrev( TRUE, pTyp ); } + BOOL GoPrev( SwFieldType* pTyp = 0 ) { return GoNextPrev( FALSE, pTyp ); } // Erfragen von Werten aus Datenbankfeldern (BASIC ) -// String GetDataBaseFieldValue(const String &rDBName, const String &rFieldName, SwWrtShell* pSh); - BOOL IsDBNumeric(const String& rDBName, const String& rTblQryName, +// String GetDataBaseFieldValue(const String &rDBName, const String &rFieldName, SwWrtShell* pSh); + BOOL IsDBNumeric(const String& rDBName, const String& rTblQryName, BOOL bIsTable, const String& rFldName); // RefMark mit Namen organisieren - BOOL CanInsertRefMark( const String& rStr ); + BOOL CanInsertRefMark( const String& rStr ); // Zugriff ueber ResId auf Feldtypen - USHORT GetFldTypeCount(USHORT nResId = USHRT_MAX) const; - SwFieldType* GetFldType(USHORT nResId, USHORT nId = 0) const; - SwFieldType* GetFldType(USHORT nResId, const String& rName) const; + USHORT GetFldTypeCount(USHORT nResId = USHRT_MAX) const; + SwFieldType* GetFldType(USHORT nResId, USHORT nId = 0) const; + SwFieldType* GetFldType(USHORT nResId, const String& rName) const; - void RemoveFldType(USHORT nResId, const String& rName); + void RemoveFldType(USHORT nResId, const String& rName); // Zugriff ueber TypeId aus dem Dialog // Ids fuer einen Bereich von Feldern const SwFldGroupRgn& GetGroupRange(BOOL bHtmlMode, USHORT nGrpId) const; - USHORT GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType = 0) const; + USHORT GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType = 0) const; // TypeId des aktuellen Feldes - USHORT GetCurTypeId() const; + USHORT GetCurTypeId() const; // TypeId fuer einen konkrete Pos in der Liste static USHORT GetTypeId(USHORT nPos); @@ -205,16 +205,16 @@ public: BOOL GetSubTypes(USHORT nId, SvStringsDtor& rToFill); // Formate zu einem Typ - USHORT GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode = FALSE) const; - String GetFormatStr(USHORT nTypeId, ULONG nFormatId) const; - USHORT GetFormatId(USHORT nTypeId, ULONG nFormatId) const; - ULONG GetDefaultFormat(USHORT nTypeId, BOOL bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L); + USHORT GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode = FALSE) const; + String GetFormatStr(USHORT nTypeId, ULONG nFormatId) const; + USHORT GetFormatId(USHORT nTypeId, ULONG nFormatId) const; + ULONG GetDefaultFormat(USHORT nTypeId, BOOL bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L); // Evaluierung der ExpressionFelder ausschalten fuer das Einfuegen // vieler Expressionfelder (siehe Etiketten) // - inline void SetEvalExpFlds(BOOL bEval); - void EvalExpFlds(SwWrtShell* pSh = NULL); + inline void SetEvalExpFlds(BOOL bEval); + void EvalExpFlds(SwWrtShell* pSh = NULL); }; inline void SwFldMgr::SetEvalExpFlds(BOOL bEval) diff --git a/sw/source/ui/inc/fldtdlg.hxx b/sw/source/ui/inc/fldtdlg.hxx index cacc2e0a6183..456c95161185 100644 --- a/sw/source/ui/inc/fldtdlg.hxx +++ b/sw/source/ui/inc/fldtdlg.hxx @@ -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 @@ -44,12 +44,12 @@ class SwFldDlg: public SfxTabDialog BOOL m_bHtmlMode; BOOL m_bDataBaseMode; - virtual BOOL Close(); - virtual SfxItemSet* CreateInputItemSet( USHORT nId ); - virtual void Activate(); + virtual BOOL Close(); + virtual SfxItemSet* CreateInputItemSet( USHORT nId ); + virtual void Activate(); virtual void PageCreated(USHORT nId, SfxTabPage& rPage); - void ReInitTabPage( USHORT nPageId, + void ReInitTabPage( USHORT nPageId, BOOL bOnlyActivate = FALSE ); public: @@ -58,10 +58,10 @@ public: DECL_LINK( OKHdl, Button * ); - void Initialize(SfxChildWinInfo *pInfo); - void ReInitDlg(); - void EnableInsert(BOOL bEnable); - void InsertHdl(); + void Initialize(SfxChildWinInfo *pInfo); + void ReInitDlg(); + void EnableInsert(BOOL bEnable); + void InsertHdl(); void ActivateDatabasePage(); }; diff --git a/sw/source/ui/inc/fldwrap.hxx b/sw/source/ui/inc/fldwrap.hxx index 12ed8743ccfd..aa57f7ab18b6 100644 --- a/sw/source/ui/inc/fldwrap.hxx +++ b/sw/source/ui/inc/fldwrap.hxx @@ -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 @@ -39,8 +39,8 @@ public: SFX_DECL_CHILDWINDOW(SwFldDlgWrapper); - virtual BOOL ReInitDlg(SwDocShell *pDocSh); - void ShowPage(USHORT nPage = 0); + virtual BOOL ReInitDlg(SwDocShell *pDocSh); + void ShowPage(USHORT nPage = 0); }; /* -----------------04.02.2003 14:14----------------- * field dialog only showing database page to support diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx index 71cbdf3ad5d2..70af7f2971af 100644 --- a/sw/source/ui/inc/fontcfg.hxx +++ b/sw/source/ui/inc/fontcfg.hxx @@ -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 @@ -58,6 +58,7 @@ //pt-size of fonts #define FONTSIZE_DEFAULT 240 +#define FONTSIZE_CJK_DEFAULT 210 #define FONTSIZE_OUTLINE 280 @@ -83,7 +84,7 @@ public: SwStdFontConfig(); ~SwStdFontConfig(); - virtual void Commit(); + virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); const String& GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];} @@ -109,7 +110,7 @@ public: void SetFontHeight( sal_Int32 nHeight, sal_uInt8 nFont, sal_uInt8 nScriptType ) { ChangeInt(nFont + FONT_PER_GROUP * nScriptType, nHeight);} - + sal_Int32 GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType, LanguageType eLang ); static String GetDefaultFor(USHORT nFontType, LanguageType eLang); diff --git a/sw/source/ui/inc/formatclipboard.hxx b/sw/source/ui/inc/formatclipboard.hxx index ca35d7b5f8ab..b01ef7c58b80 100644 --- a/sw/source/ui/inc/formatclipboard.hxx +++ b/sw/source/ui/inc/formatclipboard.hxx @@ -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/inc/formedt.hxx b/sw/source/ui/inc/formedt.hxx index c039fe512599..5efa1621b26d 100644 --- a/sw/source/ui/inc/formedt.hxx +++ b/sw/source/ui/inc/formedt.hxx @@ -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 @@ -51,7 +51,7 @@ class SwWrtShell; class SwForm; /*-------------------------------------------------------------------- - Beschreibung: Markierung fuer Verzeichniseintrag einfuegen + Beschreibung: Markierung fuer Verzeichniseintrag einfuegen --------------------------------------------------------------------*/ class SwIdxFormDlg : public SvxStandardDialog @@ -66,38 +66,38 @@ class SwIdxFormDlg : public SvxStandardDialog DECL_LINK( DoubleClickHdl, Button * ); DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( AssignHdl, Button * ); - void UpdatePattern(); - void Apply(); + void UpdatePattern(); + void Apply(); - ListBox aEntryLB; - OKButton aOKBtn; - CancelButton aCancelBT; - FixedText aLevelFT; - Edit aEntryED; - PushButton aEntryBT; - PushButton aTabBT; - PushButton aPageBT; - PushButton aJumpBT; + ListBox aEntryLB; + OKButton aOKBtn; + CancelButton aCancelBT; + FixedText aLevelFT; + Edit aEntryED; + PushButton aEntryBT; + PushButton aTabBT; + PushButton aPageBT; + PushButton aJumpBT; FixedLine aEntryFL; - FixedText aLevelFT2; - ListBox aLevelLB; - FixedText aTemplateFT; - ListBox aParaLayLB; - PushButton aStdBT; - PushButton aAssignBT; + FixedText aLevelFT2; + ListBox aLevelLB; + FixedText aTemplateFT; + ListBox aParaLayLB; + PushButton aStdBT; + PushButton aAssignBT; FixedLine aFormatFL; - SwWrtShell &rSh; - SwForm *pForm; - USHORT nAktLevel; - BOOL bLastLinkIsEnd; + SwWrtShell &rSh; + SwForm *pForm; + USHORT nAktLevel; + BOOL bLastLinkIsEnd; public: SwIdxFormDlg( Window* pParent, SwWrtShell &rShell, const SwForm& rForm ); ~SwIdxFormDlg(); - static BOOL IsNoNum(SwWrtShell& rSh, const String& rName); - const SwForm& GetTOXForm(); + static BOOL IsNoNum(SwWrtShell& rSh, const String& rName); + const SwForm& GetTOXForm(); }; inline const SwForm& SwIdxFormDlg::GetTOXForm() diff --git a/sw/source/ui/inc/frmdlg.hxx b/sw/source/ui/inc/frmdlg.hxx index 5776cc9f3dd8..fa39f4b293cd 100644 --- a/sw/source/ui/inc/frmdlg.hxx +++ b/sw/source/ui/inc/frmdlg.hxx @@ -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 @@ -33,7 +33,7 @@ class SwWrtShell; /*-------------------------------------------------------------------- - Beschreibung: Rahmendialog + Beschreibung: Rahmendialog --------------------------------------------------------------------*/ class SwFrmDlg : public SfxTabDialog @@ -49,13 +49,13 @@ class SwFrmDlg : public SfxTabDialog virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: - SwFrmDlg( SfxViewFrame *pFrame, Window *pParent, + SwFrmDlg( SfxViewFrame *pFrame, Window *pParent, const SfxItemSet& rCoreSet, - BOOL bNewFrm = TRUE, - USHORT nResType = DLG_FRM_STD, - BOOL bFmt = FALSE, - UINT16 nDefPage = 0, - const String* pFmtStr = 0); + BOOL bNewFrm = TRUE, + USHORT nResType = DLG_FRM_STD, + BOOL bFmt = FALSE, + UINT16 nDefPage = 0, + const String* pFmtStr = 0); ~SwFrmDlg(); diff --git a/sw/source/ui/inc/frmmgr.hxx b/sw/source/ui/inc/frmmgr.hxx index 9664c484b0f3..09d878c10e05 100644 --- a/sw/source/ui/inc/frmmgr.hxx +++ b/sw/source/ui/inc/frmmgr.hxx @@ -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 @@ -37,42 +37,42 @@ #include <fmtanchr.hxx> #include "swdllapi.h" -class SwWrtShell; +class SwWrtShell; struct SvxSwFrameValidation; struct SwPosition; -class SwFmt; -class SwFmtCol; +class SwFmt; +class SwFmtCol; -const SwTwips DFLT_WIDTH = MM50 * 4; -const SwTwips DFLT_HEIGHT = MM50; +const SwTwips DFLT_WIDTH = MM50 * 4; +const SwTwips DFLT_HEIGHT = MM50; -#define FULL_ATTRSET 0xffff +#define FULL_ATTRSET 0xffff -#define FRMMGR_TYPE_NONE 0x00 -#define FRMMGR_TYPE_TEXT 0x01 -#define FRMMGR_TYPE_GRF 0x02 -#define FRMMGR_TYPE_OLE 0x04 +#define FRMMGR_TYPE_NONE 0x00 +#define FRMMGR_TYPE_TEXT 0x01 +#define FRMMGR_TYPE_GRF 0x02 +#define FRMMGR_TYPE_OLE 0x04 #define FRMMGR_TYPE_LABEL 0x08 -#define FRMMGR_TYPE_ENVELP 0x10 +#define FRMMGR_TYPE_ENVELP 0x10 class SW_DLLPUBLIC SwFlyFrmAttrMgr { - SfxItemSet aSet; - Point aAbsPos; - SwWrtShell *pOwnSh; + SfxItemSet aSet; + Point aAbsPos; + SwWrtShell *pOwnSh; - BOOL bAbsPos, + BOOL bAbsPos, bNewFrm; BOOL bIsInVertical; // interne Verrechnung fuer Umrandung - SW_DLLPRIVATE SwTwips CalcTopSpace(); - SW_DLLPRIVATE SwTwips CalcBottomSpace(); - SW_DLLPRIVATE SwTwips CalcLeftSpace(); - SW_DLLPRIVATE SwTwips CalcRightSpace(); + SW_DLLPRIVATE SwTwips CalcTopSpace(); + SW_DLLPRIVATE SwTwips CalcBottomSpace(); + SW_DLLPRIVATE SwTwips CalcLeftSpace(); + SW_DLLPRIVATE SwTwips CalcRightSpace(); - SW_DLLPRIVATE void _UpdateFlyFrm(); //Nacharbeit nach Einfuegen oder Update + SW_DLLPRIVATE void _UpdateFlyFrm(); //Nacharbeit nach Einfuegen oder Update public: SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, BYTE nType ); @@ -80,65 +80,65 @@ public: //CopyCtor fuer die Dialoge, zum Pruefen der Metrics SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell *pSh, const SfxItemSet &rSet ); - inline SwWrtShell* GetShell() { return pOwnSh; } + inline SwWrtShell* GetShell() { return pOwnSh; } - void SetAnchor(RndStdIds eId); - inline RndStdIds GetAnchor() const; + void SetAnchor(RndStdIds eId); + inline RndStdIds GetAnchor() const; void SetHorzOrientation(sal_Int16 eOrient); void SetVertOrientation(sal_Int16 eOrient); // Absolute Position - void SetAbsPos(const Point& rLPoint); + void SetAbsPos(const Point& rLPoint); // Relative Position vom Anker - void SetPos(const Point& rLPoint); - inline Point GetPos() const; + void SetPos(const Point& rLPoint); + inline Point GetPos() const; // Groesse - void SetSize(const Size& rLSize); - inline const Size& GetSize() const; + void SetSize(const Size& rLSize); + inline const Size& GetSize() const; - inline USHORT GetHeightPercent() const; + inline USHORT GetHeightPercent() const; void SetHeightSizeType(SwFrmSize eType); // Abstand zum Inhalt - void SetLRSpace( long nLeft = LONG_MAX, + void SetLRSpace( long nLeft = LONG_MAX, long nRight = LONG_MAX ); - void SetULSpace( long nTop = LONG_MAX, + void SetULSpace( long nTop = LONG_MAX, long nBottom= LONG_MAX ); - void SetCol( const SwFmtCol &rCol); + void SetCol( const SwFmtCol &rCol); // Attribute aendern und erfragen - void UpdateAttrMgr(); - void UpdateFlyFrm(); + void UpdateAttrMgr(); + void UpdateFlyFrm(); // neuen Rahmen erzeugen - BOOL InsertFlyFrm(); - void InsertFlyFrm(RndStdIds eAnchorType, - const Point &rPos, - const Size &rSize, - BOOL bAbsPos = FALSE); + BOOL InsertFlyFrm(); + void InsertFlyFrm(RndStdIds eAnchorType, + const Point &rPos, + const Size &rSize, + BOOL bAbsPos = FALSE); // Metriken pruefen und aendern void ValidateMetrics(SvxSwFrameValidation& rVal, const SwPosition* pToCharCntntPos, BOOL bOnlyPercentRefValue = FALSE); - void DelAttr(USHORT nId); + void DelAttr(USHORT nId); // Set rausreichen inline const SfxItemSet &GetAttrSet() const { return aSet; } - inline SfxItemSet &GetAttrSet() { return aSet; } - void SetAttrSet(const SfxItemSet& rSet); + inline SfxItemSet &GetAttrSet() { return aSet; } + void SetAttrSet(const SfxItemSet& rSet); inline const SwFmtVertOrient &GetVertOrient() const; inline const SwFmtHoriOrient &GetHoriOrient() const; inline const SvxShadowItem &GetShadow() const; - inline const SvxBoxItem &GetBox() const; - inline const SwFmtSurround &GetSurround() const; + inline const SvxBoxItem &GetBox() const; + inline const SwFmtSurround &GetSurround() const; inline const SwFmtFrmSize &GetFrmSize() const; long CalcWidthBorder() { return CalcLeftSpace()+CalcRightSpace(); } @@ -166,7 +166,7 @@ inline const SvxShadowItem &SwFlyFrmAttrMgr::GetShadow() const { return ((SvxShadowItem&)aSet.Get(RES_SHADOW)); } -inline const SvxBoxItem &SwFlyFrmAttrMgr::GetBox() const +inline const SvxBoxItem &SwFlyFrmAttrMgr::GetBox() const { return ((SvxBoxItem&)aSet.Get(RES_BOX)); } diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index 219f6c37a308..a858c23199d7 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -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 @@ -58,49 +58,49 @@ struct FrmMap; struct SwPosition; /*-------------------------------------------------------------------- - Beschreibung: Rahmendialog + Beschreibung: Rahmendialog --------------------------------------------------------------------*/ class SwFrmPage: public SfxTabPage { // Size - FixedText aWidthFT; - FixedText aWidthAutoFT; - PercentField aWidthED; - CheckBox aRelWidthCB; - CheckBox aAutoWidthCB; - FixedText aHeightFT; - FixedText aHeightAutoFT; - PercentField aHeightED; - CheckBox aRelHeightCB; - CheckBox aAutoHeightCB; - CheckBox aFixedRatioCB; - PushButton aRealSizeBT; + FixedText aWidthFT; + FixedText aWidthAutoFT; + PercentField aWidthED; + CheckBox aRelWidthCB; + CheckBox aAutoWidthCB; + FixedText aHeightFT; + FixedText aHeightAutoFT; + PercentField aHeightED; + CheckBox aRelHeightCB; + CheckBox aAutoHeightCB; + CheckBox aFixedRatioCB; + PushButton aRealSizeBT; FixedLine aSizeFL; // Anker FixedLine aTypeFL; FixedLine aTypeSepFL; - RadioButton aAnchorAtPageRB; - RadioButton aAnchorAtParaRB; - RadioButton aAnchorAtCharRB; - RadioButton aAnchorAsCharRB; - RadioButton aAnchorAtFrameRB; + RadioButton aAnchorAtPageRB; + RadioButton aAnchorAtParaRB; + RadioButton aAnchorAtCharRB; + RadioButton aAnchorAsCharRB; + RadioButton aAnchorAtFrameRB; // Position - FixedText aHorizontalFT; - ListBox aHorizontalDLB; - FixedText aAtHorzPosFT; - MetricField aAtHorzPosED; - FixedText aHoriRelationFT; - ListBox aHoriRelationLB; - CheckBox aMirrorPagesCB; - FixedText aVerticalFT; - ListBox aVerticalDLB; - FixedText aAtVertPosFT; - MetricField aAtVertPosED; - FixedText aVertRelationFT; - ListBox aVertRelationLB; + FixedText aHorizontalFT; + ListBox aHorizontalDLB; + FixedText aAtHorzPosFT; + MetricField aAtHorzPosED; + FixedText aHoriRelationFT; + ListBox aHoriRelationLB; + CheckBox aMirrorPagesCB; + FixedText aVerticalFT; + ListBox aVerticalDLB; + FixedText aAtVertPosFT; + MetricField aAtVertPosED; + FixedText aVertRelationFT; + ListBox aVertRelationLB; // OD 02.10.2003 #i18732# - check box for new option 'FollowTextFlow' CheckBox aFollowTextFlowCB; FixedLine aPositionFL; @@ -115,18 +115,18 @@ class SwFrmPage: public SfxTabPage BOOL bAtVertPosModified; BOOL bFormat; - BOOL bNew; - BOOL bNoModifyHdl; + BOOL bNew; + BOOL bNoModifyHdl; BOOL bVerticalChanged; //check done whether frame is in vertical environment BOOL bIsVerticalFrame; //current frame is in vertical environment - strings are exchanged BOOL bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged BOOL bHtmlMode; USHORT nHtmlMode; - USHORT nDlgType; - Size aGrfSize; - Size aWrap; - SwTwips nUpperBorder; - SwTwips nLowerBorder; + USHORT nDlgType; + Size aGrfSize; + Size aWrap; + SwTwips nUpperBorder; + SwTwips nLowerBorder; double fWidthHeightRatio; //width-to-height ratio to support the KeepRatio button // OD 12.11.2003 #i22341# - keep content position of character for @@ -143,7 +143,7 @@ class SwFrmPage: public SfxTabPage FrmMap* pHMap; virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual int DeactivatePage(SfxItemSet *pSet); DECL_LINK( RangeModifyHdl, Edit * ); @@ -151,8 +151,8 @@ class SwFrmPage: public SfxTabPage DECL_LINK( PosHdl, ListBox * ); DECL_LINK( RelHdl, ListBox * ); void InitPos(RndStdIds eId, USHORT nH, USHORT nHRel, - USHORT nV, USHORT nVRel, - long nX, long nY); + USHORT nV, USHORT nVRel, + long nX, long nY); DECL_LINK( RealSizeHdl, Button * ); DECL_LINK( RelSizeClickHdl, CheckBox * ); @@ -162,10 +162,10 @@ class SwFrmPage: public SfxTabPage DECL_LINK( AutoHeightClickHdl, void* ); // Beispiel aktualisieren - void UpdateExample(); + void UpdateExample(); DECL_LINK( ModifyHdl, Edit * ); - void Init(const SfxItemSet& rSet, BOOL bReset = FALSE); + void Init(const SfxItemSet& rSet, BOOL bReset = FALSE); // OD 12.11.2003 #i22341# - adjustment to handle maps, that are ambigous // in the alignment. USHORT FillPosLB( const FrmMap* _pMap, @@ -185,7 +185,7 @@ class SwFrmPage: public SfxTabPage short GetRelation(FrmMap *pMap, ListBox &rRelationLB); RndStdIds GetAnchor(); - void EnableGraficMode( void ); // hides auto check boxes and re-org controls for "Real Size" button + void EnableGraficMode( void ); // hides auto check boxes and re-org controls for "Real Size" button SwFrmPage(Window *pParent, const SfxItemSet &rSet); ~SwFrmPage(); @@ -201,40 +201,40 @@ public: virtual BOOL FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); - void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } - void SetFormatUsed(BOOL bFmt); - void SetFrmType(USHORT nType) { nDlgType = nType; } - inline BOOL IsInGraficMode( void ) { return nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE; } + void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } + void SetFormatUsed(BOOL bFmt); + void SetFrmType(USHORT nType) { nDlgType = nType; } + inline BOOL IsInGraficMode( void ) { return nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE; } }; class SwGrfExtPage: public SfxTabPage { // Spiegeln FixedLine aMirrorFL; - CheckBox aMirrorVertBox; - CheckBox aMirrorHorzBox; - RadioButton aAllPagesRB; - RadioButton aLeftPagesRB; - RadioButton aRightPagesRB; - BmpWindow aBmpWin; + CheckBox aMirrorVertBox; + CheckBox aMirrorHorzBox; + RadioButton aAllPagesRB; + RadioButton aLeftPagesRB; + RadioButton aRightPagesRB; + BmpWindow aBmpWin; FixedLine aConnectFL; - FixedText aConnectFT; - Edit aConnectED; - PushButton aBrowseBT; + FixedText aConnectFT; + Edit aConnectED; + PushButton aBrowseBT; - String aFilterName; - String aGrfName, aNewGrfName; + String aFilterName; + String aGrfName, aNewGrfName; ::sfx2::FileDialogHelper* pGrfDlg; - BOOL bHtmlMode; + BOOL bHtmlMode; // Handler fuer Spiegeln DECL_LINK( MirrorHdl, CheckBox * ); DECL_LINK( BrowseHdl, Button * ); - virtual void ActivatePage(const SfxItemSet& rSet); + virtual void ActivatePage(const SfxItemSet& rSet); SwGrfExtPage(Window *pParent, const SfxItemSet &rSet); ~SwGrfExtPage(); @@ -255,25 +255,25 @@ class SwFrmURLPage : public SfxTabPage { //Hyperlink FixedLine aHyperLinkFL; - FixedText aURLFT; - Edit aURLED; - PushButton aSearchPB; - FixedText aNameFT; - Edit aNameED; - FixedText aFrameFT; - ComboBox aFrameCB; + FixedText aURLFT; + Edit aURLED; + PushButton aSearchPB; + FixedText aNameFT; + Edit aNameED; + FixedText aFrameFT; + ComboBox aFrameCB; //Image map FixedLine aImageFL; - CheckBox aServerCB; - CheckBox aClientCB; + CheckBox aServerCB; + CheckBox aClientCB; DECL_LINK( InsertFileHdl, PushButton * ); SwFrmURLPage(Window *pParent, const SfxItemSet &rSet); ~SwFrmURLPage(); - + using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -291,23 +291,23 @@ public: class SwFrmAddPage : public SfxTabPage { - FixedText aNameFT; - Edit aNameED; - FixedText aAltNameFT; - Edit aAltNameED; - FixedText aPrevFT; + FixedText aNameFT; + Edit aNameED; + FixedText aAltNameFT; + Edit aAltNameED; + FixedText aPrevFT; ListBox aPrevLB; - FixedText aNextFT; + FixedText aNextFT; ListBox aNextLB; FixedLine aNamesFL; - CheckBox aProtectContentCB; - CheckBox aProtectFrameCB; - CheckBox aProtectSizeCB; + CheckBox aProtectContentCB; + CheckBox aProtectFrameCB; + CheckBox aProtectSizeCB; FixedLine aProtectFL; - CheckBox aEditInReadonlyCB; - CheckBox aPrintFrameCB; + CheckBox aEditInReadonlyCB; + CheckBox aPrintFrameCB; FixedText aTextFlowFT; ListBox aTextFlowLB; @@ -315,10 +315,10 @@ class SwFrmAddPage : public SfxTabPage SwWrtShell* pWrtSh; - USHORT nDlgType; - BOOL bHtmlMode; - BOOL bFormat; - BOOL bNew; + USHORT nDlgType; + BOOL bHtmlMode; + BOOL bFormat; + BOOL bNew; DECL_LINK(EditModifyHdl, Edit*); DECL_LINK(ChainModifyHdl, ListBox*); @@ -328,16 +328,16 @@ class SwFrmAddPage : public SfxTabPage public: - static SfxTabPage* Create(Window *pParent, const SfxItemSet &rSet); - static USHORT* GetRanges(); + static SfxTabPage* Create(Window *pParent, const SfxItemSet &rSet); + static USHORT* GetRanges(); virtual BOOL FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); - void SetFormatUsed(BOOL bFmt); - void SetFrmType(USHORT nType) { nDlgType = nType; } - void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } - void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; } + void SetFormatUsed(BOOL bFmt); + void SetFrmType(USHORT nType) { nDlgType = nType; } + void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } + void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; } }; diff --git a/sw/source/ui/inc/frmsh.hxx b/sw/source/ui/inc/frmsh.hxx index d4f4c546acf1..08bca4af76a4 100644 --- a/sw/source/ui/inc/frmsh.hxx +++ b/sw/source/ui/inc/frmsh.hxx @@ -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 @@ -36,15 +36,15 @@ public: SFX_DECL_INTERFACE(SW_FRAMESHELL) SwFrameShell(SwView &rView); - virtual ~SwFrameShell(); + virtual ~SwFrameShell(); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); - void ExecFrameStyle(SfxRequest& rReq); - void GetLineStyleState(SfxItemSet &rSet); - void StateInsert(SfxItemSet &rSet); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); + void ExecFrameStyle(SfxRequest& rReq); + void GetLineStyleState(SfxItemSet &rSet); + void StateInsert(SfxItemSet &rSet); - void StateStatusline(SfxItemSet &rSet); + void StateStatusline(SfxItemSet &rSet); }; #endif diff --git a/sw/source/ui/inc/frmui.hrc b/sw/source/ui/inc/frmui.hrc index 4c71fff51b40..bb06c7157623 100644 --- a/sw/source/ui/inc/frmui.hrc +++ b/sw/source/ui/inc/frmui.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 @@ -41,17 +41,17 @@ #define DLG_VIEW_HEADER (RC_FRMDLG_BEGIN + 8) #define DLG_FORMAT_COLUMN (RC_FRMDLG_BEGIN + 10) #define DLG_CAPTION (RC_FRMDLG_BEGIN + 11) -#define DLG_SEQUENCE_OPTION (RC_FRMDLG_BEGIN + 12) +#define DLG_SEQUENCE_OPTION (RC_FRMDLG_BEGIN + 12) -#define TP_FOOTNOTEOPTION (RC_FRMDLG_BEGIN + 12) -#define TP_ENDNOTEOPTION (RC_FRMDLG_BEGIN + 13) +#define TP_FOOTNOTEOPTION (RC_FRMDLG_BEGIN + 12) +#define TP_ENDNOTEOPTION (RC_FRMDLG_BEGIN + 13) #define STR_PATTERN_BRD (RC_FRMDLG_BEGIN + 13) #define STR_SHPATTERN (RC_FRMDLG_BEGIN + 14) #define STR_LNPATTERN (RC_FRMDLG_BEGIN + 15) #define STR_FRMUI_BORDER (RC_FRMDLG_BEGIN + 16) #define STR_FRMUI_PATTERN (RC_FRMDLG_BEGIN + 17) -#define STR_FRMUI_WRAP (RC_FRMDLG_BEGIN + 18) +#define STR_FRMUI_WRAP (RC_FRMDLG_BEGIN + 18) #define BMP_PORTRAIT (RC_FRMDLG_BEGIN + 16) #define BMP_LANDSCAPE (RC_FRMDLG_BEGIN + 17) @@ -95,44 +95,44 @@ /* #define STR_FRAME (STR_FRMDLG_BEGIN + 20) -#define STR_PRTAREA (STR_FRMDLG_BEGIN + 21) -#define STR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 22) -#define STR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 23) -#define STR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 24) -#define STR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 25) -#define STR_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 26) -#define STR_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 27) -#define STR_MIR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 28) -#define STR_MIR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 29) -#define STR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 30) -#define STR_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 31) -#define STR_REL_BASE (STR_FRMDLG_BEGIN + 32) -#define STR_REL_CHAR (STR_FRMDLG_BEGIN + 33) -#define STR_REL_ROW (STR_FRMDLG_BEGIN + 34) -#define STR_REL_BORDER (STR_FRMDLG_BEGIN + 35) -#define STR_REL_PRTAREA (STR_FRMDLG_BEGIN + 36) -#define STR_FLY_REL_PG_LEFT (STR_FRMDLG_BEGIN + 37) -#define STR_FLY_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 38) -#define STR_FLY_REL_PG_FRAME (STR_FRMDLG_BEGIN + 39) -#define STR_FLY_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 40) -#define STR_FLY_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 41) -#define STR_FLY_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 42) -#define STR_FLY_MIR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 43) +#define STR_PRTAREA (STR_FRMDLG_BEGIN + 21) +#define STR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 22) +#define STR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 23) +#define STR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 24) +#define STR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 25) +#define STR_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 26) +#define STR_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 27) +#define STR_MIR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 28) +#define STR_MIR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 29) +#define STR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 30) +#define STR_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 31) +#define STR_REL_BASE (STR_FRMDLG_BEGIN + 32) +#define STR_REL_CHAR (STR_FRMDLG_BEGIN + 33) +#define STR_REL_ROW (STR_FRMDLG_BEGIN + 34) +#define STR_REL_BORDER (STR_FRMDLG_BEGIN + 35) +#define STR_REL_PRTAREA (STR_FRMDLG_BEGIN + 36) +#define STR_FLY_REL_PG_LEFT (STR_FRMDLG_BEGIN + 37) +#define STR_FLY_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 38) +#define STR_FLY_REL_PG_FRAME (STR_FRMDLG_BEGIN + 39) +#define STR_FLY_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 40) +#define STR_FLY_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 41) +#define STR_FLY_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 42) +#define STR_FLY_MIR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 43) #define STR_FLY_MIR_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 44)*/ -#define STR_OLE_INSERT (STR_FRMDLG_BEGIN + 45) +#define STR_OLE_INSERT (STR_FRMDLG_BEGIN + 45) #define STR_OLE_EDIT (STR_FRMDLG_BEGIN + 46) #define STR_COLL_HEADER (STR_FRMDLG_BEGIN + 47) #define MSG_COLUMN_ERR_BOUNDWIDTH (STR_FRMDLG_BEGIN + 48) -#define STR_EDIT_GRF (STR_FRMDLG_BEGIN + 49) - -#define STR_LINE_TOP (STR_FRMDLG_BEGIN + 50) -#define STR_LINE_BOTTOM (STR_FRMDLG_BEGIN + 51) -#define STR_LINE_CENTER (STR_FRMDLG_BEGIN + 52) -#define STR_CHAR_TOP (STR_FRMDLG_BEGIN + 53) -#define STR_CHAR_BOTTOM (STR_FRMDLG_BEGIN + 54) -#define STR_CHAR_CENTER (STR_FRMDLG_BEGIN + 55) +#define STR_EDIT_GRF (STR_FRMDLG_BEGIN + 49) + +#define STR_LINE_TOP (STR_FRMDLG_BEGIN + 50) +#define STR_LINE_BOTTOM (STR_FRMDLG_BEGIN + 51) +#define STR_LINE_CENTER (STR_FRMDLG_BEGIN + 52) +#define STR_CHAR_TOP (STR_FRMDLG_BEGIN + 53) +#define STR_CHAR_BOTTOM (STR_FRMDLG_BEGIN + 54) +#define STR_CHAR_CENTER (STR_FRMDLG_BEGIN + 55) #define FRMDLG_ACT_END STR_CHAR_CENTER diff --git a/sw/source/ui/inc/globals.h b/sw/source/ui/inc/globals.h index 46a2fba86397..d176d541630a 100644 --- a/sw/source/ui/inc/globals.h +++ b/sw/source/ui/inc/globals.h @@ -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/inc/globdoc.hrc b/sw/source/ui/inc/globdoc.hrc index cf06e4de05ca..1a27e6236222 100644 --- a/sw/source/ui/inc/globdoc.hrc +++ b/sw/source/ui/inc/globdoc.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 @@ -30,10 +30,10 @@ #include "rcid.hrc" -#define STR_HUMAN_SWGLOBDOC_NAME (RC_GLOBDOC_BEGIN + 2) -#define STR_WRITER_GLOBALDOC_FULLTYPE_40 (RC_GLOBDOC_BEGIN + 3) -#define STR_WRITER_GLOBALDOC_FULLTYPE_50 (RC_GLOBDOC_BEGIN + 4) -#define STR_WRITER_GLOBALDOC_FULLTYPE (RC_GLOBDOC_BEGIN + 5) +#define STR_HUMAN_SWGLOBDOC_NAME (RC_GLOBDOC_BEGIN + 2) +#define STR_WRITER_GLOBALDOC_FULLTYPE_40 (RC_GLOBDOC_BEGIN + 3) +#define STR_WRITER_GLOBALDOC_FULLTYPE_50 (RC_GLOBDOC_BEGIN + 4) +#define STR_WRITER_GLOBALDOC_FULLTYPE (RC_GLOBDOC_BEGIN + 5) #define MN_GLOBALFILE (RC_GLOBDOC_BEGIN + 30) #define MN_GLOBALEDIT (RC_GLOBDOC_BEGIN + 31) diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx index c96e4177027b..ee8b73aaeb10 100644 --- a/sw/source/ui/inc/glosbib.hxx +++ b/sw/source/ui/inc/glosbib.hxx @@ -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 @@ -69,35 +69,35 @@ public: SwGlossaryGroupTLB(Window* pParent, const ResId& rResId) : SvTabListBox(pParent, rResId) {} - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); }; class SwGlossaryGroupDlg : public SvxStandardDialog { - FEdit aNameED; - ListBox aPathLB; - SwGlossaryGroupTLB aGroupTLB; + FEdit aNameED; + ListBox aPathLB; + SwGlossaryGroupTLB aGroupTLB; - OKButton aOkPB; - CancelButton aCancelPB; - HelpButton aHelpPB; - PushButton aNewPB; - PushButton aDelPB; - PushButton aRenamePB; + OKButton aOkPB; + CancelButton aCancelPB; + HelpButton aHelpPB; + PushButton aNewPB; + PushButton aDelPB; + PushButton aRenamePB; FixedText aBibFT; FixedText aPathFT; FixedText aSelectFT; - SvStrings* pRemovedArr; - SvStrings* pInsertedArr; - SvStrings* pRenamedArr; + SvStrings* pRemovedArr; + SvStrings* pInsertedArr; + SvStrings* pRenamedArr; - SwGlossaryHdl *pGlosHdl; + SwGlossaryHdl *pGlosHdl; - String sCreatedGroup; + String sCreatedGroup; - BOOL IsDeleteAllowed(const String &rGroup); + BOOL IsDeleteAllowed(const String &rGroup); protected: virtual void Apply(); @@ -113,7 +113,7 @@ public: SwGlossaryHdl *pGlosHdl); ~SwGlossaryGroupDlg(); - const String& GetCreatedGroupName() const {return sCreatedGroup;} + const String& GetCreatedGroupName() const {return sCreatedGroup;} }; diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx index 1436c7fe8db9..343c3a6ca105 100644 --- a/sw/source/ui/inc/glosdoc.hxx +++ b/sw/source/ui/inc/glosdoc.hxx @@ -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 @@ -69,8 +69,8 @@ class SW_DLLPUBLIC SwGlossaries SvStrings *m_pGlosArr; BOOL m_bError; - SW_DLLPRIVATE SwTextBlocks* GetGlosDoc(const String &rName, BOOL bCreate = TRUE) const; - SW_DLLPRIVATE SvStrings *GetNameList(); + SW_DLLPRIVATE SwTextBlocks* GetGlosDoc(const String &rName, BOOL bCreate = TRUE) const; + SW_DLLPRIVATE SvStrings *GetNameList(); // implementation in unoatxt.cxx SW_DLLPRIVATE void RemoveFileFromList( const String& rGroup ); @@ -118,28 +118,28 @@ public: bool _bCreate = false ); - USHORT GetGroupCnt(); - String GetGroupName(USHORT ); - String GetGroupTitle( const String& rGroupName ); + USHORT GetGroupCnt(); + String GetGroupName(USHORT ); + String GetGroupTitle( const String& rGroupName ); - BOOL FindGroupName(String & rGroup); + BOOL FindGroupName(String & rGroup); - SwTextBlocks* GetGroupDoc(const String &rName, + SwTextBlocks* GetGroupDoc(const String &rName, BOOL bCreate = FALSE) const; - SwTextBlocks* GetDefGroupDoc() const {return GetGroupDoc(GetDefName());} - void PutGroupDoc(SwTextBlocks *pBlock); - static String GetDefName(); - static String GetExtension(); - - String GetCompleteGroupName( const ::rtl::OUString& GroupName ); - - BOOL NewGroupDoc(String &rGroupName, const String& rTitle); - BOOL RenameGroupDoc(const String& sOldGroup, String& sNewGroup, const String& rNewTitle); - BOOL DelGroupDoc(const String &); - SwDocShellRef EditGroupDoc(const String &rGrpName, const String& rShortName, BOOL bShow = TRUE ); - void SaveGroupDoc(const String &rGrpName, const String& rLongName ); - void UpdateGlosPath(BOOL bFull); - void ShowError(); + SwTextBlocks* GetDefGroupDoc() const {return GetGroupDoc(GetDefName());} + void PutGroupDoc(SwTextBlocks *pBlock); + static String GetDefName(); + static String GetExtension(); + + String GetCompleteGroupName( const ::rtl::OUString& GroupName ); + + BOOL NewGroupDoc(String &rGroupName, const String& rTitle); + BOOL RenameGroupDoc(const String& sOldGroup, String& sNewGroup, const String& rNewTitle); + BOOL DelGroupDoc(const String &); + SwDocShellRef EditGroupDoc(const String &rGrpName, const String& rShortName, BOOL bShow = TRUE ); + void SaveGroupDoc(const String &rGrpName, const String& rLongName ); + void UpdateGlosPath(BOOL bFull); + void ShowError(); inline ULONG IsGlosPathErr() { return m_bError; } const SvStrings* GetPathArray() const {return m_pPathArr;} }; diff --git a/sw/source/ui/inc/gloshdl.hxx b/sw/source/ui/inc/gloshdl.hxx index df9e610f4b9a..0e8b181f23c1 100644 --- a/sw/source/ui/inc/gloshdl.hxx +++ b/sw/source/ui/inc/gloshdl.hxx @@ -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 @@ -40,68 +40,68 @@ class SfxViewFrame; class SW_DLLPUBLIC SwGlossaryHdl { - SwGlossaries& rStatGlossaries; - String aCurGrp; - SfxViewFrame* pViewFrame; - SwWrtShell* pWrtShell; - SwTextBlocks* pCurGrp; + SwGlossaries& rStatGlossaries; + String aCurGrp; + SfxViewFrame* pViewFrame; + SwWrtShell* pWrtShell; + SwTextBlocks* pCurGrp; - SW_DLLPRIVATE void _SetMacros(const String &rName, + SW_DLLPRIVATE void _SetMacros(const String &rName, const SvxMacro *pStart, const SvxMacro *pEnd); - SW_DLLPRIVATE BOOL Expand( const String& rShortName, + SW_DLLPRIVATE BOOL Expand( const String& rShortName, SwGlossaries* pGlossaries, SwTextBlocks *pGlossary ); public: BOOL ConvertToNew(SwTextBlocks& rOld); - void GlossaryDlg(); + void GlossaryDlg(); - USHORT GetGroupCnt() const; - String GetGroupName( USHORT, String* pTitle = 0 ); - BOOL NewGroup(String & rGroupName, const String& rTitle); - BOOL DelGroup(const String &); - BOOL RenameGroup(const String & rOld, String& rNew, const String& rNewTitle); - void SetCurGroup(const String &aGrp, BOOL bApi = FALSE, BOOL bAlwaysCreateNew = FALSE); + USHORT GetGroupCnt() const; + String GetGroupName( USHORT, String* pTitle = 0 ); + BOOL NewGroup(String & rGroupName, const String& rTitle); + BOOL DelGroup(const String &); + BOOL RenameGroup(const String & rOld, String& rNew, const String& rNewTitle); + void SetCurGroup(const String &aGrp, BOOL bApi = FALSE, BOOL bAlwaysCreateNew = FALSE); const String &GetCurGroup() const { return aCurGrp; } - USHORT GetGlossaryCnt(); - String GetGlossaryName(USHORT); - String GetGlossaryShortName(const String &rName); - String GetGlossaryShortName(USHORT); + USHORT GetGlossaryCnt(); + String GetGlossaryName(USHORT); + String GetGlossaryShortName(const String &rName); + String GetGlossaryShortName(USHORT); BOOL Rename( const String& rOldShortName, const String& rNewShortName, const String& rNewName); BOOL CopyOrMove( const String& rSourceGroupName, String& rSourceShortName, const String& rDestGroupName, const String& rLongName, BOOL bMove ); - BOOL HasShortName(const String &rShortName) const; + BOOL HasShortName(const String &rShortName) const; //wird NewGlossary vom Basic gerufen, dann soll dir zuvor eingestellte //Gruppe ggf. neu erstellt werden - BOOL NewGlossary(const String &rName, const String &rShortName, + BOOL NewGlossary(const String &rName, const String &rShortName, BOOL bApiCall = FALSE, BOOL bNoAttr = FALSE ); - BOOL DelGlossary(const String&); - BOOL CopyToClipboard(SwWrtShell& rSh, const String& rShortName); + BOOL DelGlossary(const String&); + BOOL CopyToClipboard(SwWrtShell& rSh, const String& rShortName); BOOL ExpandGlossary(); - BOOL InsertGlossary(const String &rName); + BOOL InsertGlossary(const String &rName); - void SetMacros(const String& rName, + void SetMacros(const String& rName, const SvxMacro* pStart, const SvxMacro* pEnd, SwTextBlocks *pGlossary = 0 ); - void GetMacros(const String& rShortName, + void GetMacros(const String& rShortName, SvxMacro& rStart, SvxMacro& rEnd, SwTextBlocks* pGlossary = 0 ); - BOOL IsReadOnly( const String* = 0 ) const; - BOOL IsOld() const; + BOOL IsReadOnly( const String* = 0 ) const; + BOOL IsOld() const; - BOOL FindGroupName(String & rGroup); // Gruppe ohne Pfadindex finden + BOOL FindGroupName(String & rGroup); // Gruppe ohne Pfadindex finden - BOOL ImportGlossaries( const String& rName ); + BOOL ImportGlossaries( const String& rName ); SwGlossaryHdl(SfxViewFrame* pViewFrame, SwWrtShell *); ~SwGlossaryHdl(); diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx index 52654c84b865..b2a001301841 100644 --- a/sw/source/ui/inc/gloslst.hxx +++ b/sw/source/ui/inc/gloslst.hxx @@ -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 @@ -39,12 +39,12 @@ class SvStringsISortDtor; struct AutoTextGroup { - USHORT nCount; - String sName; - String sTitle; - String sLongNames; // durch 0x0A getrennte Langnamen - String sShortNames; // durch 0x0A getrennte Kurznamen - DateTime aDateModified; + USHORT nCount; + String sName; + String sTitle; + String sLongNames; // durch 0x0A getrennte Langnamen + String sShortNames; // durch 0x0A getrennte Kurznamen + DateTime aDateModified; }; @@ -53,31 +53,31 @@ SV_DECL_PTRARR(AutoTextGroups, AutoTextGroupPtr, 4, 4) class SwGlossaryList : public AutoTimer { - AutoTextGroups aGroupArr; - String sPath; - BOOL bFilled; + AutoTextGroups aGroupArr; + String sPath; + BOOL bFilled; - AutoTextGroup* FindGroup(const String& rGroupName); - void FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGloss); + AutoTextGroup* FindGroup(const String& rGroupName); + void FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGloss); public: SwGlossaryList(); ~SwGlossaryList(); - BOOL HasLongName(const String& rBegin, SvStringsISortDtor* pLongNames ); - BOOL GetShortName(const String& rLongName, + BOOL HasLongName(const String& rBegin, SvStringsISortDtor* pLongNames ); + BOOL GetShortName(const String& rLongName, String& rShortName, String& rGroupName ); - USHORT GetGroupCount(); - String GetGroupName(USHORT nPos, BOOL bNoPath = TRUE, String* pTitle = 0); - USHORT GetBlockCount(USHORT nGroup); - String GetBlockName(USHORT nGroup, USHORT nBlock, String& rShortName); + USHORT GetGroupCount(); + String GetGroupName(USHORT nPos, BOOL bNoPath = TRUE, String* pTitle = 0); + USHORT GetBlockCount(USHORT nGroup); + String GetBlockName(USHORT nGroup, USHORT nBlock, String& rShortName); - void Update(); + void Update(); - virtual void Timeout(); + virtual void Timeout(); - void ClearGroups(); + void ClearGroups(); }; #endif diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx index 3c6ce003ca8f..369b4d16fe1a 100644 --- a/sw/source/ui/inc/glossary.hxx +++ b/sw/source/ui/inc/glossary.hxx @@ -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 @@ -76,7 +76,7 @@ const short RET_EDIT = 100; class SwGlTreeListBox : public SvTreeListBox { - const String sReadonly; + const String sReadonly; SvLBoxEntry* pDragEntry; @@ -89,15 +89,15 @@ class SwGlTreeListBox : public SvTreeListBox SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos ); - virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, + virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, - ULONG& rNewChildPos); + ULONG& rNewChildPos); public: SwGlTreeListBox(Window* pParent, const ResId& rResId); - virtual void RequestHelp( const HelpEvent& rHEvt ); - void Clear(); + virtual void RequestHelp( const HelpEvent& rHEvt ); + void Clear(); }; //------------------------------------------------------------------ @@ -107,44 +107,44 @@ class SwGlossaryDlg : public SvxStandardDialog friend class SwNewGlosNameDlg; friend class SwGlTreeListBox; - CheckBox aInsertTipCB; - FixedText aNameLbl; - Edit aNameED; - FixedText aShortNameLbl; - NoSpaceEdit aShortNameEdit; - SwGlTreeListBox aCategoryBox; + CheckBox aInsertTipCB; + FixedText aNameLbl; + Edit aNameED; + FixedText aShortNameLbl; + NoSpaceEdit aShortNameEdit; + SwGlTreeListBox aCategoryBox; FixedLine aRelativeFL; - CheckBox aFileRelCB; - CheckBox aNetRelCB; + CheckBox aFileRelCB; + CheckBox aNetRelCB; Window aExampleWIN; Window aExampleDummyWIN; CheckBox aShowExampleCB; - OKButton aInsertBtn; - CancelButton aCloseBtn; - HelpButton aHelpBtn; - MenuButton aEditBtn; - PushButton aBibBtn; - PushButton aPathBtn; + OKButton aInsertBtn; + CancelButton aCloseBtn; + HelpButton aHelpBtn; + MenuButton aEditBtn; + PushButton aBibBtn; + PushButton aPathBtn; - String sReadonlyPath; + String sReadonlyPath; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > _xAutoText; - SwOneExampleFrame* pExampleFrame; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > _xAutoText; + SwOneExampleFrame* pExampleFrame; - PopupMenu* pMenu; - SwGlossaryHdl* pGlossaryHdl; + PopupMenu* pMenu; + SwGlossaryHdl* pGlossaryHdl; - String sResumeGroup; - String sResumeShortName; - BOOL bResume; + String sResumeGroup; + String sResumeShortName; + BOOL bResume; - const sal_Bool bSelection : 1; - sal_Bool bReadOnly : 1; - sal_Bool bIsOld : 1; - sal_Bool bIsDocReadOnly:1; + const sal_Bool bSelection : 1; + sal_Bool bReadOnly : 1; + sal_Bool bIsOld : 1; + sal_Bool bIsDocReadOnly:1; - SwWrtShell* pSh; + SwWrtShell* pSh; void EnableShortName(sal_Bool bOn = sal_True); @@ -161,26 +161,26 @@ class SwGlossaryDlg : public SvxStandardDialog DECL_LINK( PreviewLoadedHdl, void * ); - virtual void Apply(); - void Init(); - SvLBoxEntry* DoesBlockExist(const String& sBlock, const String& rShort); - void ShowAutoText(const String& rGroup, const String& rShortName); - void ResumeShowAutoText(); + virtual void Apply(); + void Init(); + SvLBoxEntry* DoesBlockExist(const String& sBlock, const String& rShort); + void ShowAutoText(const String& rGroup, const String& rShortName); + void ResumeShowAutoText(); - BOOL GetResumeData(String& rGroup, String& rShortName) + BOOL GetResumeData(String& rGroup, String& rShortName) {rGroup = sResumeGroup; rShortName = sResumeShortName; return bResume;} - void SetResumeData(const String& rGroup, const String& rShortName) + void SetResumeData(const String& rGroup, const String& rShortName) {sResumeGroup = rGroup; sResumeShortName = rShortName; bResume = TRUE;} - void ResetResumeData() {bResume = FALSE;} + void ResetResumeData() {bResume = FALSE;} public: SwGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell); ~SwGlossaryDlg(); - String GetCurrGrpName() const; - inline String GetCurrLongName() const; - inline String GetCurrShortName() const; + String GetCurrGrpName() const; + inline String GetCurrLongName() const; + inline String GetCurrShortName() const; static String GetCurrGroup(); - static void SetActGroup(const String& rNewGroup); - static String GetExtension(); + static void SetActGroup(const String& rNewGroup); + static String GetExtension(); }; inline String SwGlossaryDlg::GetCurrLongName() const diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/ui/inc/glshell.hxx index ac97aa7a7f70..f9730f54e83b 100644 --- a/sw/source/ui/inc/glshell.hxx +++ b/sw/source/ui/inc/glshell.hxx @@ -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 @@ -30,10 +30,10 @@ class SwGlosDocShell : public SwDocShell { - String aLongName; - String aShortName; - String aGroupName; - sal_Bool bShow; + String aLongName; + String aShortName; + String aGroupName; + sal_Bool bShow; using SotObject::GetInterface; @@ -44,27 +44,27 @@ public: TYPEINFO(); SFX_DECL_INTERFACE(SW_GLOSDOCSHELL) - + SwGlosDocShell( sal_Bool bNewShow = sal_True); virtual ~SwGlosDocShell(); - void Execute( SfxRequest& ); - void GetState( SfxItemSet& ); - void SetLongName( const String& rLongName ) + void Execute( SfxRequest& ); + void GetState( SfxItemSet& ); + void SetLongName( const String& rLongName ) { aLongName = rLongName; } - void SetShortName( const String& rShortName ) + void SetShortName( const String& rShortName ) { aShortName = rShortName; } - void SetGroupName( const String& rGroupName ) + void SetGroupName( const String& rGroupName ) { aGroupName = rGroupName; } - const String& GetShortName(){return aShortName;} + const String& GetShortName(){return aShortName;} }; class SwWebGlosDocShell : public SwWebDocShell { - String aLongName; - String aShortName; - String aGroupName; + String aLongName; + String aShortName; + String aGroupName; using SotObject::GetInterface; @@ -75,19 +75,19 @@ public: TYPEINFO(); SFX_DECL_INTERFACE(SW_WEBGLOSDOCSHELL) - + SwWebGlosDocShell(); virtual ~SwWebGlosDocShell(); - void Execute( SfxRequest& ); - void GetState( SfxItemSet& ); - void SetLongName( const String& rLongName ) + void Execute( SfxRequest& ); + void GetState( SfxItemSet& ); + void SetLongName( const String& rLongName ) { aLongName = rLongName; } - void SetShortName( const String& rShortName ) + void SetShortName( const String& rShortName ) { aShortName = rShortName; } - void SetGroupName( const String& rGroupName ) + void SetGroupName( const String& rGroupName ) { aGroupName = rGroupName; } - const String& GetShortName(){return aShortName;} + const String& GetShortName(){return aShortName;} }; #endif diff --git a/sw/source/ui/inc/grfsh.hxx b/sw/source/ui/inc/grfsh.hxx index f8448ae9bc68..7c1e576ebb98 100644 --- a/sw/source/ui/inc/grfsh.hxx +++ b/sw/source/ui/inc/grfsh.hxx @@ -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 @@ -34,9 +34,9 @@ class SwGrfShell: public SwBaseShell public: SFX_DECL_INTERFACE(SW_GRFSHELL) - void Execute(SfxRequest &); - void ExecAttr(SfxRequest &); - void GetAttrState(SfxItemSet &); + void Execute(SfxRequest &); + void ExecAttr(SfxRequest &); + void GetAttrState(SfxItemSet &); SwGrfShell(SwView &rView); }; diff --git a/sw/source/ui/inc/hidfunc.h b/sw/source/ui/inc/hidfunc.h index d5cff23e616b..9766f35f2ce8 100644 --- a/sw/source/ui/inc/hidfunc.h +++ b/sw/source/ui/inc/hidfunc.h @@ -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,327 +24,327 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define HID_EXIT 1017 -#define HID_NEW_WINDOW 1701 -#define HID_ARRANGE_CASCADE_WIN 1703 -#define HID_ARRANGE_HORZ_WIN 1704 -#define HID_ARRANGE_VERT_WIN 1705 -#define HID_ARRANGE_ALL_WIN 1702 -#define HID_SHOW_HELP_INDEX 1802 -#define HID_NEW_FILE 1005 -#define HID_NEW_FILE_DEFAULT 1024 -#define HID_CLOSE_FILE 1001 -#define HID_DOC_MGR_DLG 1032 -#define HID_CONFIG_TOOLBOX 1629 -#define HID_CONFIG_MENU 1630 -#define HID_CONFIG_KEY 1631 -#define HID_TEMPLATE_PI 1657 -#define HID_ADDR_PI 1658 -#define HID_AUTO_FORMAT 1651 -#define HID_NAVIGATION_PI 1656 -#define HID_NAVIGATION_PI_GOTO_PAGE 1659 -#define HID_HELP_PI 1655 -#define HID_FORMAT_DROPCAPS 1454 -#define HID_CONFIG_VIEWOPTIONS 1635 -#define HID_CONFIG_COLORS 1636 -#define HID_TOOLBOX 1213 -#define HID_RIBBON 1210 -#define HID_RULER 1211 -#define HID_VLINEAL 1216 -#define HID_VSCROLLBAR 1217 -#define HID_HSCROLLBAR 1218 -#define HID_SAVE_FILE 1013 -#define HID_SAVE_ALL 1023 -#define HID_SAVE_FILE_AS 1012 -#define HID_OPEN_LASTVERSION 1009 -#define HID_STATUSBAR 1212 -#define HID_ABOUT_DLG 1806 -#define HID_SEND_MAIL 1022 -#define HID_OPEN_FILE 1007 -#define HID_INSERT_FILE 1309 -#define HID_DOCSTAT_DLG 1020 -#define HID_LOAD_TEMPLATE_DLG 1021 -#define HID_ESCAPE 1941 -#define HID_PLAY_MACRO_DLG 1624 -#define HID_RECORD_MACRO_DLG 1622 -#define HID_ASSIGN_LOCAL_MACRO_DLG 1632 -#define HID_COMPILE_MACRO 1633 -#define HID_CREATE_DOCUMENT 1019 -#define HID_PAGEUP 1937 -#define HID_PAGEDOWN 1938 -#define HID_SET_LEFT_PARA 1418 -#define HID_SET_RIGHT_PARA 1419 -#define HID_SET_CENTER_PARA 1420 -#define HID_SET_JUSTIFY_PARA 1421 -#define HID_SET_ADJUST 1428 -#define HID_FORMAT_RESET 1469 -#define HID_INDENT_TO_TABSTOP 1417 -#define HID_UNINDENT_TO_TABSTOP 1431 -#define HID_SET_BOLD 1405 -#define HID_SET_ITALIC 1406 -#define HID_SET_UNDERLINE 1409 -#define HID_SET_STRIKEOUT 1410 -#define HID_SET_OUTLINE 1408 -#define HID_SET_SHADOW 1407 -#define HID_SET_SUPER_SCRIPT 1411 -#define HID_SET_SUB_SCRIPT 1412 -#define HID_SET_COLOR 1413 -#define HID_SET_CASEMAP 1414 -#define HID_SET_LANGUAGE 1415 -#define HID_SET_KERNING 1416 -#define HID_SET_FONT 1401 -#define HID_SET_FONT_SIZE 1402 -#define HID_GROW_FONT_SIZE 1403 -#define HID_SHRINK_FONT_SIZE 1404 -#define HID_SET_LINE_SPACE_1 1422 -#define HID_SET_LINE_SPACE_15 1423 -#define HID_SET_LINE_SPACE_2 1424 -#define HID_SET_PROP_LINE_SPACE 1540 -#define HID_SET_ABS_LINE_SPACE 1541 -#define HID_INSERT_SYMBOL 1328 -#define HID_INSERT_OBJECT_DLG 1322 -#define HID_EDIT_OBJECT 1110 -#define HID_EDIT_LINK_DLG 1109 -#define HID_EDIT_FILE_INFO_DLG 1107 -#define HID_EDIT_IDX_ENTRY_DLG 1123 -#define HID_NUM_BULLET_DOWN 1130 -#define HID_NUM_BULLET_MOVEUP 1134 -#define HID_NUM_BULLET_MOVEDOWN 1135 -#define HID_NUM_BULLET_UP 1131 -#define HID_NUM_BULLET_PREV 1132 -#define HID_NUM_BULLET_NEXT 1133 -#define HID_NUM_BULLET_OUTLINE_MOVEDOWN 1142 -#define HID_NUM_BULLET_OUTLINE_MOVEUP 1141 -#define HID_NUM_BULLET_OUTLINE_UP 1140 -#define HID_NUM_BULLET_OUTLINE_DOWN 1139 -#define HID_NUM_BULLET_NONUM 1136 -#define HID_NUM_NUMBERING_ON 1144 -#define HID_NUM_BULLET_ON 1138 -#define HID_NUM_BULLET_OFF 1137 -#define HID_INSERT_IDX_ENTRY_DLG 1335 -#define HID_POSTIT 1329 -#define HID_INSERT_CAPTION 1310 -#define HID_INSERT_IDX 1336 -#define HID_INSERT_USERIDX 1337 -#define HID_INSERT_CNTNTIDX 1338 -#define HID_INSERT_IDX_ENTRY 1340 -#define HID_INSERT_USERIDX_ENTRY 1341 -#define HID_INSERT_CNTNTIDX_ENTRY 1342 -#define HID_INSERT_FRAME 1334 -#define HID_INSERT_FRAME_INTERACT 1333 -#define HID_INSERT_SOFT_HYPHEN 1350 -#define HID_INSERT_HARD_SPACE 1351 -#define HID_FORMAT_FRAME_DLG 1456 -#define HID_FRAME_TO_TOP 1470 -#define HID_FRAME_TO_BOTTOM 1471 -#define HID_FRAME_NOWRAP 1472 -#define HID_FRAME_WRAP 1473 -#define HID_FRAME_WRAPTHRU 1474 -#define HID_FRAME_ALIGN_HORZ_LEFT 1475 -#define HID_FRAME_ALIGN_HORZ_RIGHT 1476 -#define HID_FRAME_ALIGN_HORZ_CENTER 1477 -#define HID_FRAME_ALIGN_VERT_TOP 1478 -#define HID_FRAME_ALIGN_VERT_BOTTOM 1479 -#define HID_FRAME_ALIGN_VERT_CENTER 1480 -#define HID_EDIT_FIELD 1104 -#define HID_SET_FIELD_VALUE 1112 -#define HID_INSERT_FIELD 1308 -#define HID_INSERT_MERGEFIELD_DLG 1320 -#define HID_EXECUTE_MACROFIELD 1127 -#define HID_UPDATE_FIELDS 1126 -#define HID_UPDATE_INPUTFIELDS 1143 -#define HID_CALC_TABLE 1129 -#define HID_INSERT_BREAK_DLG 1304 -#define HID_INSERT_BOOKMARK 1302 -#define HID_DELETE_BOOKMARK 1301 -#define HID_INSERT_GRAFIC 1315 -#define HID_FORMAT_TABLE_DLG 1460 -#define HID_INSERT_TABLE 1330 -#define HID_INSERT_COLS 1332 -#define HID_PAGE_STYLE_SET_COLS 1538 -#define HID_CONVERT_TEXT_TABLE 1500 -#define HID_TABLE_INSERT_ROW 1501 -#define HID_TABLE_INSERT_COL 1502 -#define HID_TABLE_DELETE_ROW 1503 -#define HID_TABLE_DELETE_COL 1504 -#define HID_TABLE_SPLIT_CELLS 1505 -#define HID_TABLE_MERGE_CELLS 1506 -#define HID_TABLE_SET_ROW_HEIGHT 1507 -#define HID_TABLE_SET_COL_WIDTH 1508 -#define HID_TABLE_SET_ULSPACE 1509 -#define HID_TABLE_SET_GRID 1510 -#define HID_TABLE_SET_SHADOW 1511 -#define HID_FORMAT_CHAR_DLG 1441 -#define HID_FORMAT_PAGE_DLG 1452 -#define HID_CHANGE_PAGENUM 1634 -#define HID_FORMAT_PARA_DLG 1443 -#define HID_FORMAT_TAB_DLG 1445 -#define HID_FORMAT_BORDER_DLG 1447 -#define HID_FORMAT_BORDER 1439 -#define HID_FORMAT_SHADOW 1438 -#define HID_FORMAT_BACKGROUND 1448 -#define HID_FORMAT_BACKGROUND_DLG 1450 -#define HID_SET_FRM_SIZE 1481 -#define HID_SET_FRM_POSITION 1482 -#define HID_SET_FRM_ANCHOR 1483 -#define HID_SET_FRM_WRAP 1484 -#define HID_SET_FRM_DIST 1485 -#define HID_SET_FRM_OPTIONS 1486 -#define HID_SET_FRM_MACRO 1494 -#define HID_SET_FRM_COLUMNS 1495 -#define HID_SET_FRM_COLUMN_WIDTH 1496 -#define HID_SET_GRF_MIRROR 1488 -#define HID_SET_TABLE_WIDTH 1489 -#define HID_SET_TABLE_ALIGN 1490 -#define HID_TABLE_SET_READ_ONLY_CELLS 1517 -#define HID_TABLE_UNSET_READ_ONLY_CELLS 1519 -#define HID_NEW_STYLE_BY_EXAMPLE 1462 -#define HID_UPDATE_STYLES_DIRECT 1497 -#define HID_UPDATE_STYLE_BY_EXAMPLE 1463 -#define HID_STYLE_SHEET_FRAME_DLG 1464 -#define HID_STYLE_SHEET_DOC_DLG 1465 -#define HID_SET_STANDARD_FONTS 1442 -#define HID_COPY 1102 -#define HID_PASTE 1113 -#define HID_PASTEUNFORMATTED 1115 -#define HID_PASTESPECIAL 1114 -#define HID_CUT 1103 -#define HID_FLIP_HORZ_GRAFIC 1425 -#define HID_FLIP_VERT_GRAFIC 1426 -#define HID_FORMAT_GRAFIC_DLG 1458 -#define HID_VIEW_BOUNDS 1214 -#define HID_VIEW_FIELDS 1215 -#define HID_VIEW_META_CHARS 1224 -#define HID_VIEW_MARKS 1225 -#define HID_VIEW_FIELDNAME 1226 -#define HID_VIEW_TABLEGRID 1227 -#define HID_SEARCH 1117 -#define HID_REPEAT_SEARCH 1150 -#define HID_REPLACE 1118 -#define HID_GOTO 1111 -#define HID_SETUP_PRINTER_DLG 1015 -#define HID_PRINT_FILE 1010 -#define HID_PRINT_FILE_DEFAULT 1025 -#define HID_FAX 1028 -#define HID_PRINT_FILE_OPTIONS 1011 -#define HID_THESAURUS_DLG 1604 -#define HID_SPELLING_DLG 1601 -#define HID_HYPHENATE_OPT_DLG 1607 -#define HID_MERGE_FILE_DLG 1004 -#define HID_SELECT_DATABASE 1030 -#define HID_DOC_INFO_DLG 1031 -#define HID_MERGE_FILE 1003 -#define HID_MERGE_RECORD 1327 -#define HID_INSERT_RECORD 1326 -#define HID_NUMBERING_OUTLINE_DLG 1612 -#define HID_NUMBER_BULLETS 1121 -#define HID_ZOOM 1231 -#define HID_SORTING 1613 -#define HID_SORTING_DLG 1614 -#define HID_CALCULATE 1615 -#define HID_REFRESH_VIEW 1201 -#define HID_CHAR_LEFT 1901 -#define HID_CHAR_RIGHT 1902 -#define HID_LINE_UP 1903 -#define HID_LINE_DOWN 1904 -#define HID_START_OF_LINE 1905 -#define HID_END_OF_LINE 1906 -#define HID_START_OF_DOCUMENT 1907 -#define HID_END_OF_DOCUMENT 1908 -#define HID_SELECT_WORD 1943 -#define HID_SELECT_ALL 1119 -#define HID_START_OF_NEXT_PAGE 1909 -#define HID_END_OF_NEXT_PAGE 1910 -#define HID_START_OF_PREV_PAGE 1911 -#define HID_END_OF_PREV_PAGE 1912 -#define HID_START_OF_PAGE 1913 -#define HID_END_OF_PAGE 1914 -#define HID_NEXT_WORD 1921 -#define HID_START_OF_PARA 1919 -#define HID_END_OF_PARA 1920 -#define HID_PREV_WORD 1922 -#define HID_NEXT_SENT 1923 -#define HID_PREV_SENT 1924 -#define HID_SET_INS_MODE 1936 -#define HID_SET_ADD_MODE 1939 -#define HID_SET_EXT_MODE 1940 -#define HID_START_TABLE 1947 -#define HID_END_TABLE 1948 -#define HID_NEXT_TABLE 1949 -#define HID_PREV_TABLE 1950 -#define HID_TABLE_SELECT_ALL 1515 -#define HID_TABLE_SELECT_COL 1514 -#define HID_TABLE_SELECT_ROW 1513 -#define HID_START_OF_COLUMN 1917 -#define HID_END_OF_COLUMN 1918 -#define HID_START_OF_NEXT_COLUMN 1951 -#define HID_END_OF_NEXT_COLUMN 1952 -#define HID_START_OF_PREV_COLUMN 1953 -#define HID_END_OF_PREV_COLUMN 1954 -#define HID_FOOTNOTE_TO_ANCHOR 1955 -#define HID_NEXT_FOOTNOTE 1956 -#define HID_PREV_FOOTNOTE 1957 -#define HID_CNTNT_TO_NEXT_FRAME 1958 -#define HID_FRAME_TO_ANCHOR 1959 -#define HID_TO_HEADER 1960 -#define HID_TO_FOOTER 1961 -#define HID_IDX_MARK_TO_IDX 1962 -#define HID_DELETE 1925 -#define HID_BACKSPACE 1926 -#define HID_DELETE_SENT 1927 -#define HID_DELETE_BACK_SENT 1928 -#define HID_DELETE_WORD 1929 -#define HID_DELETE_BACK_WORD 1930 -#define HID_DELETE_LINE 1931 -#define HID_DELETE_BACK_LINE 1932 -#define HID_DELETE_PARA 1933 -#define HID_DELETE_BACK_PARA 1934 -#define HID_DELETE_WHOLE_LINE 1935 -#define HID_INSERT_BREAK 1303 -#define HID_INSERT_PAGEBREAK 1323 -#define HID_INSERT_LINEBREAK 1318 -#define HID_INSERT_COLUMN_BREAK 1305 -#define HID_INSERT_FOOTNOTE 1311 -#define HID_INSERT_FOOTNOTE_DLG 1312 -#define HID_FORMAT_FOOTNOTE_DLG 1468 -#define HID_UNDO 1120 -#define HID_REDO 1116 -#define HID_REPEAT 1122 -#define HID_REPAGINATE 1161 -#define HID_SHOW_UPDATE_HELP 1805 -#define HID_SHOW_KEYBOARD_HELP 1803 -#define HID_SHOW_HELP_MANUAL 1804 -#define HID_GLOSSARY_DLG 1620 -#define HID_EXPAND_GLOSSARY 1628 -#define HID_INSERT_GLOSSARY 1640 -#define HID_AUTO_CORRECT_DLG 1650 -#define HID_AUTO_CORRECT 1649 -#define HID_CONFIG_DLG 1627 -#define HID_INSERT_STRING 1331 -#define HID_SET_CHAR_STYLE 1491 -#define HID_SET_PARA_STYLE 1492 -#define HID_SET_PAGE_STYLE 1493 -#define HID_SET_LRMARGIN 1429 -#define HID_SET_ULMARGIN 1430 -#define HID_SET_HYPHEN_ZONE 1432 -#define HID_SET_PAGE_BREAK 1433 -#define HID_FORMAT_PAGE 1451 -#define HID_SET_KEEP_TOGETHER 1434 -#define HID_SET_WIDOW 1436 -#define HID_SET_ORPHAN 1437 -#define HID_BUFFER_UPDATE 1124 -#define HID_FORMAT_TAB 1444 -#define HID_IS_END_OF_PARA 2000 -#define HID_IS_END_OF_WORD 2000 -#define HID_IS_END_OF_DOC 2000 -#define HID_IS_START_OF_PARA 2000 -#define HID_IS_START_OF_WORD 2000 -#define HID_IS_START_OF_DOC 2000 -#define HID_EDIT_FORMULA 1128 -#define HID_ENVELOP 2050 -#define HID_LABEL 2051 -#define HID_AGENDA_WIZZARD 1663 -#define HID_MEMO_WIZZARD 1662 -#define HID_FAX_WIZZARD 1661 -#define HID_LETTER_WIZZARD 1660 -#define HID_LAUNCH_REGISTRY 1002 +#define HID_EXIT 1017 +#define HID_NEW_WINDOW 1701 +#define HID_ARRANGE_CASCADE_WIN 1703 +#define HID_ARRANGE_HORZ_WIN 1704 +#define HID_ARRANGE_VERT_WIN 1705 +#define HID_ARRANGE_ALL_WIN 1702 +#define HID_SHOW_HELP_INDEX 1802 +#define HID_NEW_FILE 1005 +#define HID_NEW_FILE_DEFAULT 1024 +#define HID_CLOSE_FILE 1001 +#define HID_DOC_MGR_DLG 1032 +#define HID_CONFIG_TOOLBOX 1629 +#define HID_CONFIG_MENU 1630 +#define HID_CONFIG_KEY 1631 +#define HID_TEMPLATE_PI 1657 +#define HID_ADDR_PI 1658 +#define HID_AUTO_FORMAT 1651 +#define HID_NAVIGATION_PI 1656 +#define HID_NAVIGATION_PI_GOTO_PAGE 1659 +#define HID_HELP_PI 1655 +#define HID_FORMAT_DROPCAPS 1454 +#define HID_CONFIG_VIEWOPTIONS 1635 +#define HID_CONFIG_COLORS 1636 +#define HID_TOOLBOX 1213 +#define HID_RIBBON 1210 +#define HID_RULER 1211 +#define HID_VLINEAL 1216 +#define HID_VSCROLLBAR 1217 +#define HID_HSCROLLBAR 1218 +#define HID_SAVE_FILE 1013 +#define HID_SAVE_ALL 1023 +#define HID_SAVE_FILE_AS 1012 +#define HID_OPEN_LASTVERSION 1009 +#define HID_STATUSBAR 1212 +#define HID_ABOUT_DLG 1806 +#define HID_SEND_MAIL 1022 +#define HID_OPEN_FILE 1007 +#define HID_INSERT_FILE 1309 +#define HID_DOCSTAT_DLG 1020 +#define HID_LOAD_TEMPLATE_DLG 1021 +#define HID_ESCAPE 1941 +#define HID_PLAY_MACRO_DLG 1624 +#define HID_RECORD_MACRO_DLG 1622 +#define HID_ASSIGN_LOCAL_MACRO_DLG 1632 +#define HID_COMPILE_MACRO 1633 +#define HID_CREATE_DOCUMENT 1019 +#define HID_PAGEUP 1937 +#define HID_PAGEDOWN 1938 +#define HID_SET_LEFT_PARA 1418 +#define HID_SET_RIGHT_PARA 1419 +#define HID_SET_CENTER_PARA 1420 +#define HID_SET_JUSTIFY_PARA 1421 +#define HID_SET_ADJUST 1428 +#define HID_FORMAT_RESET 1469 +#define HID_INDENT_TO_TABSTOP 1417 +#define HID_UNINDENT_TO_TABSTOP 1431 +#define HID_SET_BOLD 1405 +#define HID_SET_ITALIC 1406 +#define HID_SET_UNDERLINE 1409 +#define HID_SET_STRIKEOUT 1410 +#define HID_SET_OUTLINE 1408 +#define HID_SET_SHADOW 1407 +#define HID_SET_SUPER_SCRIPT 1411 +#define HID_SET_SUB_SCRIPT 1412 +#define HID_SET_COLOR 1413 +#define HID_SET_CASEMAP 1414 +#define HID_SET_LANGUAGE 1415 +#define HID_SET_KERNING 1416 +#define HID_SET_FONT 1401 +#define HID_SET_FONT_SIZE 1402 +#define HID_GROW_FONT_SIZE 1403 +#define HID_SHRINK_FONT_SIZE 1404 +#define HID_SET_LINE_SPACE_1 1422 +#define HID_SET_LINE_SPACE_15 1423 +#define HID_SET_LINE_SPACE_2 1424 +#define HID_SET_PROP_LINE_SPACE 1540 +#define HID_SET_ABS_LINE_SPACE 1541 +#define HID_INSERT_SYMBOL 1328 +#define HID_INSERT_OBJECT_DLG 1322 +#define HID_EDIT_OBJECT 1110 +#define HID_EDIT_LINK_DLG 1109 +#define HID_EDIT_FILE_INFO_DLG 1107 +#define HID_EDIT_IDX_ENTRY_DLG 1123 +#define HID_NUM_BULLET_DOWN 1130 +#define HID_NUM_BULLET_MOVEUP 1134 +#define HID_NUM_BULLET_MOVEDOWN 1135 +#define HID_NUM_BULLET_UP 1131 +#define HID_NUM_BULLET_PREV 1132 +#define HID_NUM_BULLET_NEXT 1133 +#define HID_NUM_BULLET_OUTLINE_MOVEDOWN 1142 +#define HID_NUM_BULLET_OUTLINE_MOVEUP 1141 +#define HID_NUM_BULLET_OUTLINE_UP 1140 +#define HID_NUM_BULLET_OUTLINE_DOWN 1139 +#define HID_NUM_BULLET_NONUM 1136 +#define HID_NUM_NUMBERING_ON 1144 +#define HID_NUM_BULLET_ON 1138 +#define HID_NUM_BULLET_OFF 1137 +#define HID_INSERT_IDX_ENTRY_DLG 1335 +#define HID_POSTIT 1329 +#define HID_INSERT_CAPTION 1310 +#define HID_INSERT_IDX 1336 +#define HID_INSERT_USERIDX 1337 +#define HID_INSERT_CNTNTIDX 1338 +#define HID_INSERT_IDX_ENTRY 1340 +#define HID_INSERT_USERIDX_ENTRY 1341 +#define HID_INSERT_CNTNTIDX_ENTRY 1342 +#define HID_INSERT_FRAME 1334 +#define HID_INSERT_FRAME_INTERACT 1333 +#define HID_INSERT_SOFT_HYPHEN 1350 +#define HID_INSERT_HARD_SPACE 1351 +#define HID_FORMAT_FRAME_DLG 1456 +#define HID_FRAME_TO_TOP 1470 +#define HID_FRAME_TO_BOTTOM 1471 +#define HID_FRAME_NOWRAP 1472 +#define HID_FRAME_WRAP 1473 +#define HID_FRAME_WRAPTHRU 1474 +#define HID_FRAME_ALIGN_HORZ_LEFT 1475 +#define HID_FRAME_ALIGN_HORZ_RIGHT 1476 +#define HID_FRAME_ALIGN_HORZ_CENTER 1477 +#define HID_FRAME_ALIGN_VERT_TOP 1478 +#define HID_FRAME_ALIGN_VERT_BOTTOM 1479 +#define HID_FRAME_ALIGN_VERT_CENTER 1480 +#define HID_EDIT_FIELD 1104 +#define HID_SET_FIELD_VALUE 1112 +#define HID_INSERT_FIELD 1308 +#define HID_INSERT_MERGEFIELD_DLG 1320 +#define HID_EXECUTE_MACROFIELD 1127 +#define HID_UPDATE_FIELDS 1126 +#define HID_UPDATE_INPUTFIELDS 1143 +#define HID_CALC_TABLE 1129 +#define HID_INSERT_BREAK_DLG 1304 +#define HID_INSERT_BOOKMARK 1302 +#define HID_DELETE_BOOKMARK 1301 +#define HID_INSERT_GRAFIC 1315 +#define HID_FORMAT_TABLE_DLG 1460 +#define HID_INSERT_TABLE 1330 +#define HID_INSERT_COLS 1332 +#define HID_PAGE_STYLE_SET_COLS 1538 +#define HID_CONVERT_TEXT_TABLE 1500 +#define HID_TABLE_INSERT_ROW 1501 +#define HID_TABLE_INSERT_COL 1502 +#define HID_TABLE_DELETE_ROW 1503 +#define HID_TABLE_DELETE_COL 1504 +#define HID_TABLE_SPLIT_CELLS 1505 +#define HID_TABLE_MERGE_CELLS 1506 +#define HID_TABLE_SET_ROW_HEIGHT 1507 +#define HID_TABLE_SET_COL_WIDTH 1508 +#define HID_TABLE_SET_ULSPACE 1509 +#define HID_TABLE_SET_GRID 1510 +#define HID_TABLE_SET_SHADOW 1511 +#define HID_FORMAT_CHAR_DLG 1441 +#define HID_FORMAT_PAGE_DLG 1452 +#define HID_CHANGE_PAGENUM 1634 +#define HID_FORMAT_PARA_DLG 1443 +#define HID_FORMAT_TAB_DLG 1445 +#define HID_FORMAT_BORDER_DLG 1447 +#define HID_FORMAT_BORDER 1439 +#define HID_FORMAT_SHADOW 1438 +#define HID_FORMAT_BACKGROUND 1448 +#define HID_FORMAT_BACKGROUND_DLG 1450 +#define HID_SET_FRM_SIZE 1481 +#define HID_SET_FRM_POSITION 1482 +#define HID_SET_FRM_ANCHOR 1483 +#define HID_SET_FRM_WRAP 1484 +#define HID_SET_FRM_DIST 1485 +#define HID_SET_FRM_OPTIONS 1486 +#define HID_SET_FRM_MACRO 1494 +#define HID_SET_FRM_COLUMNS 1495 +#define HID_SET_FRM_COLUMN_WIDTH 1496 +#define HID_SET_GRF_MIRROR 1488 +#define HID_SET_TABLE_WIDTH 1489 +#define HID_SET_TABLE_ALIGN 1490 +#define HID_TABLE_SET_READ_ONLY_CELLS 1517 +#define HID_TABLE_UNSET_READ_ONLY_CELLS 1519 +#define HID_NEW_STYLE_BY_EXAMPLE 1462 +#define HID_UPDATE_STYLES_DIRECT 1497 +#define HID_UPDATE_STYLE_BY_EXAMPLE 1463 +#define HID_STYLE_SHEET_FRAME_DLG 1464 +#define HID_STYLE_SHEET_DOC_DLG 1465 +#define HID_SET_STANDARD_FONTS 1442 +#define HID_COPY 1102 +#define HID_PASTE 1113 +#define HID_PASTEUNFORMATTED 1115 +#define HID_PASTESPECIAL 1114 +#define HID_CUT 1103 +#define HID_FLIP_HORZ_GRAFIC 1425 +#define HID_FLIP_VERT_GRAFIC 1426 +#define HID_FORMAT_GRAFIC_DLG 1458 +#define HID_VIEW_BOUNDS 1214 +#define HID_VIEW_FIELDS 1215 +#define HID_VIEW_META_CHARS 1224 +#define HID_VIEW_MARKS 1225 +#define HID_VIEW_FIELDNAME 1226 +#define HID_VIEW_TABLEGRID 1227 +#define HID_SEARCH 1117 +#define HID_REPEAT_SEARCH 1150 +#define HID_REPLACE 1118 +#define HID_GOTO 1111 +#define HID_SETUP_PRINTER_DLG 1015 +#define HID_PRINT_FILE 1010 +#define HID_PRINT_FILE_DEFAULT 1025 +#define HID_FAX 1028 +#define HID_PRINT_FILE_OPTIONS 1011 +#define HID_THESAURUS_DLG 1604 +#define HID_SPELLING_DLG 1601 +#define HID_HYPHENATE_OPT_DLG 1607 +#define HID_MERGE_FILE_DLG 1004 +#define HID_SELECT_DATABASE 1030 +#define HID_DOC_INFO_DLG 1031 +#define HID_MERGE_FILE 1003 +#define HID_MERGE_RECORD 1327 +#define HID_INSERT_RECORD 1326 +#define HID_NUMBERING_OUTLINE_DLG 1612 +#define HID_NUMBER_BULLETS 1121 +#define HID_ZOOM 1231 +#define HID_SORTING 1613 +#define HID_SORTING_DLG 1614 +#define HID_CALCULATE 1615 +#define HID_REFRESH_VIEW 1201 +#define HID_CHAR_LEFT 1901 +#define HID_CHAR_RIGHT 1902 +#define HID_LINE_UP 1903 +#define HID_LINE_DOWN 1904 +#define HID_START_OF_LINE 1905 +#define HID_END_OF_LINE 1906 +#define HID_START_OF_DOCUMENT 1907 +#define HID_END_OF_DOCUMENT 1908 +#define HID_SELECT_WORD 1943 +#define HID_SELECT_ALL 1119 +#define HID_START_OF_NEXT_PAGE 1909 +#define HID_END_OF_NEXT_PAGE 1910 +#define HID_START_OF_PREV_PAGE 1911 +#define HID_END_OF_PREV_PAGE 1912 +#define HID_START_OF_PAGE 1913 +#define HID_END_OF_PAGE 1914 +#define HID_NEXT_WORD 1921 +#define HID_START_OF_PARA 1919 +#define HID_END_OF_PARA 1920 +#define HID_PREV_WORD 1922 +#define HID_NEXT_SENT 1923 +#define HID_PREV_SENT 1924 +#define HID_SET_INS_MODE 1936 +#define HID_SET_ADD_MODE 1939 +#define HID_SET_EXT_MODE 1940 +#define HID_START_TABLE 1947 +#define HID_END_TABLE 1948 +#define HID_NEXT_TABLE 1949 +#define HID_PREV_TABLE 1950 +#define HID_TABLE_SELECT_ALL 1515 +#define HID_TABLE_SELECT_COL 1514 +#define HID_TABLE_SELECT_ROW 1513 +#define HID_START_OF_COLUMN 1917 +#define HID_END_OF_COLUMN 1918 +#define HID_START_OF_NEXT_COLUMN 1951 +#define HID_END_OF_NEXT_COLUMN 1952 +#define HID_START_OF_PREV_COLUMN 1953 +#define HID_END_OF_PREV_COLUMN 1954 +#define HID_FOOTNOTE_TO_ANCHOR 1955 +#define HID_NEXT_FOOTNOTE 1956 +#define HID_PREV_FOOTNOTE 1957 +#define HID_CNTNT_TO_NEXT_FRAME 1958 +#define HID_FRAME_TO_ANCHOR 1959 +#define HID_TO_HEADER 1960 +#define HID_TO_FOOTER 1961 +#define HID_IDX_MARK_TO_IDX 1962 +#define HID_DELETE 1925 +#define HID_BACKSPACE 1926 +#define HID_DELETE_SENT 1927 +#define HID_DELETE_BACK_SENT 1928 +#define HID_DELETE_WORD 1929 +#define HID_DELETE_BACK_WORD 1930 +#define HID_DELETE_LINE 1931 +#define HID_DELETE_BACK_LINE 1932 +#define HID_DELETE_PARA 1933 +#define HID_DELETE_BACK_PARA 1934 +#define HID_DELETE_WHOLE_LINE 1935 +#define HID_INSERT_BREAK 1303 +#define HID_INSERT_PAGEBREAK 1323 +#define HID_INSERT_LINEBREAK 1318 +#define HID_INSERT_COLUMN_BREAK 1305 +#define HID_INSERT_FOOTNOTE 1311 +#define HID_INSERT_FOOTNOTE_DLG 1312 +#define HID_FORMAT_FOOTNOTE_DLG 1468 +#define HID_UNDO 1120 +#define HID_REDO 1116 +#define HID_REPEAT 1122 +#define HID_REPAGINATE 1161 +#define HID_SHOW_UPDATE_HELP 1805 +#define HID_SHOW_KEYBOARD_HELP 1803 +#define HID_SHOW_HELP_MANUAL 1804 +#define HID_GLOSSARY_DLG 1620 +#define HID_EXPAND_GLOSSARY 1628 +#define HID_INSERT_GLOSSARY 1640 +#define HID_AUTO_CORRECT_DLG 1650 +#define HID_AUTO_CORRECT 1649 +#define HID_CONFIG_DLG 1627 +#define HID_INSERT_STRING 1331 +#define HID_SET_CHAR_STYLE 1491 +#define HID_SET_PARA_STYLE 1492 +#define HID_SET_PAGE_STYLE 1493 +#define HID_SET_LRMARGIN 1429 +#define HID_SET_ULMARGIN 1430 +#define HID_SET_HYPHEN_ZONE 1432 +#define HID_SET_PAGE_BREAK 1433 +#define HID_FORMAT_PAGE 1451 +#define HID_SET_KEEP_TOGETHER 1434 +#define HID_SET_WIDOW 1436 +#define HID_SET_ORPHAN 1437 +#define HID_BUFFER_UPDATE 1124 +#define HID_FORMAT_TAB 1444 +#define HID_IS_END_OF_PARA 2000 +#define HID_IS_END_OF_WORD 2000 +#define HID_IS_END_OF_DOC 2000 +#define HID_IS_START_OF_PARA 2000 +#define HID_IS_START_OF_WORD 2000 +#define HID_IS_START_OF_DOC 2000 +#define HID_EDIT_FORMULA 1128 +#define HID_ENVELOP 2050 +#define HID_LABEL 2051 +#define HID_AGENDA_WIZZARD 1663 +#define HID_MEMO_WIZZARD 1662 +#define HID_FAX_WIZZARD 1661 +#define HID_LETTER_WIZZARD 1660 +#define HID_LAUNCH_REGISTRY 1002 diff --git a/sw/source/ui/inc/hyp.hxx b/sw/source/ui/inc/hyp.hxx index 330507024f3c..6f06a226584c 100644 --- a/sw/source/ui/inc/hyp.hxx +++ b/sw/source/ui/inc/hyp.hxx @@ -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 @@ -37,29 +37,29 @@ class SwView; class SwHyphWrapper : public SvxSpellWrapper { private: SwView* pView; - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > xHyph; - Link aOldLnk; - LanguageType nLangError; // nicht vorhandene Sprache - sal_uInt16 nPageCount; // Seitenanzahl fuer Progressanzeige - sal_uInt16 nPageStart; // 1. gepruefte Seite - sal_Bool bInSelection : 1; // Trennen von selektiertem Text - sal_Bool bShowError : 1; // nicht vorhandene Sprache melden - sal_Bool bAutomatic : 1; // Trennstellen ohne Rueckfrage einfuegen + Link aOldLnk; + LanguageType nLangError; // nicht vorhandene Sprache + sal_uInt16 nPageCount; // Seitenanzahl fuer Progressanzeige + sal_uInt16 nPageStart; // 1. gepruefte Seite + sal_Bool bInSelection : 1; // Trennen von selektiertem Text + sal_Bool bShowError : 1; // nicht vorhandene Sprache melden + sal_Bool bAutomatic : 1; // Trennstellen ohne Rueckfrage einfuegen sal_Bool bInfoBox : 1; // display info-box when ending DECL_LINK( SpellError, LanguageType * ); protected: - virtual void SpellStart( SvxSpellArea eSpell ); - virtual sal_Bool SpellContinue(); - virtual void SpellEnd( ); - virtual sal_Bool SpellMore(); + virtual void SpellStart( SvxSpellArea eSpell ); + virtual sal_Bool SpellContinue(); + virtual void SpellEnd( ); + virtual sal_Bool SpellMore(); virtual void InsertHyphen( const sal_uInt16 nPos ); // Hyphen einfuegen public: - SwHyphWrapper( SwView* pVw, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > &rxHyph, + SwHyphWrapper( SwView* pVw, + ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XHyphenator > &rxHyph, sal_Bool bStart, sal_Bool bOther, sal_Bool bSelect ); ~SwHyphWrapper(); }; diff --git a/sw/source/ui/inc/idxmrk.hxx b/sw/source/ui/inc/idxmrk.hxx index 6d569bb798dd..429db80af83b 100644 --- a/sw/source/ui/inc/idxmrk.hxx +++ b/sw/source/ui/inc/idxmrk.hxx @@ -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 @@ -40,7 +40,7 @@ class SwInsertIdxMarkWrapper : public SfxChildWindow { AbstractMarkFloatDlg* pAbstDlg; protected: - SwInsertIdxMarkWrapper( Window *pParentWindow, + SwInsertIdxMarkWrapper( Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); @@ -48,7 +48,7 @@ protected: SFX_DECL_CHILDWINDOW(SwInsertIdxMarkWrapper); public: - void ReInitDlg(SwWrtShell& rWrtShell); + void ReInitDlg(SwWrtShell& rWrtShell); }; /* -----------------07.09.99 08:02------------------- @@ -58,7 +58,7 @@ class SwInsertAuthMarkWrapper : public SfxChildWindow { AbstractMarkFloatDlg* pAbstDlg; protected: - SwInsertAuthMarkWrapper( Window *pParentWindow, + SwInsertAuthMarkWrapper( Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); @@ -66,7 +66,7 @@ protected: SFX_DECL_CHILDWINDOW(SwInsertAuthMarkWrapper); public: - void ReInitDlg(SwWrtShell& rWrtShell); + void ReInitDlg(SwWrtShell& rWrtShell); }; #endif // _IDXMRK_HXX diff --git a/sw/source/ui/inc/imaildsplistener.hxx b/sw/source/ui/inc/imaildsplistener.hxx index 9cb7d11f2684..90d6e16450e0 100644 --- a/sw/source/ui/inc/imaildsplistener.hxx +++ b/sw/source/ui/inc/imaildsplistener.hxx @@ -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 @@ -36,10 +36,10 @@ class MailDispatcher; /** MailDispatcher listener interface. - Clients may implement and register instances of the + Clients may implement and register instances of the mail dispatcher interface in order to get notifications - about the MailDispatcher status. - + about the MailDispatcher status. + @see MailDispatcher */ class IMailDispatcherListener : public ::salhelper::ReferenceObject @@ -49,29 +49,29 @@ public: Called when the MailDispatcher is started. */ virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher) = 0; - + /** Called when the MailDispatcher is stopped. */ virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher) = 0; - + /** Called when there are no more mail messages - to deliver. + to deliver. */ virtual void idle(::rtl::Reference<MailDispatcher> xMailDispatcher) = 0; - + /** - Called for every mail message that has been + Called for every mail message that has been successfully delivered. */ - virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage) = 0; - + virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage) = 0; + /** Called for every mail message whose delivery failed. */ - virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage, const rtl::OUString& sErrorMessage) = 0; + virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage, const rtl::OUString& sErrorMessage) = 0; }; #endif // INCLUDED_IMAILDISPATCHERLISTENER_HXX diff --git a/sw/source/ui/inc/initui.hxx b/sw/source/ui/inc/initui.hxx index 0a81e53f6149..7f180c917638 100644 --- a/sw/source/ui/inc/initui.hxx +++ b/sw/source/ui/inc/initui.hxx @@ -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 @@ -40,13 +40,13 @@ class SvStringsDtor; /* * Extern Definitions */ -extern SwThesaurus* pThes; +extern SwThesaurus* pThes; -extern String* pOldGrfCat; -extern String* pOldTabCat; -extern String* pOldFrmCat; +extern String* pOldGrfCat; +extern String* pOldTabCat; +extern String* pOldFrmCat; -extern String* pCurrGlosGroup; +extern String* pCurrGlosGroup; SW_DLLPUBLIC String* GetOldGrfCat(); SW_DLLPUBLIC String* GetOldTabCat(); @@ -56,10 +56,10 @@ SW_DLLPUBLIC String* GetOldDrwCat(); SW_DLLPUBLIC String* GetCurrGlosGroup(); SW_DLLPUBLIC void SetCurrGlosGroup(String* pStr); -extern SvStringsDtor* pDBNameList; +extern SvStringsDtor* pDBNameList; -extern SvStringsDtor* pAuthFieldNameList; -extern SvStringsDtor* pAuthFieldTypeList; +extern SvStringsDtor* pAuthFieldNameList; +extern SvStringsDtor* pAuthFieldTypeList; // stellt die Textbausteinverwaltung zur Verfuegung class SwGlossaries; @@ -70,8 +70,8 @@ class SwGlossaryList; BOOL HasGlossaryList(); SwGlossaryList* GetGlossaryList(); -extern void _InitUI(); -extern void _FinitUI(); +extern void _InitUI(); +extern void _FinitUI(); extern void _InitSpell(); extern void _FinitSpell(); diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/ui/inc/inpdlg.hxx index f0c2f13cc6bc..5c19fcc0eee4 100644 --- a/sw/source/ui/inc/inpdlg.hxx +++ b/sw/source/ui/inc/inpdlg.hxx @@ -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 @@ -49,27 +49,27 @@ class SwWrtShell; class SwFldInputDlg: public SvxStandardDialog { - virtual void Apply(); + virtual void Apply(); virtual void StateChanged( StateChangedType ); - SwWrtShell &rSh; - SwInputField* pInpFld; - SwSetExpField* pSetFld; - SwUserFieldType* pUsrType; + SwWrtShell &rSh; + SwInputField* pInpFld; + SwSetExpField* pSetFld; + SwUserFieldType* pUsrType; - Edit aLabelED; + Edit aLabelED; - MultiLineEdit aEditED; + MultiLineEdit aEditED; FixedLine aEditFL; - OKButton aOKBT; - CancelButton aCancelBT; - PushButton aNextBT; - HelpButton aHelpBT; + OKButton aOKBT; + CancelButton aCancelBT; + PushButton aNextBT; + HelpButton aHelpBT; DECL_LINK(NextHdl, PushButton*); public: - SwFldInputDlg( Window *pParent, SwWrtShell &rSh, + SwFldInputDlg( Window *pParent, SwWrtShell &rSh, SwField* pField, BOOL bNextButton = FALSE ); ~SwFldInputDlg(); }; diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx index 8693572d167f..5b88d13bc984 100644 --- a/sw/source/ui/inc/inputwin.hxx +++ b/sw/source/ui/inc/inputwin.hxx @@ -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 @@ -51,11 +51,11 @@ public: InputEdit(Window* pParent, WinBits nStyle) : Edit(pParent , nStyle){} - void UpdateRange(const String& aSel, + void UpdateRange(const String& aSel, const String& aTblName ); protected: - virtual void KeyInput( const KeyEvent& ); + virtual void KeyInput( const KeyEvent& ); }; //======================================================================== @@ -64,23 +64,23 @@ class SwInputWindow : public ToolBox { friend class InputEdit; - Edit aPos; - InputEdit aEdit; - PopupMenu aPopMenu; - SwFldMgr* pMgr; - SwWrtShell* pWrtShell; - SwView* pView; + Edit aPos; + InputEdit aEdit; + PopupMenu aPopMenu; + SwFldMgr* pMgr; + SwWrtShell* pWrtShell; + SwView* pView; SfxBindings* pBindings; - String aAktTableName, sOldFml; - USHORT nActionCnt; + String aAktTableName, sOldFml; + USHORT nActionCnt; - BOOL bFirst : 1; //Initialisierungen beim ersten Aufruf - BOOL bActive : 1; //fuer Hide/Show beim Dokumentwechsel - BOOL bIsTable : 1; - BOOL bDelSel : 1; - BOOL bDoesUndo : 1; - BOOL bResetUndo : 1; - BOOL bCallUndo : 1; + BOOL bFirst : 1; //Initialisierungen beim ersten Aufruf + BOOL bActive : 1; //fuer Hide/Show beim Dokumentwechsel + BOOL bIsTable : 1; + BOOL bDelSel : 1; + BOOL bDoesUndo : 1; + BOOL bResetUndo : 1; + BOOL bCallUndo : 1; void DelBoxCntnt(); @@ -89,35 +89,35 @@ friend class InputEdit; using Window::IsActive; protected: - virtual void Resize(); - virtual void Click(); + virtual void Resize(); + virtual void Click(); DECL_LINK( MenuHdl, Menu * ); DECL_LINK( DropdownClickHdl, ToolBox* ); - void ApplyFormula(); - void CancelFormula(); + void ApplyFormula(); + void CancelFormula(); public: SwInputWindow( Window* pParent, SfxBindings* pBindings ); - virtual ~SwInputWindow(); + virtual ~SwInputWindow(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void SelectHdl( ToolBox*); - - void ShowWin(); - - BOOL IsActive(){ return bActive; }; - + void SelectHdl( ToolBox*); + + void ShowWin(); + + BOOL IsActive(){ return bActive; }; + DECL_LINK( SelTblCellsNotify, SwWrtShell * ); - void SetFormula( const String& rFormula, BOOL bDelSel = TRUE ); - const SwView* GetView() const{return pView;} + void SetFormula( const String& rFormula, BOOL bDelSel = TRUE ); + const SwView* GetView() const{return pView;} }; class SwInputChild : public SfxChildWindow { - BOOL bObjVis; - SfxDispatcher* pDispatch; + BOOL bObjVis; + SfxDispatcher* pDispatch; public: SwInputChild( Window* , USHORT nId, @@ -125,10 +125,10 @@ public: SfxChildWinInfo* ); ~SwInputChild(); SFX_DECL_CHILDWINDOW( SwInputChild ); - void SetFormula( const String& rFormula, BOOL bDelSel = TRUE ) + void SetFormula( const String& rFormula, BOOL bDelSel = TRUE ) { ((SwInputWindow*)pWindow)->SetFormula( rFormula, bDelSel ); } - const SwView* GetView() const{return ((SwInputWindow*)pWindow)->GetView();} + const SwView* GetView() const{return ((SwInputWindow*)pWindow)->GetView();} }; diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/ui/inc/insfnote.hxx index c9c51301a100..7ff65ce3f060 100644 --- a/sw/source/ui/inc/insfnote.hxx +++ b/sw/source/ui/inc/insfnote.hxx @@ -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 @@ -42,30 +42,30 @@ class SwWrtShell; class SwInsFootNoteDlg: public SvxStandardDialog { - SwWrtShell &rSh; + SwWrtShell &rSh; //Alles fuer das/die Zeichen - String aFontName; - CharSet eCharSet; - char cExtChar; - BOOL bExtCharAvailable; - BOOL bEdit; - RadioButton aNumberAutoBtn; - RadioButton aNumberCharBtn; - Edit aNumberCharEdit; - PushButton aNumberExtChar; + String aFontName; + CharSet eCharSet; + char cExtChar; + BOOL bExtCharAvailable; + BOOL bEdit; + RadioButton aNumberAutoBtn; + RadioButton aNumberCharBtn; + Edit aNumberCharEdit; + PushButton aNumberExtChar; FixedLine aNumberFL; //Alles fuer die Auswahl Fussnote/Endnote - RadioButton aFtnBtn; - RadioButton aEndNoteBtn; + RadioButton aFtnBtn; + RadioButton aEndNoteBtn; FixedLine aTypeFL; - OKButton aOkBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; - ImageButton aPrevBT; - ImageButton aNextBT; + OKButton aOkBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + ImageButton aPrevBT; + ImageButton aNextBT; DECL_LINK( NumberCharHdl, Button * ); DECL_LINK( NumberEditHdl, void * ); @@ -73,9 +73,9 @@ class SwInsFootNoteDlg: public SvxStandardDialog DECL_LINK( NumberExtCharHdl, Button *); DECL_LINK( NextPrevHdl, Button * ); - virtual void Apply(); + virtual void Apply(); - void Init(); + void Init(); public: SwInsFootNoteDlg(Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE); diff --git a/sw/source/ui/inc/insrule.hxx b/sw/source/ui/inc/insrule.hxx index 316a161d6c06..dc35db20dc0c 100644 --- a/sw/source/ui/inc/insrule.hxx +++ b/sw/source/ui/inc/insrule.hxx @@ -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 @@ -36,14 +36,14 @@ class ValueSet; class SwInsertGrfRulerDlg : public SfxModalDialog { FixedLine aSelectionFL; - OKButton aOkPB; - CancelButton aCancelPB; - HelpButton aHelpPB; + OKButton aOkPB; + CancelButton aCancelPB; + HelpButton aHelpPB; - List aGrfNames; - String sSimple; + List aGrfNames; + String sSimple; String sRulers; - USHORT nSelPos; + USHORT nSelPos; SwRulerValueSet* pExampleVS; @@ -55,9 +55,9 @@ public: SwInsertGrfRulerDlg( Window* pParent ); ~SwInsertGrfRulerDlg(); - String GetGraphicName(); - BOOL IsSimpleLine() {return nSelPos == 1;} - BOOL HasImages() const {return 0 != aGrfNames.Count();} + String GetGraphicName(); + BOOL IsSimpleLine() {return nSelPos == 1;} + BOOL HasImages() const {return 0 != aGrfNames.Count();} }; #endif diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx index e48eece78a9f..478210897120 100644 --- a/sw/source/ui/inc/instable.hxx +++ b/sw/source/ui/inc/instable.hxx @@ -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 @@ -56,29 +56,29 @@ class SwInsTableDlg : public SfxModalDialog FixedLine aFL; FixedText aColLbl; - NumericField aColEdit; - FixedText aRowLbl; - NumericField aRowEdit; + NumericField aColEdit; + FixedText aRowLbl; + NumericField aRowEdit; FixedLine aOptionsFL; CheckBox aHeaderCB; - CheckBox aRepeatHeaderCB; - FixedText aRepeatHeaderFT; // "dummy" to build before and after FT - FixedText aRepeatHeaderBeforeFT; - NumericField aRepeatHeaderNF; - FixedText aRepeatHeaderAfterFT; - TextControlCombo aRepeatHeaderCombo; + CheckBox aRepeatHeaderCB; + FixedText aRepeatHeaderFT; // "dummy" to build before and after FT + FixedText aRepeatHeaderBeforeFT; + NumericField aRepeatHeaderNF; + FixedText aRepeatHeaderAfterFT; + TextControlCombo aRepeatHeaderCombo; - CheckBox aDontSplitCB; - CheckBox aBorderCB; + CheckBox aDontSplitCB; + CheckBox aBorderCB; OKButton aOkBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; - PushButton aAutoFmtBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + PushButton aAutoFmtBtn; - SwWrtShell* pShell; - SwTableAutoFmt* pTAutoFmt; + SwWrtShell* pShell; + SwTableAutoFmt* pTAutoFmt; sal_Int64 nEnteredValRepeatHeaderNF; DECL_LINK( ModifyName, Edit * ); diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx index 6fecb6c82b30..7eadaa7c349d 100644 --- a/sw/source/ui/inc/javaedit.hxx +++ b/sw/source/ui/inc/javaedit.hxx @@ -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 @@ -59,11 +59,11 @@ class SwJavaEditDialog : public SvxStandardDialog { private: FixedText aTypeFT; - Edit aTypeED; + Edit aTypeED; RadioButton aUrlRB; RadioButton aEditRB; - PushButton aUrlPB; - Edit aUrlED; + PushButton aUrlPB; + Edit aUrlED; MultiLineEdit aEditED; FixedLine aPostItFL; @@ -76,7 +76,7 @@ private: String aText; String aType; - BOOL bNew; + BOOL bNew; BOOL bIsUrl; SwScriptField* pFld; @@ -92,10 +92,10 @@ private: DECL_LINK( InsertFileHdl, PushButton * ); DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper * ); - virtual void Apply(); + virtual void Apply(); - void CheckTravel(); - void SetFld(); + void CheckTravel(); + void SetFld(); using Window::GetText; using Window::GetType; @@ -105,9 +105,9 @@ public: ~SwJavaEditDialog(); String GetText() { return aText; } - + String GetType() { return aType; } - + BOOL IsUrl() { return bIsUrl; } BOOL IsNew() { return bNew; } BOOL IsUpdate(); diff --git a/sw/source/ui/inc/label.hxx b/sw/source/ui/inc/label.hxx index 0717ef2b6bd2..819c56c00eda 100644 --- a/sw/source/ui/inc/label.hxx +++ b/sw/source/ui/inc/label.hxx @@ -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 @@ -44,19 +44,19 @@ class Printer; class SwLabDlg : public SfxTabDialog { - SwLabelConfig aLabelsCfg; - SwNewDBMgr* pNewDBMgr; - SwLabPrtPage* pPrtPage; - - SvUShorts aTypeIds; - SvStringsDtor aMakes; - - SwLabRecs* pRecs; - String aLstGroup; - String sBusinessCardDlg; - String sFormat; - String sMedium; - BOOL m_bLabel; + SwLabelConfig aLabelsCfg; + SwNewDBMgr* pNewDBMgr; + SwLabPrtPage* pPrtPage; + + SvUShorts aTypeIds; + SvStringsDtor aMakes; + + SwLabRecs* pRecs; + String aLstGroup; + String sBusinessCardDlg; + String sFormat; + String sMedium; + BOOL m_bLabel; void _ReplaceGroup( const String &rMake ); virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); @@ -66,17 +66,17 @@ public: SwNewDBMgr* pNewDBMgr, BOOL bLabel); ~SwLabDlg(); - SwLabRec* GetRecord(const String &rRecName, BOOL bCont); - void GetLabItem(SwLabItem &rItem); + SwLabRec* GetRecord(const String &rRecName, BOOL bCont); + void GetLabItem(SwLabItem &rItem); - SwLabRecs &Recs() { return *pRecs; } - const SwLabRecs &Recs() const { return *pRecs; } + SwLabRecs &Recs() { return *pRecs; } + const SwLabRecs &Recs() const { return *pRecs; } - SvUShorts &TypeIds() { return aTypeIds; } + SvUShorts &TypeIds() { return aTypeIds; } const SvUShorts &TypeIds() const { return aTypeIds; } - SvStringsDtor &Makes() { return aMakes; } - const SvStringsDtor &Makes() const { return aMakes; } + SvStringsDtor &Makes() { return aMakes; } + const SvStringsDtor &Makes() const { return aMakes; } Printer *GetPrt(); inline void ReplaceGroup( const String &rMake ); diff --git a/sw/source/ui/inc/labelcfg.hxx b/sw/source/ui/inc/labelcfg.hxx index ab01d365bbe1..17a234174601 100644 --- a/sw/source/ui/inc/labelcfg.hxx +++ b/sw/source/ui/inc/labelcfg.hxx @@ -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 @@ -46,12 +46,12 @@ public: virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - void FillLabels(const rtl::OUString& rManufacturer, SwLabRecs& rLabArr); + void FillLabels(const rtl::OUString& rManufacturer, SwLabRecs& rLabArr); const com::sun::star::uno::Sequence<rtl::OUString>& GetManufacturers() const {return aNodeNames;} - sal_Bool HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType); - void SaveLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType, + sal_Bool HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType); + void SaveLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType, const SwLabRec& rRec); }; diff --git a/sw/source/ui/inc/labimg.hxx b/sw/source/ui/inc/labimg.hxx index cb435bd38925..91162ff271d6 100644 --- a/sw/source/ui/inc/labimg.hxx +++ b/sw/source/ui/inc/labimg.hxx @@ -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 @@ -47,81 +47,81 @@ public: virtual int operator ==(const SfxPoolItem& rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; - - rtl::OUString aLstMake; //Letzte Auswahl merken. - rtl::OUString aLstType; - rtl::OUString sDBName; // Verwendete Datenbank - - rtl::OUString aWriting; // Aufschrift - rtl::OUString aMake; // Etikettenmarke - rtl::OUString aType; // Etikettentyp - rtl::OUString aBin; // Druckerschacht - sal_Int32 lHDist; // Horizontaler Abstand (Benutzer) - sal_Int32 lVDist; // Vertikaler Abstand (Benutzer) - sal_Int32 lWidth; // Breite (Benutzer) - sal_Int32 lHeight; // Hoehe (Benutzer) - sal_Int32 lLeft; // Rand links (Benutzer) - sal_Int32 lUpper; // Rand oben (Benutzer) - sal_Int32 nCols; // Anzahl Spalten (Benutzer) - sal_Int32 nRows; // Anzahl Zeilen (Benutzer) - sal_Int32 nCol; // Spalte fuer Einzeldruck - sal_Int32 nRow; // Zeile fuer Einzeldruck - sal_Bool bAddr;// Adresse als Aufschrift? - sal_Bool bCont;// Endlospapier? - sal_Bool bPage;// Ganze Seite oder einzelnes Etikett? - sal_Bool bSynchron;// Alle Etiketten synchronisieren + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; + + rtl::OUString aLstMake; //Letzte Auswahl merken. + rtl::OUString aLstType; + rtl::OUString sDBName; // Verwendete Datenbank + + rtl::OUString aWriting; // Aufschrift + rtl::OUString aMake; // Etikettenmarke + rtl::OUString aType; // Etikettentyp + rtl::OUString aBin; // Druckerschacht + sal_Int32 lHDist; // Horizontaler Abstand (Benutzer) + sal_Int32 lVDist; // Vertikaler Abstand (Benutzer) + sal_Int32 lWidth; // Breite (Benutzer) + sal_Int32 lHeight; // Hoehe (Benutzer) + sal_Int32 lLeft; // Rand links (Benutzer) + sal_Int32 lUpper; // Rand oben (Benutzer) + sal_Int32 nCols; // Anzahl Spalten (Benutzer) + sal_Int32 nRows; // Anzahl Zeilen (Benutzer) + sal_Int32 nCol; // Spalte fuer Einzeldruck + sal_Int32 nRow; // Zeile fuer Einzeldruck + sal_Bool bAddr;// Adresse als Aufschrift? + sal_Bool bCont;// Endlospapier? + sal_Bool bPage;// Ganze Seite oder einzelnes Etikett? + sal_Bool bSynchron;// Alle Etiketten synchronisieren //parts of the business card - rtl::OUString aPrivFirstName; - rtl::OUString aPrivName; - rtl::OUString aPrivShortCut; - rtl::OUString aPrivFirstName2; - rtl::OUString aPrivName2; - rtl::OUString aPrivShortCut2; - rtl::OUString aPrivStreet; - rtl::OUString aPrivZip; - rtl::OUString aPrivCity; - rtl::OUString aPrivCountry; - rtl::OUString aPrivState; - rtl::OUString aPrivTitle; - rtl::OUString aPrivProfession; - rtl::OUString aPrivPhone; - rtl::OUString aPrivMobile; - rtl::OUString aPrivFax; - rtl::OUString aPrivWWW; - rtl::OUString aPrivMail; - rtl::OUString aCompCompany; - rtl::OUString aCompCompanyExt; - rtl::OUString aCompSlogan; - rtl::OUString aCompStreet; - rtl::OUString aCompZip; - rtl::OUString aCompCity; - rtl::OUString aCompCountry; - rtl::OUString aCompState; - rtl::OUString aCompPosition; - rtl::OUString aCompPhone; - rtl::OUString aCompMobile; - rtl::OUString aCompFax; - rtl::OUString aCompWWW; - rtl::OUString aCompMail; - - rtl::OUString sGlossaryGroup; - rtl::OUString sGlossaryBlockName; + rtl::OUString aPrivFirstName; + rtl::OUString aPrivName; + rtl::OUString aPrivShortCut; + rtl::OUString aPrivFirstName2; + rtl::OUString aPrivName2; + rtl::OUString aPrivShortCut2; + rtl::OUString aPrivStreet; + rtl::OUString aPrivZip; + rtl::OUString aPrivCity; + rtl::OUString aPrivCountry; + rtl::OUString aPrivState; + rtl::OUString aPrivTitle; + rtl::OUString aPrivProfession; + rtl::OUString aPrivPhone; + rtl::OUString aPrivMobile; + rtl::OUString aPrivFax; + rtl::OUString aPrivWWW; + rtl::OUString aPrivMail; + rtl::OUString aCompCompany; + rtl::OUString aCompCompanyExt; + rtl::OUString aCompSlogan; + rtl::OUString aCompStreet; + rtl::OUString aCompZip; + rtl::OUString aCompCity; + rtl::OUString aCompCountry; + rtl::OUString aCompState; + rtl::OUString aCompPosition; + rtl::OUString aCompPhone; + rtl::OUString aCompMobile; + rtl::OUString aCompFax; + rtl::OUString aCompWWW; + rtl::OUString aCompMail; + + rtl::OUString sGlossaryGroup; + rtl::OUString sGlossaryBlockName; }; // class SwLabCfgItem ------------------------------------------------------- class SwLabCfgItem : public utl::ConfigItem { - SwLabItem aItem; - sal_Bool bIsLabel; + SwLabItem aItem; + sal_Bool bIsLabel; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: SwLabCfgItem(sal_Bool bLabel); - SwLabItem& GetItem() {return aItem;} + SwLabItem& GetItem() {return aItem;} virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); diff --git a/sw/source/ui/inc/langhelper.hxx b/sw/source/ui/inc/langhelper.hxx index 3ff795d83f56..562cb522877d 100755 --- a/sw/source/ui/inc/langhelper.hxx +++ b/sw/source/ui/inc/langhelper.hxx @@ -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 @@ -41,26 +41,26 @@ namespace SwLangHelper extern bool SetLanguageStatus( OutlinerView* pOLV, SfxRequest &rReq, SwView &rView, SwWrtShell &rSh ); extern void SetLanguage( SwWrtShell &rWrtSh, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet ); -// extern void SetLanguage( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet ); +// extern void SetLanguage( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet ); extern void SetLanguage( SwWrtShell &rWrtSh, OutlinerView* pOLV, ESelection aSelection, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet ); extern void SetLanguage_None( SwWrtShell &rWrtSh, bool bIsForSelection, SfxItemSet &rCoreSet ); -// extern void SetLanguage_None( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, bool bIsForSelection, SfxItemSet &rCoreSet ); +// extern void SetLanguage_None( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, bool bIsForSelection, SfxItemSet &rCoreSet ); extern void SetLanguage_None( SwWrtShell &rWrtSh, OutlinerView* pOLV, ESelection aSelection, bool bIsForSelection, SfxItemSet &rCoreSet ); extern void ResetLanguages( SwWrtShell &rWrtSh, bool bIsForSelection ); -// extern void ResetLanguages( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, bool bIsForSelection ); +// extern void ResetLanguages( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, bool bIsForSelection ); extern void ResetLanguages( SwWrtShell &rWrtSh, OutlinerView* pOLV, ESelection aSelection, bool bIsForSelection ); - + // document extern void SelectCurrentPara( SwWrtShell &rWrtSh ); // EditView extern void SelectPara( EditView &rEditView, const ESelection &rCurSel ); - + extern String GetTextForLanguageGuessing( EditEngine* rEditEngine, ESelection aDocSelection ); extern String GetTextForLanguageGuessing( SwWrtShell &rSh ); - + extern LanguageType GetLanguage( SfxItemSet aSet, USHORT nLangWhichId ); extern LanguageType GetLanguage( SwWrtShell &rSh, USHORT nLangWhichId ); - + extern LanguageType GetCurrentLanguage( SfxItemSet aSet, USHORT nScriptType ); extern LanguageType GetCurrentLanguage( SwWrtShell &rSh ); } diff --git a/sw/source/ui/inc/linenum.hxx b/sw/source/ui/inc/linenum.hxx index 62da2e1925ef..75b358d07a8d 100644 --- a/sw/source/ui/inc/linenum.hxx +++ b/sw/source/ui/inc/linenum.hxx @@ -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 @@ -65,31 +65,31 @@ public: class SwLineNumberingPage : public SfxTabPage { - CheckBox aNumberingOnCB; - FixedText aCharStyleFT; - ListBox aCharStyleLB; - FixedText aFormatFT; - SwNumberingTypeListBox aFormatLB; - FixedText aPosFT; - ListBox aPosLB; - FixedText aOffsetFT; - MetricField aOffsetMF; - FixedText aNumIntervalFT; - NumericField aNumIntervalNF; - FixedText aNumRowsFT; + CheckBox aNumberingOnCB; + FixedText aCharStyleFT; + ListBox aCharStyleLB; + FixedText aFormatFT; + SwNumberingTypeListBox aFormatLB; + FixedText aPosFT; + ListBox aPosLB; + FixedText aOffsetFT; + MetricField aOffsetMF; + FixedText aNumIntervalFT; + NumericField aNumIntervalNF; + FixedText aNumRowsFT; FixedLine aDisplayFL; - FixedText aDivisorFT; - Edit aDivisorED; - FixedText aDivIntervalFT; - NumericField aDivIntervalNF; - FixedText aDivRowsFT; + FixedText aDivisorFT; + Edit aDivisorED; + FixedText aDivIntervalFT; + NumericField aDivIntervalNF; + FixedText aDivRowsFT; FixedLine aDivisorFL; - CheckBox aCountEmptyLinesCB; - CheckBox aCountFrameLinesCB; - CheckBox aRestartEachPageCB; + CheckBox aCountEmptyLinesCB; + CheckBox aCountFrameLinesCB; + CheckBox aRestartEachPageCB; FixedLine aCountFL; - SwWrtShell* pSh; + SwWrtShell* pSh; SwLineNumberingPage( Window* pParent, const SfxItemSet& rSet ); ~SwLineNumberingPage(); @@ -99,10 +99,10 @@ class SwLineNumberingPage : public SfxTabPage public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/sw/source/ui/inc/listsh.hxx b/sw/source/ui/inc/listsh.hxx index 61fea6ece214..8817b145e048 100644 --- a/sw/source/ui/inc/listsh.hxx +++ b/sw/source/ui/inc/listsh.hxx @@ -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 @@ -37,8 +37,8 @@ public: SwListShell(SwView &rView); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); }; #endif diff --git a/sw/source/ui/inc/macassgn.hxx b/sw/source/ui/inc/macassgn.hxx index 6093a2a8cb51..b824d2ebc2f0 100644 --- a/sw/source/ui/inc/macassgn.hxx +++ b/sw/source/ui/inc/macassgn.hxx @@ -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/inc/mailconfigpage.hxx b/sw/source/ui/inc/mailconfigpage.hxx index e2717ebb17fa..ef0d409eb0b1 100644 --- a/sw/source/ui/inc/mailconfigpage.hxx +++ b/sw/source/ui/inc/mailconfigpage.hxx @@ -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 @@ -52,7 +52,7 @@ class SwMailConfigPage : public SfxTabPage friend class SwTestAccountSettingsDialog; FixedLine m_aIdentityFL; - + FixedText m_aDisplayNameFT; Edit m_aDisplayNameED; FixedText m_aAddressFT; @@ -61,7 +61,7 @@ class SwMailConfigPage : public SfxTabPage CheckBox m_aReplyToCB; FixedText m_aReplyToFT; Edit m_aReplyToED; - + FixedLine m_aSMTPFL; FixedText m_aServerFT; @@ -69,10 +69,10 @@ class SwMailConfigPage : public SfxTabPage FixedText m_aPortFT; NumericField m_aPortNF; - CheckBox m_aSecureCB; + CheckBox m_aSecureCB; PushButton m_aServerAuthenticationPB; - + FixedLine m_aSeparatorFL; PushButton m_aTestPB; diff --git a/sw/source/ui/inc/maildispatcher.hxx b/sw/source/ui/inc/maildispatcher.hxx index bc8afb829fdf..e2c0d9170b21 100644 --- a/sw/source/ui/inc/maildispatcher.hxx +++ b/sw/source/ui/inc/maildispatcher.hxx @@ -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 @@ -45,25 +45,25 @@ class IMailDispatcherListener; A MailDispatcher should be used for sending a bunch a mail messages asynchronously. Usually a client enqueues a number of mail messages and then calls start to begin sending them. An instance of this class - must not be shared among different client threads. Instead each client + must not be shared among different client threads. Instead each client thread should create an own instance of this class. -*/ +*/ class MailDispatcher : public ::salhelper::ReferenceObject, private ::osl::Thread { public: - // bringing operator new/delete into scope + // bringing operator new/delete into scope using osl::Thread::operator new; using osl::Thread::operator delete; using osl::Thread::join; - + public: - /** + /** @param xSmtpService [in] a reference to a mail server. A user must be connected to the mail server otherwise errors occur during the delivery of mail messages. - + @throws ::com::sun::star::uno::RuntimeException on errors during construction of an instance of this class. */ @@ -72,39 +72,39 @@ public: /** Shutdown the mail dispatcher. Every mail messages not yet sent will be discarded. - */ + */ virtual ~MailDispatcher(); - + /** Enqueue a mail message for delivery. A client must - start the mail dispatcher in order to send the + start the mail dispatcher in order to send the enqueued mail messages. - + @param xMailMessage [in] a mail message that should be send. */ void enqueueMailMessage(::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage); - /** - Dequeues a mail message. + /** + Dequeues a mail message. This enables the caller to remove attachments when sending mails is to be cancelled. */ ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> dequeueMailMessage(); - + /** Start sending mail messages asynchronously. A client may register - a listener for mail dispatcher events. For every mail message sent - the notification will be sent. While handling such notification a + a listener for mail dispatcher events. For every mail message sent + the notification will be sent. While handling such notification a client may enqueue new mail messages. If there are no more mail messages to send an respective notification is sent and the mail dispatcher waits for more mail messages. - + @precond not isStarted() */ void start(); - + /** Stop sending mail messages. - + @precond isStarted() */ void stop(); @@ -116,52 +116,52 @@ public: mail dispatcher thread will never end. */ void shutdown(); - + /** Check whether the mail dispatcher is started or not. - - @return + + @return <TRUE/> if the sending thread is running. */ bool isStarted() const; - + /** returns if the thread is still running */ using osl::Thread::isRunning; - + /** returns if shutdown has already been called */ - bool isShutdownRequested() const - { return shutdown_requested_; } + bool isShutdownRequested() const + { return shutdown_requested_; } /** Register a listener for mail dispatcher events. */ void addListener(::rtl::Reference<IMailDispatcherListener> listener); - + /** Unregister a listener for mail dispatcher events */ void removeListener(::rtl::Reference<IMailDispatcherListener> listener); - + protected: virtual void SAL_CALL run(); virtual void SAL_CALL onTerminated(); private: std::list< ::rtl::Reference<IMailDispatcherListener> > cloneListener(); - void sendMailMessageNotifyListener(::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> message); - -private: - ::com::sun::star::uno::Reference< ::com::sun::star::mail::XSmtpService> mailserver_; + void sendMailMessageNotifyListener(::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> message); + +private: + ::com::sun::star::uno::Reference< ::com::sun::star::mail::XSmtpService> mailserver_; ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage > > messages_; - ::std::list< ::rtl::Reference<IMailDispatcherListener> > listeners_; + ::std::list< ::rtl::Reference<IMailDispatcherListener> > listeners_; ::osl::Mutex message_container_mutex_; - ::osl::Mutex listener_container_mutex_; + ::osl::Mutex listener_container_mutex_; ::osl::Mutex thread_status_mutex_; ::osl::Condition mail_dispatcher_active_; - ::osl::Condition wakening_call_; + ::osl::Condition wakening_call_; ::rtl::Reference<MailDispatcher> m_xSelfReference; - bool run_; + bool run_; bool shutdown_requested_; }; diff --git a/sw/source/ui/inc/mailmergechildwindow.hxx b/sw/source/ui/inc/mailmergechildwindow.hxx index 21afff7aa8bb..d741320bf689 100644 --- a/sw/source/ui/inc/mailmergechildwindow.hxx +++ b/sw/source/ui/inc/mailmergechildwindow.hxx @@ -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/inc/mailmergehelper.hxx b/sw/source/ui/inc/mailmergehelper.hxx index 954ce643d8e9..f8381bca2bbf 100644 --- a/sw/source/ui/inc/mailmergehelper.hxx +++ b/sw/source/ui/inc/mailmergehelper.hxx @@ -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/inc/mailmergewizard.hxx b/sw/source/ui/inc/mailmergewizard.hxx index 7a582693b013..123703f2fef8 100644 --- a/sw/source/ui/inc/mailmergewizard.hxx +++ b/sw/source/ui/inc/mailmergewizard.hxx @@ -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 @@ -41,7 +41,7 @@ class SwMailMergeConfigItem; #define MM_MERGEPAGE 6 #define MM_OUTPUTPAGE 7 -class SwMailMergeWizard : public ::svt::RoadmapWizard +class SwMailMergeWizard : public ::svt::RoadmapWizard { SwView* m_pSwView; String sDocumentURL; @@ -68,11 +68,11 @@ protected: virtual svt::OWizardPage* createPage(WizardState _nState); virtual void enterState( WizardState _nState ); -// roadmap feature ?? +// roadmap feature ?? // virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason ); virtual String getStateDisplayName( WizardState _nState ) const; -public: +public: SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem); ~SwMailMergeWizard(); @@ -91,13 +91,13 @@ public: sal_uInt16 GetRestartPage() const {return m_nRestartPage;} void SetRestartPage(sal_uInt16 nPage) { m_nRestartPage = nPage;} - sal_Bool skipUntil( sal_uInt16 nPage) + sal_Bool skipUntil( sal_uInt16 nPage) {return ::svt::RoadmapWizard::skipUntil(WizardState(nPage));} - void updateRoadmapItemLabel( WizardState _nState ); + void updateRoadmapItemLabel( WizardState _nState ); - virtual short Execute(); - virtual void StartExecuteModal( const Link& rEndDialogHdl ); + virtual short Execute(); + virtual void StartExecuteModal( const Link& rEndDialogHdl ); }; #endif diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index e1f9f355c96a..6c434498d16a 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.hxx @@ -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 @@ -72,62 +72,62 @@ class SwMailMergeDlg : public SvxStandardDialog Window* pBeamerWin; RadioButton aAllRB; - RadioButton aMarkedRB; - RadioButton aFromRB; - NumericField aFromNF; - FixedText aBisFT; - NumericField aToNF; + RadioButton aMarkedRB; + RadioButton aFromRB; + NumericField aFromNF; + FixedText aBisFT; + NumericField aToNF; FixedLine aRecordFL; FixedLine aSeparatorFL; RadioButton aPrinterRB; - RadioButton aMailingRB; - RadioButton aFileRB; + RadioButton aMailingRB; + RadioButton aFileRB; - CheckBox aSingleJobsCB; + CheckBox aSingleJobsCB; FixedLine aSaveMergedDocumentFL; RadioButton aSaveSingleDocRB; RadioButton aSaveIndividualRB; CheckBox aGenerateFromDataBaseCB; - + FixedText aColumnFT; ListBox aColumnLB; FixedText aPathFT; - Edit aPathED; - PushButton aPathPB; + Edit aPathED; + PushButton aPathPB; FixedText aFilterFT; ListBox aFilterLB; - ListBox aAddressFldLB; - FixedText aSubjectFT; - Edit aSubjectED; - FixedText aFormatFT; - FixedText aAttachFT; - Edit aAttachED; - PushButton aAttachPB; - CheckBox aFormatHtmlCB; - CheckBox aFormatRtfCB; - CheckBox aFormatSwCB; + ListBox aAddressFldLB; + FixedText aSubjectFT; + Edit aSubjectED; + FixedText aFormatFT; + FixedText aAttachFT; + Edit aAttachED; + PushButton aAttachPB; + CheckBox aFormatHtmlCB; + CheckBox aFormatRtfCB; + CheckBox aFormatSwCB; FixedLine aDestFL; FixedLine aBottomSeparatorFL; OKButton aOkBTN; - CancelButton aCancelBTN; - HelpButton aHelpBTN; + CancelButton aCancelBTN; + HelpButton aHelpBTN; SwMailMergeDlg_Impl* pImpl; SwWrtShell& rSh; SwModuleOptions* pModOpt; - const String& rDBName; - const String& rTableName; + const String& rDBName; + const String& rTableName; - USHORT nMergeType; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aSelection; + USHORT nMergeType; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aSelection; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame; Size m_aDialogSize; @@ -142,7 +142,7 @@ class SwMailMergeDlg : public SvxStandardDialog DECL_LINK( ModifyHdl, NumericField* pLB ); DECL_LINK( SaveTypeHdl, RadioButton* pBtn ); - virtual void Apply(); + virtual void Apply(); virtual void Resize(); bool ExecQryShell(); @@ -155,8 +155,8 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0); ~SwMailMergeDlg(); - inline USHORT GetMergeType() { return nMergeType; } - const ::rtl::OUString& GetSaveFilter() const {return m_sSaveFilter;} + inline USHORT GetMergeType() { return nMergeType; } + const ::rtl::OUString& GetSaveFilter() const {return m_sSaveFilter;} inline const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const { return m_aSelection; } ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const; @@ -193,9 +193,9 @@ class SwMailMergeFieldConnectionsDlg : public ModalDialog OKButton aOK; CancelButton aCancel; HelpButton aHelp; -public: +public: SwMailMergeFieldConnectionsDlg(Window* pParent); - ~SwMailMergeFieldConnectionsDlg(); + ~SwMailMergeFieldConnectionsDlg(); BOOL IsUseExistingConnections() const {return aUseExistingRB.IsChecked();} }; diff --git a/sw/source/ui/inc/mediash.hxx b/sw/source/ui/inc/mediash.hxx index 035c03656119..fb71c50e16b1 100644 --- a/sw/source/ui/inc/mediash.hxx +++ b/sw/source/ui/inc/mediash.hxx @@ -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 @@ -34,8 +34,8 @@ class SwMediaShell: public SwBaseShell public: SFX_DECL_INTERFACE(SW_MEDIASHELL) - void ExecMedia(SfxRequest &); - void GetMediaState(SfxItemSet &); + void ExecMedia(SfxRequest &); + void GetMediaState(SfxItemSet &); SwMediaShell(SwView &rView); }; diff --git a/sw/source/ui/inc/mergetbl.hxx b/sw/source/ui/inc/mergetbl.hxx index 44916f5d3b1d..0f57a98f3e5a 100644 --- a/sw/source/ui/inc/mergetbl.hxx +++ b/sw/source/ui/inc/mergetbl.hxx @@ -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 @@ -39,14 +39,14 @@ class SwMergeTblDlg : public SvxStandardDialog { - OKButton aOKPB; - CancelButton aCancelPB; - HelpButton aHelpPB; + OKButton aOKPB; + CancelButton aCancelPB; + HelpButton aHelpPB; FixedLine aMergeFL; - RadioButton aMergePrevRB; - RadioButton aMergeNextRB; + RadioButton aMergePrevRB; + RadioButton aMergeNextRB; - BOOL& rMergePrev; + BOOL& rMergePrev; protected: virtual void Apply(); diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc index f7c7cfcde9a0..72db9773032c 100644 --- a/sw/source/ui/inc/misc.hrc +++ b/sw/source/ui/inc/misc.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 @@ -30,77 +30,77 @@ #include "rcid.hrc" -#define DLG_QUERY_DELETE (RC_MISC_BEGIN + 2) +#define DLG_QUERY_DELETE (RC_MISC_BEGIN + 2) -#define DLG_MASTERDOC_PAGE (RC_MISC_BEGIN + 3) -#define DLG_QUERY_ADD (RC_MISC_BEGIN + 4) +#define DLG_MASTERDOC_PAGE (RC_MISC_BEGIN + 3) +#define DLG_QUERY_ADD (RC_MISC_BEGIN + 4) -#define STR_GLOSSARY_BIB_DLG (RC_MISC_BEGIN + 5) -#define STR_DOCUMENT_BIB_DLG (RC_MISC_BEGIN + 6) +#define STR_GLOSSARY_BIB_DLG (RC_MISC_BEGIN + 5) +#define STR_DOCUMENT_BIB_DLG (RC_MISC_BEGIN + 6) -#define WIN_GLOBAL_DOC (RC_MISC_BEGIN + 7) -#define DLG_GLOBAL_DOC_OPTION (RC_MISC_BEGIN + 8) -#define DLG_NUMBERING (RC_MISC_BEGIN + 9) -#define DLG_ZOOM (RC_MISC_BEGIN + 10) -#define DLG_GLOSSARY (RC_MISC_BEGIN + 11) -#define DLG_INS_FOOTNOTE (RC_MISC_BEGIN + 12) +#define WIN_GLOBAL_DOC (RC_MISC_BEGIN + 7) +#define DLG_GLOBAL_DOC_OPTION (RC_MISC_BEGIN + 8) +#define DLG_NUMBERING (RC_MISC_BEGIN + 9) +#define DLG_ZOOM (RC_MISC_BEGIN + 10) +#define DLG_GLOSSARY (RC_MISC_BEGIN + 11) +#define DLG_INS_FOOTNOTE (RC_MISC_BEGIN + 12) #define DLG_DOC_FOOTNOTE (RC_MISC_BEGIN + 13) -#define DLG_PG_FOOTNOTE (RC_MISC_BEGIN + 14) -#define DLG_NUMBERING_OUTLINE (RC_MISC_BEGIN + 15) -#define DLG_BIB_BASE (RC_MISC_BEGIN + 16) -#define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17) -#define DLG_NUM_NAMES (RC_MISC_BEGIN + 18) -#define DLG_SORTING (RC_MISC_BEGIN + 19) -#define DLG_CHARMAP (RC_MISC_BEGIN + 20) -#define DLG_AUTOCORR (RC_MISC_BEGIN + 23) -#define DLG_AUTOFMT_OPT (RC_MISC_BEGIN + 24) -#define DLG_RENAME_GLOS (RC_MISC_BEGIN + 25) -#define DLG_AUTOFMT_TAB (RC_MISC_BEGIN + 26) +#define DLG_PG_FOOTNOTE (RC_MISC_BEGIN + 14) +#define DLG_NUMBERING_OUTLINE (RC_MISC_BEGIN + 15) +#define DLG_BIB_BASE (RC_MISC_BEGIN + 16) +#define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17) +#define DLG_NUM_NAMES (RC_MISC_BEGIN + 18) +#define DLG_SORTING (RC_MISC_BEGIN + 19) +#define DLG_CHARMAP (RC_MISC_BEGIN + 20) +#define DLG_AUTOCORR (RC_MISC_BEGIN + 23) +#define DLG_AUTOFMT_OPT (RC_MISC_BEGIN + 24) +#define DLG_RENAME_GLOS (RC_MISC_BEGIN + 25) +#define DLG_AUTOFMT_TAB (RC_MISC_BEGIN + 26) #define DLG_PRCNT_SET (RC_MISC_BEGIN + 27) #define DLG_INSERT_RULER (RC_MISC_BEGIN + 28) #define DLG_REDLINE_ACCEPT (RC_MISC_BEGIN + 29) -#define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 31) +#define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 31) #define DLG_MOD_REDLINE_ACCEPT (RC_MISC_BEGIN + 32) -#define MSG_DOUBLE_SHORTNAME (RC_MISC_BEGIN + 30) -#define MSG_QUERY_DELETE (RC_MISC_BEGIN + 31) -#define STR_QUERY_DELETE_GROUP1 (RC_MISC_BEGIN + 32) -#define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33) -#define MSG_NO_GLOSSARIES (RC_MISC_BEGIN + 34) +#define MSG_DOUBLE_SHORTNAME (RC_MISC_BEGIN + 30) +#define MSG_QUERY_DELETE (RC_MISC_BEGIN + 31) +#define STR_QUERY_DELETE_GROUP1 (RC_MISC_BEGIN + 32) +#define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33) +#define MSG_NO_GLOSSARIES (RC_MISC_BEGIN + 34) -#define MSG_BLOCK_CREATE_ERR (RC_MISC_BEGIN + 40) -#define MSG_BLOCK_DELETE_ERR (RC_MISC_BEGIN + 41) -#define MSG_SRTERR (RC_MISC_BEGIN + 42) +#define MSG_BLOCK_CREATE_ERR (RC_MISC_BEGIN + 40) +#define MSG_BLOCK_DELETE_ERR (RC_MISC_BEGIN + 41) +#define MSG_SRTERR (RC_MISC_BEGIN + 42) -#define STR_GLOSSARY (RC_MISC_BEGIN + 43) -#define STR_CHANGE_START (RC_MISC_BEGIN + 44) -#define STR_CHANGE_END (RC_MISC_BEGIN + 45) +#define STR_GLOSSARY (RC_MISC_BEGIN + 43) +#define STR_CHANGE_START (RC_MISC_BEGIN + 44) +#define STR_CHANGE_END (RC_MISC_BEGIN + 45) #define STR_SAVE_GLOSSARY (RC_MISC_BEGIN + 46) #define STR_FULLNUMS_START (RC_MISC_BEGIN + 47) -#define STR_FULLNUMS_1 (STR_FULLNUMS_START ) -#define STR_FULLNUMS_2 (STR_FULLNUMS_START + 1) -#define STR_FULLNUMS_3 (STR_FULLNUMS_START + 2) -#define STR_FULLNUMS_4 (STR_FULLNUMS_START + 3) -#define STR_FULLNUMS_5 (STR_FULLNUMS_START + 4) -#define STR_FULLNUMS_6 (STR_FULLNUMS_START + 5) -#define STR_FULLNUMS_7 (STR_FULLNUMS_START + 6) -#define STR_FULLNUMS_8 (STR_FULLNUMS_START + 7) - -#define STR_BULLET_THEME (RC_MISC_BEGIN + 55) -#define MSG_NO_BULLETS (RC_MISC_BEGIN + 56) - -#define STR_NUMRULE_UNKNOWN (RC_MISC_BEGIN + 60) -#define MN_REDLINE_POPUP (RC_MISC_BEGIN + 61) +#define STR_FULLNUMS_1 (STR_FULLNUMS_START ) +#define STR_FULLNUMS_2 (STR_FULLNUMS_START + 1) +#define STR_FULLNUMS_3 (STR_FULLNUMS_START + 2) +#define STR_FULLNUMS_4 (STR_FULLNUMS_START + 3) +#define STR_FULLNUMS_5 (STR_FULLNUMS_START + 4) +#define STR_FULLNUMS_6 (STR_FULLNUMS_START + 5) +#define STR_FULLNUMS_7 (STR_FULLNUMS_START + 6) +#define STR_FULLNUMS_8 (STR_FULLNUMS_START + 7) + +#define STR_BULLET_THEME (RC_MISC_BEGIN + 55) +#define MSG_NO_BULLETS (RC_MISC_BEGIN + 56) + +#define STR_NUMRULE_UNKNOWN (RC_MISC_BEGIN + 60) +#define MN_REDLINE_POPUP (RC_MISC_BEGIN + 61) #define STR_REMOVE_WARNING (RC_MISC_BEGIN + 62) -#define STRRES_NUMTYPES (RC_MISC_BEGIN + 63) +#define STRRES_NUMTYPES (RC_MISC_BEGIN + 63) -#define MISC_ACT_END STRRES_NUMTYPES +#define MISC_ACT_END STRRES_NUMTYPES #if MISC_ACT_END > RC_MISC_END #error Resource-Id Ueberlauf in #file, #line #endif -#endif // _MISC_HRC +#endif // _MISC_HRC diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/ui/inc/mmconfigitem.hxx index 33454896627d..5d70bb433cea 100644 --- a/sw/source/ui/inc/mmconfigitem.hxx +++ b/sw/source/ui/inc/mmconfigitem.hxx @@ -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 @@ -103,8 +103,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> GetColumnsSupplier(); - - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> + + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const; void DisposeResultSet(); @@ -136,14 +136,14 @@ public: sal_Bool IsAddressBlock()const; void SetAddressBlock(sal_Bool bSet); - + sal_Bool IsHideEmptyParagraphs() const; void SetHideEmptyParagraphs(sal_Bool bSet); - const com::sun::star::uno::Sequence< ::rtl::OUString> + const com::sun::star::uno::Sequence< ::rtl::OUString> GetAddressBlocks() const; void SetAddressBlocks(const com::sun::star::uno::Sequence< ::rtl::OUString>& rBlocks); - + void SetCurrentAddressBlockIndex( sal_Int32 nSet ); sal_Int32 GetCurrentAddressBlockIndex() const; @@ -178,7 +178,7 @@ public: bool IsAddressFieldsAssigned() const; bool IsGreetingFieldsAssigned() const; - //e-Mail settings: + //e-Mail settings: ::rtl::OUString GetMailDisplayName() const; void SetMailDisplayName(const ::rtl::OUString& rName); diff --git a/sw/source/ui/inc/multmrk.hxx b/sw/source/ui/inc/multmrk.hxx index 7d5dae802e01..e42c072d6fbb 100644 --- a/sw/source/ui/inc/multmrk.hxx +++ b/sw/source/ui/inc/multmrk.hxx @@ -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 @@ -48,7 +48,7 @@ class SwTOXMgr; /*-------------------------------------------------------------------- - Beschreibung: Markierung fuer Verzeichniseintrag einfuegen + Beschreibung: Markierung fuer Verzeichniseintrag einfuegen --------------------------------------------------------------------*/ class SwMultiTOXMarkDlg : public SvxStandardDialog @@ -56,17 +56,17 @@ class SwMultiTOXMarkDlg : public SvxStandardDialog DECL_LINK( SelectHdl, ListBox * ); FixedLine aTOXFL; - FixedText aEntryFT; - FixedInfo aTextFT; - FixedText aTOXFT; - ListBox aTOXLB; - OKButton aOkBT; - CancelButton aCancelBT; + FixedText aEntryFT; + FixedInfo aTextFT; + FixedText aTOXFT; + ListBox aTOXLB; + OKButton aOkBT; + CancelButton aCancelBT; - SwTOXMgr &rMgr; - USHORT nPos; + SwTOXMgr &rMgr; + USHORT nPos; - void Apply(); + void Apply(); public: SwMultiTOXMarkDlg( Window* pParent, SwTOXMgr &rTOXMgr ); ~SwMultiTOXMarkDlg(); diff --git a/sw/source/ui/inc/navicfg.hxx b/sw/source/ui/inc/navicfg.hxx index de400eca916e..c214f723c916 100644 --- a/sw/source/ui/inc/navicfg.hxx +++ b/sw/source/ui/inc/navicfg.hxx @@ -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 @@ -33,13 +33,13 @@ ---------------------------------------------------------------------------*/ class SwNavigationConfig : public utl::ConfigItem { - sal_Int32 nRootType; //RootType - sal_Int32 nSelectedPos; //SelectedPosition - sal_Int32 nOutlineLevel; //OutlineLevel - sal_Int32 nRegionMode; //InsertMode - sal_Int32 nActiveBlock; //ActiveBlock//Expand/CollapsState - sal_Bool bIsSmall; //ShowListBox - sal_Bool bIsGlobalActive; //GlobalDocMode// Globalansicht fuer GlobalDoc gueltig? + sal_Int32 nRootType; //RootType + sal_Int32 nSelectedPos; //SelectedPosition + sal_Int32 nOutlineLevel; //OutlineLevel + sal_Int32 nRegionMode; //InsertMode + sal_Int32 nActiveBlock; //ActiveBlock//Expand/CollapsState + sal_Bool bIsSmall; //ShowListBox + sal_Bool bIsGlobalActive; //GlobalDocMode// Globalansicht fuer GlobalDoc gueltig? com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); @@ -50,8 +50,8 @@ public: virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - sal_Int32 GetRootType()const {return nRootType;} - void SetRootType(sal_Int32 nSet){ + sal_Int32 GetRootType()const {return nRootType;} + void SetRootType(sal_Int32 nSet){ if(nRootType != nSet) { SetModified(); @@ -59,8 +59,8 @@ public: } } - sal_Int32 GetSelectedPos()const {return nSelectedPos;} - void SetSelectedPos(sal_Int32 nSet){ + sal_Int32 GetSelectedPos()const {return nSelectedPos;} + void SetSelectedPos(sal_Int32 nSet){ if(nSelectedPos != nSet) { SetModified(); @@ -69,8 +69,8 @@ public: } - sal_Int32 GetOutlineLevel()const {return nOutlineLevel;} - void SetOutlineLevel(sal_Int32 nSet){ + sal_Int32 GetOutlineLevel()const {return nOutlineLevel;} + void SetOutlineLevel(sal_Int32 nSet){ if(nOutlineLevel != nSet) { SetModified(); @@ -78,8 +78,8 @@ public: } } - sal_Int32 GetRegionMode()const {return nRegionMode;} - void SetRegionMode(sal_Int32 nSet){ + sal_Int32 GetRegionMode()const {return nRegionMode;} + void SetRegionMode(sal_Int32 nSet){ if(nRegionMode != nSet) { SetModified(); @@ -89,7 +89,7 @@ public: sal_Int32 GetActiveBlock()const {return nActiveBlock;} - void SetActiveBlock(sal_Int32 nSet){ + void SetActiveBlock(sal_Int32 nSet){ if(nActiveBlock != nSet) { SetModified(); @@ -97,8 +97,8 @@ public: } } - sal_Bool IsSmall() const {return bIsSmall;} - void SetSmall(sal_Bool bSet){ + sal_Bool IsSmall() const {return bIsSmall;} + void SetSmall(sal_Bool bSet){ if(bIsSmall != bSet) { SetModified(); @@ -106,8 +106,8 @@ public: } } - sal_Bool IsGlobalActive() const {return bIsGlobalActive;} - void SetGlobalActive(sal_Bool bSet){ + sal_Bool IsGlobalActive() const {return bIsGlobalActive;} + void SetGlobalActive(sal_Bool bSet){ if(bIsGlobalActive != bSet) { SetModified(); diff --git a/sw/source/ui/inc/navicont.hxx b/sw/source/ui/inc/navicont.hxx index 124309057953..f9a0dd9fe587 100644 --- a/sw/source/ui/inc/navicont.hxx +++ b/sw/source/ui/inc/navicont.hxx @@ -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 @@ -34,28 +34,28 @@ class SwDocShell; class TransferDataContainer; class TransferableDataHelper; -/* [Beschreibung] +/* [Beschreibung] Navigator-Bookmark zur eindeutigen Identifizierung im Sw */ class NaviContentBookmark { - String aUrl; // URL inkl. Sprungmarke - String aDescr; // Description - long nDocSh; // Adresse der DocShell - USHORT nDefDrag; // Description enthaelt defaultDragType + String aUrl; // URL inkl. Sprungmarke + String aDescr; // Description + long nDocSh; // Adresse der DocShell + USHORT nDefDrag; // Description enthaelt defaultDragType public: NaviContentBookmark(); NaviContentBookmark( const String &rUrl, const String& rDesc, USHORT nDragType, const SwDocShell* ); - const String& GetURL() const { return aUrl; } - const String& GetDescription() const { return aDescr; } - USHORT GetDefaultDragType() const { return nDefDrag; } - long GetDocShell() const { return nDocSh; } - void Copy( TransferDataContainer& rData ) const; - BOOL Paste( TransferableDataHelper& rData ); + const String& GetURL() const { return aUrl; } + const String& GetDescription() const { return aDescr; } + USHORT GetDefaultDragType() const { return nDefDrag; } + long GetDocShell() const { return nDocSh; } + void Copy( TransferDataContainer& rData ) const; + BOOL Paste( TransferableDataHelper& rData ); }; #endif diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx index b2b457bdd5d4..9e38b2567271 100644 --- a/sw/source/ui/inc/navipi.hxx +++ b/sw/source/ui/inc/navipi.hxx @@ -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 @@ -54,8 +54,8 @@ class SfxChildWindowContext; class SwNavigationPI; class SwNavHelpToolBox : public SwHelpToolBox { - virtual void MouseButtonDown(const MouseEvent &rEvt); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void MouseButtonDown(const MouseEvent &rEvt); + virtual void RequestHelp( const HelpEvent& rHEvt ); public: SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId); }; @@ -70,44 +70,44 @@ class SwNavigationPI : public Window, friend class SwGlobalTree; // --------- members ----------------------------- - SwNavHelpToolBox aContentToolBox; - SwHelpToolBox aGlobalToolBox; - ImageList aContentImageList; + SwNavHelpToolBox aContentToolBox; + SwHelpToolBox aGlobalToolBox; + ImageList aContentImageList; ImageList aContentImageListH; - SwContentTree aContentTree; + SwContentTree aContentTree; SwGlobalTree aGlobalTree; - ListBox aDocListBox; - Timer aPageChgTimer; - String sContentFileName; - String aContextArr[3]; - String aStatusArr[4]; - Point aBoxBottomLeft; // Pos., wenn Box unten ist - - SfxObjectShellLock *pxObjectShell; - SwView *pContentView; - SwWrtShell *pContentWrtShell; - SwView *pActContView; - SwView *pCreateView; + ListBox aDocListBox; + Timer aPageChgTimer; + String sContentFileName; + String aContextArr[3]; + String aStatusArr[4]; + Point aBoxBottomLeft; // Pos., wenn Box unten ist + + SfxObjectShellLock *pxObjectShell; + SwView *pContentView; + SwWrtShell *pContentWrtShell; + SwView *pActContView; + SwView *pCreateView; SfxPopupWindow *pPopupWindow; SfxPopupWindow *pFloatingWindow; SfxChildWindowContext* pContextWin; - SwNavigationConfig *pConfig; - SfxBindings &rBindings; + SwNavigationConfig *pConfig; + SfxBindings &rBindings; - long nDocLBIniHeight; - long nWishWidth; - USHORT nAutoMarkIdx; - USHORT nRegionMode; // 0 - URL, 1 - Bereich mit Link 2 - B. ohne Link - short nZoomIn; - short nZoomOutInit; - short nZoomOut; + long nDocLBIniHeight; + long nWishWidth; + USHORT nAutoMarkIdx; + USHORT nRegionMode; // 0 - URL, 1 - Bereich mit Link 2 - B. ohne Link + short nZoomIn; + short nZoomOutInit; + short nZoomOut; - BOOL bSmallMode : 1; - BOOL bIsZoomedIn : 1; - BOOL bPageCtrlsVisible : 1; - BOOL bGlobalMode : 1; + BOOL bSmallMode : 1; + BOOL bIsZoomedIn : 1; + BOOL bPageCtrlsVisible : 1; + BOOL bGlobalMode : 1; // --------- methods ----------------------------- BOOL _IsZoomedIn() const {return bIsZoomedIn;} @@ -142,43 +142,43 @@ class SwNavigationPI : public Window, protected: - virtual BOOL Close(); - virtual void Resize(); + virtual BOOL Close(); + virtual void Resize(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); // zum App-Ende rechtzeitig ObjectShellLock loslassen - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - NumEditAction& GetPageEdit(); - BOOL ToggleTree(); - void SetGlobalMode(BOOL bSet) {bGlobalMode = bSet;} + NumEditAction& GetPageEdit(); + BOOL ToggleTree(); + void SetGlobalMode(BOOL bSet) {bGlobalMode = bSet;} public: SwNavigationPI(SfxBindings*, SfxChildWindowContext*, Window*); ~SwNavigationPI(); - void GotoPage(); // Seite anspringen; bindbare Funktion + void GotoPage(); // Seite anspringen; bindbare Funktion - void Update() { FillBox(); } - void UpdateListBox(); - void MoveOutline(USHORT nSource, USHORT nTarget, BOOL bWithCilds); + void Update() { FillBox(); } + void UpdateListBox(); + void MoveOutline(USHORT nSource, USHORT nTarget, BOOL bWithCilds); virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); - static String CreateDropFileName( TransferableDataHelper& rData ); - static void CleanEntry( String& rEntry ); + static String CreateDropFileName( TransferableDataHelper& rData ); + static void CleanEntry( String& rEntry ); - USHORT GetRegionDropMode() const {return nRegionMode;} - void SetRegionDropMode(USHORT nNewMode); + USHORT GetRegionDropMode() const {return nRegionMode;} + void SetRegionDropMode(USHORT nNewMode); - sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - BOOL IsGlobalDoc() const; - BOOL IsGlobalMode() const {return bGlobalMode;} + BOOL IsGlobalDoc() const; + BOOL IsGlobalMode() const {return bGlobalMode;} SwView* GetCreateView() const; void CreateNavigationTool(const Rectangle& rRect, BOOL bSetFocus); diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx index 2233f9609fe4..4dd77ffe98e2 100644 --- a/sw/source/ui/inc/num.hxx +++ b/sw/source/ui/inc/num.hxx @@ -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 @@ -63,15 +63,15 @@ class SwOutlineTabDialog; struct SwBmpItemInfo { - SvxBrushItem* pBrushItem; - USHORT nItemId; + SvxBrushItem* pBrushItem; + USHORT nItemId; }; /*-----------------07.02.97 15.37------------------- --------------------------------------------------*/ -#define NUM_PAGETYPE_BULLET 0 +#define NUM_PAGETYPE_BULLET 0 #define NUM_PAGETYPE_SINGLENUM 1 #define NUM_PAGETYPE_NUM 2 #define NUM_PAGETYPE_BMP 3 @@ -84,20 +84,20 @@ class SwNumPositionTabPage : public SfxTabPage { FixedLine aPositionFL; FixedLine aLevelFL; - MultiListBox aLevelLB; + MultiListBox aLevelLB; // --> OD 2008-02-01 #newlistlevelattrs# // former set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION - FixedText aDistBorderFT; - MetricField aDistBorderMF; - CheckBox aRelativeCB; - FixedText aIndentFT; - MetricField aIndentMF; - FixedText aDistNumFT; - MetricField aDistNumMF; - FixedText aAlignFT; - ListBox aAlignLB; + FixedText aDistBorderFT; + MetricField aDistBorderMF; + CheckBox aRelativeCB; + FixedText aIndentFT; + MetricField aIndentMF; + FixedText aDistNumFT; + MetricField aDistNumMF; + FixedText aAlignFT; + ListBox aAlignLB; // <-- // --> OD 2008-02-01 #newlistlevelattrs# @@ -115,25 +115,25 @@ class SwNumPositionTabPage : public SfxTabPage MetricField aIndentAtMF; // <-- - PushButton aStandardPB; + PushButton aStandardPB; - NumberingPreview aPreviewWIN; + NumberingPreview aPreviewWIN; - SwNumRule* pActNum; - SwNumRule* pSaveNum; - SwWrtShell* pWrtSh; + SwNumRule* pActNum; + SwNumRule* pSaveNum; + SwWrtShell* pWrtSh; - SwOutlineTabDialog* pOutlineDlg; - USHORT nActNumLvl; + SwOutlineTabDialog* pOutlineDlg; + USHORT nActNumLvl; - BOOL bModified : 1; - BOOL bPreset : 1; - BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein + BOOL bModified : 1; + BOOL bPreset : 1; + BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein // --> OD 2008-02-01 #newlistlevelattrs# bool bLabelAlignmentPosAndSpaceModeActive; // <-- - void InitControls(); + void InitControls(); DECL_LINK( LevelHdl, ListBox * ); DECL_LINK( EditModifyHdl, Edit*); @@ -160,20 +160,20 @@ public: const SfxItemSet& rSet); ~SwNumPositionTabPage(); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} - void SetWrtShell(SwWrtShell* pSh); + void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} + void SetWrtShell(SwWrtShell* pSh); #if OSL_DEBUG_LEVEL > 1 - void SetModified(BOOL bRepaint = TRUE); + void SetModified(BOOL bRepaint = TRUE); #else - void SetModified(BOOL bRepaint = TRUE) + void SetModified(BOOL bRepaint = TRUE) { bModified = TRUE; if(bRepaint) { @@ -186,14 +186,14 @@ public: class SwSvxNumBulletTabDialog : public SfxTabDialog { - SwWrtShell& rWrtSh; + SwWrtShell& rWrtSh; - String sRemoveText; - int nRetOptionsDialog; + String sRemoveText; + int nRetOptionsDialog; protected: - virtual short Ok(); - virtual void PageCreated(USHORT nPageId, SfxTabPage& rPage); + virtual short Ok(); + virtual void PageCreated(USHORT nPageId, SfxTabPage& rPage); DECL_LINK(RemoveNumberingHdl, PushButton*); public: SwSvxNumBulletTabDialog(Window* pParent, diff --git a/sw/source/ui/inc/numberingtypelistbox.hxx b/sw/source/ui/inc/numberingtypelistbox.hxx index d70bbc9cc74c..792dfe37433f 100644 --- a/sw/source/ui/inc/numberingtypelistbox.hxx +++ b/sw/source/ui/inc/numberingtypelistbox.hxx @@ -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 @@ -30,9 +30,9 @@ #include <vcl/lstbox.hxx> #include "swdllapi.h" -#define INSERT_NUM_TYPE_NO_NUMBERING 0x01 -#define INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING 0x02 -#define INSERT_NUM_TYPE_BITMAP 0x04 +#define INSERT_NUM_TYPE_NO_NUMBERING 0x01 +#define INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING 0x02 +#define INSERT_NUM_TYPE_BITMAP 0x04 #define INSERT_NUM_TYPE_BULLET 0x08 #define INSERT_NUM_EXTENDED_TYPES 0x10 @@ -47,10 +47,10 @@ public: USHORT nTypeFlags = INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING|INSERT_NUM_TYPE_NO_NUMBERING|INSERT_NUM_EXTENDED_TYPES ); ~SwNumberingTypeListBox(); - void Reload(USHORT nTypeFlags); + void Reload(USHORT nTypeFlags); - sal_Int16 GetSelectedNumberingType(); - sal_Bool SelectNumberingType(sal_Int16 nType); + sal_Int16 GetSelectedNumberingType(); + sal_Bool SelectNumberingType(sal_Int16 nType); }; diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/ui/inc/numfmtlb.hxx index 50d762dc4419..50ebd6546ff1 100644 --- a/sw/source/ui/inc/numfmtlb.hxx +++ b/sw/source/ui/inc/numfmtlb.hxx @@ -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 @@ -35,13 +35,13 @@ class SwView; class SW_DLLPUBLIC NumFormatListBox : public ListBox { - short nCurrFormatType; - USHORT nStdEntry; - BOOL bOneArea; - ULONG nDefFormat; - SwView* pVw; - SvNumberFormatter* pOwnFormatter; - LanguageType eCurLanguage; + short nCurrFormatType; + USHORT nStdEntry; + BOOL bOneArea; + ULONG nDefFormat; + SwView* pVw; + SvNumberFormatter* pOwnFormatter; + LanguageType eCurLanguage; BOOL bShowLanguageControl; //determine whether the language control has //to be shown in the number format dialog BOOL bUseAutomaticLanguage;//determine whether language is automatically assigned @@ -50,7 +50,7 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox SW_DLLPRIVATE double GetDefValue(const short nFormatType) const; SW_DLLPRIVATE void Init(short nFormatType, BOOL bUsrFmts); - SW_DLLPRIVATE SwView* GetView(); + SW_DLLPRIVATE SwView* GetView(); public: NumFormatListBox( Window* pWin, const ResId& rResId, @@ -65,14 +65,14 @@ public: void Clear(); - inline void SetOneArea(BOOL bOnlyOne = TRUE) { bOneArea = bOnlyOne; } + inline void SetOneArea(BOOL bOnlyOne = TRUE) { bOneArea = bOnlyOne; } - void SetFormatType(const short nFormatType); - inline short GetFormatType() const { return nCurrFormatType; } - void SetDefFormat(const ULONG nDefFmt); - ULONG GetFormat() const; + void SetFormatType(const short nFormatType); + inline short GetFormatType() const { return nCurrFormatType; } + void SetDefFormat(const ULONG nDefFmt); + ULONG GetFormat() const; - inline LanguageType GetCurLanguage() const { return eCurLanguage;} + inline LanguageType GetCurLanguage() const { return eCurLanguage;} void SetLanguage(LanguageType eSet) { eCurLanguage = eSet;} void SetAutomaticLanguage(BOOL bSet){bUseAutomaticLanguage = bSet;} diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx index f8d748c4473c..6b62baa694e6 100644 --- a/sw/source/ui/inc/numpara.hxx +++ b/sw/source/ui/inc/numpara.hxx @@ -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 @@ -44,30 +44,30 @@ ---------------------------------------------------------------------------*/ class SwParagraphNumTabPage : public SfxTabPage { - FixedLine aOutlineStartFL; - FixedText aOutlineLvFT; - ListBox aOutlineLvLB; + FixedLine aOutlineStartFL; + FixedText aOutlineLvFT; + ListBox aOutlineLvLB; FixedText aNumberStyleFT; - ListBox aNumberStyleLB; + ListBox aNumberStyleLB; FixedLine aNewStartFL; - TriStateBox aNewStartCB; + TriStateBox aNewStartCB; TriStateBox aNewStartNumberCB; - NumericField aNewStartNF; + NumericField aNewStartNF; FixedLine aCountParaFL; - TriStateBox aCountParaCB; - TriStateBox aRestartParaCountCB; - FixedText aRestartFT; - NumericField aRestartNF; + TriStateBox aCountParaCB; + TriStateBox aRestartParaCountCB; + FixedText aRestartFT; + NumericField aRestartNF; // --> OD 2008-04-14 #outlinelevel# const String msOutlineNumbering; // <-- - BOOL bModified : 1; - BOOL bCurNumrule : 1; + BOOL bModified : 1; + BOOL bCurNumrule : 1; DECL_LINK( NewStartHdl_Impl, CheckBox* ); DECL_LINK( StyleHdl_Impl, ListBox* ); @@ -79,18 +79,18 @@ protected: public: ~SwParagraphNumTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void EnableNewStart(); - void DisableOutline(); - void DisableNumbering(); + void EnableNewStart(); + void DisableOutline(); + void DisableNumbering(); - ListBox& GetStyleBox() {return aNumberStyleLB;}; + ListBox& GetStyleBox() {return aNumberStyleLB;}; }; diff --git a/sw/source/ui/inc/numprevw.hxx b/sw/source/ui/inc/numprevw.hxx index 3ee9a2316103..977503c967a1 100644 --- a/sw/source/ui/inc/numprevw.hxx +++ b/sw/source/ui/inc/numprevw.hxx @@ -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 @@ -38,15 +38,15 @@ class SwNumRule; class NumberingPreview : public Window { - const SwNumRule* pActNum; - Font aStdFont; - long nPageWidth; - const String* pOutlineNames; - BOOL bPosition; - UINT16 nActLevel; + const SwNumRule* pActNum; + Font aStdFont; + long nPageWidth; + const String* pOutlineNames; + BOOL bPosition; + UINT16 nActLevel; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); public: NumberingPreview(Window* pParent, const ResId& rResId ) : @@ -54,15 +54,15 @@ class NumberingPreview : public Window pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(FALSE), nActLevel(USHRT_MAX) {} ~NumberingPreview(); - void SetNumRule(const SwNumRule* pNum) + void SetNumRule(const SwNumRule* pNum) {pActNum = pNum; Invalidate();}; - void SetPageWidth(long nPgWidth) + void SetPageWidth(long nPgWidth) {nPageWidth = nPgWidth;} - void SetOutlineNames(const String* pNames) + void SetOutlineNames(const String* pNames) {pOutlineNames = pNames;} - void SetPositionMode() + void SetPositionMode() { bPosition = TRUE;} - void SetLevel(USHORT nSet) {nActLevel = nSet;} + void SetLevel(USHORT nSet) {nActLevel = nSet;} }; diff --git a/sw/source/ui/inc/olesh.hxx b/sw/source/ui/inc/olesh.hxx index 32a413300f36..77852098908a 100644 --- a/sw/source/ui/inc/olesh.hxx +++ b/sw/source/ui/inc/olesh.hxx @@ -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/inc/olmenu.hxx b/sw/source/ui/inc/olmenu.hxx index ef6a26e73f67..e2285207e429 100644 --- a/sw/source/ui/inc/olmenu.hxx +++ b/sw/source/ui/inc/olmenu.hxx @@ -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 @@ -44,14 +44,14 @@ class SwWrtShell; class SwSpellPopup : public PopupMenu { - SwWrtShell* pSh; + SwWrtShell* pSh; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > > aDics; + ::com::sun::star::linguistic2::XDictionary > > aDics; ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellAlternatives > xSpellAlt; + ::com::sun::star::linguistic2::XSpellAlternatives > xSpellAlt; ::com::sun::star::uno::Sequence< rtl::OUString > aSuggestions; - + LanguageType nCheckedLanguage; LanguageType nGuessLangWord; LanguageType nGuessLangPara; @@ -63,9 +63,9 @@ class SwSpellPopup : public PopupMenu bool bGrammarResults; // show grammar results? Or show spellcheck results? Image aInfo16; - - void fillLangPopupMenu( PopupMenu *pPopupMenu, USHORT nLangStart, - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq, SwWrtShell* pWrtSh, + + void fillLangPopupMenu( PopupMenu *pPopupMenu, USHORT nLangStart, + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq, SwWrtShell* pWrtSh, std::map< sal_Int16, ::rtl::OUString > &rLangTable ); using PopupMenu::Execute; @@ -81,7 +81,7 @@ public: sal_Int32 nErrorInResult, const ::com::sun::star::uno::Sequence< rtl::OUString > &rSuggestions, const String & rParaText ); - + sal_uInt16 Execute( const Rectangle& rPopupPos, Window* pWin ); void Execute( USHORT nId ); diff --git a/sw/source/ui/inc/optcomp.hxx b/sw/source/ui/inc/optcomp.hxx index 34de97517fd2..a564cc071527 100644 --- a/sw/source/ui/inc/optcomp.hxx +++ b/sw/source/ui/inc/optcomp.hxx @@ -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 @@ -42,45 +42,45 @@ class SwCompatibilityOptPage : public SfxTabPage { private: // controls - FixedLine m_aMainFL; - FixedText m_aFormattingFT; - ListBox m_aFormattingLB; - FixedText m_aOptionsFT; - SvxCheckListBox m_aOptionsLB; - PushButton m_aResetPB; - PushButton m_aDefaultPB; + FixedLine m_aMainFL; + FixedText m_aFormattingFT; + ListBox m_aFormattingLB; + FixedText m_aOptionsFT; + SvxCheckListBox m_aOptionsLB; + PushButton m_aResetPB; + PushButton m_aDefaultPB; // config item - SvtCompatibilityOptions m_aConfigItem; + SvtCompatibilityOptions m_aConfigItem; // text of the user entry - String m_sUserEntry; + String m_sUserEntry; // text of the "use as default" querybox - String m_sUseAsDefaultQuery; + String m_sUseAsDefaultQuery; // shell of the current document - SwWrtShell* m_pWrtShell; + SwWrtShell* m_pWrtShell; // impl object SwCompatibilityOptPage_Impl* m_pImpl; // saved options after "Reset"; used in "FillItemSet" for comparison - ULONG m_nSavedOptions; + ULONG m_nSavedOptions; // handler - DECL_LINK( SelectHdl, ListBox* ); - DECL_LINK( UseAsDefaultHdl, PushButton* ); + DECL_LINK( SelectHdl, ListBox* ); + DECL_LINK( UseAsDefaultHdl, PushButton* ); // private methods - void InitControls( const SfxItemSet& rSet ); - void ReplaceFormatName( String& rEntry ); - void SetCurrentOptions( ULONG nOptions ); - ULONG GetDocumentOptions() const; - void WriteOptions(); + void InitControls( const SfxItemSet& rSet ); + void ReplaceFormatName( String& rEntry ); + void SetCurrentOptions( ULONG nOptions ); + ULONG GetDocumentOptions() const; + void WriteOptions(); public: SwCompatibilityOptPage( Window* pParent, const SfxItemSet& rSet ); ~SwCompatibilityOptPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index abe43c00f0a3..2e17cb683f44 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.hxx @@ -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 @@ -55,12 +55,12 @@ private: FixedLine aUpdateFL; FixedText aLinkFT; RadioButton aAlwaysRB; - RadioButton aRequestRB; - RadioButton aNeverRB; + RadioButton aRequestRB; + RadioButton aNeverRB; FixedText aFieldFT; CheckBox aAutoUpdateFields; - CheckBox aAutoUpdateCharts; + CheckBox aAutoUpdateCharts; FixedLine aSettingsFL; FixedText aMetricFT; @@ -68,8 +68,9 @@ private: FixedText aTabFT; MetricField aTabMF; CheckBox aUseSquaredPageMode; + CheckBox aUseCharUnit; - SwWrtShell* pWrtShell; + SwWrtShell* pWrtShell; sal_Bool bHTMLMode; UINT16 nLastTab; sal_Int32 nOldLinkMode; @@ -81,11 +82,11 @@ public: SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ); ~SwLoadOptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; /*-------------------------------------------------------------------- @@ -119,69 +120,69 @@ public: class SwCaptionPreview : public Window { private: - String maText; - Point maDrawPos; + String maText; + Point maDrawPos; public: SwCaptionPreview( Window* pParent, const ResId& rResId ); - void SetPreviewText( const String& rText ); - virtual void Paint( const Rectangle& rRect ); + void SetPreviewText( const String& rText ); + virtual void Paint( const Rectangle& rRect ); }; class SwCaptionOptPage : public SfxTabPage { private: - FixedText aCheckFT; - SvxCheckListBox aCheckLB; + FixedText aCheckFT; + SvxCheckListBox aCheckLB; FixedText aFtCaptionOrder; ListBox aLbCaptionOrder; - + SwCaptionPreview aPreview; - + FixedLine aSettingsGroupFL; - FixedText aCategoryText; - CaptionComboBox aCategoryBox; - FixedText aFormatText; - ListBox aFormatBox; - //#i61007# order of captions + FixedText aCategoryText; + CaptionComboBox aCategoryBox; + FixedText aFormatText; + ListBox aFormatBox; + //#i61007# order of captions FixedText aNumberingSeparatorFT; Edit aNumberingSeparatorED; - FixedText aTextText; - Edit aTextEdit; - FixedText aPosText; - ListBox aPosBox; - - FixedLine aNumCaptFL; - FixedText aFtLevel; - ListBox aLbLevel; - FixedText aFtDelim; - Edit aEdDelim; - - FixedLine aCategoryFL; - FixedText aCharStyleFT; - ListBox aCharStyleLB; - CheckBox aApplyBorderCB; - - String sSWTable; - String sSWFrame; - String sSWGraphic; - String sOLE; - - String sIllustration; - String sTable; - String sText; + FixedText aTextText; + Edit aTextEdit; + FixedText aPosText; + ListBox aPosBox; + + FixedLine aNumCaptFL; + FixedText aFtLevel; + ListBox aLbLevel; + FixedText aFtDelim; + Edit aEdDelim; + + FixedLine aCategoryFL; + FixedText aCharStyleFT; + ListBox aCharStyleLB; + CheckBox aApplyBorderCB; + + String sSWTable; + String sSWFrame; + String sSWGraphic; + String sOLE; + + String sIllustration; + String sTable; + String sText; String sDrawing; - String sBegin; - String sEnd; - String sAbove; - String sBelow; + String sBegin; + String sEnd; + String sAbove; + String sBelow; String sNone; - SwFldMgr *pMgr; - USHORT eType; - BOOL bHTMLMode; + SwFldMgr *pMgr; + USHORT eType; + BOOL bHTMLMode; DECL_LINK( SelectHdl, ListBox *pLB = 0 ); DECL_LINK( ModifyHdl, Edit *pEdt = 0 ); @@ -189,23 +190,23 @@ private: DECL_LINK( ShowEntryHdl, SvxCheckListBox *pLB = 0 ); DECL_LINK( SaveEntryHdl, SvxCheckListBox *pLB = 0 ); - void DelUserData(); - void SetOptions( const USHORT nPos, + void DelUserData(); + void SetOptions( const USHORT nPos, const SwCapObjType eType, const SvGlobalName *pOleId = 0); - void SaveEntry( SvLBoxEntry* pEntry ); - void DrawSample(); + void SaveEntry( SvLBoxEntry* pEntry ); + void DrawSample(); public: SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ); ~SwCaptionOptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index d05e68588b2d..60e15f866bb3 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -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 @@ -64,29 +64,29 @@ class SwContentOptPage : public SfxTabPage { //visual aids FixedLine aLineFL; - CheckBox aCrossCB; - CheckBox aSolidHandleCB; - CheckBox aBigHandleCB; + CheckBox aCrossCB; + CheckBox aSolidHandleCB; + CheckBox aBigHandleCB; //view FixedLine aWindowFL; - CheckBox aHScrollBox; - CheckBox aVScrollBox; + CheckBox aHScrollBox; + CheckBox aVScrollBox; CheckBox aAnyRulerCB; CheckBox aHRulerCBox; ListBox aHMetric; - CheckBox aVRulerCBox; + CheckBox aVRulerCBox; CheckBox aVRulerRightCBox; ListBox aVMetric; - CheckBox aSmoothCBox; + CheckBox aSmoothCBox; //display FixedLine aDispFL; - CheckBox aGrfCB; - CheckBox aTblCB; - CheckBox aDrwCB; - CheckBox aFldNameCB; - CheckBox aPostItCB; + CheckBox aGrfCB; + CheckBox aTblCB; + CheckBox aDrwCB; + CheckBox aFldNameCB; + CheckBox aPostItCB; FixedLine aSettingsFL; FixedText aMetricFT; @@ -99,11 +99,11 @@ public: const SfxItemSet& rSet ); ~SwContentOptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; @@ -116,11 +116,11 @@ class SwAddPrinterTabPage : public SfxTabPage { FixedLine aFL1; CheckBox aGrfCB; -// CheckBox aTabCB; -// CheckBox aDrawCB; - CheckBox aCtrlFldCB; - CheckBox aBackgroundCB; - CheckBox aBlackFontCB; +// CheckBox aTabCB; +// CheckBox aDrawCB; + CheckBox aCtrlFldCB; + CheckBox aBackgroundCB; + CheckBox aBlackFontCB; CheckBox aPrintHiddenTextCB; CheckBox aPrintTextPlaceholderCB; @@ -128,8 +128,8 @@ class SwAddPrinterTabPage : public SfxTabPage FixedLine aFL2; CheckBox aLeftPageCB; - CheckBox aRightPageCB; -// CheckBox aReverseCB; + CheckBox aRightPageCB; +// CheckBox aReverseCB; CheckBox aProspectCB; CheckBox aProspectCB_RTL; @@ -143,15 +143,15 @@ class SwAddPrinterTabPage : public SfxTabPage FixedLine aFL4; CheckBox aPrintEmptyPagesCB; // CheckBox aSingleJobsCB; - CheckBox aPaperFromSetupCB; + CheckBox aPaperFromSetupCB; FixedText aFaxFT; ListBox aFaxLB; String sNone; - BOOL bAttrModified; - BOOL bPreview; + BOOL bAttrModified; + BOOL bPreview; - void Init(); + void Init(); DECL_LINK( AutoClickHdl, CheckBox * ); DECL_LINK( SelectHdl, ListBox * ); @@ -160,14 +160,14 @@ class SwAddPrinterTabPage : public SfxTabPage const SfxItemSet& rSet ); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - void SetFax( const SvStringsDtor& ); - void SelectFax( const String& ); - void SetPreview(BOOL bPrev); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + void SetFax( const SvStringsDtor& ); + void SelectFax( const String& ); + void SetPreview(BOOL bPrev); virtual void PageCreated (SfxAllItemSet aSet); }; @@ -183,49 +183,49 @@ class SwStdFontTabPage : public SfxTabPage FixedText aTypeFT; FixedText aStandardLbl; - ComboBox aStandardBox; + ComboBox aStandardBox; FixedText aHeightFT; FontSizeBox aStandardHeightLB; FixedText aTitleLbl ; - ComboBox aTitleBox ; + ComboBox aTitleBox ; FontSizeBox aTitleHeightLB; - FixedText aListLbl ; - ComboBox aListBox ; + FixedText aListLbl ; + ComboBox aListBox ; FontSizeBox aListHeightLB; - FixedText aLabelLbl ; - ComboBox aLabelBox ; + FixedText aLabelLbl ; + ComboBox aLabelBox ; FontSizeBox aLabelHeightLB; - FixedText aIdxLbl ; - ComboBox aIdxBox ; + FixedText aIdxLbl ; + ComboBox aIdxBox ; FontSizeBox aIndexHeightLB; - CheckBox aDocOnlyCB ; + CheckBox aDocOnlyCB ; PushButton aStandardPB; - String sShellStd; - String sShellTitle; - String sShellList; + String sShellStd; + String sShellTitle; + String sShellList; String sShellLabel; String sShellIndex; - SfxPrinter* pPrt; + SfxPrinter* pPrt; FontList* pFontList; - SwStdFontConfig* pFontConfig; - SwWrtShell* pWrtShell; + SwStdFontConfig* pFontConfig; + SwWrtShell* pWrtShell; LanguageType eLanguage; // waren nur defaults vorhanden? wurden sie mit den Boxen ueberschrieben - BOOL bListDefault :1; - BOOL bSetListDefault :1; - BOOL bLabelDefault :1; - BOOL bSetLabelDefault :1; - BOOL bIdxDefault :1; - BOOL bSetIdxDefault :1; - BOOL bDeletePrinter :1; + BOOL bListDefault :1; + BOOL bSetListDefault :1; + BOOL bLabelDefault :1; + BOOL bSetLabelDefault :1; + BOOL bIdxDefault :1; + BOOL bSetIdxDefault :1; + BOOL bDeletePrinter :1; BOOL bListHeightDefault :1; BOOL bSetListHeightDefault :1; @@ -250,11 +250,11 @@ class SwStdFontTabPage : public SfxTabPage ~SwStdFontTabPage(); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); void SetFontMode(sal_uInt8 nGroup) {nFontGroup = nGroup;} virtual void PageCreated (SfxAllItemSet aSet); @@ -268,39 +268,39 @@ class SwTableOptionsTabPage : public SfxTabPage { FixedLine aTableFL; CheckBox aHeaderCB; - CheckBox aRepeatHeaderCB; - CheckBox aDontSplitCB; - CheckBox aBorderCB; + CheckBox aRepeatHeaderCB; + CheckBox aDontSplitCB; + CheckBox aBorderCB; FixedLine aSeparatorFL; FixedLine aTableInsertFL; - CheckBox aNumFormattingCB; - CheckBox aNumFmtFormattingCB; - CheckBox aNumAlignmentCB; + CheckBox aNumFormattingCB; + CheckBox aNumFmtFormattingCB; + CheckBox aNumAlignmentCB; FixedLine aMoveFL; FixedText aMoveFT; FixedText aRowMoveFT; - MetricField aRowMoveMF; - FixedText aColMoveFT; - MetricField aColMoveMF; + MetricField aRowMoveMF; + FixedText aColMoveFT; + MetricField aColMoveMF; FixedText aInsertFT; - FixedText aRowInsertFT; - MetricField aRowInsertMF; - FixedText aColInsertFT; - MetricField aColInsertMF; + FixedText aRowInsertFT; + MetricField aRowInsertMF; + FixedText aColInsertFT; + MetricField aColInsertMF; FixedText aHandlingFT; - RadioButton aFixRB; + RadioButton aFixRB; RadioButton aFixPropRB; RadioButton aVarRB; - FixedText aFixFT; - FixedText aFixPropFT; - FixedText aVarFT; + FixedText aFixFT; + FixedText aFixPropFT; + FixedText aVarFT; - SwWrtShell* pWrtShell; + SwWrtShell* pWrtShell; BOOL bHTMLMode; DECL_LINK(CheckBoxHdl, CheckBox *pCB); @@ -312,11 +312,11 @@ class SwTableOptionsTabPage : public SfxTabPage public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); void SetWrtShell(SwWrtShell* pSh) {pWrtShell = pSh;} virtual void PageCreated (SfxAllItemSet aSet); @@ -329,12 +329,12 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage { //nonprinting characters FixedLine aUnprintFL; - CheckBox aParaCB; - CheckBox aSHyphCB; - CheckBox aSpacesCB; - CheckBox aHSpacesCB; - CheckBox aTabCB; - CheckBox aBreakCB; + CheckBox aParaCB; + CheckBox aSHyphCB; + CheckBox aSpacesCB; + CheckBox aHSpacesCB; + CheckBox aTabCB; + CheckBox aBreakCB; CheckBox aCharHiddenCB; CheckBox aFldHiddenCB; CheckBox aFldHiddenParaCB; @@ -342,26 +342,26 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage FixedLine aSeparatorFL; FixedLine aFlagFL; - CheckBox aOnOffCB; + CheckBox aOnOffCB; - FixedText aFillModeFT; + FixedText aFillModeFT; RadioButton aFillMarginRB; RadioButton aFillIndentRB; RadioButton aFillTabRB; RadioButton aFillSpaceRB; FixedLine aCrsrOptFL; - CheckBox aCrsrInProtCB; + CheckBox aCrsrInProtCB; SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SwShdwCrsrOptionsTabPage(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; /*----------------------------------------------------------------------- @@ -370,36 +370,36 @@ public: class SwMarkPreview : public Window { - Color m_aBgCol; // background - Color m_aTransCol; // transparency - Color m_aMarkCol; // marks - Color m_aLineCol; // general lines - Color m_aShadowCol; // shadow - Color m_aTxtCol; // text - Color m_aPrintAreaCol; // frame for print area + Color m_aBgCol; // background + Color m_aTransCol; // transparency + Color m_aMarkCol; // marks + Color m_aLineCol; // general lines + Color m_aShadowCol; // shadow + Color m_aTxtCol; // text + Color m_aPrintAreaCol; // frame for print area - Rectangle aPage; - Rectangle aLeftPagePrtArea; - Rectangle aRightPagePrtArea; + Rectangle aPage; + Rectangle aLeftPagePrtArea; + Rectangle aRightPagePrtArea; - USHORT nMarkPos; + USHORT nMarkPos; using OutputDevice::DrawRect; - void DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor); + void DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor); - void Paint(const Rectangle&); - void PaintPage(const Rectangle &rRect); - void InitColors( void ); + void Paint(const Rectangle&); + void PaintPage(const Rectangle &rRect); + void InitColors( void ); protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: SwMarkPreview(Window* pParent, const ResId& rResID); - virtual ~SwMarkPreview(); + virtual ~SwMarkPreview(); - inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } - inline void SetMarkPos(USHORT nPos) { nMarkPos = nPos; } + inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } + inline void SetMarkPos(USHORT nPos) { nMarkPos = nPos; } }; /*----------------------------------------------------------------------- @@ -412,9 +412,9 @@ class SwRedlineOptionsTabPage : public SfxTabPage FixedText aInsertFT; FixedText aInsertAttrFT; - ListBox aInsertLB; + ListBox aInsertLB; FixedText aInsertColorFT; - ColorListBox aInsertColorLB; + ColorListBox aInsertColorLB; SvxFontPrevWindow aInsertedPreviewWN; FixedText aDeletedFT; @@ -434,13 +434,13 @@ class SwRedlineOptionsTabPage : public SfxTabPage FixedLine aChangedFL; FixedText aMarkPosFT; - ListBox aMarkPosLB; - FixedText aMarkColorFT; - ColorListBox aMarkColorLB; - SwMarkPreview aMarkPreviewWN; + ListBox aMarkPosLB; + FixedText aMarkColorFT; + ColorListBox aMarkColorLB; + SwMarkPreview aMarkPreviewWN; String sAuthor; - String sNone; + String sNone; SwRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SwRedlineOptionsTabPage(); @@ -449,14 +449,14 @@ class SwRedlineOptionsTabPage : public SfxTabPage DECL_LINK( ChangedMaskPrevHdl, ListBox *pLB = 0 ); DECL_LINK( ColorHdl, ColorListBox *pColorLB ); - void InitFontStyle(SvxFontPrevWindow& rExampleWin); + void InitFontStyle(SvxFontPrevWindow& rExampleWin); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; /*--------OS 11.01.95 ----------------------------------- @@ -471,11 +471,11 @@ public: SwTestTabPage( Window* pParent, const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); private: FixedLine aTestFL; @@ -490,9 +490,9 @@ private: CheckBox aTest9CBox; CheckBox aTest10CBox; - BOOL bAttrModified; + BOOL bAttrModified; - void Init(); + void Init(); DECL_LINK( AutoClickHdl, CheckBox * ); }; diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx index 65f57636c02d..dbe36d92f6f3 100644 --- a/sw/source/ui/inc/outline.hxx +++ b/sw/source/ui/inc/outline.hxx @@ -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 @@ -53,7 +53,7 @@ #include <vcl/field.hxx> #endif -#include "swtypes.hxx" //fuer MAXLEVEL +#include "swtypes.hxx" //fuer MAXLEVEL #include <numprevw.hxx> #include <numberingtypelistbox.hxx> @@ -69,12 +69,12 @@ class SwOutlineTabDialog : public SfxTabDialog static USHORT nNumLevel; String aNullStr; - String aCollNames[MAXLEVEL]; - PopupMenu aFormMenu; + String aCollNames[MAXLEVEL]; + PopupMenu aFormMenu; - SwWrtShell& rWrtSh; - SwNumRule* pNumRule; - SwChapterNumRules* pChapterNumRules; + SwWrtShell& rWrtSh; + SwNumRule* pNumRule; + SwChapterNumRules* pChapterNumRules; BOOL bModified : 1; @@ -83,8 +83,8 @@ class SwOutlineTabDialog : public SfxTabDialog DECL_LINK( FormHdl, Button * ); DECL_LINK( MenuSelectHdl, Menu * ); - virtual void PageCreated(USHORT nPageId, SfxTabPage& rPage); - virtual short Ok(); + virtual void PageCreated(USHORT nPageId, SfxTabPage& rPage); + virtual short Ok(); public: SwOutlineTabDialog(Window* pParent, @@ -92,9 +92,9 @@ class SwOutlineTabDialog : public SfxTabDialog SwWrtShell &); ~SwOutlineTabDialog(); - SwNumRule* GetNumRule() {return pNumRule;} - USHORT GetLevel(const String &rFmtName) const; - String* GetCollNames() {return aCollNames;} + SwNumRule* GetNumRule() {return pNumRule;} + USHORT GetLevel(const String &rFmtName) const; + String* GetCollNames() {return aCollNames;} static USHORT GetActNumLevel() {return nNumLevel;} static void SetActNumLevel(USHORT nSet) {nNumLevel = nSet;} @@ -104,33 +104,33 @@ class SwOutlineTabDialog : public SfxTabDialog * --------------------------------------------------*/ class SwOutlineSettingsTabPage : public SfxTabPage { - ListBox aLevelLB; + ListBox aLevelLB; FixedLine aLevelFL; - FixedText aCollLbl; - ListBox aCollBox; - FixedText aNumberLbl; - SwNumberingTypeListBox aNumberBox; - FixedText aCharFmtFT; - ListBox aCharFmtLB; + FixedText aCollLbl; + ListBox aCollBox; + FixedText aNumberLbl; + SwNumberingTypeListBox aNumberBox; + FixedText aCharFmtFT; + ListBox aCharFmtLB; FixedText aAllLevelFT; - NumericField aAllLevelNF; - FixedText aDelim; - FixedText aPrefixFT; - Edit aPrefixED; - FixedText aSuffixFT; - Edit aSuffixED; - FixedText aStartLbl; - NumericField aStartEdit; + NumericField aAllLevelNF; + FixedText aDelim; + FixedText aPrefixFT; + Edit aPrefixED; + FixedText aSuffixFT; + Edit aSuffixED; + FixedText aStartLbl; + NumericField aStartEdit; FixedLine aNumberFL; NumberingPreview aPreviewWIN; - String aNoFmtName; - String aSaveCollNames[MAXLEVEL]; - SwWrtShell* pSh; - SwNumRule* pNumRule; - String* pCollNames; - USHORT nActLevel; + String aNoFmtName; + String aSaveCollNames[MAXLEVEL]; + SwWrtShell* pSh; + SwNumRule* pNumRule; + String* pCollNames; + USHORT nActLevel; DECL_LINK( LevelHdl, ListBox * ); DECL_LINK( ToggleComplete, NumericField * ); @@ -141,9 +141,9 @@ class SwOutlineSettingsTabPage : public SfxTabPage DECL_LINK( StartModified, NumericField * ); DECL_LINK( CharFmtHdl, ListBox * ); - void Update(); + void Update(); - void SetModified(){aPreviewWIN.Invalidate();} + void SetModified(){aPreviewWIN.Invalidate();} void CheckForStartValue_Impl(sal_uInt16 nNumberingType); using SfxTabPage::ActivatePage; @@ -155,12 +155,12 @@ public: void SetWrtShell(SwWrtShell* pShell); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); }; #endif diff --git a/sw/source/ui/inc/pardlg.hxx b/sw/source/ui/inc/pardlg.hxx index 3946300dc248..a8b0f03db1fe 100644 --- a/sw/source/ui/inc/pardlg.hxx +++ b/sw/source/ui/inc/pardlg.hxx @@ -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 @@ -33,7 +33,7 @@ class SwView; class SfxItemSet; //DialogModes: -#define DLG_STD 0 -#define DLG_ENVELOP 2 +#define DLG_STD 0 +#define DLG_ENVELOP 2 #endif diff --git a/sw/source/ui/inc/pattern.hxx b/sw/source/ui/inc/pattern.hxx index 2ee7cb079afd..9e3ab6d629bd 100644 --- a/sw/source/ui/inc/pattern.hxx +++ b/sw/source/ui/inc/pattern.hxx @@ -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/inc/pgfnote.hxx b/sw/source/ui/inc/pgfnote.hxx index 31bb0c68fc22..9f7a324577b2 100644 --- a/sw/source/ui/inc/pgfnote.hxx +++ b/sw/source/ui/inc/pgfnote.hxx @@ -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 @@ #include <svtools/ctrlbox.hxx> /*-------------------------------------------------------------------- - Beschreibung: Fussnoteneinstellungs-TabPage + Beschreibung: Fussnoteneinstellungs-TabPage --------------------------------------------------------------------*/ class SwFootNotePage: public SfxTabPage @@ -59,34 +59,34 @@ private: SwFootNotePage(Window *pParent, const SfxItemSet &rSet); ~SwFootNotePage(); - RadioButton aMaxHeightPageBtn; - RadioButton aMaxHeightBtn; - MetricField aMaxHeightEdit; - FixedText aDistLbl; - MetricField aDistEdit; - FixedLine aPosHeader; - - FixedText aLinePosLbl; - ListBox aLinePosBox; - FixedText aLineTypeLbl; - LineListBox aLineTypeBox; - FixedText aLineWidthLbl; - MetricField aLineWidthEdit; - FixedText aLineDistLbl; - MetricField aLineDistEdit; - FixedLine aLineHeader; + RadioButton aMaxHeightPageBtn; + RadioButton aMaxHeightBtn; + MetricField aMaxHeightEdit; + FixedText aDistLbl; + MetricField aDistEdit; + FixedLine aPosHeader; + + FixedText aLinePosLbl; + ListBox aLinePosBox; + FixedText aLineTypeLbl; + LineListBox aLineTypeBox; + FixedText aLineWidthLbl; + MetricField aLineWidthEdit; + FixedText aLineDistLbl; + MetricField aLineDistEdit; + FixedLine aLineHeader; DECL_LINK( HeightPage, Button * ); DECL_LINK( HeightMetric, Button * ); DECL_LINK( HeightModify, MetricField * ); - long lMaxHeight; + long lMaxHeight; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - + virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); }; diff --git a/sw/source/ui/inc/pggrid.hxx b/sw/source/ui/inc/pggrid.hxx index 92ba2fa2ebd4..5317f48a5aba 100644 --- a/sw/source/ui/inc/pggrid.hxx +++ b/sw/source/ui/inc/pggrid.hxx @@ -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 @@ -54,16 +54,18 @@ class SwTextGridPage: public SfxTabPage FixedText aLinesPerPageFT; NumericField aLinesPerPageNF; + FixedText aLinesRangeFT; FixedText aTextSizeFT; MetricField aTextSizeMF; FixedText aCharsPerLineFT; NumericField aCharsPerLineNF; + FixedText aCharsRangeFT; FixedText aCharWidthFT; - MetricField aCharWidthMF; - + MetricField aCharWidthMF; + FixedText aRubySizeFT; MetricField aRubySizeMF; @@ -76,19 +78,22 @@ class SwTextGridPage: public SfxTabPage FixedText aColorFT; ColorListBox aColorLB; - Window* aControls[18]; + Window* aControls[20]; sal_Int32 m_nRubyUserValue; sal_Bool m_bRubyUserValue; Size m_aPageSize; sal_Bool m_bVertical; - sal_Bool m_bSquaredMode; + sal_Bool m_bSquaredMode; + sal_Bool m_bHRulerChanged; + sal_Bool m_bVRulerChanged; SwTextGridPage(Window *pParent, const SfxItemSet &rSet); ~SwTextGridPage(); void UpdatePageSize(const SfxItemSet& rSet); void PutGridItem(SfxItemSet& rSet); + void SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue ); DECL_LINK(GridTypeHdl, RadioButton*); DECL_LINK(CharorLineChangedHdl, SpinField*); @@ -107,7 +112,7 @@ public: virtual void Reset(const SfxItemSet &rSet); virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); }; #endif diff --git a/sw/source/ui/inc/popbox.hxx b/sw/source/ui/inc/popbox.hxx index bc9fa1855287..378961ffc103 100644 --- a/sw/source/ui/inc/popbox.hxx +++ b/sw/source/ui/inc/popbox.hxx @@ -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 @@ -38,21 +38,21 @@ class SwNavigationPI; class SwHelpToolBox: public ToolBox, public DropTargetHelper { Link aDoubleClickLink; - Link aRightClickLink; // Link bekommt MouseEvent als Parameter !!! + Link aRightClickLink; // Link bekommt MouseEvent als Parameter !!! using ToolBox::DoubleClick; protected: virtual void MouseButtonDown(const MouseEvent &rEvt); virtual long DoubleClick(ToolBox *); - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); public: SwHelpToolBox(SwNavigationPI* pParent, const ResId &); ~SwHelpToolBox(); - void SetDoubleClickLink(const Link &); // inline - void SetRightClickLink(const Link &); // inline + void SetDoubleClickLink(const Link &); // inline + void SetRightClickLink(const Link &); // inline }; inline void SwHelpToolBox::SetDoubleClickLink(const Link &rLink) { diff --git a/sw/source/ui/inc/popup.hrc b/sw/source/ui/inc/popup.hrc index 62f210938a36..72fc074b526b 100644 --- a/sw/source/ui/inc/popup.hrc +++ b/sw/source/ui/inc/popup.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 @@ -30,24 +30,24 @@ #include "rcid.hrc" -#define MN_TEXT_POPUPMENU (RC_POPUPS_BEGIN + 0) -#define MN_TAB_POPUPMENU (RC_POPUPS_BEGIN + 1) -#define MN_FRM_POPUPMENU (RC_POPUPS_BEGIN + 2) -#define MN_DRAW_POPUPMENU (RC_POPUPS_BEGIN + 3) -#define MN_DRWTXT_POPUPMENU (RC_POPUPS_BEGIN + 4) -#define MN_GRF_POPUPMENU (RC_POPUPS_BEGIN + 5) -#define MN_OLE_POPUPMENU (RC_POPUPS_BEGIN + 6) -#define MN_PPREVIEW_POPUPMENU (RC_POPUPS_BEGIN + 7) +#define MN_TEXT_POPUPMENU (RC_POPUPS_BEGIN + 0) +#define MN_TAB_POPUPMENU (RC_POPUPS_BEGIN + 1) +#define MN_FRM_POPUPMENU (RC_POPUPS_BEGIN + 2) +#define MN_DRAW_POPUPMENU (RC_POPUPS_BEGIN + 3) +#define MN_DRWTXT_POPUPMENU (RC_POPUPS_BEGIN + 4) +#define MN_GRF_POPUPMENU (RC_POPUPS_BEGIN + 5) +#define MN_OLE_POPUPMENU (RC_POPUPS_BEGIN + 6) +#define MN_PPREVIEW_POPUPMENU (RC_POPUPS_BEGIN + 7) #define MN_SRCVIEW_POPUPMENU (RC_POPUPS_BEGIN + 8) -#define MN_DRAWFORM_POPUPMENU (RC_POPUPS_BEGIN + 9) -#define MN_MEDIA_POPUPMENU (RC_POPUPS_BEGIN + 10) -#define MN_LANGUAGE_FOR_TEXT (RC_POPUPS_BEGIN + 11) -#define MN_LANGUAGE_FOR_PARAGRAPH (RC_POPUPS_BEGIN + 12) -#define MN_LANGUAGE_FOR_DOCUMENT (RC_POPUPS_BEGIN + 13) -#define MN_ANNOTATION_POPUPMENU (RC_POPUPS_BEGIN + 14) -#define MN_ANNOTATION_BUTTON (RC_POPUPS_BEGIN + 15) -#define MN_REDCOMMENT_POPUPMENU (RC_POPUPS_BEGIN + 16) -#define MN_REDCOMMENT_BUTTON (RC_POPUPS_BEGIN + 17) +#define MN_DRAWFORM_POPUPMENU (RC_POPUPS_BEGIN + 9) +#define MN_MEDIA_POPUPMENU (RC_POPUPS_BEGIN + 10) +#define MN_LANGUAGE_FOR_TEXT (RC_POPUPS_BEGIN + 11) +#define MN_LANGUAGE_FOR_PARAGRAPH (RC_POPUPS_BEGIN + 12) +#define MN_LANGUAGE_FOR_DOCUMENT (RC_POPUPS_BEGIN + 13) +#define MN_ANNOTATION_POPUPMENU (RC_POPUPS_BEGIN + 14) +#define MN_ANNOTATION_BUTTON (RC_POPUPS_BEGIN + 15) +#define MN_REDCOMMENT_POPUPMENU (RC_POPUPS_BEGIN + 16) +#define MN_REDCOMMENT_BUTTON (RC_POPUPS_BEGIN + 17) #if MN_MEDIA_POPUPMENU > RC_POPUPS_END diff --git a/sw/source/ui/inc/prcntfld.hxx b/sw/source/ui/inc/prcntfld.hxx index e506f31de708..f5356235ae6a 100644 --- a/sw/source/ui/inc/prcntfld.hxx +++ b/sw/source/ui/inc/prcntfld.hxx @@ -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 @@ -41,8 +41,8 @@ class SW_DLLPUBLIC PercentField : public MetricField sal_Int64 nOldBaseValue; sal_Int64 nLastPercent; sal_Int64 nLastValue; - USHORT nOldDigits; - FieldUnit eOldUnit; + USHORT nOldDigits; + FieldUnit eOldUnit; sal_Bool bLockAutoCalculation; //prevent recalcution of percent values when the //reference value is changed @@ -70,7 +70,7 @@ public: sal_Int64 GetValue(FieldUnit eOutUnit = FUNIT_NONE); - BOOL IsValueModified(); + BOOL IsValueModified(); //using NumericFormatter::SetMax; void SetMax(sal_Int64 nNewMax, FieldUnit eInUnit = FUNIT_NONE); @@ -87,9 +87,9 @@ public: sal_Int64 Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit eOutUnit); - void ShowPercent(BOOL bPercent); + void ShowPercent(BOOL bPercent); - USHORT GetOldDigits() const {return nOldDigits;} + USHORT GetOldDigits() const {return nOldDigits;} void LockAutoCalculation(sal_Bool bLock) {bLockAutoCalculation = bLock;} sal_Bool IsAutoCalculationLocked()const {return bLockAutoCalculation;} diff --git a/sw/source/ui/inc/prtopt.hxx b/sw/source/ui/inc/prtopt.hxx index 75f0520e35e8..c46e93a138f4 100644 --- a/sw/source/ui/inc/prtopt.hxx +++ b/sw/source/ui/inc/prtopt.hxx @@ -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 @@ -41,7 +41,7 @@ public: virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - virtual void doSetModified( ) { bModified = sal_True; SetModified();} + virtual void doSetModified( ) { bModified = sal_True; SetModified();} SwPrintOptions& operator=(const SwPrintData& rData) { diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index d0d8f2cb804a..b2a72cca4f32 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.hxx @@ -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 @@ -181,7 +181,7 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell // aktuelle Dispatcher-Shell SwPagePreViewWin aViewWin; //viewdata of the previous SwView and the new crsrposition - String sSwViewData, + String sSwViewData, //and the new cursor position if the user double click in the PagePreView sNewCrsrPos; // to support keyboard the number of the page to go to can be set too @@ -198,7 +198,7 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell *pPageDownBtn; // Dummy-Window zum F�llen der rechten unteren Ecke, wenn beide Scrollbars // aktiv sind - Window *pScrollFill; + Window *pScrollFill; USHORT mnPageCount; BOOL bNormalPrint; @@ -246,7 +246,7 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell protected: virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); - virtual Size GetOptimalSizePixel() const; + virtual Size GetOptimalSizePixel() const; void SetZoom(SvxZoomType eSet, USHORT nFactor); @@ -277,11 +277,11 @@ public: USHORT GetPageCount() const { return mnPageCount; } - BOOL HandleWheelCommands( const CommandEvent& ); + BOOL HandleWheelCommands( const CommandEvent& ); - const String& GetPrevSwViewData() const { return sSwViewData; } - void SetNewCrsrPos( const String& rStr ) { sNewCrsrPos = rStr; } - const String& GetNewCrsrPos() const { return sNewCrsrPos; } + const String& GetPrevSwViewData() const { return sSwViewData; } + void SetNewCrsrPos( const String& rStr ) { sNewCrsrPos = rStr; } + const String& GetNewCrsrPos() const { return sNewCrsrPos; } USHORT GetNewPage() const {return nNewPage;} void SetNewPage(USHORT nSet) {nNewPage = nSet;} diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index 152c17387072..5c70eeae63ba 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.hxx @@ -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 @@ -45,21 +45,21 @@ class SwChildWinWrapper; struct SwRedlineDataChild { - const SwRedlineData* pChild; // Verweis auf originale gestackte Daten - const SwRedlineDataChild* pNext; // Verweis auf gestackte Daten - SvLBoxEntry* pTLBChild; // zugehoeriger TreeListBox-Eintrag + const SwRedlineData* pChild; // Verweis auf originale gestackte Daten + const SwRedlineDataChild* pNext; // Verweis auf gestackte Daten + SvLBoxEntry* pTLBChild; // zugehoeriger TreeListBox-Eintrag }; struct SwRedlineDataParent { - const SwRedlineData* pData; // RedlineDataPtr - const SwRedlineDataChild* pNext; // Verweis auf gestackte Daten - SvLBoxEntry* pTLBParent; // zugehoeriger TreeListBox-Eintrag - String sComment; // Redline-Kommentar + const SwRedlineData* pData; // RedlineDataPtr + const SwRedlineDataChild* pNext; // Verweis auf gestackte Daten + SvLBoxEntry* pTLBParent; // zugehoeriger TreeListBox-Eintrag + String sComment; // Redline-Kommentar - inline BOOL operator==( const SwRedlineDataParent& rObj ) const + inline BOOL operator==( const SwRedlineDataParent& rObj ) const { return (pData && pData->GetSeqNo() == rObj.pData->GetSeqNo()); } - inline BOOL operator< ( const SwRedlineDataParent& rObj ) const + inline BOOL operator< ( const SwRedlineDataParent& rObj ) const { return (pData && pData->GetSeqNo() < rObj.pData->GetSeqNo()); } }; @@ -79,52 +79,52 @@ SV_DECL_PTRARR(SvLBoxEntryArr, SvLBoxEntryPtr, 100, 100) class SW_DLLPUBLIC SwRedlineAcceptDlg { - Dialog* pParentDlg; - SwRedlineDataParentArr aRedlineParents; - SwRedlineDataChildArr aRedlineChilds; + Dialog* pParentDlg; + SwRedlineDataParentArr aRedlineParents; + SwRedlineDataChildArr aRedlineChilds; SwRedlineDataParentSortArr aUsedSeqNo; - SvxAcceptChgCtr aTabPagesCTRL; - PopupMenu aPopup; - Timer aDeselectTimer; - Timer aSelectTimer; - String sInserted; - String sDeleted; - String sFormated; - String sTableChgd; - String sFmtCollSet; - String sFilterAction; - String sAutoFormat; - Size aBorderSz; - SvxTPView* pTPView; - SvxRedlinTable* pTable; // PB 2006/02/02 #i48648 now SvHeaderTabListBox - Link aOldSelectHdl; - Link aOldDeselectHdl; - BOOL bOnlyFormatedRedlines; - BOOL bHasReadonlySel; - BOOL bRedlnAutoFmt; + SvxAcceptChgCtr aTabPagesCTRL; + PopupMenu aPopup; + Timer aDeselectTimer; + Timer aSelectTimer; + String sInserted; + String sDeleted; + String sFormated; + String sTableChgd; + String sFmtCollSet; + String sFilterAction; + String sAutoFormat; + Size aBorderSz; + SvxTPView* pTPView; + SvxRedlinTable* pTable; // PB 2006/02/02 #i48648 now SvHeaderTabListBox + Link aOldSelectHdl; + Link aOldDeselectHdl; + BOOL bOnlyFormatedRedlines; + BOOL bHasReadonlySel; + BOOL bRedlnAutoFmt; // prevent update dialog data during longer operations (cf #102657#) bool bInhibitActivate; - SW_DLLPRIVATE DECL_LINK( AcceptHdl, void* ); - SW_DLLPRIVATE DECL_LINK( AcceptAllHdl, void* ); - SW_DLLPRIVATE DECL_LINK( RejectHdl, void* ); - SW_DLLPRIVATE DECL_LINK( RejectAllHdl, void* ); - SW_DLLPRIVATE DECL_LINK( UndoHdl, void* ); - SW_DLLPRIVATE DECL_LINK( DeselectHdl, void* ); - SW_DLLPRIVATE DECL_LINK( SelectHdl, void* ); - SW_DLLPRIVATE DECL_LINK( GotoHdl, void* ); - SW_DLLPRIVATE DECL_LINK( CommandHdl, void* ); - - SW_DLLPRIVATE USHORT CalcDiff(USHORT nStart, BOOL bChild); - SW_DLLPRIVATE void InsertChilds(SwRedlineDataParent *pParent, const SwRedline& rRedln, const USHORT nAutoFmt); - SW_DLLPRIVATE void InsertParents(USHORT nStart, USHORT nEnd = USHRT_MAX); - SW_DLLPRIVATE void RemoveParents(USHORT nStart, USHORT nEnd); - SW_DLLPRIVATE void InitAuthors(); - - SW_DLLPRIVATE String GetRedlineText(const SwRedline& rRedln, DateTime &rDateTime, USHORT nStack = 0); - SW_DLLPRIVATE const String& GetActionText(const SwRedline& rRedln, USHORT nStack = 0); - SW_DLLPRIVATE USHORT GetRedlinePos( const SvLBoxEntry& rEntry) const; + SW_DLLPRIVATE DECL_LINK( AcceptHdl, void* ); + SW_DLLPRIVATE DECL_LINK( AcceptAllHdl, void* ); + SW_DLLPRIVATE DECL_LINK( RejectHdl, void* ); + SW_DLLPRIVATE DECL_LINK( RejectAllHdl, void* ); + SW_DLLPRIVATE DECL_LINK( UndoHdl, void* ); + SW_DLLPRIVATE DECL_LINK( DeselectHdl, void* ); + SW_DLLPRIVATE DECL_LINK( SelectHdl, void* ); + SW_DLLPRIVATE DECL_LINK( GotoHdl, void* ); + SW_DLLPRIVATE DECL_LINK( CommandHdl, void* ); + + SW_DLLPRIVATE USHORT CalcDiff(USHORT nStart, BOOL bChild); + SW_DLLPRIVATE void InsertChilds(SwRedlineDataParent *pParent, const SwRedline& rRedln, const USHORT nAutoFmt); + SW_DLLPRIVATE void InsertParents(USHORT nStart, USHORT nEnd = USHRT_MAX); + SW_DLLPRIVATE void RemoveParents(USHORT nStart, USHORT nEnd); + SW_DLLPRIVATE void InitAuthors(); + + SW_DLLPRIVATE String GetRedlineText(const SwRedline& rRedln, DateTime &rDateTime, USHORT nStack = 0); + SW_DLLPRIVATE const String& GetActionText(const SwRedline& rRedln, USHORT nStack = 0); + SW_DLLPRIVATE USHORT GetRedlinePos( const SvLBoxEntry& rEntry) const; public: SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt = FALSE); @@ -132,17 +132,17 @@ public: DECL_LINK( FilterChangedHdl, void *pDummy = 0 ); - inline SvxAcceptChgCtr* GetChgCtrl() { return &aTabPagesCTRL; } - inline BOOL HasRedlineAutoFmt() const { return bRedlnAutoFmt; } + inline SvxAcceptChgCtr* GetChgCtrl() { return &aTabPagesCTRL; } + inline BOOL HasRedlineAutoFmt() const { return bRedlnAutoFmt; } - void Init(USHORT nStart = 0); - void CallAcceptReject( BOOL bSelect, BOOL bAccept ); + void Init(USHORT nStart = 0); + void CallAcceptReject( BOOL bSelect, BOOL bAccept ); - void Initialize(const String &rExtraData); - void FillInfo(String &rExtraData) const; + void Initialize(const String &rExtraData); + void FillInfo(String &rExtraData) const; - virtual void Activate(); - virtual void Resize(); + virtual void Activate(); + virtual void Resize(); }; /*------------------------------------------------------------------------ @@ -151,18 +151,18 @@ public: class SwModelessRedlineAcceptDlg : public SfxModelessDialog { - SwRedlineAcceptDlg* pImplDlg; - SwChildWinWrapper* pChildWin; + SwRedlineAcceptDlg* pImplDlg; + SwChildWinWrapper* pChildWin; - virtual void Resize(); + virtual void Resize(); public: SwModelessRedlineAcceptDlg(SfxBindings*, SwChildWinWrapper*, Window *pParent); ~SwModelessRedlineAcceptDlg(); - virtual void Activate(); - virtual void FillInfo(SfxChildWinInfo&) const; - void Initialize (SfxChildWinInfo* pInfo); + virtual void Activate(); + virtual void FillInfo(SfxChildWinInfo&) const; + void Initialize (SfxChildWinInfo* pInfo); }; @@ -173,14 +173,14 @@ public: class SwRedlineAcceptChild : public SwChildWinWrapper { public: - SwRedlineAcceptChild( Window* , + SwRedlineAcceptChild( Window* , USHORT nId, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW( SwRedlineAcceptChild ); - virtual BOOL ReInitDlg(SwDocShell *pDocSh); + virtual BOOL ReInitDlg(SwDocShell *pDocSh); }; diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index 0237f560da09..2521232be034 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -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 @@ -77,10 +77,10 @@ class SwEditRegionDlg : public SfxModalDialog FixedLine aLinkFL; TriStateBox aFileCB; - CheckBox aDDECB; - FixedText aFileNameFT; - FixedText aDDECommandFT; - Edit aFileNameED; + CheckBox aDDECB; + FixedText aFileNameFT; + FixedText aDDECommandFT; + Edit aFileNameED; PushButton aFilePB; FixedText aSubRegionFT; ComboBox aSubRegionED; @@ -94,7 +94,7 @@ class SwEditRegionDlg : public SfxModalDialog FixedLine aHideFL; TriStateBox aHideCB; FixedText aConditionFT; - ConditionEdit aConditionED; + ConditionEdit aConditionED; // --> FME 2004-06-22 #114856# edit in readonly sections FixedLine aPropertiesFL; @@ -102,10 +102,10 @@ class SwEditRegionDlg : public SfxModalDialog // <-- OKButton aOK; - CancelButton aCancel; - PushButton aOptionsPB; - PushButton aDismiss; - HelpButton aHelp; + CancelButton aCancel; + PushButton aOptionsPB; + PushButton aDismiss; + HelpButton aHelp; ImageList aImageIL; ImageList aImageILH; @@ -117,13 +117,13 @@ class SwEditRegionDlg : public SfxModalDialog Window* m_pOldDefDlgParent; BOOL bDontCheckPasswd :1; - BOOL bWeb :1; + BOOL bWeb :1; Image BuildBitmap(BOOL bProtect,BOOL bHidden,BOOL bHighContrast); void RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry); - USHORT FindArrPos(const SwSectionFmt* pFmt); + USHORT FindArrPos(const SwSectionFmt* pFmt); DECL_LINK( GetFirstEntryHdl, SvTreeListBox * ); DECL_LINK( DeselectHdl, SvTreeListBox * ); @@ -170,13 +170,13 @@ class SwInsertSectionTabPage : public SfxTabPage FixedLine aLinkFL; CheckBox aFileCB; - CheckBox aDDECB; - FixedText aDDECommandFT; - FixedText aFileNameFT; - Edit aFileNameED; + CheckBox aDDECB; + FixedText aDDECommandFT; + FixedText aFileNameFT; + Edit aFileNameED; PushButton aFilePB; FixedText aSubRegionFT; - ComboBox aSubRegionED; + ComboBox aSubRegionED; FixedLine aProtectFL; CheckBox aProtectCB; @@ -186,7 +186,7 @@ class SwInsertSectionTabPage : public SfxTabPage FixedLine aHideFL; CheckBox aHideCB; FixedText aConditionFT; - ConditionEdit aConditionED; + ConditionEdit aConditionED; // --> FME 2004-06-22 #114856# edit in readonly sections FixedLine aPropertiesFL; @@ -197,7 +197,7 @@ class SwInsertSectionTabPage : public SfxTabPage String m_sFilterName; String m_sFilePasswd; -// SwFmtCol* pCols; +// SwFmtCol* pCols; ::com::sun::star::uno::Sequence <sal_Int8 > m_aNewPasswd; SwWrtShell* m_pWrtSh; sfx2::DocumentInserter* m_pDocInserter; @@ -219,44 +219,44 @@ public: SwInsertSectionTabPage(Window *pParent, const SfxItemSet &rAttrSet); virtual ~SwInsertSectionTabPage(); - void SetWrtShell(SwWrtShell& rSh); + void SetWrtShell(SwWrtShell& rSh); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet& ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); }; class SwSectionFtnEndTabPage : public SfxTabPage { FixedLine aFtnFL; - CheckBox aFtnNtAtTextEndCB; + CheckBox aFtnNtAtTextEndCB; - CheckBox aFtnNtNumCB; - FixedText aFtnOffsetLbl; - NumericField aFtnOffsetFld; + CheckBox aFtnNtNumCB; + FixedText aFtnOffsetLbl; + NumericField aFtnOffsetFld; - CheckBox aFtnNtNumFmtCB; - FixedText aFtnPrefixFT; - Edit aFtnPrefixED; - SwNumberingTypeListBox aFtnNumViewBox; - FixedText aFtnSuffixFT; - Edit aFtnSuffixED; + CheckBox aFtnNtNumFmtCB; + FixedText aFtnPrefixFT; + Edit aFtnPrefixED; + SwNumberingTypeListBox aFtnNumViewBox; + FixedText aFtnSuffixFT; + Edit aFtnSuffixED; FixedLine aEndFL; - CheckBox aEndNtAtTextEndCB; + CheckBox aEndNtAtTextEndCB; - CheckBox aEndNtNumCB; - FixedText aEndOffsetLbl; - NumericField aEndOffsetFld; + CheckBox aEndNtNumCB; + FixedText aEndOffsetLbl; + NumericField aEndOffsetFld; - CheckBox aEndNtNumFmtCB; - FixedText aEndPrefixFT; - Edit aEndPrefixED; - SwNumberingTypeListBox aEndNumViewBox; - FixedText aEndSuffixFT; - Edit aEndSuffixED; + CheckBox aEndNtNumFmtCB; + FixedText aEndPrefixFT; + Edit aEndPrefixED; + SwNumberingTypeListBox aEndNumViewBox; + FixedText aEndSuffixFT; + Edit aEndSuffixED; DECL_LINK( FootEndHdl, CheckBox * ); @@ -266,10 +266,10 @@ public: SwSectionFtnEndTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionFtnEndTabPage(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet& ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); }; /* -----------------13.06.2003 09:51----------------- @@ -304,12 +304,12 @@ public: * --------------------------------------------------*/ class SwInsertSectionTabDialog : public SfxTabDialog { - SwWrtShell& rWrtSh; + SwWrtShell& rWrtSh; ::std::auto_ptr<SwSectionData> m_pSectionData; protected: - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); - virtual short Ok(); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual short Ok(); public: SwInsertSectionTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwInsertSectionTabDialog(); @@ -325,7 +325,7 @@ class SwSectionPropertyTabDialog : public SfxTabDialog { SwWrtShell& rWrtSh; protected: - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: SwSectionPropertyTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwSectionPropertyTabDialog(); diff --git a/sw/source/ui/inc/ribbar.hrc b/sw/source/ui/inc/ribbar.hrc index 45c494b6f136..892261512a83 100644 --- a/sw/source/ui/inc/ribbar.hrc +++ b/sw/source/ui/inc/ribbar.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 @@ -29,59 +29,59 @@ #include "rcid.hrc" -#define MN_FORM1 1 // Defines fuer NumNames-Popup +#define MN_FORM1 1 // Defines fuer NumNames-Popup #define MN_FORMBASE MN_FORM1 #define MN_FORM2 2 #define MN_FORM3 3 #define MN_FORM4 4 #define MN_FORM5 5 -#define WIN_RIBBAR RC_RIBBAR_BEGIN - -#define CB_FORMAT (RC_RIBBAR_BEGIN +1) -#define CB_FONT (RC_RIBBAR_BEGIN +2) -#define CB_SIZE (RC_RIBBAR_BEGIN +3) -#define PB_FORMULA_OK (RC_RIBBAR_BEGIN +4) -#define PB_FORMULA_CANCEL (RC_RIBBAR_BEGIN +5) -#define BMP_OK PB_FORMULA_OK -#define BMP_CANCEL PB_FORMULA_CANCEL -#define RID_TBX_FORMULA (RC_RIBBAR_BEGIN +6) -#define FT_POS (RC_RIBBAR_BEGIN +7) -#define BT_FORMULA (RC_RIBBAR_BEGIN +8) +#define WIN_RIBBAR RC_RIBBAR_BEGIN + +#define CB_FORMAT (RC_RIBBAR_BEGIN +1) +#define CB_FONT (RC_RIBBAR_BEGIN +2) +#define CB_SIZE (RC_RIBBAR_BEGIN +3) +#define PB_FORMULA_OK (RC_RIBBAR_BEGIN +4) +#define PB_FORMULA_CANCEL (RC_RIBBAR_BEGIN +5) +#define BMP_OK PB_FORMULA_OK +#define BMP_CANCEL PB_FORMULA_CANCEL +#define RID_TBX_FORMULA (RC_RIBBAR_BEGIN +6) +#define FT_POS (RC_RIBBAR_BEGIN +7) +#define BT_FORMULA (RC_RIBBAR_BEGIN +8) #define STR_TBL_FORMULA (RC_RIBBAR_BEGIN +9) -#define STR_BACKGROUND_PATTERN (RC_RIBBAR_BEGIN + 10) -#define STR_BACKGROUND_COLOR (RC_RIBBAR_BEGIN + 11) -#define STR_BORDER_COLOR (RC_RIBBAR_BEGIN + 12) -#define STR_BORDER_STYLE (RC_RIBBAR_BEGIN + 13) -#define STR_BORDER_LINE (RC_RIBBAR_BEGIN + 14) -#define STR_TEXT_COLOR (RC_RIBBAR_BEGIN + 15) -#define STR_NUMLIST (RC_RIBBAR_BEGIN + 16) +#define STR_BACKGROUND_PATTERN (RC_RIBBAR_BEGIN + 10) +#define STR_BACKGROUND_COLOR (RC_RIBBAR_BEGIN + 11) +#define STR_BORDER_COLOR (RC_RIBBAR_BEGIN + 12) +#define STR_BORDER_STYLE (RC_RIBBAR_BEGIN + 13) +#define STR_BORDER_LINE (RC_RIBBAR_BEGIN + 14) +#define STR_TEXT_COLOR (RC_RIBBAR_BEGIN + 15) +#define STR_NUMLIST (RC_RIBBAR_BEGIN + 16) -#define STR_HELP_TOOLBOX_TOGGLE (RC_RIBBAR_BEGIN + 17) +#define STR_HELP_TOOLBOX_TOGGLE (RC_RIBBAR_BEGIN + 17) -#define RID_DRAW_WIN (RC_RIBBAR_BEGIN + 18) -#define RID_CNTRLR_WIN (RC_RIBBAR_BEGIN + 19) -#define RID_ALIGNMENT_WIN (RC_RIBBAR_BEGIN + 20) +#define RID_DRAW_WIN (RC_RIBBAR_BEGIN + 18) +#define RID_CNTRLR_WIN (RC_RIBBAR_BEGIN + 19) +#define RID_ALIGNMENT_WIN (RC_RIBBAR_BEGIN + 20) //Resourcen fuer Inputwin (Rechenleiste) -#define RID_WIN_FORMULA (RC_RIBBAR_BEGIN + 21) -#define MN_CALC_POPUP (RC_RIBBAR_BEGIN + 22) +#define RID_WIN_FORMULA (RC_RIBBAR_BEGIN + 21) +#define MN_CALC_POPUP (RC_RIBBAR_BEGIN + 22) -#define MN_NUMNAMES_POPUP (RC_RIBBAR_BEGIN + 23) +#define MN_NUMNAMES_POPUP (RC_RIBBAR_BEGIN + 23) #define RID_INSERT_CTRL (RC_RIBBAR_BEGIN + 24) #define RID_INSERT_OBJ_CTRL (RC_RIBBAR_BEGIN + 25) #define RID_INSERT_FIELD_CTRL (RC_RIBBAR_BEGIN + 26) #define RID_TBL_OPT_CTRL (RC_RIBBAR_BEGIN + 27) -#define RID_BEZIER_WIN (RC_RIBBAR_BEGIN + 28) +#define RID_BEZIER_WIN (RC_RIBBAR_BEGIN + 28) #define RID_SCROLL_NAVI_TBX (RC_RIBBAR_BEGIN + 29) #define RID_SCROLL_NAVIGATION_WIN (RC_RIBBAR_BEGIN + 30) #define RID_PVIEW_ZOOM_LB (RC_RIBBAR_BEGIN + 31) -#define STR_IMGBTN_START (RC_RIBBAR_BEGIN + 31) +#define STR_IMGBTN_START (RC_RIBBAR_BEGIN + 31) #define STR_IMGBTN_NEXT_DOWN (STR_IMGBTN_START + 0) -#define STR_IMGBTN_PREV_DOWN (STR_IMGBTN_START + 1) +#define STR_IMGBTN_PREV_DOWN (STR_IMGBTN_START + 1) #define STR_IMGBTN_TBL_DOWN (STR_IMGBTN_START + 2) #define STR_IMGBTN_FRM_DOWN (STR_IMGBTN_START + 3) #define STR_IMGBTN_PGE_DOWN (STR_IMGBTN_START + 4) @@ -98,11 +98,11 @@ #define STR_IMGBTN_POSTIT_DOWN (STR_IMGBTN_START +15) #define STR_IMGBTN_SRCH_REP_DOWN (STR_IMGBTN_START +16) #define STR_IMGBTN_INDEX_ENTRY_DOWN (STR_IMGBTN_START +17) -#define STR_IMGBTN_TBLFML_DOWN (STR_IMGBTN_START +18) +#define STR_IMGBTN_TBLFML_DOWN (STR_IMGBTN_START +18) #define STR_IMGBTN_TBLFML_ERR_DOWN (STR_IMGBTN_START +19) #define STR_IMGBTN_NEXT_UP (STR_IMGBTN_START +20) -#define STR_IMGBTN_PREV_UP (STR_IMGBTN_START +21) +#define STR_IMGBTN_PREV_UP (STR_IMGBTN_START +21) #define STR_IMGBTN_TBL_UP (STR_IMGBTN_START +22) #define STR_IMGBTN_FRM_UP (STR_IMGBTN_START +23) #define STR_IMGBTN_PGE_UP (STR_IMGBTN_START +24) @@ -119,16 +119,16 @@ #define STR_IMGBTN_POSTIT_UP (STR_IMGBTN_START +35) #define STR_IMGBTN_SRCH_REP_UP (STR_IMGBTN_START +36) #define STR_IMGBTN_INDEX_ENTRY_UP (STR_IMGBTN_START +37) -#define STR_IMGBTN_TBLFML_UP (STR_IMGBTN_START +38) +#define STR_IMGBTN_TBLFML_UP (STR_IMGBTN_START +38) #define STR_IMGBTN_TBLFML_ERR_UP (STR_IMGBTN_START +39) #define BTN_NAVI (STR_IMGBTN_START +40) #define MN_ANCHOR_POPUP (STR_IMGBTN_START +41) -#define RC_RIBBAR_ACT_END MN_ANCHOR_POPUP +#define RC_RIBBAR_ACT_END MN_ANCHOR_POPUP -#if RC_RIBBAR_ACT_END > RC_RIBBAR_END +#if RC_RIBBAR_ACT_END > RC_RIBBAR_END #error Resource-Id Ueberlauf in #file, #line #endif diff --git a/sw/source/ui/inc/rowht.hxx b/sw/source/ui/inc/rowht.hxx index e4b497246cd7..5e6e6502bc2e 100644 --- a/sw/source/ui/inc/rowht.hxx +++ b/sw/source/ui/inc/rowht.hxx @@ -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 @@ -49,13 +49,13 @@ class SwWrtShell; class SwTableHeightDlg : public SvxStandardDialog { - MetricField aHeightEdit; - CheckBox aAutoHeightCB; + MetricField aHeightEdit; + CheckBox aAutoHeightCB; FixedLine aHeightFL; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; - SwWrtShell &rSh; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + SwWrtShell &rSh; protected: virtual void Apply(); diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/ui/inc/scroll.hxx index 80c57767fbe2..dec146084473 100644 --- a/sw/source/ui/inc/scroll.hxx +++ b/sw/source/ui/inc/scroll.hxx @@ -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 @@ -33,14 +33,14 @@ class SwScrollbar: public ScrollBar { Size aDocSz; - BOOL bHori :1; // Horizontal = TRUE, sonst Vertikal - BOOL bAuto :1; // fuer Scrollingmode - BOOL bThumbEnabled:1; - BOOL bVisible :1; // Show/Hide sollen nur noch dieses Flag setzen - BOOL bSizeSet :1; // wurde die Groesse bereits gesetzt? - - void AutoShow(); + BOOL bHori :1; // Horizontal = TRUE, sonst Vertikal + BOOL bAuto :1; // fuer Scrollingmode + BOOL bThumbEnabled:1; + BOOL bVisible :1; // Show/Hide sollen nur noch dieses Flag setzen + BOOL bSizeSet :1; // wurde die Groesse bereits gesetzt? + void AutoShow(); + using Window::Hide; using Window::SetPosSizePixel; using Window::IsVisible; @@ -48,19 +48,19 @@ class SwScrollbar: public ScrollBar public: void ExtendedShow( BOOL bVisible = TRUE ); - void Hide() { Show( FALSE ); } - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); - BOOL IsVisible(BOOL bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; } + void Hide() { Show( FALSE ); } + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); + BOOL IsVisible(BOOL bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; } // Aenderung der Dokumentgroesse - void DocSzChgd(const Size &rNewSize); + void DocSzChgd(const Size &rNewSize); // Aenderung des sichtbaren Bereiches - void ViewPortChgd(const Rectangle &rRectangle); + void ViewPortChgd(const Rectangle &rRectangle); // was fuer einer ist es denn ?? BOOL IsHoriScroll() const { return bHori; } - void SetAuto(BOOL bSet); - BOOL IsAuto() { return bAuto;} + void SetAuto(BOOL bSet); + BOOL IsAuto() { return bAuto;} SwScrollbar(Window *pParent, BOOL bHori = TRUE ); ~SwScrollbar(); diff --git a/sw/source/ui/inc/selglos.hxx b/sw/source/ui/inc/selglos.hxx index 1fa693691086..b5f8190163bc 100644 --- a/sw/source/ui/inc/selglos.hxx +++ b/sw/source/ui/inc/selglos.hxx @@ -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,19 +43,19 @@ class SwSelGlossaryDlg : public ModalDialog { protected: - ListBox aGlosBox; + ListBox aGlosBox; FixedLine aGlosFL; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; DECL_LINK(DoubleClickHdl, ListBox*); public: SwSelGlossaryDlg(Window * pParent, const String &rShortName); ~SwSelGlossaryDlg(); - void InsertGlos(const String &rRegion, const String &rGlosName); // inline - USHORT GetSelectedIdx() const; // inline - void SelectEntryPos(USHORT nIdx); // inline + void InsertGlos(const String &rRegion, const String &rGlosName); // inline + USHORT GetSelectedIdx() const; // inline + void SelectEntryPos(USHORT nIdx); // inline }; inline void SwSelGlossaryDlg::InsertGlos(const String &rRegion, @@ -67,8 +67,8 @@ inline void SwSelGlossaryDlg::InsertGlos(const String &rRegion, aGlosBox.InsertEntry( aTmp ); } inline USHORT SwSelGlossaryDlg::GetSelectedIdx() const -{ return aGlosBox.GetSelectEntryPos(); } +{ return aGlosBox.GetSelectEntryPos(); } inline void SwSelGlossaryDlg::SelectEntryPos(USHORT nIdx) -{ aGlosBox.SelectEntryPos(nIdx); } +{ aGlosBox.SelectEntryPos(nIdx); } #endif diff --git a/sw/source/ui/inc/sharedconnection.hxx b/sw/source/ui/inc/sharedconnection.hxx index cbb6f41d17ad..b90c82773205 100644 --- a/sw/source/ui/inc/sharedconnection.hxx +++ b/sw/source/ui/inc/sharedconnection.hxx @@ -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/inc/shdwcrsr.hxx b/sw/source/ui/inc/shdwcrsr.hxx index fc95e36de5e7..abd9a1fc12ff 100644 --- a/sw/source/ui/inc/shdwcrsr.hxx +++ b/sw/source/ui/inc/shdwcrsr.hxx @@ -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 @@ -54,9 +54,9 @@ public: void Paint(); - const Point& GetPoint() const { return aOldPt; } - long GetHeight() const { return nOldHeight; } - USHORT GetMode() const { return nOldMode; } + const Point& GetPoint() const { return aOldPt; } + long GetHeight() const { return nOldHeight; } + USHORT GetMode() const { return nOldMode; } Rectangle GetRect() const; }; diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc index 2058b6432ed8..243c4fcf9256 100644 --- a/sw/source/ui/inc/shells.hrc +++ b/sw/source/ui/inc/shells.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 @@ -38,12 +38,12 @@ #define STR_GRFILTER_TOOBIG (RC_SHELLS_BEGIN + 6) #define STR_INSERT_GRAPHIC (RC_SHELLS_BEGIN + 7) #define STR_NOTIZ_INSERT (RC_SHELLS_BEGIN + 8) -#define DLG_IMPORT_DBNAME (RC_SHELLS_BEGIN + 9) +#define DLG_IMPORT_DBNAME (RC_SHELLS_BEGIN + 9) #define STR_NO_ADDRESSBOOK (RC_SHELLS_BEGIN + 10) -#define STR_REDLINE_COMMENT (RC_SHELLS_BEGIN + 11) -#define STR_REDLINE_INSERTED (RC_SHELLS_BEGIN + 12) -#define STR_REDLINE_DELETED (RC_SHELLS_BEGIN + 13) -#define STR_REDLINE_FMTCOLLSET (RC_SHELLS_BEGIN + 14) +#define STR_REDLINE_COMMENT (RC_SHELLS_BEGIN + 11) +#define STR_REDLINE_INSERTED (RC_SHELLS_BEGIN + 12) +#define STR_REDLINE_DELETED (RC_SHELLS_BEGIN + 13) +#define STR_REDLINE_FMTCOLLSET (RC_SHELLS_BEGIN + 14) #define RID_TEXT_TOOLBOX (RC_SHELLS_BEGIN + 15) #define RID_TABLE_TOOLBOX (RC_SHELLS_BEGIN + 16) @@ -69,7 +69,7 @@ #define RID_BEZIER_TOOLBOX (RC_SHELLS_BEGIN + 33) #define STR_SHELLNAME_BEZIER (RC_SHELLS_BEGIN + 34) -#define STR_SWBG_PARAGRAPH (RC_SHELLS_BEGIN + 37) +#define STR_SWBG_PARAGRAPH (RC_SHELLS_BEGIN + 37) #define STR_SWBG_GRAPHIC (RC_SHELLS_BEGIN + 38) #define STR_SWBG_OLE (RC_SHELLS_BEGIN + 39) #define STR_SWBG_FRAME (RC_SHELLS_BEGIN + 40) @@ -84,23 +84,23 @@ #define STR_SHELLNAME_DRAWFORM (RC_SHELLS_BEGIN + 48) // FREE -#define STR_REDLINE_FORMATED (RC_SHELLS_BEGIN + 50) -#define STR_REDLINE_TABLECHG (RC_SHELLS_BEGIN + 51) +#define STR_REDLINE_FORMATED (RC_SHELLS_BEGIN + 50) +#define STR_REDLINE_TABLECHG (RC_SHELLS_BEGIN + 51) -#define STR_REDLINE_TITLE (RC_SHELLS_BEGIN + 52) -#define STR_REDLINE_MSG (RC_SHELLS_BEGIN + 53) -#define STR_REDLINE_ACCEPT_ALL (RC_SHELLS_BEGIN + 54) -#define STR_REDLINE_REJECT_ALL (RC_SHELLS_BEGIN + 55) -#define STR_REDLINE_EDIT (RC_SHELLS_BEGIN + 56) -#define STR_REDLINE_AUTOFMT (RC_SHELLS_BEGIN + 57) +#define STR_REDLINE_TITLE (RC_SHELLS_BEGIN + 52) +#define STR_REDLINE_MSG (RC_SHELLS_BEGIN + 53) +#define STR_REDLINE_ACCEPT_ALL (RC_SHELLS_BEGIN + 54) +#define STR_REDLINE_REJECT_ALL (RC_SHELLS_BEGIN + 55) +#define STR_REDLINE_EDIT (RC_SHELLS_BEGIN + 56) +#define STR_REDLINE_AUTOFMT (RC_SHELLS_BEGIN + 57) -// #i68101# no longer needed +// #i68101# no longer needed // #define STR_NAME_SHAPE_LABEL (RC_SHELLS_BEGIN + 58) // #define STR_NAME_SHAPE_DIALOG (RC_SHELLS_BEGIN + 59) #define RID_MODULE_TOOLBOX (RC_SHELLS_BEGIN + 60) -#define RID_MEDIA_TOOLBOX (RC_SHELLS_BEGIN + 61) +#define RID_MEDIA_TOOLBOX (RC_SHELLS_BEGIN + 61) #define SHELLS_ACT_END RID_MEDIA_TOOLBOX diff --git a/sw/source/ui/inc/split.hxx b/sw/source/ui/inc/split.hxx index 9d96d6ac3a9d..d058276c544f 100644 --- a/sw/source/ui/inc/split.hxx +++ b/sw/source/ui/inc/split.hxx @@ -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 @@ -49,17 +49,17 @@ class SwWrtShell; class SwSplitTableDlg : public SvxStandardDialog { - FixedText aCountLbl; - NumericField aCountEdit; + FixedText aCountLbl; + NumericField aCountEdit; FixedLine aCountFL; - ImageRadioButton aHorzBox; + ImageRadioButton aHorzBox; ImageRadioButton aVertBox; CheckBox aPropCB; FixedLine aDirFL; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; - SwWrtShell& rSh; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + SwWrtShell& rSh; protected: virtual void Apply(); diff --git a/sw/source/ui/inc/splittbl.hxx b/sw/source/ui/inc/splittbl.hxx index 3e21b347651a..eb610de64752 100644 --- a/sw/source/ui/inc/splittbl.hxx +++ b/sw/source/ui/inc/splittbl.hxx @@ -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 @@ -35,16 +35,16 @@ class SwWrtShell; class SwSplitTblDlg : public SvxStandardDialog { - OKButton aOKPB; - CancelButton aCancelPB; - HelpButton aHelpPB; + OKButton aOKPB; + CancelButton aCancelPB; + HelpButton aHelpPB; FixedLine aSplitFL; - RadioButton aCntntCopyRB; - RadioButton aBoxAttrCopyWithParaRB ; - RadioButton aBoxAttrCopyNoParaRB ; - RadioButton aBorderCopyRB; + RadioButton aCntntCopyRB; + RadioButton aBoxAttrCopyWithParaRB ; + RadioButton aBoxAttrCopyNoParaRB ; + RadioButton aBorderCopyRB; - SwWrtShell &rShell; + SwWrtShell &rShell; USHORT m_nSplit; protected: diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx index c23ee997852d..4df24cefc3b1 100644 --- a/sw/source/ui/inc/srcedtw.hxx +++ b/sw/source/ui/inc/srcedtw.hxx @@ -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 @@ -51,22 +51,22 @@ namespace utl class TextViewOutWin : public Window { - ExtTextView* pTextView; + ExtTextView* pTextView; protected: - virtual void Paint( const Rectangle& ); - virtual void KeyInput( const KeyEvent& rKeyEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void DataChanged( const DataChangedEvent& ); + virtual void Paint( const Rectangle& ); + virtual void KeyInput( const KeyEvent& rKeyEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void DataChanged( const DataChangedEvent& ); public: TextViewOutWin(Window* pParent, WinBits nBits) : Window(pParent, nBits), pTextView(0){} - void SetTextView( ExtTextView* pView ) {pTextView = pView;} + void SetTextView( ExtTextView* pView ) {pTextView = pView;} }; @@ -75,27 +75,27 @@ namespace svt{ class SourceViewConfig;} class SwSrcEditWindow : public Window, public SfxListener, public utl::ConfigurationListener { private: - ExtTextView* pTextView; - ExtTextEngine* pTextEngine; + ExtTextView* pTextView; + ExtTextEngine* pTextEngine; - TextViewOutWin* pOutWin; - ScrollBar *pHScrollbar, + TextViewOutWin* pOutWin; + ScrollBar *pHScrollbar, *pVScrollbar; - SwSrcView* pSrcView; + SwSrcView* pSrcView; utl::SourceViewConfig* pSourceViewConfig; - long nCurTextWidth; - USHORT nStartLine; + long nCurTextWidth; + USHORT nStartLine; rtl_TextEncoding eSourceEncoding; - BOOL bReadonly; - BOOL bDoSyntaxHighlight; - BOOL bHighlighting; + BOOL bReadonly; + BOOL bDoSyntaxHighlight; + BOOL bHighlighting; - Timer aSyntaxIdleTimer; - Table aSyntaxLineTable; + Timer aSyntaxIdleTimer; + Table aSyntaxLineTable; - void ImpDoHighlight( const String& rSource, USHORT nLineOff ); + void ImpDoHighlight( const String& rSource, USHORT nLineOff ); using OutputDevice::SetFont; void SetFont(); @@ -108,15 +108,15 @@ private: protected: - virtual void Resize(); - virtual void DataChanged( const DataChangedEvent& ); - virtual void GetFocus(); -// virtual void LoseFocus(); + virtual void Resize(); + virtual void DataChanged( const DataChangedEvent& ); + virtual void GetFocus(); +// virtual void LoseFocus(); - void CreateTextEngine(); - void DoSyntaxHighlight( USHORT nPara ); + void CreateTextEngine(); + void DoSyntaxHighlight( USHORT nPara ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); DECL_LINK(ScrollHdl, ScrollBar*); @@ -125,38 +125,38 @@ public: SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ); ~SwSrcEditWindow(); - void SetScrollBarRanges(); - void InitScrollBars(); - ULONG Read( SvStream& rInput) + void SetScrollBarRanges(); + void InitScrollBars(); + ULONG Read( SvStream& rInput) {return pTextEngine->Read(rInput);} - ULONG Write( SvStream& rOutput) + ULONG Write( SvStream& rOutput) {return pTextEngine->Write(rOutput);} - ExtTextView* GetTextView() + ExtTextView* GetTextView() {return pTextView;} - TextEngine* GetTextEngine() + TextEngine* GetTextEngine() {return pTextEngine;} - SwSrcView* GetSrcView() {return pSrcView;} + SwSrcView* GetSrcView() {return pSrcView;} - TextViewOutWin* GetOutWin() {return pOutWin;} + TextViewOutWin* GetOutWin() {return pOutWin;} virtual void Invalidate( USHORT nFlags = 0 ); - void ClearModifyFlag() + void ClearModifyFlag() { pTextEngine->SetModified(FALSE); } - BOOL IsModified() const + BOOL IsModified() const { return pTextEngine->IsModified();} - void CreateScrollbars(); + void CreateScrollbars(); - void SetReadonly(BOOL bSet){bReadonly = bSet;} - BOOL IsReadonly(){return bReadonly;} + void SetReadonly(BOOL bSet){bReadonly = bSet;} + BOOL IsReadonly(){return bReadonly;} - void DoDelayedSyntaxHighlight( USHORT nPara ); + void DoDelayedSyntaxHighlight( USHORT nPara ); - void SetStartLine(USHORT nLine){nStartLine = nLine;} + void SetStartLine(USHORT nLine){nStartLine = nLine;} - virtual void Command( const CommandEvent& rCEvt ); - void HandleWheelCommand( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ); + void HandleWheelCommand( const CommandEvent& rCEvt ); void SetTextEncoding(rtl_TextEncoding eEncoding); }; diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/ui/inc/srcview.hxx index 574696f1fd27..06487fdea3f6 100644 --- a/sw/source/ui/inc/srcview.hxx +++ b/sw/source/ui/inc/srcview.hxx @@ -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 @@ -44,20 +44,20 @@ class SfxMedium; class SwSrcView: public SfxViewShell { - SwSrcEditWindow aEditWin; + SwSrcEditWindow aEditWin; - SvxSearchItem* pSearchItem; + SvxSearchItem* pSearchItem; - BOOL bSourceSaved :1; + BOOL bSourceSaved :1; rtl_TextEncoding eLoadEncoding; void Init(); // fuer Readonly-Umschaltung - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); protected: - USHORT StartSearchAndReplace(const SvxSearchItem& rItem, + USHORT StartSearchAndReplace(const SvxSearchItem& rItem, BOOL bFromStart, BOOL bApi, BOOL bRecursive = FALSE); @@ -74,30 +74,30 @@ public: ~SwSrcView(); - SwDocShell* GetDocShell(); + SwDocShell* GetDocShell(); SwSrcEditWindow& GetEditWin() {return aEditWin;} - void SaveContent(const String& rTmpFile); - void SaveContentTo(SfxMedium& rMed); + void SaveContent(const String& rTmpFile); + void SaveContentTo(SfxMedium& rMed); - BOOL IsModified() {return aEditWin.IsModified();} + BOOL IsModified() {return aEditWin.IsModified();} - void Execute(SfxRequest&); - void GetState(SfxItemSet&); + void Execute(SfxRequest&); + void GetState(SfxItemSet&); - SvxSearchItem* GetSearchItem(); - void SetSearchItem( const SvxSearchItem& rItem ); + SvxSearchItem* GetSearchItem(); + void SetSearchItem( const SvxSearchItem& rItem ); - void Load(SwDocShell* pDocShell); + void Load(SwDocShell* pDocShell); virtual USHORT SetPrinter( SfxPrinter* pNew, USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ); virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); - + sal_Int32 PrintSource( OutputDevice *pOutDev, sal_Int32 nPage, bool bCalcNumPagesOnly ); - void SourceSaved() {bSourceSaved = TRUE;} - BOOL HasSourceSaved() const {return bSourceSaved;} + void SourceSaved() {bSourceSaved = TRUE;} + BOOL HasSourceSaved() const {return bSourceSaved;} }; diff --git a/sw/source/ui/inc/srtdlg.hxx b/sw/source/ui/inc/srtdlg.hxx index 09d91cf64195..76cc70baa453 100644 --- a/sw/source/ui/inc/srtdlg.hxx +++ b/sw/source/ui/inc/srtdlg.hxx @@ -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 @@ -47,38 +47,38 @@ class CollatorRessource; class SwSortDlg : public SvxStandardDialog { - FixedText aColLbl; - FixedText aTypLbl; - FixedText aDirLbl; + FixedText aColLbl; + FixedText aTypLbl; + FixedText aDirLbl; FixedLine aDirFL; - CheckBox aKeyCB1; - NumericField aColEdt1; - ListBox aTypDLB1; - RadioButton aSortUpRB; - RadioButton aSortDnRB; + CheckBox aKeyCB1; + NumericField aColEdt1; + ListBox aTypDLB1; + RadioButton aSortUpRB; + RadioButton aSortDnRB; - CheckBox aKeyCB2; - NumericField aColEdt2; - ListBox aTypDLB2; - RadioButton aSortUp2RB; - RadioButton aSortDn2RB; + CheckBox aKeyCB2; + NumericField aColEdt2; + ListBox aTypDLB2; + RadioButton aSortUp2RB; + RadioButton aSortDn2RB; - CheckBox aKeyCB3; - NumericField aColEdt3; - ListBox aTypDLB3; - RadioButton aSortUp3RB; - RadioButton aSortDn3RB; + CheckBox aKeyCB3; + NumericField aColEdt3; + ListBox aTypDLB3; + RadioButton aSortUp3RB; + RadioButton aSortDn3RB; FixedLine aSortFL; - RadioButton aColumnRB; - RadioButton aRowRB; + RadioButton aColumnRB; + RadioButton aRowRB; FixedLine aDelimFL; - RadioButton aDelimTabRB; - RadioButton aDelimFreeRB; - Edit aDelimEdt; + RadioButton aDelimTabRB; + RadioButton aDelimFreeRB; + Edit aDelimEdt; PushButton aDelimPB; FixedLine aLangFL; @@ -87,22 +87,22 @@ class SwSortDlg : public SvxStandardDialog FixedLine aSortOptFL; CheckBox aCaseCB; - OKButton aOkBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOkBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; String aColTxt; String aRowTxt; String aNumericTxt; - SwWrtShell &rSh; + SwWrtShell &rSh; CollatorRessource* pColRes; USHORT nX; USHORT nY; - virtual void Apply(); - sal_Unicode GetDelimChar() const; + virtual void Apply(); + sal_Unicode GetDelimChar() const; DECL_LINK( CheckHdl, CheckBox * ); DECL_LINK( DelimHdl, RadioButton* ); diff --git a/sw/source/ui/inc/stmenu.hxx b/sw/source/ui/inc/stmenu.hxx index a761d60a12ed..553f86f0e12e 100644 --- a/sw/source/ui/inc/stmenu.hxx +++ b/sw/source/ui/inc/stmenu.hxx @@ -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 @@ -65,7 +65,7 @@ class SwSmartTagPopup : public PopupMenu sal_uInt32 mnActionID; InvokeAction( com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > xAction, com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xSmartTagProperties, - sal_uInt32 nActionID ) : mxAction( xAction ), mxSmartTagProperties( xSmartTagProperties ), mnActionID( nActionID ) {} + sal_uInt32 nActionID ) : mxAction( xAction ), mxSmartTagProperties( xSmartTagProperties ), mnActionID( nActionID ) {} }; std::vector< InvokeAction > maInvokeActions; @@ -73,7 +73,7 @@ class SwSmartTagPopup : public PopupMenu using PopupMenu::Execute; public: - SwSmartTagPopup( SwView* _pSwView, + SwSmartTagPopup( SwView* _pSwView, ::com::sun::star::uno::Sequence< rtl::OUString >& rSmartTagTypes, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, ::com::sun::star::uno::Reference< com::sun::star::text::XTextRange > xTextRange ); diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx index f9d5dd049b1d..e0da2a8694fc 100644 --- a/sw/source/ui/inc/swcont.hxx +++ b/sw/source/ui/inc/swcont.hxx @@ -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 @@ -33,33 +33,33 @@ class SwContentType; //Reihenfolge und Anzahl mit ResIds abgleichen!! -#define CONTENT_TYPE_OUTLINE 0 -#define CONTENT_TYPE_TABLE 1 +#define CONTENT_TYPE_OUTLINE 0 +#define CONTENT_TYPE_TABLE 1 #define CONTENT_TYPE_FRAME 2 #define CONTENT_TYPE_GRAPHIC 3 #define CONTENT_TYPE_OLE 4 #define CONTENT_TYPE_BOOKMARK 5 #define CONTENT_TYPE_REGION 6 -#define CONTENT_TYPE_URLFIELD 7 +#define CONTENT_TYPE_URLFIELD 7 #define CONTENT_TYPE_REFERENCE 8 -#define CONTENT_TYPE_INDEX 9 -#define CONTENT_TYPE_POSTIT 10 +#define CONTENT_TYPE_INDEX 9 +#define CONTENT_TYPE_POSTIT 10 #define CONTENT_TYPE_DRAWOBJECT 11 -#define CONTENT_TYPE_MAX CONTENT_TYPE_DRAWOBJECT +1 +#define CONTENT_TYPE_MAX CONTENT_TYPE_DRAWOBJECT +1 // Typen fuer das Globaldokument -#define GLOBAL_CONTENT_REGION 100 +#define GLOBAL_CONTENT_REGION 100 #define GLOBAL_CONTENT_INDEX 101 -#define GLOBAL_CONTENT_TEXT 102 -#define GLOBAL_CONTENT_MAX 3 +#define GLOBAL_CONTENT_TEXT 102 +#define GLOBAL_CONTENT_MAX 3 // Strings fuer Kontextmenue -#define CONTEXT_COUNT 12 +#define CONTEXT_COUNT 12 #define GLOBAL_CONTEXT_COUNT 14 // Modi fuer Drag 'n Drop -#define REGION_MODE_NONE 0 +#define REGION_MODE_NONE 0 #define REGION_MODE_LINK 1 #define REGION_MODE_EMBEDDED 2 @@ -75,28 +75,28 @@ class SwTypeNumber SwTypeNumber(BYTE nId) :nTypeId(nId){} virtual ~SwTypeNumber(); - virtual BYTE GetTypeId(); + virtual BYTE GetTypeId(); }; //---------------------------------------------------------------------------- class SwContent : public SwTypeNumber { - const SwContentType* pParent; - String sContentName; - long nYPosition; - BOOL bInvisible; + const SwContentType* pParent; + String sContentName; + long nYPosition; + BOOL bInvisible; public: SwContent(const SwContentType* pCnt, const String& rName, long nYPos ); - virtual BOOL IsProtect() const; - const SwContentType* GetParent() const {return pParent;} - const String& GetName() const {return sContentName;} - int operator==(const SwContent& /*rCont*/) const + virtual BOOL IsProtect() const; + const SwContentType* GetParent() const {return pParent;} + const String& GetName() const {return sContentName;} + int operator==(const SwContent& /*rCont*/) const { //gleich sind sie nie, sonst fallen sie aus dem Array return FALSE; } - int operator<(const SwContent& rCont) const + int operator<(const SwContent& rCont) const { //zuerst nach Position dann nach Name sortieren return nYPosition != rCont.nYPosition ? @@ -104,10 +104,10 @@ public: sContentName < rCont.sContentName;; } - long GetYPos() const {return nYPosition;} + long GetYPos() const {return nYPosition;} - BOOL IsInvisible() const {return bInvisible;} - void SetInvisible(){ bInvisible = TRUE;} + BOOL IsInvisible() const {return bInvisible;} + void SetInvisible(){ bInvisible = TRUE;} }; #endif diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx index 041b55d9c6db..2fc7d153f805 100644 --- a/sw/source/ui/inc/swdtflvr.hxx +++ b/sw/source/ui/inc/swdtflvr.hxx @@ -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 @@ -49,41 +49,41 @@ class SwView_Impl; typedef sal_uInt16 TransferBufferType; namespace nsTransferBufferType { - const sal_uInt16 TRNSFR_NONE = 0x0000; - const sal_uInt16 TRNSFR_DOCUMENT = 0x0001; - const sal_uInt16 TRNSFR_DOCUMENT_WORD = 0x0002; - const sal_uInt16 TRNSFR_GRAPHIC = 0x0004; - const sal_uInt16 TRNSFR_TABELLE = 0x0008; - const sal_uInt16 TRNSFR_DDELINK = 0x0010; - const sal_uInt16 TRNSFR_OLE = 0x0020; - const sal_uInt16 TRNSFR_INETFLD = 0x0040; - const sal_uInt16 TRNSFR_DRAWING = 0x0081; //Drawing ist auch intern! + const sal_uInt16 TRNSFR_NONE = 0x0000; + const sal_uInt16 TRNSFR_DOCUMENT = 0x0001; + const sal_uInt16 TRNSFR_DOCUMENT_WORD = 0x0002; + const sal_uInt16 TRNSFR_GRAPHIC = 0x0004; + const sal_uInt16 TRNSFR_TABELLE = 0x0008; + const sal_uInt16 TRNSFR_DDELINK = 0x0010; + const sal_uInt16 TRNSFR_OLE = 0x0020; + const sal_uInt16 TRNSFR_INETFLD = 0x0040; + const sal_uInt16 TRNSFR_DRAWING = 0x0081; //Drawing ist auch intern! } -#define DATA_FLAVOR ::com::sun::star::datatransfer::DataFlavor +#define DATA_FLAVOR ::com::sun::star::datatransfer::DataFlavor class SwTransferable : public TransferableHelper { friend class SwView_Impl; SfxObjectShellRef aDocShellRef; - TransferableDataHelper aOleData; - TransferableObjectDescriptor aObjDesc; + TransferableDataHelper aOleData; + TransferableObjectDescriptor aObjDesc; ::sfx2::SvBaseLinkRef refDdeLink; - SwWrtShell *pWrtShell; + SwWrtShell *pWrtShell; /* #96392# Added pCreatorView to distinguish SwFrameShell from SwWrtShell. */ const ViewShell *pCreatorView; - SwDocFac *pClpDocFac; - Graphic *pClpGraphic, *pClpBitmap, *pOrigGrf; - INetBookmark *pBkmk; // URL und Beschreibung! - ImageMap *pImageMap; - INetImage *pTargetURL; + SwDocFac *pClpDocFac; + Graphic *pClpGraphic, *pClpBitmap, *pOrigGrf; + INetBookmark *pBkmk; // URL und Beschreibung! + ImageMap *pImageMap; + INetImage *pTargetURL; TransferBufferType eBufferType; - BOOL bOldIdle :1; //D&D Idle flag from the viewsettings - BOOL bCleanUp :1; //D&D cleanup after Drop (not by internal Drop) + BOOL bOldIdle :1; //D&D Idle flag from the viewsettings + BOOL bCleanUp :1; //D&D cleanup after Drop (not by internal Drop) // helper methods for the copy com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > FindOLEObj( sal_Int64& nAspect ) const; @@ -143,17 +143,17 @@ class SwTransferable : public TransferableHelper // not available SwTransferable(); SwTransferable( const SwTransferable& ); - SwTransferable& operator=( const SwTransferable& ); + SwTransferable& operator=( const SwTransferable& ); protected: - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const DATA_FLAVOR& rFlavor ); - virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const DATA_FLAVOR& rFlavor ); + virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const DATA_FLAVOR& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); - virtual void ObjectReleased(); + virtual void DragFinished( sal_Int8 nDropAction ); + virtual void ObjectReleased(); using TransferableHelper::StartDrag; @@ -168,17 +168,17 @@ public: static void InitOle( SfxObjectShell* pDoc, SwDoc& rDoc ); // copy - methods and helper methods for the copy - int Cut(); - int Copy( BOOL bIsCut = FALSE ); + int Cut(); + int Copy( BOOL bIsCut = FALSE ); int PrepareForCopy( BOOL bIsCut = FALSE ); - int CalculateAndCopy(); // special for Calculator + int CalculateAndCopy(); // special for Calculator int CopyGlossary( SwTextBlocks& rGlossary, const String& rStr ); // remove the DDE-Link format promise void RemoveDDELinkFormat( const Window& rWin ); // paste - methods and helper methods for the paste - static BOOL IsPaste( const SwWrtShell&, const TransferableDataHelper& ); + static BOOL IsPaste( const SwWrtShell&, const TransferableDataHelper& ); static int Paste( SwWrtShell&, TransferableDataHelper& ); static int PasteData( TransferableDataHelper& rData, SwWrtShell& rSh, USHORT nAction, ULONG nFormat, @@ -200,9 +200,9 @@ public: // Interfaces for Drag & Drop void StartDrag( Window* pWin, const Point& rPos ); - - SwWrtShell* GetShell() { return pWrtShell; } - void SetCleanUp( BOOL bFlag ) { bCleanUp = bFlag; } + + SwWrtShell* GetShell() { return pWrtShell; } + void SetCleanUp( BOOL bFlag ) { bCleanUp = bFlag; } // Interfaces for Selection /* #96392# Added pCreator to distinguish SwFrameShell from SwWrtShell. */ diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index 0c31a9ab977f..5488f0ef2b84 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.hxx @@ -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 @@ -51,8 +51,8 @@ class SW_DLLPUBLIC SwBoxEntry { friend class SwComboBox; - BOOL bModified : 1; - BOOL bNew : 1; + BOOL bModified : 1; + BOOL bNew : 1; String aName; USHORT nId; @@ -69,29 +69,29 @@ public: Beschreibung: fuer ComboBoxen --------------------------------------------------------------------*/ -typedef USHORT SwComboBoxStyle; +typedef USHORT SwComboBoxStyle; namespace nsSwComboBoxStyle { - const SwComboBoxStyle CBS_UPPER = 0x01; - const SwComboBoxStyle CBS_LOWER = 0x02; - const SwComboBoxStyle CBS_ALL = 0x04; - const SwComboBoxStyle CBS_FILENAME = 0x08; + const SwComboBoxStyle CBS_UPPER = 0x01; + const SwComboBoxStyle CBS_LOWER = 0x02; + const SwComboBoxStyle CBS_ALL = 0x04; + const SwComboBoxStyle CBS_FILENAME = 0x08; #ifdef WIN - const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME | CBS_LOWER; + const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME | CBS_LOWER; #else - const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME; + const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME; #endif } class SW_DLLPUBLIC SwComboBox : public ComboBox { - SwEntryLst aEntryLst; - SwEntryLst aDelEntryLst; - SwBoxEntry aDefault; - USHORT nStyle; + SwEntryLst aEntryLst; + SwEntryLst aDelEntryLst; + SwBoxEntry aDefault; + USHORT nStyle; - SW_DLLPRIVATE void InitComboBox(); - SW_DLLPRIVATE void InsertSorted(SwBoxEntry* pEntry); + SW_DLLPRIVATE void InitComboBox(); + SW_DLLPRIVATE void InsertSorted(SwBoxEntry* pEntry); using ComboBox::InsertEntry; using ComboBox::RemoveEntry; @@ -105,24 +105,24 @@ public: USHORT nStyleBits = nsSwComboBoxStyle::CBS_ALL); ~SwComboBox(); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); void InsertEntry(const SwBoxEntry&); - USHORT InsertEntry( const XubString& rStr, USHORT = 0) - { InsertEntry( SwBoxEntry( rStr ) ); return 0; } + USHORT InsertEntry( const XubString& rStr, USHORT = 0) + { InsertEntry( SwBoxEntry( rStr ) ); return 0; } - void RemoveEntry(USHORT nPos); + void RemoveEntry(USHORT nPos); - USHORT GetEntryPos(const SwBoxEntry& rEntry) const; - const SwBoxEntry& GetEntry(USHORT) const; + USHORT GetEntryPos(const SwBoxEntry& rEntry) const; + const SwBoxEntry& GetEntry(USHORT) const; - USHORT GetRemovedCount() const; - const SwBoxEntry& GetRemovedEntry(USHORT nPos) const; + USHORT GetRemovedCount() const; + const SwBoxEntry& GetRemovedEntry(USHORT nPos) const; - USHORT GetStyle() const { return nStyle; } - void SetStyle(const USHORT nSt) { nStyle = nSt; } + USHORT GetStyle() const { return nStyle; } + void SetStyle(const USHORT nSt) { nStyle = nSt; } - String GetText() const; + String GetText() const; }; #endif /* _SWLBOX_HXX */ diff --git a/sw/source/ui/inc/swmn_tmpl.hrc b/sw/source/ui/inc/swmn_tmpl.hrc index bf375e4ab010..af1c013c1a95 100644 --- a/sw/source/ui/inc/swmn_tmpl.hrc +++ b/sw/source/ui/inc/swmn_tmpl.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 @@ -39,7 +39,7 @@ /* --------------------- F O R M A T --------------------------------- */ -#define SEPARATOR MenuItem { Separator = TRUE; } +#define SEPARATOR MenuItem { Separator = TRUE; } //define for ITEM_FORMAT_NUMBERING #define DEFINE_SLOTID_FOR_NUMBER_BULLETS FN_NUMBER_BULLETS @@ -238,7 +238,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml Identifier = FN_REDLINE_REJECT_DIRECT ; \ HelpID = FN_REDLINE_REJECT_DIRECT ; \ Text [ en-US ] = "Reject Change" ; \ - }; \ + }; \ SEPARATOR ; #define _MN_EDIT_BIB_ENTRY_DLG \ MenuItem \ @@ -271,14 +271,14 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml Identifier = FN_REMOVE_HYPERLINK ; \ HelpID = FN_REMOVE_HYPERLINK ; \ Text [ en-US ] = "Remo~ve Hyperlink"; \ - }; + }; #define _MN_EDIT_OPEN_SMARTTAGMENU \ MenuItem \ { \ ITEM_OPEN_SMARTTAGMENU \ }; - + #define _MN_EDIT__HYPERLINK \ MenuItem\ {\ @@ -286,7 +286,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml HelpID = FN_EDIT_HYPERLINK ; \ Text [ en-US ] = "~Edit Hyperlink" ; \ }; - + #define _DEFAULT_TEXT_EDIT_ELEMENTS \ _MN_EDIT_FIELD \ _MN_EDIT_FOOTNOTE \ @@ -335,7 +335,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml Identifier = FN_NUM_BULLET_DOWN; \ HelpId = FN_NUM_BULLET_DOWN; \ Text[ en-US ] = "Down One Level"; \ - }; + }; #define BASE_TEXT_POPUPMENU_BEGIN \ { \ @@ -349,7 +349,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MN_TXT \ MN_NUMBERING \ ITEM_TRANSLITERATE_MENU \ - SEPARATOR ; + SEPARATOR ; // not in Writer/Web #define BASE_TEXT_POPUPMENU_NOWEB \ @@ -371,12 +371,12 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml HelpID = FN_REMOVE_CUR_TOX; \ Text [ en-US ] = "Delete Index/Table"; \ }; \ - SEPARATOR ; + SEPARATOR ; #define BASE_TEXT_POPUPMENU_END \ _DEFAULT_TEXT_EDIT_ELEMENTS \ }; \ -}; +}; -#endif +#endif diff --git a/sw/source/ui/inc/swmodalredlineacceptdlg.hxx b/sw/source/ui/inc/swmodalredlineacceptdlg.hxx index c3af65d764ff..b73ec454a14a 100644 --- a/sw/source/ui/inc/swmodalredlineacceptdlg.hxx +++ b/sw/source/ui/inc/swmodalredlineacceptdlg.hxx @@ -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 @@ -33,16 +33,16 @@ class SwRedlineAcceptDlg; class SwModalRedlineAcceptDlg : public SfxModalDialog { - SwRedlineAcceptDlg* pImplDlg; + SwRedlineAcceptDlg* pImplDlg; - virtual void Resize(); + virtual void Resize(); public: SwModalRedlineAcceptDlg(Window *pParent); ~SwModalRedlineAcceptDlg(); - void AcceptAll( BOOL bAccept ); - virtual void Activate(); + void AcceptAll( BOOL bAccept ); + virtual void Activate(); }; #endif diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx index 16f3d56852e6..b4dbfaed74c2 100644 --- a/sw/source/ui/inc/swrenamexnameddlg.hxx +++ b/sw/source/ui/inc/swrenamexnameddlg.hxx @@ -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 @@ -50,16 +50,16 @@ * --------------------------------------------------*/ class SwRenameXNamedDlg : public ModalDialog { - FixedText aNewNameFT; - NoSpaceEdit aNewNameED; + FixedText aNewNameFT; + NoSpaceEdit aNewNameED; FixedLine aNameFL; - OKButton aOk; - CancelButton aCancel; - HelpButton aHelp; + OKButton aOk; + CancelButton aCancel; + HelpButton aHelp; - String sRemoveWarning; + String sRemoveWarning; - STAR_REFERENCE( container::XNamed ) & xNamed; + STAR_REFERENCE( container::XNamed ) & xNamed; STAR_REFERENCE( container::XNameAccess ) & xNameAccess; STAR_REFERENCE( container::XNameAccess ) xSecondAccess; STAR_REFERENCE( container::XNameAccess ) xThirdAccess; @@ -72,7 +72,7 @@ public: STAR_REFERENCE( container::XNamed ) & xNamed, STAR_REFERENCE( container::XNameAccess ) & xNameAccess ); - void SetForbiddenChars( const String& rSet ) + void SetForbiddenChars( const String& rSet ) { aNewNameED.SetForbiddenChars( rSet ); } void SetAlternativeAccess( diff --git a/sw/source/ui/inc/swtablerep.hxx b/sw/source/ui/inc/swtablerep.hxx index 20af27911317..c9bbaff6b940 100644 --- a/sw/source/ui/inc/swtablerep.hxx +++ b/sw/source/ui/inc/swtablerep.hxx @@ -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 @@ -36,59 +36,59 @@ class SwTabCols; struct TColumn; class SW_DLLPUBLIC SwTableRep { - TColumn* pTColumns; - - SwTwips nTblWidth; - SwTwips nSpace; - SwTwips nLeftSpace; - SwTwips nRightSpace; - USHORT nAlign; - USHORT nColCount; - USHORT nAllCols; - USHORT nWidthPercent; - BOOL bComplex : 1; - BOOL bLineSelected : 1; - BOOL bWidthChanged : 1; - BOOL bColsChanged : 1; + TColumn* pTColumns; + + SwTwips nTblWidth; + SwTwips nSpace; + SwTwips nLeftSpace; + SwTwips nRightSpace; + USHORT nAlign; + USHORT nColCount; + USHORT nAllCols; + USHORT nWidthPercent; + BOOL bComplex : 1; + BOOL bLineSelected : 1; + BOOL bWidthChanged : 1; + BOOL bColsChanged : 1; public: SwTableRep( const SwTabCols& rTabCol, BOOL bComplex ); ~SwTableRep(); - BOOL FillTabCols( SwTabCols& rTabCol ) const; + BOOL FillTabCols( SwTabCols& rTabCol ) const; - SwTwips GetLeftSpace() const {return nLeftSpace;} - void SetLeftSpace(SwTwips nSet) {nLeftSpace = nSet;} + SwTwips GetLeftSpace() const {return nLeftSpace;} + void SetLeftSpace(SwTwips nSet) {nLeftSpace = nSet;} - SwTwips GetRightSpace() const {return nRightSpace;} - void SetRightSpace(SwTwips nSet) {nRightSpace = nSet;} + SwTwips GetRightSpace() const {return nRightSpace;} + void SetRightSpace(SwTwips nSet) {nRightSpace = nSet;} - SwTwips GetWidth() const {return nTblWidth;} - void SetWidth(SwTwips nSet) {nTblWidth = nSet;} + SwTwips GetWidth() const {return nTblWidth;} + void SetWidth(SwTwips nSet) {nTblWidth = nSet;} - USHORT GetWidthPercent() const {return nWidthPercent;} - void SetWidthPercent(USHORT nSet) {nWidthPercent = nSet;} + USHORT GetWidthPercent() const {return nWidthPercent;} + void SetWidthPercent(USHORT nSet) {nWidthPercent = nSet;} - USHORT GetAlign() const {return nAlign;} - void SetAlign(USHORT nSet) {nAlign = nSet;} + USHORT GetAlign() const {return nAlign;} + void SetAlign(USHORT nSet) {nAlign = nSet;} - BOOL IsComplex() const {return bComplex;} - USHORT GetColCount() const {return nColCount;} - USHORT GetAllColCount() const {return nAllCols;} + BOOL IsComplex() const {return bComplex;} + USHORT GetColCount() const {return nColCount;} + USHORT GetAllColCount() const {return nAllCols;} - BOOL HasColsChanged() const {return bColsChanged;} - void SetColsChanged() {bColsChanged = TRUE;} + BOOL HasColsChanged() const {return bColsChanged;} + void SetColsChanged() {bColsChanged = TRUE;} - BOOL HasWidthChanged() const {return bWidthChanged;} - void SetWidthChanged() {bWidthChanged = TRUE;} + BOOL HasWidthChanged() const {return bWidthChanged;} + void SetWidthChanged() {bWidthChanged = TRUE;} - BOOL IsLineSelected() const {return bLineSelected;} - void SetLineSelected(BOOL bSet) {bLineSelected = bSet;} + BOOL IsLineSelected() const {return bLineSelected;} + void SetLineSelected(BOOL bSet) {bLineSelected = bSet;} - SwTwips GetSpace() const { return nSpace;} - void SetSpace(SwTwips nSet) {nSpace = nSet;} + SwTwips GetSpace() const { return nSpace;} + void SetSpace(SwTwips nSet) {nSpace = nSet;} - TColumn* GetColumns() const {return pTColumns;} + TColumn* GetColumns() const {return pTColumns;} }; #endif diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx index 5079d9ebda08..eab682ea40a0 100644 --- a/sw/source/ui/inc/swuiccoll.hxx +++ b/sw/source/ui/inc/swuiccoll.hxx @@ -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 @@ -35,29 +35,29 @@ class SwFmt; class SwCondCollPage : public SfxTabPage { FixedLine aConditionFL; - CheckBox aConditionCB; + CheckBox aConditionCB; - FixedText aContextFT; - FixedText aUsedFT; - SvTabListBox aTbLinks; + FixedText aContextFT; + FixedText aUsedFT; + SvTabListBox aTbLinks; - FixedText aStyleFT; - ListBox aStyleLB; - ListBox aFilterLB; + FixedText aStyleFT; + ListBox aStyleLB; + ListBox aFilterLB; - PushButton aRemovePB; - PushButton aAssignPB; + PushButton aRemovePB; + PushButton aAssignPB; - String sNoTmpl; - ResStringArray aStrArr; + String sNoTmpl; + ResStringArray aStrArr; - SwWrtShell &rSh; + SwWrtShell &rSh; const CommandStruct*pCmds; - SwFmt* pFmt; + SwFmt* pFmt; - CollName* pNms; + CollName* pNms; - BOOL bNewTemplate; + BOOL bNewTemplate; SwCondCollPage(Window *pParent, const SfxItemSet &rSet); diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx index 8c7160433837..5bb247187d58 100644 --- a/sw/source/ui/inc/swuicnttab.hxx +++ b/sw/source/ui/inc/swuicnttab.hxx @@ -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 @@ -78,32 +78,32 @@ struct SwIndexSections_Impl; class SwMultiTOXTabDialog : public SfxTabDialog { - Window aExampleContainerWIN; + Window aExampleContainerWIN; Window aExampleWIN; - CheckBox aShowExampleCB; - SwTOXMgr* pMgr; - SwWrtShell& rSh; + CheckBox aShowExampleCB; + SwTOXMgr* pMgr; + SwWrtShell& rSh; - SwOneExampleFrame* pExampleFrame; + SwOneExampleFrame* pExampleFrame; - SwTOXDescription** pDescArr; // - SwForm** pFormArr; // - SwIndexSections_Impl** pxIndexSectionsArr; + SwTOXDescription** pDescArr; // + SwForm** pFormArr; // + SwIndexSections_Impl** pxIndexSectionsArr; - SwTOXBase* pParamTOXBase; + SwTOXBase* pParamTOXBase; - CurTOXType eCurrentTOXType; + CurTOXType eCurrentTOXType; - String sUserDefinedIndex; - USHORT nTypeCount; - USHORT nInitialTOXType; + String sUserDefinedIndex; + USHORT nTypeCount; + USHORT nInitialTOXType; - BOOL bEditTOX; - BOOL bExampleCreated; - BOOL bGlobalFlag; + BOOL bEditTOX; + BOOL bExampleCreated; + BOOL bGlobalFlag; - virtual short Ok(); - SwTOXDescription* CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); + virtual short Ok(); + SwTOXDescription* CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); DECL_LINK(CreateExample_Hdl, void* ); DECL_LINK(ShowPreviewHdl, CheckBox*); @@ -115,26 +115,26 @@ public: BOOL bGlobal = FALSE); ~SwMultiTOXTabDialog(); - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); - SwForm* GetForm(CurTOXType eType); + SwForm* GetForm(CurTOXType eType); - CurTOXType GetCurrentTOXType() const { return eCurrentTOXType;} - void SetCurrentTOXType(CurTOXType eSet) + CurTOXType GetCurrentTOXType() const { return eCurrentTOXType;} + void SetCurrentTOXType(CurTOXType eSet) { eCurrentTOXType = eSet; } - void UpdateExample(); - BOOL IsTOXEditMode() const { return bEditTOX;} + void UpdateExample(); + BOOL IsTOXEditMode() const { return bEditTOX;} - SwWrtShell& GetWrtShell() {return rSh;} + SwWrtShell& GetWrtShell() {return rSh;} - SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes); - void CreateOrUpdateExample( + SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes); + void CreateOrUpdateExample( TOXTypes nTOXIndex, USHORT nPage = 0, USHORT nCurLevel = USHRT_MAX); - static BOOL IsNoNum(SwWrtShell& rSh, const String& rName); + static BOOL IsNoNum(SwWrtShell& rSh, const String& rName); }; /* -----------------14.07.99 12:17------------------- @@ -145,65 +145,65 @@ class IndexEntrySupplierWrapper; class SwTOXSelectTabPage : public SfxTabPage { FixedLine aTypeTitleFL; - FixedText aTitleFT; - Edit aTitleED; - FixedText aTypeFT; - ListBox aTypeLB; - CheckBox aReadOnlyCB; + FixedText aTitleFT; + Edit aTitleED; + FixedText aTypeFT; + ListBox aTypeLB; + CheckBox aReadOnlyCB; FixedLine aAreaFL; FixedText aAreaFT; ListBox aAreaLB; - FixedText aLevelFT; //content, user - NumericField aLevelNF; //content, user + FixedText aLevelFT; //content, user + NumericField aLevelNF; //content, user //content FixedLine aCreateFromFL; // content, user, illustration - CheckBox aFromHeadingsCB; -// PushButton aChapterDlgPB; //#outline level,removed by zhaojianwei - CheckBox aAddStylesCB; - PushButton aAddStylesPB; + CheckBox aFromHeadingsCB; +// PushButton aChapterDlgPB; //#outline level,removed by zhaojianwei + CheckBox aAddStylesCB; + PushButton aAddStylesPB; //user - CheckBox aFromTablesCB; - CheckBox aFromFramesCB; - CheckBox aFromGraphicsCB; - CheckBox aFromOLECB; - CheckBox aLevelFromChapterCB; + CheckBox aFromTablesCB; + CheckBox aFromFramesCB; + CheckBox aFromGraphicsCB; + CheckBox aFromOLECB; + CheckBox aLevelFromChapterCB; //illustration + table - RadioButton aFromCaptionsRB; + RadioButton aFromCaptionsRB; RadioButton aFromObjectNamesRB; //illustration and tables - FixedText aCaptionSequenceFT; - ListBox aCaptionSequenceLB; - FixedText aDisplayTypeFT; - ListBox aDisplayTypeLB; + FixedText aCaptionSequenceFT; + ListBox aCaptionSequenceLB; + FixedText aDisplayTypeFT; + ListBox aDisplayTypeLB; //all but illustration and table - CheckBox aTOXMarksCB; + CheckBox aTOXMarksCB; // //index only - CheckBox aCollectSameCB; - CheckBox aUseFFCB; - CheckBox aUseDashCB; - CheckBox aCaseSensitiveCB; - CheckBox aInitialCapsCB; - CheckBox aKeyAsEntryCB; - CheckBox aFromFileCB; - MenuButton aAutoMarkPB; + CheckBox aCollectSameCB; + CheckBox aUseFFCB; + CheckBox aUseDashCB; + CheckBox aCaseSensitiveCB; + CheckBox aInitialCapsCB; + CheckBox aKeyAsEntryCB; + CheckBox aFromFileCB; + MenuButton aAutoMarkPB; FixedLine aIdxOptionsFL; // index only // object only - SwOLENames aFromNames; - SvxCheckListBox aFromObjCLB; + SwOLENames aFromNames; + SvxCheckListBox aFromObjCLB; FixedLine aFromObjFL; - CheckBox aSequenceCB; - FixedText aBracketFT; - ListBox aBracketLB; + CheckBox aSequenceCB; + FixedText aBracketFT; + ListBox aBracketLB; FixedLine aAuthorityFormatFL; //all @@ -216,34 +216,34 @@ class SwTOXSelectTabPage : public SfxTabPage IndexEntryRessource* pIndexRes; Point aCBLeftPos1; - Point aCBLeftPos2; - Point aCBLeftPos3; + Point aCBLeftPos2; + Point aCBLeftPos3; - String aStyleArr[MAXLEVEL]; - String sAutoMarkURL; - String sAutoMarkType; - String sAddStyleUser; - String sAddStyleContent; + String aStyleArr[MAXLEVEL]; + String sAutoMarkURL; + String sAutoMarkType; + String sAddStyleUser; + String sAddStyleContent; const IndexEntrySupplierWrapper* pIndexEntryWrapper; - BOOL bFirstCall; + BOOL bFirstCall; - DECL_LINK(TOXTypeHdl, ListBox* ); - DECL_LINK(TOXAreaHdl, ListBox* ); -// DECL_LINK(ChapterHdl, PushButton* ); //#outline level,removed by zhaojianwei + DECL_LINK(TOXTypeHdl, ListBox* ); + DECL_LINK(TOXAreaHdl, ListBox* ); +// DECL_LINK(ChapterHdl, PushButton* ); //#outline level,removed by zhaojianwei DECL_LINK(AddStylesHdl, PushButton* ); DECL_LINK(MenuEnableHdl, Menu*); DECL_LINK(MenuExecuteHdl, Menu*); DECL_LINK(LanguageHdl, ListBox*); - DECL_LINK(CheckBoxHdl, CheckBox* ); + DECL_LINK(CheckBoxHdl, CheckBox* ); DECL_LINK(RadioButtonHdl, RadioButton* ); DECL_LINK(ModifyHdl, void*); - void ApplyTOXDescription(); - void FillTOXDescription(); - + void ApplyTOXDescription(); + void FillTOXDescription(); + using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -251,17 +251,17 @@ public: SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXSelectTabPage(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet& ); - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc - void SetWrtShell(SwWrtShell& rSh); + void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc + void SetWrtShell(SwWrtShell& rSh); }; /* -----------------16.06.99 08:33------------------- @@ -275,21 +275,21 @@ class SwTOXEntryTabPage; class SwTokenWindow : public Window { - ImageButton aLeftScrollWin; - Window aCtrlParentWin; - ImageButton aRightScrollWin; - TOXControlList aControlList; - SwForm* pForm; - USHORT nLevel; - BOOL bValid; - String aButtonTexts[TOKEN_END]; // Text of the buttons - String aButtonHelpTexts[TOKEN_END]; // QuickHelpText of the buttons - String sCharStyle; - Link aButtonSelectedHdl; - Control* pActiveCtrl; - Link aModifyHdl; - - SwTOXEntryTabPage* m_pParent; + ImageButton aLeftScrollWin; + Window aCtrlParentWin; + ImageButton aRightScrollWin; + TOXControlList aControlList; + SwForm* pForm; + USHORT nLevel; + BOOL bValid; + String aButtonTexts[TOKEN_END]; // Text of the buttons + String aButtonHelpTexts[TOKEN_END]; // QuickHelpText of the buttons + String sCharStyle; + Link aButtonSelectedHdl; + Control* pActiveCtrl; + Link aModifyHdl; + + SwTOXEntryTabPage* m_pParent; DECL_LINK(EditResize, Edit*); DECL_LINK(NextItemHdl, SwTOXEdit* ); @@ -298,46 +298,46 @@ class SwTokenWindow : public Window DECL_LINK(TbxFocusBtnHdl, SwTOXButton* ); DECL_LINK(ScrollHdl, ImageButton* ); - void SetActiveControl(Control* pSet); + void SetActiveControl(Control* pSet); - Control* InsertItem(const String& rText, const SwFormToken& aToken); - void AdjustPositions(); - void AdjustScrolling(); - void MoveControls(long nOffset); + Control* InsertItem(const String& rText, const SwFormToken& aToken); + void AdjustPositions(); + void AdjustScrolling(); + void MoveControls(long nOffset); public: SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId); ~SwTokenWindow(); - void SetForm(SwForm& rForm, USHORT nLevel); - USHORT GetLastLevel()const {return nLevel;}; + void SetForm(SwForm& rForm, USHORT nLevel); + USHORT GetLastLevel()const {return nLevel;}; - BOOL IsValid() const {return bValid;} + BOOL IsValid() const {return bValid;} - void SetInvalid() {bValid = FALSE;} + void SetInvalid() {bValid = FALSE;} - String GetPattern() const; + String GetPattern() const; - void SetButtonSelectedHdl(const Link& rLink) + void SetButtonSelectedHdl(const Link& rLink) { aButtonSelectedHdl = rLink;} - void SetModifyHdl(const Link& rLink){aModifyHdl = rLink;} + void SetModifyHdl(const Link& rLink){aModifyHdl = rLink;} - Control* GetActiveControl() + Control* GetActiveControl() { return pActiveCtrl;} - void InsertAtSelection(const String& rText, const SwFormToken& aToken); - void RemoveControl(SwTOXButton* pDel, BOOL bInternalCall = FALSE); + void InsertAtSelection(const String& rText, const SwFormToken& aToken); + void RemoveControl(SwTOXButton* pDel, BOOL bInternalCall = FALSE); - BOOL Contains(FormTokenType) const; + BOOL Contains(FormTokenType) const; - BOOL DetermineLinkStart(); + BOOL DetermineLinkStart(); //helper for pattern buttons and edits - BOOL CreateQuickHelp(Control* pCtrl, + BOOL CreateQuickHelp(Control* pCtrl, const SwFormToken& rToken, const HelpEvent& ); - virtual void Resize(); + virtual void Resize(); virtual void GetFocus(); }; /* -----------------------------23.12.99 14:16-------------------------------- @@ -363,81 +363,81 @@ class SwTOXEntryTabPage : public SfxTabPage FixedText aTokenFT; SwTokenWindow aTokenWIN; - PushButton aAllLevelsPB; - - PushButton aEntryNoPB; - PushButton aEntryPB; - PushButton aTabPB; - PushButton aChapterInfoPB; - PushButton aPageNoPB; - PushButton aHyperLinkPB; - - ListBox aAuthFieldsLB; - PushButton aAuthInsertPB; - PushButton aAuthRemovePB; - - FixedText aCharStyleFT; - ListBox aCharStyleLB; // character style of the current token - PushButton aEditStylePB; - - FixedText aChapterEntryFT; - ListBox aChapterEntryLB; // type of chapter info - - FixedText aNumberFormatFT; - ListBox aNumberFormatLB; //!< format for numbering (E#) - - FixedText aEntryOutlineLevelFT; //!< Fixed text, for i53420 - NumericField aEntryOutlineLevelNF; //!< level to evaluate outline level to, for i53420 - FixedText aFillCharFT; - ComboBox aFillCharCB; // fill char for tab stop - FixedText aTabPosFT; - MetricField aTabPosMF; // tab stop position - CheckBox aAutoRightCB; + PushButton aAllLevelsPB; + + PushButton aEntryNoPB; + PushButton aEntryPB; + PushButton aTabPB; + PushButton aChapterInfoPB; + PushButton aPageNoPB; + PushButton aHyperLinkPB; + + ListBox aAuthFieldsLB; + PushButton aAuthInsertPB; + PushButton aAuthRemovePB; + + FixedText aCharStyleFT; + ListBox aCharStyleLB; // character style of the current token + PushButton aEditStylePB; + + FixedText aChapterEntryFT; + ListBox aChapterEntryLB; // type of chapter info + + FixedText aNumberFormatFT; + ListBox aNumberFormatLB; //!< format for numbering (E#) + + FixedText aEntryOutlineLevelFT; //!< Fixed text, for i53420 + NumericField aEntryOutlineLevelNF; //!< level to evaluate outline level to, for i53420 + FixedText aFillCharFT; + ComboBox aFillCharCB; // fill char for tab stop + FixedText aTabPosFT; + MetricField aTabPosMF; // tab stop position + CheckBox aAutoRightCB; FixedLine aEntryFL; - CheckBox aRelToStyleCB; // position relative to the right margin of the para style - FixedText aMainEntryStyleFT; - ListBox aMainEntryStyleLB; // character style of main entries in indexes - CheckBox aAlphaDelimCB; - CheckBox aCommaSeparatedCB; + CheckBox aRelToStyleCB; // position relative to the right margin of the para style + FixedText aMainEntryStyleFT; + ListBox aMainEntryStyleLB; // character style of main entries in indexes + CheckBox aAlphaDelimCB; + CheckBox aCommaSeparatedCB; FixedLine aFormatFL; - RadioButton aSortDocPosRB; - RadioButton aSortContentRB; + RadioButton aSortDocPosRB; + RadioButton aSortContentRB; FixedLine aSortingFL; - FixedText aFirstKeyFT; - ListBox aFirstKeyLB; + FixedText aFirstKeyFT; + ListBox aFirstKeyLB; ImageRadioButton aFirstSortUpRB; ImageRadioButton aFirstSortDownRB; - FixedText aSecondKeyFT; - ListBox aSecondKeyLB; + FixedText aSecondKeyFT; + ListBox aSecondKeyLB; ImageRadioButton aSecondSortUpRB; ImageRadioButton aSecondSortDownRB; - FixedText aThirdKeyFT; - ListBox aThirdKeyLB; + FixedText aThirdKeyFT; + ListBox aThirdKeyLB; ImageRadioButton aThirdSortUpRB; ImageRadioButton aThirdSortDownRB; FixedLine aSortKeyFL; - String sDelimStr; - String sLevelStr; - String sAuthTypeStr; + String sDelimStr; + String sLevelStr; + String sAuthTypeStr; - String sNoCharStyle; - String sNoCharSortKey; - Point aButtonPositions[5]; + String sNoCharStyle; + String sNoCharSortKey; + Point aButtonPositions[5]; SwForm* m_pCurrentForm; - Point aRelToStylePos; - Point aRelToStyleIdxPos; + Point aRelToStylePos; + Point aRelToStyleIdxPos; Size aLevelFLSize; - CurTOXType aLastTOXType; - BOOL bInLevelHdl; + CurTOXType aLastTOXType; + BOOL bInLevelHdl; Point aChapterEntryFTPosition; //!< holds position of ChapterEntryFT control, //to be used in moving the element among different tokens @@ -460,9 +460,9 @@ class SwTOXEntryTabPage : public SfxTabPage DECL_LINK(AllLevelsHdl, PushButton*); - void EnableButtons(); - void WriteBackLevel(); - void UpdateDescriptor(); + void EnableButtons(); + void WriteBackLevel(); + void UpdateDescriptor(); DECL_LINK(ModifyHdl, void*); using SfxTabPage::ActivatePage; @@ -472,35 +472,35 @@ public: SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXEntryTabPage(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet& ); + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - void SetWrtShell(SwWrtShell& rSh); + void SetWrtShell(SwWrtShell& rSh); - String GetLevelHelp(USHORT nLevel) const; + String GetLevelHelp(USHORT nLevel) const; - void PreTokenButtonRemoved(const SwFormToken& rToken); + void PreTokenButtonRemoved(const SwFormToken& rToken); }; /* -----------------05.07.99 13:00------------------- --------------------------------------------------*/ class SwTOXStylesTabPage : public SfxTabPage { - FixedText aLevelFT2; - ListBox aLevelLB; - FixedText aTemplateFT; - ListBox aParaLayLB; - PushButton aStdBT; + FixedText aLevelFT2; + ListBox aLevelLB; + FixedText aTemplateFT; + ListBox aParaLayLB; + PushButton aStdBT; ImageButton aAssignBT; - PushButton aEditStyleBT; + PushButton aEditStyleBT; FixedLine aFormatFL; SwForm* m_pCurrentForm; -// void UpdatePattern(); +// void UpdatePattern(); DECL_LINK( EditStyleHdl, Button *); DECL_LINK( StdHdl, Button * ); @@ -509,7 +509,7 @@ class SwTOXStylesTabPage : public SfxTabPage DECL_LINK( AssignHdl, Button * ); DECL_LINK( ModifyHdl, void*); - SwForm& GetForm() + SwForm& GetForm() { SwMultiTOXTabDialog* pDlg = (SwMultiTOXTabDialog*)GetTabDialog(); return *pDlg->GetForm(pDlg->GetCurrentTOXType()); @@ -522,13 +522,13 @@ public: SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXStylesTabPage(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet& ); - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); }; diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx index 037aac07fe16..de05db1b8227 100644 --- a/sw/source/ui/inc/swuiidxmrk.hxx +++ b/sw/source/ui/inc/swuiidxmrk.hxx @@ -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 @@ -63,7 +63,7 @@ class SwWrtShell; class SwTOXMgr; class SwTOXMark; /*-------------------------------------------------------------------- - Beschreibung: Markierung fuer Verzeichniseintrag einfuegen + Beschreibung: Markierung fuer Verzeichniseintrag einfuegen --------------------------------------------------------------------*/ class SwIndexMarkFloatDlg; class SwIndexMarkModalDlg; @@ -71,66 +71,66 @@ class SwIndexMarkDlg : public Window { friend class SwIndexMarkFloatDlg; friend class SwIndexMarkModalDlg; - FixedText aTypeFT; - ListBox aTypeDCB; - ImageButton aNewBT; - - FixedText aEntryFT; - Edit aEntryED; - FixedText aPhoneticFT0; - Edit aPhoneticED0; - - FixedText aKeyFT; - ComboBox aKeyDCB; - FixedText aPhoneticFT1; - Edit aPhoneticED1; - - FixedText aKey2FT; - ComboBox aKey2DCB; - FixedText aPhoneticFT2; - Edit aPhoneticED2; - - FixedText aLevelFT; - NumericField aLevelED; - CheckBox aMainEntryCB; - CheckBox aApplyToAllCB; - CheckBox aSearchCaseSensitiveCB; - CheckBox aSearchCaseWordOnlyCB; + FixedText aTypeFT; + ListBox aTypeDCB; + ImageButton aNewBT; + + FixedText aEntryFT; + Edit aEntryED; + FixedText aPhoneticFT0; + Edit aPhoneticED0; + + FixedText aKeyFT; + ComboBox aKeyDCB; + FixedText aPhoneticFT1; + Edit aPhoneticED1; + + FixedText aKey2FT; + ComboBox aKey2DCB; + FixedText aPhoneticFT2; + Edit aPhoneticED2; + + FixedText aLevelFT; + NumericField aLevelED; + CheckBox aMainEntryCB; + CheckBox aApplyToAllCB; + CheckBox aSearchCaseSensitiveCB; + CheckBox aSearchCaseWordOnlyCB; FixedLine aIndexFL; - OKButton aOKBT; - CancelButton aCancelBT; - HelpButton aHelpBT; - PushButton aDelBT; - //PushButton aNewBT; - - ImageButton aPrevSameBT; - ImageButton aNextSameBT; - ImageButton aPrevBT; - ImageButton aNextBT; - - String aOrgStr; - sal_Int32 nOptionsId; - sal_Bool bDel; - sal_Bool bNewMark; - sal_Bool bSelected; - - BOOL bPhoneticED0_ChangedByUser; - BOOL bPhoneticED1_ChangedByUser; - BOOL bPhoneticED2_ChangedByUser; - LanguageType nLangForPhoneticReading; //Language of current text used for phonetic reading proposal - BOOL bIsPhoneticReadingEnabled; //this value states wether phopentic reading is enabled in principle dependend of global cjk settings and language of current entry + OKButton aOKBT; + CancelButton aCancelBT; + HelpButton aHelpBT; + PushButton aDelBT; + //PushButton aNewBT; + + ImageButton aPrevSameBT; + ImageButton aNextSameBT; + ImageButton aPrevBT; + ImageButton aNextBT; + + String aOrgStr; + sal_Int32 nOptionsId; + sal_Bool bDel; + sal_Bool bNewMark; + sal_Bool bSelected; + + BOOL bPhoneticED0_ChangedByUser; + BOOL bPhoneticED1_ChangedByUser; + BOOL bPhoneticED2_ChangedByUser; + LanguageType nLangForPhoneticReading; //Language of current text used for phonetic reading proposal + BOOL bIsPhoneticReadingEnabled; //this value states wether phopentic reading is enabled in principle dependend of global cjk settings and language of current entry com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedIndexEntrySupplier > xExtendedIndexEntrySupplier; - SwTOXMgr* pTOXMgr; - SwWrtShell* pSh; + SwTOXMgr* pTOXMgr; + SwWrtShell* pSh; - void Apply(); - void InitControls(); - void InsertMark(); - void UpdateMark(); + void Apply(); + void InitControls(); + void InsertMark(); + void UpdateMark(); DECL_LINK( InsertHdl, Button * ); DECL_LINK( CloseHdl, Button * ); @@ -148,15 +148,15 @@ class SwIndexMarkDlg : public Window //this method updates the values from 'nLangForPhoneticReading' and 'bIsPhoneticReadingEnabled' //it needs to be called ones if this dialog is opened to create a new entry (in InitControls), //or otherwise it has to be called for each changed TOXMark (in UpdateDialog) - void UpdateLanguageDependenciesForPhoneticReading(); - String GetDefaultPhoneticReading( const String& rText ); + void UpdateLanguageDependenciesForPhoneticReading(); + String GetDefaultPhoneticReading( const String& rText ); - void UpdateKeyBoxes(); + void UpdateKeyBoxes(); - void UpdateDialog(); - void InsertUpdate(); + void UpdateDialog(); + void InsertUpdate(); - virtual void Activate(); + virtual void Activate(); public: @@ -170,7 +170,7 @@ public: ~SwIndexMarkDlg(); void ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark = 0); - sal_Bool IsTOXType(const String& rName) + sal_Bool IsTOXType(const String& rName) {return LISTBOX_ENTRY_NOTFOUND != aTypeDCB.GetEntryPos(rName);} }; /* -----------------06.10.99 10:11------------------- @@ -178,27 +178,27 @@ public: --------------------------------------------------*/ class SwIndexMarkFloatDlg : public SfxModelessDialog { - SwIndexMarkDlg aDlg; - virtual void Activate(); + SwIndexMarkDlg aDlg; + virtual void Activate(); public: - SwIndexMarkFloatDlg( SfxBindings* pBindings, + SwIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo, sal_Bool bNew=sal_True); - void ReInitDlg(SwWrtShell& rWrtShell); + void ReInitDlg(SwWrtShell& rWrtShell); }; /* -----------------06.10.99 10:33------------------- --------------------------------------------------*/ class SwIndexMarkModalDlg : public SvxStandardDialog { - SwIndexMarkDlg aDlg; + SwIndexMarkDlg aDlg; public: SwIndexMarkModalDlg(Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark); - virtual void Apply(); - void ReInitDlg(SwWrtShell& rWrtShell); + virtual void Apply(); + void ReInitDlg(SwWrtShell& rWrtShell); }; /* -----------------15.09.99 08:39------------------- @@ -207,41 +207,41 @@ public: class SwAuthMarkModalDlg; class SwAuthMarkDlg : public Window { - static sal_Bool bIsFromComponent; + static sal_Bool bIsFromComponent; friend class SwAuthMarkModalDlg; friend class SwAuthMarkFloatDlg; RadioButton aFromComponentRB; - RadioButton aFromDocContentRB; - FixedText aAuthorFT; - FixedInfo aAuthorFI; - FixedText aTitleFT; - FixedInfo aTitleFI; - FixedText aEntryFT; - Edit aEntryED; - ListBox aEntryLB; + RadioButton aFromDocContentRB; + FixedText aAuthorFT; + FixedInfo aAuthorFI; + FixedText aTitleFT; + FixedInfo aTitleFI; + FixedText aEntryFT; + Edit aEntryED; + ListBox aEntryLB; FixedLine aEntryFL; - OKButton aOKBT; - CancelButton aCancelBT; - HelpButton aHelpBT; - PushButton aCreateEntryPB; - PushButton aEditEntryPB; + OKButton aOKBT; + CancelButton aCancelBT; + HelpButton aHelpBT; + PushButton aCreateEntryPB; + PushButton aEditEntryPB; - String sChangeST; - sal_Bool bNewEntry; - sal_Bool bBibAccessInitialized; + String sChangeST; + sal_Bool bNewEntry; + sal_Bool bBibAccessInitialized; - SwWrtShell* pSh; + SwWrtShell* pSh; - String m_sColumnTitles[AUTH_FIELD_END]; - String m_sFields[AUTH_FIELD_END]; + String m_sColumnTitles[AUTH_FIELD_END]; + String m_sFields[AUTH_FIELD_END]; - String m_sCreatedEntry[AUTH_FIELD_END]; + String m_sCreatedEntry[AUTH_FIELD_END]; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xBibAccess; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xBibAccess; DECL_LINK(InsertHdl, PushButton*); DECL_LINK(CloseHdl, PushButton*); @@ -260,34 +260,34 @@ public: sal_Bool bNew=sal_True); ~SwAuthMarkDlg(); - void ReInitDlg(SwWrtShell& rWrtShell); + void ReInitDlg(SwWrtShell& rWrtShell); }; /* -----------------06.10.99 10:11------------------- --------------------------------------------------*/ class SwAuthMarkFloatDlg : public SfxModelessDialog { - SwAuthMarkDlg aDlg; - virtual void Activate(); + SwAuthMarkDlg aDlg; + virtual void Activate(); public: - SwAuthMarkFloatDlg( SfxBindings* pBindings, + SwAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo, sal_Bool bNew=sal_True); - void ReInitDlg(SwWrtShell& rWrtShell); + void ReInitDlg(SwWrtShell& rWrtShell); }; /* -----------------06.10.99 10:33------------------- --------------------------------------------------*/ class SwAuthMarkModalDlg : public SvxStandardDialog { - SwAuthMarkDlg aDlg; + SwAuthMarkDlg aDlg; public: SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh); - virtual void Apply(); - void ReInitDlg(SwWrtShell& rWrtShell); + virtual void Apply(); + void ReInitDlg(SwWrtShell& rWrtShell); }; diff --git a/sw/source/ui/inc/swuipardlg.hxx b/sw/source/ui/inc/swuipardlg.hxx index d9460f62ad65..1dbec7f72ca5 100644 --- a/sw/source/ui/inc/swuipardlg.hxx +++ b/sw/source/ui/inc/swuipardlg.hxx @@ -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 @@ -48,4 +48,4 @@ public: ~SwParaDlg(); }; -#endif +#endif diff --git a/sw/source/ui/inc/swvset.hxx b/sw/source/ui/inc/swvset.hxx index 4e6b2a46f856..cec1f7b21e54 100644 --- a/sw/source/ui/inc/swvset.hxx +++ b/sw/source/ui/inc/swvset.hxx @@ -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 @@ -35,7 +35,7 @@ class SwRulerValueSet : public SvxBmpNumValueSet SwRulerValueSet( Window* pParent, const ResId& rResId ); ~SwRulerValueSet(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ); }; #endif diff --git a/sw/source/ui/inc/swwrtshitem.hxx b/sw/source/ui/inc/swwrtshitem.hxx index 3e33c3722f6b..2469ef806e40 100644 --- a/sw/source/ui/inc/swwrtshitem.hxx +++ b/sw/source/ui/inc/swwrtshitem.hxx @@ -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 @@ -33,7 +33,7 @@ class SwWrtShell; class SW_DLLPUBLIC SwWrtShellItem: public SfxPoolItem { - SwWrtShell* pWrtSh; + SwWrtShell* pWrtSh; public: TYPEINFO(); @@ -42,10 +42,10 @@ public: SwWrtShellItem( const SwWrtShellItem& ); - virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - SwWrtShell* GetValue() const { return pWrtSh; } + SwWrtShell* GetValue() const { return pWrtSh; } }; diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/ui/inc/syncbtn.hxx index 0ae8c7009426..bd99b185b86a 100644 --- a/sw/source/ui/inc/syncbtn.hxx +++ b/sw/source/ui/inc/syncbtn.hxx @@ -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 @@ -41,9 +41,9 @@ class SwSyncBtnDlg : public SfxFloatingWindow { - PushButton aSyncBtn; + PushButton aSyncBtn; - DECL_LINK( BtnHdl, PushButton* pBtn = 0 ); + DECL_LINK( BtnHdl, PushButton* pBtn = 0 ); public: SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, Window *pParent); @@ -58,7 +58,7 @@ public: class SwSyncChildWin : public SfxChildWindow { public: - SwSyncChildWin( Window* , + SwSyncChildWin( Window* , USHORT nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/ui/inc/table.hrc b/sw/source/ui/inc/table.hrc index 076028925804..721c6de5b67c 100644 --- a/sw/source/ui/inc/table.hrc +++ b/sw/source/ui/inc/table.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 @@ -27,23 +27,23 @@ #include "rcid.hrc" -#define DLG_INSERT_TABLE RC_TABLE_BEGIN -#define DLG_FORMAT_TABLE (RC_TABLE_BEGIN + 1) -#define DLG_CONV_TEXT_TABLE (RC_TABLE_BEGIN + 2) -//#define DLG_INS_ROW_COL (RC_TABLE_BEGIN + 3) moved to svx -#define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4) -#define DLG_SPLIT (RC_TABLE_BEGIN + 5) -#define DLG_COL_WIDTH (RC_TABLE_BEGIN + 6) -#define MSG_ERR_TABLE_MERGE (RC_TABLE_BEGIN + 7) -#define DLG_AUTOFMT_TABLE (RC_TABLE_BEGIN + 9) -#define DLG_SWDLG_STRINPUT (RC_TABLE_BEGIN + 10) -#define TP_TABLE_COLUMN (RC_TABLE_BEGIN + 11) -#define DLG_INSERT_CHART (RC_TABLE_BEGIN + 12) +#define DLG_INSERT_TABLE RC_TABLE_BEGIN +#define DLG_FORMAT_TABLE (RC_TABLE_BEGIN + 1) +#define DLG_CONV_TEXT_TABLE (RC_TABLE_BEGIN + 2) +//#define DLG_INS_ROW_COL (RC_TABLE_BEGIN + 3) moved to svx +#define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4) +#define DLG_SPLIT (RC_TABLE_BEGIN + 5) +#define DLG_COL_WIDTH (RC_TABLE_BEGIN + 6) +#define MSG_ERR_TABLE_MERGE (RC_TABLE_BEGIN + 7) +#define DLG_AUTOFMT_TABLE (RC_TABLE_BEGIN + 9) +#define DLG_SWDLG_STRINPUT (RC_TABLE_BEGIN + 10) +#define TP_TABLE_COLUMN (RC_TABLE_BEGIN + 11) +#define DLG_INSERT_CHART (RC_TABLE_BEGIN + 12) #define MSG_WRONG_TABLENAME (RC_TABLE_BEGIN + 13) -#define DLG_SPLIT_TABLE (RC_TABLE_BEGIN + 14) -#define DLG_MERGE_TABLE (RC_TABLE_BEGIN + 15) +#define DLG_SPLIT_TABLE (RC_TABLE_BEGIN + 14) +#define DLG_MERGE_TABLE (RC_TABLE_BEGIN + 15) -#define TABLE_ACT_END DLG_MERGE_TABLE +#define TABLE_ACT_END DLG_MERGE_TABLE #if TABLE_ACT_END > RC_TABLE_END #error Resource-Id Ueberlauf in #file, #line diff --git a/sw/source/ui/inc/tabledlg.hxx b/sw/source/ui/inc/tabledlg.hxx index 497d16449774..8ef084bb6abd 100644 --- a/sw/source/ui/inc/tabledlg.hxx +++ b/sw/source/ui/inc/tabledlg.hxx @@ -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,9 +43,9 @@ struct TColumn; class SwTableTabDlg : public SfxTabDialog { SwWrtShell* pShell; - USHORT nHtmlMode; + USHORT nHtmlMode; - virtual void PageCreated(USHORT nId, SfxTabPage& rPage); + virtual void PageCreated(USHORT nId, SfxTabPage& rPage); public: SwTableTabDlg( Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh ); diff --git a/sw/source/ui/inc/tablemgr.hxx b/sw/source/ui/inc/tablemgr.hxx index 4256d4069fe2..8ada860a620f 100644 --- a/sw/source/ui/inc/tablemgr.hxx +++ b/sw/source/ui/inc/tablemgr.hxx @@ -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 @@ -50,10 +50,10 @@ const char cParaDelim = 0x0a; class SW_DLLPUBLIC SwTableFUNC { - SwFrmFmt *pFmt; - SwWrtShell *pSh; - BOOL bCopy; - SwTabCols aCols; + SwFrmFmt *pFmt; + SwWrtShell *pSh; + BOOL bCopy; + SwTabCols aCols; private: SW_DLLPRIVATE int GetRightSeparator(int nNum) const; @@ -63,13 +63,13 @@ public: SwTableFUNC(SwWrtShell *pShell, BOOL bCopyFmt = FALSE); ~SwTableFUNC(); - void InitTabCols(); - void ColWidthDlg(Window *pParent ); + void InitTabCols(); + void ColWidthDlg(Window *pParent ); SwTwips GetColWidth(USHORT nNum) const; SwTwips GetMaxColWidth(USHORT nNum) const; - void SetColWidth(USHORT nNum, SwTwips nWidth ); - USHORT GetColCount() const; - USHORT GetCurColNum() const; + void SetColWidth(USHORT nNum, SwTwips nWidth ); + USHORT GetColCount() const; + USHORT GetCurColNum() const; BOOL IsTableSelected() const { return pFmt != 0; } @@ -81,7 +81,7 @@ public: void UpdateChart(); /// @return the XModel of the newly inserted chart if successfull - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, sal_Bool bFillWithData, const rtl::OUString &rCellRange, SwFlyFrmFmt** ppFlyFrmFmt = 0 ); }; diff --git a/sw/source/ui/inc/tabsh.hxx b/sw/source/ui/inc/tabsh.hxx index 3e3c1304b1ee..f2a8b99de9b4 100644 --- a/sw/source/ui/inc/tabsh.hxx +++ b/sw/source/ui/inc/tabsh.hxx @@ -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 @@ -44,13 +44,13 @@ public: SFX_DECL_INTERFACE(SW_TABSHELL) TYPEINFO(); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); - void GetFrmBorderState(SfxItemSet &rSet); - void GetLineStyleState(SfxItemSet &rSet); - void ExecTableStyle(SfxRequest& rReq); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); + void GetFrmBorderState(SfxItemSet &rSet); + void GetLineStyleState(SfxItemSet &rSet); + void ExecTableStyle(SfxRequest& rReq); - void ExecNumberFormat(SfxRequest& rReq); + void ExecNumberFormat(SfxRequest& rReq); SwTableShell(SwView &rView); }; diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/ui/inc/tautofmt.hxx index 9c35450eb208..ca455b4432c7 100644 --- a/sw/source/ui/inc/tautofmt.hxx +++ b/sw/source/ui/inc/tautofmt.hxx @@ -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 @@ -62,36 +62,36 @@ enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; class SwAutoFormatDlg : public SfxModalDialog { FixedLine aFlFormat; - ListBox aLbFormat; - CheckBox aBtnNumFormat; - CheckBox aBtnBorder; - CheckBox aBtnFont; - CheckBox aBtnPattern; - CheckBox aBtnAlignment; + ListBox aLbFormat; + CheckBox aBtnNumFormat; + CheckBox aBtnBorder; + CheckBox aBtnFont; + CheckBox aBtnPattern; + CheckBox aBtnAlignment; FixedLine aFlFormats; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnAdd; - PushButton aBtnRemove; - PushButton aBtnRename; - MoreButton aBtnMore; - String aStrTitle; - String aStrLabel; - String aStrClose; - String aStrDelTitle; - String aStrDelMsg; - String aStrRenameTitle; - String aStrInvalidFmt; - AutoFmtPreview* pWndPreview; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnAdd; + PushButton aBtnRemove; + PushButton aBtnRename; + MoreButton aBtnMore; + String aStrTitle; + String aStrLabel; + String aStrClose; + String aStrDelTitle; + String aStrDelMsg; + String aStrRenameTitle; + String aStrInvalidFmt; + AutoFmtPreview* pWndPreview; //------------------------ - SwWrtShell* pShell; - SwTableAutoFmtTbl* pTableTbl; - BYTE nIndex; - BYTE nDfltStylePos; - BOOL bCoreDataChanged : 1; - BOOL bSetAutoFmt : 1; + SwWrtShell* pShell; + SwTableAutoFmtTbl* pTableTbl; + BYTE nIndex; + BYTE nDfltStylePos; + BOOL bCoreDataChanged : 1; + BOOL bSetAutoFmt : 1; void Init( const SwTableAutoFmt* pSelFmt ); diff --git a/sw/source/ui/inc/tblctrl.hxx b/sw/source/ui/inc/tblctrl.hxx index f46103098278..897d9dc0ac79 100644 --- a/sw/source/ui/inc/tblctrl.hxx +++ b/sw/source/ui/inc/tblctrl.hxx @@ -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 @@ -44,8 +44,8 @@ public: SwTableOptimizeCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); ~SwTableOptimizeCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const; + virtual SfxPopupWindow* CreatePopupWindow(); }; diff --git a/sw/source/ui/inc/tblnumfm.hxx b/sw/source/ui/inc/tblnumfm.hxx index b6118f3943fe..64f7fa152622 100644 --- a/sw/source/ui/inc/tblnumfm.hxx +++ b/sw/source/ui/inc/tblnumfm.hxx @@ -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/inc/tbxanchr.hxx b/sw/source/ui/inc/tbxanchr.hxx index a2c378f15198..21670abfd03d 100644 --- a/sw/source/ui/inc/tbxanchr.hxx +++ b/sw/source/ui/inc/tbxanchr.hxx @@ -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/inc/textcontrolcombo.hxx b/sw/source/ui/inc/textcontrolcombo.hxx index dbf42d86d085..d367cf3b29c1 100644 --- a/sw/source/ui/inc/textcontrolcombo.hxx +++ b/sw/source/ui/inc/textcontrolcombo.hxx @@ -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 @@ -39,9 +39,9 @@ class SW_DLLPUBLIC TextControlCombo : public Window { protected: - Control& mrCtrl; - FixedText& mrFTbefore; - FixedText& mrFTafter; + Control& mrCtrl; + FixedText& mrFTbefore; + FixedText& mrFTafter; public: @@ -50,16 +50,16 @@ public: TextControlCombo( Window* _pParent, const ResId& _rResId, Control& _rCtrl, FixedText& _rFTbefore, FixedText& _rFTafter ); - virtual ~TextControlCombo(); + virtual ~TextControlCombo(); - void Arrange( FixedText& _rOrg, BOOL bShow = true ); + void Arrange( FixedText& _rOrg, BOOL bShow = true ); // identical to window functionality - void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ); - void Hide( USHORT nFlags = 0 ) { Show( FALSE, nFlags ); } - - void Enable( BOOL bEnable = TRUE, BOOL bChild = TRUE ); - void Disable( BOOL bChild = TRUE ) { Enable( FALSE, bChild ); } + void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ); + void Hide( USHORT nFlags = 0 ) { Show( FALSE, nFlags ); } + + void Enable( BOOL bEnable = TRUE, BOOL bChild = TRUE ); + void Disable( BOOL bChild = TRUE ) { Enable( FALSE, bChild ); } }; diff --git a/sw/source/ui/inc/textsh.hxx b/sw/source/ui/inc/textsh.hxx index d4ec7b99ed25..3212bd7a632c 100644 --- a/sw/source/ui/inc/textsh.hxx +++ b/sw/source/ui/inc/textsh.hxx @@ -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 @@ -36,7 +36,7 @@ class SvxHyperlinkItem; class SwTextShell: public SwBaseShell { - SwFldMgr* pPostItFldMgr; + SwFldMgr* pPostItFldMgr; void InsertSymbol( SfxRequest& ); void InsertHyperlink(const SvxHyperlinkItem& rHlnkItem); @@ -47,41 +47,41 @@ public: SFX_DECL_INTERFACE(SW_TEXTSHELL) TYPEINFO(); -//CHINA001 DECL_LINK( PostItNextHdl, Button * ); -//CHINA001 DECL_LINK( PostItPrevHdl, Button * ); -//CHINA001 DECL_LINK( RedlineNextHdl, Button * ); -//CHINA001 DECL_LINK( RedlinePrevHdl, Button * ); +//CHINA001 DECL_LINK( PostItNextHdl, Button * ); +//CHINA001 DECL_LINK( PostItPrevHdl, Button * ); +//CHINA001 DECL_LINK( RedlineNextHdl, Button * ); +//CHINA001 DECL_LINK( RedlinePrevHdl, Button * ); DECL_LINK( RedlineNextHdl, AbstractSvxPostItDialog * ); DECL_LINK( RedlinePrevHdl, AbstractSvxPostItDialog * ); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); - void ExecInsert(SfxRequest &); - void StateInsert(SfxItemSet&); - void ExecDelete(SfxRequest &); - void ExecEnterNum(SfxRequest &); - void ExecBasicMove(SfxRequest &); - void ExecMove(SfxRequest &); - void ExecMovePage(SfxRequest &); - void ExecMoveCol(SfxRequest &); - void ExecMoveLingu(SfxRequest &); - void ExecMoveMisc(SfxRequest &); - void ExecField(SfxRequest &rReq); - void StateField(SfxItemSet &); - void ExecIdx(SfxRequest &); - void GetIdxState(SfxItemSet &); - void ExecGlossary(SfxRequest &); + void ExecInsert(SfxRequest &); + void StateInsert(SfxItemSet&); + void ExecDelete(SfxRequest &); + void ExecEnterNum(SfxRequest &); + void ExecBasicMove(SfxRequest &); + void ExecMove(SfxRequest &); + void ExecMovePage(SfxRequest &); + void ExecMoveCol(SfxRequest &); + void ExecMoveLingu(SfxRequest &); + void ExecMoveMisc(SfxRequest &); + void ExecField(SfxRequest &rReq); + void StateField(SfxItemSet &); + void ExecIdx(SfxRequest &); + void GetIdxState(SfxItemSet &); + void ExecGlossary(SfxRequest &); - void ExecCharAttr(SfxRequest &); - void ExecCharAttrArgs(SfxRequest &); - void ExecParaAttr(SfxRequest &); - void ExecParaAttrArgs(SfxRequest &); - void ExecAttr(SfxRequest &); - void ExecDB(SfxRequest &); - void ExecTransliteration(SfxRequest &); + void ExecCharAttr(SfxRequest &); + void ExecCharAttrArgs(SfxRequest &); + void ExecParaAttr(SfxRequest &); + void ExecParaAttrArgs(SfxRequest &); + void ExecAttr(SfxRequest &); + void ExecDB(SfxRequest &); + void ExecTransliteration(SfxRequest &); - void GetAttrState(SfxItemSet &); + void GetAttrState(SfxItemSet &); SwTextShell(SwView &rView); virtual ~SwTextShell(); diff --git a/sw/source/ui/inc/tmpdlg.hxx b/sw/source/ui/inc/tmpdlg.hxx index 7971a6607915..7f9b8f7de0d2 100644 --- a/sw/source/ui/inc/tmpdlg.hxx +++ b/sw/source/ui/inc/tmpdlg.hxx @@ -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 @@ -41,8 +41,8 @@ class SwTemplateDlg: public SfxStyleDialog USHORT nType; USHORT nHtmlMode; - SwWrtShell* pWrtShell; - BOOL bNewStyle; + SwWrtShell* pWrtShell; + BOOL bNewStyle; DECL_LINK( NumOptionsHdl, PushButton* ); @@ -50,9 +50,9 @@ public: SwTemplateDlg( Window* pParent, SfxStyleSheetBase& rBase, USHORT nRegion, - BOOL bColumn = FALSE, - SwWrtShell* pActShell = 0, - BOOL bNew = FALSE ); + BOOL bColumn = FALSE, + SwWrtShell* pActShell = 0, + BOOL bNew = FALSE ); ~SwTemplateDlg(); const SfxItemSet* GetRefreshedSet(); diff --git a/sw/source/ui/inc/tmplctrl.hxx b/sw/source/ui/inc/tmplctrl.hxx index 206645d7fe83..4a97d0f80d02 100644 --- a/sw/source/ui/inc/tmplctrl.hxx +++ b/sw/source/ui/inc/tmplctrl.hxx @@ -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 @@ -40,7 +40,7 @@ class SwTemplateControl : public SfxStatusBarControl protected: virtual void Command( const CommandEvent& rCEvt ); public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); diff --git a/sw/source/ui/inc/toolbox_tmpl.hrc b/sw/source/ui/inc/toolbox_tmpl.hrc index 73ab3059d705..8c73a70c6041 100644 --- a/sw/source/ui/inc/toolbox_tmpl.hrc +++ b/sw/source/ui/inc/toolbox_tmpl.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 diff --git a/sw/source/ui/inc/toxmgr.hxx b/sw/source/ui/inc/toxmgr.hxx index 38cc1e5398b3..ca5d93560dfa 100644 --- a/sw/source/ui/inc/toxmgr.hxx +++ b/sw/source/ui/inc/toxmgr.hxx @@ -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 @@ -42,32 +42,32 @@ class SwForm; class SW_DLLPUBLIC SwTOXDescription { - TOXTypes eTOXType; - String aStyleNames[MAXLEVEL]; - String sSequenceName; - String sMainEntryCharStyle; - String sAutoMarkURL; - String* pTitle; - String* pTOUName; - SwForm* pForm; - USHORT nContent; - USHORT nIndexOptions; - USHORT nOLEOptions; + TOXTypes eTOXType; + String aStyleNames[MAXLEVEL]; + String sSequenceName; + String sMainEntryCharStyle; + String sAutoMarkURL; + String* pTitle; + String* pTOUName; + SwForm* pForm; + USHORT nContent; + USHORT nIndexOptions; + USHORT nOLEOptions; LanguageType eLanguage; String sSortAlgorithm; String sAuthBrackets; - SwCaptionDisplay eCaptionDisplay; - SwTOXSortKey eSortKey1; - SwTOXSortKey eSortKey2; - SwTOXSortKey eSortKey3; - BYTE nLevel; - BOOL bFromObjectNames : 1; - BOOL bFromChapter : 1; - BOOL bReadonly: 1; - BOOL bLevelFromChapter : 1; - BOOL bIsAuthSequence :1; - BOOL bSortByDocument :1; + SwCaptionDisplay eCaptionDisplay; + SwTOXSortKey eSortKey1; + SwTOXSortKey eSortKey2; + SwTOXSortKey eSortKey3; + BYTE nLevel; + BOOL bFromObjectNames : 1; + BOOL bFromChapter : 1; + BOOL bReadonly: 1; + BOOL bLevelFromChapter : 1; + BOOL bIsAuthSequence :1; + BOOL bSortByDocument :1; //TODO: TemplateNames //const String* pTemplateName = 0, ??? @@ -104,67 +104,67 @@ public: delete pTOUName; } - void SetTOXType(TOXTypes eSet) { eTOXType = eSet;} - TOXTypes GetTOXType() const { return eTOXType;} + void SetTOXType(TOXTypes eSet) { eTOXType = eSet;} + TOXTypes GetTOXType() const { return eTOXType;} const String& GetStyleNames(USHORT nLvl) const {return aStyleNames[nLvl];} void SetStyleNames(const String& rSet, USHORT nLvl) {aStyleNames[nLvl] = rSet; } - const String& GetAutoMarkURL() const { return sAutoMarkURL;} - void SetAutoMarkURL(const String& rSet) {sAutoMarkURL = rSet;} + const String& GetAutoMarkURL() const { return sAutoMarkURL;} + void SetAutoMarkURL(const String& rSet) {sAutoMarkURL = rSet;} - void SetTitle(const String& pSet) {delete pTitle; pTitle = new String(pSet);} - const String* GetTitle() const {return pTitle; } + void SetTitle(const String& pSet) {delete pTitle; pTitle = new String(pSet);} + const String* GetTitle() const {return pTitle; } - void SetTOUName(const String& pSet) {delete pTOUName; pTOUName = new String(pSet);} - const String* GetTOUName() const {return pTOUName; } + void SetTOUName(const String& pSet) {delete pTOUName; pTOUName = new String(pSet);} + const String* GetTOUName() const {return pTOUName; } - void SetForm(const SwForm& rSet) {delete pForm; pForm = new SwForm(rSet);} - const SwForm* GetForm() const {return pForm;} + void SetForm(const SwForm& rSet) {delete pForm; pForm = new SwForm(rSet);} + const SwForm* GetForm() const {return pForm;} - void SetContentOptions(USHORT nSet) { nContent = nSet;} - USHORT GetContentOptions() const { return nContent;} + void SetContentOptions(USHORT nSet) { nContent = nSet;} + USHORT GetContentOptions() const { return nContent;} - void SetIndexOptions(USHORT nSet) { nIndexOptions = nSet;} - USHORT GetIndexOptions() const { return nIndexOptions;} + void SetIndexOptions(USHORT nSet) { nIndexOptions = nSet;} + USHORT GetIndexOptions() const { return nIndexOptions;} - const String& GetMainEntryCharStyle() const {return sMainEntryCharStyle;} - void SetMainEntryCharStyle(const String& rSet) {sMainEntryCharStyle = rSet;} + const String& GetMainEntryCharStyle() const {return sMainEntryCharStyle;} + void SetMainEntryCharStyle(const String& rSet) {sMainEntryCharStyle = rSet;} - void SetLevel(BYTE nSet) {nLevel = nSet;} - BYTE GetLevel()const {return nLevel; } + void SetLevel(BYTE nSet) {nLevel = nSet;} + BYTE GetLevel()const {return nLevel; } - void SetCreateFromObjectNames(BOOL bSet) { bFromObjectNames = bSet;} - BOOL IsCreateFromObjectNames() const {return bFromObjectNames;} + void SetCreateFromObjectNames(BOOL bSet) { bFromObjectNames = bSet;} + BOOL IsCreateFromObjectNames() const {return bFromObjectNames;} - const String& GetSequenceName() const {return sSequenceName;} - void SetSequenceName(const String& rSet) {sSequenceName = rSet;} + const String& GetSequenceName() const {return sSequenceName;} + void SetSequenceName(const String& rSet) {sSequenceName = rSet;} - SwCaptionDisplay GetCaptionDisplay() const { return eCaptionDisplay;} - void SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;} + SwCaptionDisplay GetCaptionDisplay() const { return eCaptionDisplay;} + void SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;} - void SetFromChapter(BOOL bSet) { bFromChapter = bSet;} - BOOL IsFromChapter() const {return bFromChapter;} + void SetFromChapter(BOOL bSet) { bFromChapter = bSet;} + BOOL IsFromChapter() const {return bFromChapter;} - void SetReadonly(BOOL bSet){bReadonly = bSet;} - BOOL IsReadonly() const {return bReadonly;} + void SetReadonly(BOOL bSet){bReadonly = bSet;} + BOOL IsReadonly() const {return bReadonly;} - USHORT GetOLEOptions() const {return nOLEOptions;} - void SetOLEOptions(USHORT nOpt) {nOLEOptions = nOpt;} + USHORT GetOLEOptions() const {return nOLEOptions;} + void SetOLEOptions(USHORT nOpt) {nOLEOptions = nOpt;} - BOOL IsLevelFromChapter() const {return bLevelFromChapter;} - void SetLevelFromChapter(BOOL bSet) {bLevelFromChapter = bSet;} + BOOL IsLevelFromChapter() const {return bLevelFromChapter;} + void SetLevelFromChapter(BOOL bSet) {bLevelFromChapter = bSet;} - String GetAuthBrackets() const {return sAuthBrackets;} - void SetAuthBrackets(const String& rSet) {sAuthBrackets = rSet;} + String GetAuthBrackets() const {return sAuthBrackets;} + void SetAuthBrackets(const String& rSet) {sAuthBrackets = rSet;} - BOOL IsAuthSequence() const {return bIsAuthSequence;} - void SetAuthSequence(BOOL bSet){bIsAuthSequence = bSet;} + BOOL IsAuthSequence() const {return bIsAuthSequence;} + void SetAuthSequence(BOOL bSet){bIsAuthSequence = bSet;} - BOOL IsSortByDocument()const {return bSortByDocument ;} - void SetSortByDocument(BOOL bSet) {bSortByDocument = bSet;} + BOOL IsSortByDocument()const {return bSortByDocument ;} + void SetSortByDocument(BOOL bSet) {bSortByDocument = bSet;} void SetSortKeys(SwTOXSortKey eKey1, SwTOXSortKey eKey2, @@ -186,18 +186,18 @@ public: // -------------------------------------------------------------------------------- class SwTOXMarkDescription { - TOXTypes eTOXType; - int nLevel; - BOOL bMainEntry; + TOXTypes eTOXType; + int nLevel; + BOOL bMainEntry; - String* pPrimKey; - String* pSecKey; - String* pAltStr; - String* pTOUName; + String* pPrimKey; + String* pSecKey; + String* pAltStr; + String* pTOUName; - String* pPhoneticReadingOfAltStr; - String* pPhoneticReadingOfPrimKey; - String* pPhoneticReadingOfSecKey; + String* pPhoneticReadingOfAltStr; + String* pPhoneticReadingOfPrimKey; + String* pPhoneticReadingOfSecKey; // forbidden and not implemented. SwTOXMarkDescription(); @@ -230,51 +230,51 @@ public: delete pPhoneticReadingOfSecKey; } - TOXTypes GetTOXType()const {return eTOXType;} + TOXTypes GetTOXType()const {return eTOXType;} - void SetLevel(int nSet) {nLevel = nSet;} - int GetLevel() const {return nLevel;} + void SetLevel(int nSet) {nLevel = nSet;} + int GetLevel() const {return nLevel;} - void SetMainEntry(BOOL bSet) {bMainEntry = bSet;} - BOOL IsMainEntry() const {return bMainEntry;} + void SetMainEntry(BOOL bSet) {bMainEntry = bSet;} + BOOL IsMainEntry() const {return bMainEntry;} - void SetPrimKey(const String& rSet) + void SetPrimKey(const String& rSet) {delete pPrimKey; pPrimKey = new String(rSet);} - const String* GetPrimKey() const {return pPrimKey;} + const String* GetPrimKey() const {return pPrimKey;} - void SetSecKey(const String& rSet) + void SetSecKey(const String& rSet) {delete pSecKey; pSecKey = new String(rSet);} - const String* GetSecKey() const { return pSecKey; } + const String* GetSecKey() const { return pSecKey; } - void SetAltStr(const String& rSet) + void SetAltStr(const String& rSet) {delete pAltStr; pAltStr = new String(rSet);} - const String* GetAltStr() const { return pAltStr; } + const String* GetAltStr() const { return pAltStr; } - void SetTOUName(const String& rSet) + void SetTOUName(const String& rSet) {delete pTOUName; pTOUName = new String(rSet);} - const String* GetTOUName() const {return pTOUName;} + const String* GetTOUName() const {return pTOUName;} - void SetPhoneticReadingOfAltStr(const String& rSet) + void SetPhoneticReadingOfAltStr(const String& rSet) {delete pPhoneticReadingOfAltStr; pPhoneticReadingOfAltStr = new String(rSet);} - const String* GetPhoneticReadingOfAltStr() const { return pPhoneticReadingOfAltStr; } + const String* GetPhoneticReadingOfAltStr() const { return pPhoneticReadingOfAltStr; } - void SetPhoneticReadingOfPrimKey(const String& rSet) + void SetPhoneticReadingOfPrimKey(const String& rSet) {delete pPhoneticReadingOfPrimKey; pPhoneticReadingOfPrimKey = new String(rSet);} - const String* GetPhoneticReadingOfPrimKey() const { return pPhoneticReadingOfPrimKey; } + const String* GetPhoneticReadingOfPrimKey() const { return pPhoneticReadingOfPrimKey; } - void SetPhoneticReadingOfSecKey(const String& rSet) + void SetPhoneticReadingOfSecKey(const String& rSet) {delete pPhoneticReadingOfSecKey; pPhoneticReadingOfSecKey = new String(rSet);} - const String* GetPhoneticReadingOfSecKey() const { return pPhoneticReadingOfSecKey; } + const String* GetPhoneticReadingOfSecKey() const { return pPhoneticReadingOfSecKey; } }; class SW_DLLPUBLIC SwTOXMgr { - SwWrtShell* pSh; - SwTOXMark* pCurTOXMark; - SwTOXMarks aCurMarks; + SwWrtShell* pSh; + SwTOXMark* pCurTOXMark; + SwTOXMarks aCurMarks; - SW_DLLPRIVATE USHORT GetUserTypeID(const String& rStr); + SW_DLLPRIVATE USHORT GetUserTypeID(const String& rStr); public: // single argument ctors shall be explicit. @@ -283,29 +283,29 @@ public: // // Methoden fuer Verzeichnismarkierungen // - void InsertTOXMark(const SwTOXMarkDescription& rDesc); + void InsertTOXMark(const SwTOXMarkDescription& rDesc); - void UpdateTOXMark(const SwTOXMarkDescription& rDesc); + void UpdateTOXMark(const SwTOXMarkDescription& rDesc); - void DeleteTOXMark(); - void NextTOXMark(BOOL bSame=FALSE); - void PrevTOXMark(BOOL bSame=FALSE); + void DeleteTOXMark(); + void NextTOXMark(BOOL bSame=FALSE); + void PrevTOXMark(BOOL bSame=FALSE); // Aktuelle TOXmarks holen - USHORT GetTOXMarks(); - USHORT GetTOXMarkCount(); - SwTOXMark* GetTOXMark(USHORT nId); - SwTOXMark* GetCurTOXMark(); - void SetCurTOXMark(USHORT nId); + USHORT GetTOXMarks(); + USHORT GetTOXMarkCount(); + SwTOXMark* GetTOXMark(USHORT nId); + SwTOXMark* GetCurTOXMark(); + void SetCurTOXMark(USHORT nId); // // Methoden fuer Verzeichnisse // - BOOL UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0); + BOOL UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0); - const SwTOXType* GetTOXType(TOXTypes eTyp, USHORT nId) const; - const SwTOXBase* GetCurTOX(); + const SwTOXType* GetTOXType(TOXTypes eTyp, USHORT nId) const; + const SwTOXBase* GetCurTOX(); }; @@ -315,10 +315,10 @@ public: --------------------------------------------------------------------*/ inline USHORT SwTOXMgr::GetTOXMarkCount() - { return aCurMarks.Count(); } + { return aCurMarks.Count(); } inline SwTOXMark* SwTOXMgr::GetCurTOXMark() - { return pCurTOXMark; } + { return pCurTOXMark; } #endif diff --git a/sw/source/ui/inc/uiborder.hxx b/sw/source/ui/inc/uiborder.hxx index a7688ac343ac..239af9a74158 100644 --- a/sw/source/ui/inc/uiborder.hxx +++ b/sw/source/ui/inc/uiborder.hxx @@ -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/inc/uiitems.hxx b/sw/source/ui/inc/uiitems.hxx index d559a9ea3fb9..d430abb71201 100644 --- a/sw/source/ui/inc/uiitems.hxx +++ b/sw/source/ui/inc/uiitems.hxx @@ -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 @@ -57,11 +57,11 @@ public: const IntlWrapper* pIntl = 0 ) const; virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); SwPageFtnInfo& GetPageFtnInfo() { return aFtnInfo; } const SwPageFtnInfo& GetPageFtnInfo() const { return aFtnInfo; } - void SetPageFtnInfo(SwPageFtnInfo& rInf) { aFtnInfo = rInf; } + void SetPageFtnInfo(SwPageFtnInfo& rInf) { aFtnInfo = rInf; } }; /*******************************************************************/ @@ -77,8 +77,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; - void SetValue(void * pPtr) { pMisc= pPtr; } - void* GetValue() const { return pMisc; } + void SetValue(void * pPtr) { pMisc= pPtr; } + void* GetValue() const { return pMisc; } }; /*******************************************************************/ @@ -95,11 +95,11 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - const SwNumRule* GetNumRule() const { return pRule; } - SwNumRule* GetNumRule() { return pRule; } + const SwNumRule* GetNumRule() const { return pRule; } + SwNumRule* GetNumRule() { return pRule; } }; /* -----------------17.06.98 17:40------------------- diff --git a/sw/source/ui/inc/uinums.hxx b/sw/source/ui/inc/uinums.hxx index 5ba9d6f4dfc1..38e18b1a8f3d 100644 --- a/sw/source/ui/inc/uinums.hxx +++ b/sw/source/ui/inc/uinums.hxx @@ -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 @@ -78,7 +78,7 @@ public: const SwNumRulesWithName &operator=(const SwNumRulesWithName &); - const String& GetName() const { return aName; } + const String& GetName() const { return aName; } void MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const; void Store( SvStream& ); @@ -89,24 +89,24 @@ public: class SwBaseNumRules { public: - enum { nMaxRules = MAX_NUM_RULES }; // zur Zeit 9 definierte Forms + enum { nMaxRules = MAX_NUM_RULES }; // zur Zeit 9 definierte Forms protected: - SwNumRulesWithName *pNumRules[ MAX_NUM_RULES ]; - String sFileName; - USHORT nVersion; - BOOL bModified; + SwNumRulesWithName *pNumRules[ MAX_NUM_RULES ]; + String sFileName; + USHORT nVersion; + BOOL bModified; - virtual int Load(SvStream&); - virtual BOOL Store(SvStream&); + virtual int Load(SvStream&); + virtual BOOL Store(SvStream&); - void Init(); + void Init(); public: SwBaseNumRules(const String& rFileName); virtual ~SwBaseNumRules(); - inline const SwNumRulesWithName* GetRules(USHORT nIdx) const; - virtual void ApplyNumRules( + inline const SwNumRulesWithName* GetRules(USHORT nIdx) const; + virtual void ApplyNumRules( const SwNumRulesWithName &rCopy, USHORT nIdx); @@ -122,7 +122,7 @@ public: SwChapterNumRules(); virtual ~SwChapterNumRules(); - virtual void ApplyNumRules( const SwNumRulesWithName &rCopy, + virtual void ApplyNumRules( const SwNumRulesWithName &rCopy, USHORT nIdx); }; diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/ui/inc/uitool.hxx index e48f78f9aa96..eaaf99f579dc 100644 --- a/sw/source/ui/inc/uitool.hxx +++ b/sw/source/ui/inc/uitool.hxx @@ -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 @@ -56,13 +56,13 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ); void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet); // Auffuellen der Tabs mit DefaultTabs -SW_DLLPUBLIC void MakeDefTabs(SwTwips nDefDist, SvxTabStopItem& rTabs); +SW_DLLPUBLIC void MakeDefTabs(SwTwips nDefDist, SvxTabStopItem& rTabs); // DefaultTabs loeschen aus dem TabStopArray -//void EraseDefTabs(SvxTabStopItem& rTabs); +//void EraseDefTabs(SvxTabStopItem& rTabs); // Abstand zwischen dem 1. und zweitem Element ermitteln -SW_DLLPUBLIC USHORT GetTabDist(const SvxTabStopItem& rTabs); +SW_DLLPUBLIC USHORT GetTabDist(const SvxTabStopItem& rTabs); // erfrage ob im Set eine Sfx-PageDesc-Kombination vorliegt // und setze diesen im Set und loesche die Transport Items @@ -70,8 +70,11 @@ SW_DLLPUBLIC USHORT GetTabDist(const SvxTabStopItem& rTabs); void SwToSfxPageDescAttr( SfxItemSet& rSet ); void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet ); -SW_DLLPUBLIC FieldUnit GetDfltMetric(BOOL bWeb); -void SetDfltMetric(FieldUnit eMetric, BOOL bWeb); +SW_DLLPUBLIC FieldUnit GetDfltMetric(BOOL bWeb); +void SetDfltMetric(FieldUnit eMetric, BOOL bWeb); + +SW_DLLPUBLIC BOOL HasCharUnit( BOOL bWeb ); +void SetApplyCharUnit(BOOL bApplyChar, BOOL bWeb); // ListBox mit allen Zeichenvorlagen fuellen - ausser Standard! SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, BOOL bSorted = FALSE, BOOL bWithDefault = FALSE); @@ -85,7 +88,7 @@ SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, USHORT *pPercent, String GetAppLangDateTimeString( const DateTime& ); -// search for a command string withing the menu structure and execute it +// search for a command string withing the menu structure and execute it // at the dispatcher if there is one, if executed return true bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, USHORT nId ); diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx index 9c22b44ad868..d8131f51de83 100644 --- a/sw/source/ui/inc/uivwimp.hxx +++ b/sw/source/ui/inc/uivwimp.hxx @@ -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 @@ -33,7 +33,7 @@ #include <sfx2/objsh.hxx> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp> -#include <cppuhelper/implbase1.hxx> // helper for implementations +#include <cppuhelper/implbase1.hxx> // helper for implementations #include <swunodef.hxx> #include <cppuhelper/weakref.hxx> @@ -58,7 +58,7 @@ namespace com{ namespace sun{ namespace star { class SwScannerEventListener : public ::cppu::WeakImplHelper1< STAR_NMSPC::lang::XEventListener > { - SwView* pView; + SwView* pView; public: @@ -77,7 +77,7 @@ public: class SwClipboardChangeListener : public ::cppu::WeakImplHelper1< CLIP_NMSPC::XClipboardListener > { - SwView* pView; + SwView* pView; // XEventListener virtual void SAL_CALL disposing( const STAR_NMSPC::lang::EventObject& rEventObject ) @@ -89,7 +89,7 @@ class SwClipboardChangeListener : public ::cppu::WeakImplHelper1< public: SwClipboardChangeListener( SwView& rView ) : pView( &rView ) {} - virtual ~SwClipboardChangeListener(); + virtual ~SwClipboardChangeListener(); void ViewDestroyed() { pView = 0; } @@ -103,10 +103,10 @@ public: class SwMailMergeConfigItem; class SwView_Impl { - STAR_REFERENCE( lang::XEventListener ) xScanEvtLstnr; - STAR_REFERENCE( lang::XEventListener ) xClipEvtLstnr; - STAR_REFERENCE( frame::XDispatchProviderInterceptor ) xDisProvInterceptor; - STAR_REFERENCE( view::XSelectionSupplier ) *pxXTextView; // UNO object + STAR_REFERENCE( lang::XEventListener ) xScanEvtLstnr; + STAR_REFERENCE( lang::XEventListener ) xClipEvtLstnr; + STAR_REFERENCE( frame::XDispatchProviderInterceptor ) xDisProvInterceptor; + STAR_REFERENCE( view::XSelectionSupplier ) *pxXTextView; // UNO object com::sun::star::uno::WeakReference< com::sun::star::lang::XUnoTunnel > xTransferable; // temporary document for printing text of selection / multi selection @@ -115,9 +115,9 @@ class SwView_Impl SfxObjectShellRef aEmbeddedObjRef; SwView* pView; - SwScannerEventListener* pScanEvtLstnr; - SwClipboardChangeListener* pClipEvtLstnr; - ShellModes eShellMode; + SwScannerEventListener* pScanEvtLstnr; + SwClipboardChangeListener* pClipEvtLstnr; + ShellModes eShellMode; SwMailMergeConfigItem* pConfigItem; sal_uInt16 nMailMergeRestartPage; @@ -135,18 +135,18 @@ public: SwView_Impl(SwView* pShell); ~SwView_Impl(); - void SetShellMode(ShellModes eSet); + void SetShellMode(ShellModes eSet); ::com::sun::star::view::XSelectionSupplier* GetUNOObject(); - SwXTextView* GetUNOObject_Impl(); + SwXTextView* GetUNOObject_Impl(); void Invalidate(); - ShellModes GetShellMode() {return eShellMode;} + ShellModes GetShellMode() {return eShellMode;} void ExecuteScan(SfxRequest& rReq); - SwScannerEventListener& GetScannerEventListener(); + SwScannerEventListener& GetScannerEventListener(); - void AddClipboardListener(); + void AddClipboardListener(); SfxObjectShellRef & GetTmpSelectionDoc() { return xTmpSelDocSh; } diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx index 884d647725e5..5deae6b3fa9d 100644 --- a/sw/source/ui/inc/unodispatch.hxx +++ b/sw/source/ui/inc/unodispatch.hxx @@ -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 @@ -63,11 +63,11 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3 // ::osl::Mutex m_aMutex;#102295# solar mutex has to be used currently // the component which's dispatches we're intercepting - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception> m_xIntercepted; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception> m_xIntercepted; // chaining - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xSlaveDispatcher; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xMasterDispatcher; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xSlaveDispatcher; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xMasterDispatcher; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> m_xDispatch; diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx index 6399e2acba9e..007860d7100b 100644 --- a/sw/source/ui/inc/unotools.hxx +++ b/sw/source/ui/inc/unotools.hxx @@ -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 @@ -50,18 +50,18 @@ class SwOneExampleFrame; class SwFrmCtrlWindow : public Window { - SwOneExampleFrame* pExampleFrame; + SwOneExampleFrame* pExampleFrame; public: - SwFrmCtrlWindow(Window* pParent, WinBits nBits, SwOneExampleFrame* pFrame); + SwFrmCtrlWindow(Window* pParent, WinBits nBits, SwOneExampleFrame* pFrame); - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ); }; /* -----------------------------15.12.99 12:56-------------------------------- ---------------------------------------------------------------------------*/ class MenuResource : public Resource { - ResStringArray aMenuArray; + ResStringArray aMenuArray; public: MenuResource(const ResId& rResId); @@ -71,7 +71,7 @@ public: /* -----------------27.07.99 15:20------------------- --------------------------------------------------*/ -#define EX_SHOW_ONLINE_LAYOUT 0x001 +#define EX_SHOW_ONLINE_LAYOUT 0x001 // hard zoom value #define EX_SHOW_BUSINESS_CARDS 0x02 @@ -86,28 +86,28 @@ class SW_DLLPUBLIC SwOneExampleFrame ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > _xController; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > _xCursor; - SwFrmCtrlWindow aTopWindow; - Window& rWindow; - Timer aLoadedTimer; - Link aInitializedLink; + SwFrmCtrlWindow aTopWindow; + Window& rWindow; + Timer aLoadedTimer; + Link aInitializedLink; - MenuResource aMenuRes; - String sArgumentURL; + MenuResource aMenuRes; + String sArgumentURL; - SwView* pModuleView; + SwView* pModuleView; - sal_uInt32 nStyleFlags; + sal_uInt32 nStyleFlags; - sal_Bool bIsInitialized; - sal_Bool bServiceAvailable; + sal_Bool bIsInitialized; + sal_Bool bServiceAvailable; - static sal_Bool bShowServiceNotAvailableMessage; + static sal_Bool bShowServiceNotAvailableMessage; SW_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer* ); SW_DLLPRIVATE DECL_LINK( PopupHdl, Menu* ); - SW_DLLPRIVATE void CreateControl(); - SW_DLLPRIVATE void DisposeControl(); + SW_DLLPRIVATE void CreateControl(); + SW_DLLPRIVATE void DisposeControl(); public: SwOneExampleFrame(Window& rWin, @@ -116,10 +116,10 @@ public: String* pURL = 0); ~SwOneExampleFrame(); - STAR_REFERENCE( awt::XControl ) & GetControl() {return _xControl; } - STAR_REFERENCE( frame::XModel ) & GetModel() {return _xModel;} - STAR_REFERENCE( frame::XController ) & GetController() {return _xController;} - STAR_REFERENCE( text::XTextCursor ) & GetTextCursor() {return _xCursor;} + STAR_REFERENCE( awt::XControl ) & GetControl() {return _xControl; } + STAR_REFERENCE( frame::XModel ) & GetModel() {return _xModel;} + STAR_REFERENCE( frame::XController ) & GetController() {return _xController;} + STAR_REFERENCE( text::XTextCursor ) & GetTextCursor() {return _xCursor;} void ClearDocument( BOOL bStartTimer = FALSE ); @@ -128,7 +128,7 @@ public: void CreatePopup(const Point& rPt); - static void CreateErrorMessage(Window* pParent); + static void CreateErrorMessage(Window* pParent); }; #endif diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx index 91cf8823e124..828016c6e370 100644 --- a/sw/source/ui/inc/unotxvw.hxx +++ b/sw/source/ui/inc/unotxvw.hxx @@ -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 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/datatransfer/XTransferableSupplier.hpp> -#include <cppuhelper/implbase8.hxx> // helper for implementations +#include <cppuhelper/implbase8.hxx> // helper for implementations #include <svl/itemprop.hxx> #include "calbck.hxx" #include "TextCursorHelper.hxx" @@ -77,8 +77,8 @@ class SwXTextView : const SfxItemPropertySet* m_pPropSet; // property map for SwXTextView properties // (not related to pxViewSettings!) - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > * pxViewSettings; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > * pxTextViewCursor; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > * pxViewSettings; + ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > * pxTextViewCursor; SdrObject* GetControl( @@ -91,7 +91,7 @@ public: SwXTextView(SwView* pSwView); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire( ) throw(); virtual void SAL_CALL release( ) throw(); @@ -149,7 +149,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException); - void NotifySelChanged(); + void NotifySelChanged(); void NotifyDBChanged(); SwView* GetView() {return m_pView;} @@ -264,10 +264,10 @@ public: void Invalidate(){m_pView = 0;} // ITextCursorHelper - virtual const SwPaM* GetPaM() const; - virtual SwPaM* GetPaM(); - virtual const SwDoc* GetDoc() const; - virtual SwDoc* GetDoc(); + virtual const SwPaM* GetPaM() const; + virtual SwPaM* GetPaM(); + virtual const SwDoc* GetDoc() const; + virtual SwDoc* GetDoc(); }; #endif diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx index 7864bf135934..c35db3a29ed9 100644 --- a/sw/source/ui/inc/usrpref.hxx +++ b/sw/source/ui/inc/usrpref.hxx @@ -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 @@ -40,8 +40,8 @@ class SwMasterUsrPref; class SwContentViewConfig : public utl::ConfigItem { - SwMasterUsrPref& rParent; - BOOL bWeb; + SwMasterUsrPref& rParent; + BOOL bWeb; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: @@ -53,15 +53,15 @@ class SwContentViewConfig : public utl::ConfigItem virtual void Commit(); void Load(); - void SetModified(){ConfigItem::SetModified();} + void SetModified(){ConfigItem::SetModified();} }; /* -----------------------------28.09.00 09:45-------------------------------- ---------------------------------------------------------------------------*/ class SwLayoutViewConfig : public utl::ConfigItem { - SwMasterUsrPref& rParent; - BOOL bWeb; + SwMasterUsrPref& rParent; + BOOL bWeb; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: @@ -69,17 +69,17 @@ class SwLayoutViewConfig : public utl::ConfigItem ~SwLayoutViewConfig(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - virtual void Commit(); - void Load(); - void SetModified(){ConfigItem::SetModified();} + virtual void Commit(); + void Load(); + void SetModified(){ConfigItem::SetModified();} }; /* -----------------------------19.01.01 13:06-------------------------------- ---------------------------------------------------------------------------*/ class SwGridConfig : public utl::ConfigItem { - SwMasterUsrPref& rParent; - BOOL bWeb; + SwMasterUsrPref& rParent; + BOOL bWeb; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: @@ -88,15 +88,15 @@ class SwGridConfig : public utl::ConfigItem virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - void Load(); - void SetModified(){ConfigItem::SetModified();} + void Load(); + void SetModified(){ConfigItem::SetModified();} }; /* -----------------------------19.01.01 13:06-------------------------------- ---------------------------------------------------------------------------*/ class SwCursorConfig : public utl::ConfigItem { - SwMasterUsrPref& rParent; + SwMasterUsrPref& rParent; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: @@ -105,15 +105,15 @@ class SwCursorConfig : public utl::ConfigItem virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - void Load(); - void SetModified(){ConfigItem::SetModified();} + void Load(); + void SetModified(){ConfigItem::SetModified();} }; /* -----------------------------28.09.00 09:45-------------------------------- ---------------------------------------------------------------------------*/ class SwWebColorConfig : public utl::ConfigItem { - SwMasterUsrPref& rParent; + SwMasterUsrPref& rParent; com::sun::star::uno::Sequence<rtl::OUString> aPropNames; public: @@ -122,8 +122,8 @@ class SwWebColorConfig : public utl::ConfigItem virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - void Load(); - void SetModified(){ConfigItem::SetModified();} + void Load(); + void SetModified(){ConfigItem::SetModified();} }; /* -----------------------------28.09.00 09:45-------------------------------- @@ -137,14 +137,14 @@ class SwMasterUsrPref : public SwViewOption friend class SwWebColorConfig; SwFldUpdateFlags eFldUpdateFlags; //udpate of fields and charts - sal_Int32 nLinkUpdateMode; - FieldUnit eUserMetric; + sal_Int32 nLinkUpdateMode; + FieldUnit eUserMetric; FieldUnit eHScrollMetric; sal_Bool bIsHScrollMetricSet; FieldUnit eVScrollMetric; sal_Bool bIsVScrollMetricSet; - sal_Int32 nDefTab; //default tab stop distance + sal_Int32 nDefTab; //default tab stop distance sal_Bool bIsSquaredPageMode; //default page mode for text grid SwContentViewConfig aContentConfig; @@ -153,6 +153,7 @@ class SwMasterUsrPref : public SwViewOption SwCursorConfig aCursorConfig; SwWebColorConfig* pWebColorConfig; + sal_Bool bApplyCharUnit; // apply_char_unit public: SwMasterUsrPref(BOOL bWeb); ~SwMasterUsrPref(); @@ -228,7 +229,7 @@ public: }; sal_Bool IsUpdateCharts()const {return eFldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS; } - FieldUnit GetMetric() const { return eUserMetric;} + FieldUnit GetMetric() const { return eUserMetric;} void SetMetric(FieldUnit eSet, sal_Bool bNoModify = sal_False) { eUserMetric = eSet; @@ -254,6 +255,17 @@ public: aLayoutConfig.SetModified(); } + sal_Bool IsApplyCharUnit() const + { + return bApplyCharUnit; + } + void SetApplyCharUnit(BOOL bSet, sal_Bool bNoModify = sal_False) + { + bApplyCharUnit = bSet; + if(!bNoModify) + aLayoutConfig.SetModified(); + } + sal_Int32 GetDefTab() const { return nDefTab;} void SetDefTab( sal_Int32 nSet, sal_Bool bNoModify = sal_False ) { @@ -261,14 +273,14 @@ public: if(!bNoModify) aLayoutConfig.SetModified(); } - + //default page mode for text grid sal_Bool IsSquaredPageMode() const {return bIsSquaredPageMode;} - void SetDefaultPageMode( sal_Bool bVal, sal_Bool bNoModify = sal_False ) - { + void SetDefaultPageMode( sal_Bool bVal, sal_Bool bNoModify = sal_False ) + { bIsSquaredPageMode = bVal; if(!bNoModify) - aLayoutConfig.SetModified(); + aLayoutConfig.SetModified(); } }; diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/ui/inc/utlui.hrc index aa7dab24054a..17961add6636 100644 --- a/sw/source/ui/inc/utlui.hrc +++ b/sw/source/ui/inc/utlui.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 @@ -31,21 +31,21 @@ #include "rcid.hrc" -#define RID_SW_SHELLRES (RC_UTLUI_BEGIN + 1) -#define RID_STR_SYSTEM (RC_UTLUI_BEGIN + 2) +#define RID_SW_SHELLRES (RC_UTLUI_BEGIN + 1) +#define RID_STR_SYSTEM (RC_UTLUI_BEGIN + 2) // ------------------------------------------------------------------------ // Strings in NumberFormatter-Listbox -#define STR_DEFINE_NUMBERFORMAT (RC_UTLUI_BEGIN + 4) +#define STR_DEFINE_NUMBERFORMAT (RC_UTLUI_BEGIN + 4) // hyperlink status bar control #define STR_HYPERCTRL_SEL (RC_UTLUI_BEGIN + 5) #define STR_HYPERCTRL_HYP (RC_UTLUI_BEGIN + 6) // Namene der Inhaltstypen (RC_UTLUI_BEGIN + 7) #define STR_CONTENT_TYPE_FIRST (RC_UTLUI_BEGIN + 8) -#define STR_CONTENT_TYPE_OUTLINE STR_CONTENT_TYPE_FIRST -#define STR_CONTENT_TYPE_TABLE (RC_UTLUI_BEGIN + 9) +#define STR_CONTENT_TYPE_OUTLINE STR_CONTENT_TYPE_FIRST +#define STR_CONTENT_TYPE_TABLE (RC_UTLUI_BEGIN + 9) #define STR_CONTENT_TYPE_FRAME (RC_UTLUI_BEGIN + 10) #define STR_CONTENT_TYPE_GRAPHIC (RC_UTLUI_BEGIN + 11) #define STR_CONTENT_TYPE_OLE (RC_UTLUI_BEGIN + 12) @@ -53,14 +53,14 @@ #define STR_CONTENT_TYPE_REGION (RC_UTLUI_BEGIN + 14) #define STR_CONTENT_TYPE_URLFIELD (RC_UTLUI_BEGIN + 15) #define STR_CONTENT_TYPE_REFERENCE (RC_UTLUI_BEGIN + 16) -#define STR_CONTENT_TYPE_INDEX (RC_UTLUI_BEGIN + 17) -#define STR_CONTENT_TYPE_POSTIT (RC_UTLUI_BEGIN + 18) -#define STR_CONTENT_TYPE_DRAWOBJECT (RC_UTLUI_BEGIN + 19) -#define STR_CONTENT_END (RC_UTLUI_BEGIN + 19) - -#define STR_CONTENT_TYPE_SINGLE_FIRST (STR_CONTENT_END + 1) -#define STR_CONTENT_TYPE_SINGLE_OUTLINE (STR_CONTENT_TYPE_SINGLE_FIRST + 0) -#define STR_CONTENT_TYPE_SINGLE_TABLE (STR_CONTENT_TYPE_SINGLE_FIRST + 1) +#define STR_CONTENT_TYPE_INDEX (RC_UTLUI_BEGIN + 17) +#define STR_CONTENT_TYPE_POSTIT (RC_UTLUI_BEGIN + 18) +#define STR_CONTENT_TYPE_DRAWOBJECT (RC_UTLUI_BEGIN + 19) +#define STR_CONTENT_END (RC_UTLUI_BEGIN + 19) + +#define STR_CONTENT_TYPE_SINGLE_FIRST (STR_CONTENT_END + 1) +#define STR_CONTENT_TYPE_SINGLE_OUTLINE (STR_CONTENT_TYPE_SINGLE_FIRST + 0) +#define STR_CONTENT_TYPE_SINGLE_TABLE (STR_CONTENT_TYPE_SINGLE_FIRST + 1) #define STR_CONTENT_TYPE_SINGLE_FRAME (STR_CONTENT_TYPE_SINGLE_FIRST + 2) #define STR_CONTENT_TYPE_SINGLE_GRAPHIC (STR_CONTENT_TYPE_SINGLE_FIRST + 3) #define STR_CONTENT_TYPE_SINGLE_OLE (STR_CONTENT_TYPE_SINGLE_FIRST + 4) @@ -71,24 +71,24 @@ #define STR_CONTENT_TYPE_SINGLE_INDEX (STR_CONTENT_TYPE_SINGLE_FIRST + 9) #define STR_CONTENT_TYPE_SINGLE_POSTIT (STR_CONTENT_TYPE_SINGLE_FIRST + 10) #define STR_CONTENT_TYPE_SINGLE_DRAWOBJECT (STR_CONTENT_TYPE_SINGLE_FIRST + 11) -#define STR_CONTENT_SINGLE_END STR_CONTENT_TYPE_SINGLE_DRAWOBJECT - -#define FLD_DOCINFO_BEGIN STR_CONTENT_SINGLE_END -#define FLD_DOCINFO_TITEL FLD_DOCINFO_BEGIN -#define FLD_DOCINFO_THEMA (FLD_DOCINFO_BEGIN + 1) -#define FLD_DOCINFO_KEYS (FLD_DOCINFO_BEGIN + 2) -#define FLD_DOCINFO_COMMENT (FLD_DOCINFO_BEGIN + 3) -#define FLD_DOCINFO_CREATE (FLD_DOCINFO_BEGIN + 4) -#define FLD_DOCINFO_CHANGE (FLD_DOCINFO_BEGIN + 5) -#define FLD_DOCINFO_PRINT (FLD_DOCINFO_BEGIN + 6) -#define FLD_DOCINFO_DOCNO (FLD_DOCINFO_BEGIN + 7) -#define FLD_DOCINFO_EDIT (FLD_DOCINFO_BEGIN + 8) -#define FLD_DOCINFO_END (FLD_DOCINFO_BEGIN + 9) - -#define STR_SERVICE_UNAVAILABLE (FLD_DOCINFO_END + 1) - -#define STR_AUTH_TYPE_START (FLD_DOCINFO_END + 2) -#define STR_AUTH_TYPE_ARTICLE (STR_AUTH_TYPE_START + 0) +#define STR_CONTENT_SINGLE_END STR_CONTENT_TYPE_SINGLE_DRAWOBJECT + +#define FLD_DOCINFO_BEGIN STR_CONTENT_SINGLE_END +#define FLD_DOCINFO_TITEL FLD_DOCINFO_BEGIN +#define FLD_DOCINFO_THEMA (FLD_DOCINFO_BEGIN + 1) +#define FLD_DOCINFO_KEYS (FLD_DOCINFO_BEGIN + 2) +#define FLD_DOCINFO_COMMENT (FLD_DOCINFO_BEGIN + 3) +#define FLD_DOCINFO_CREATE (FLD_DOCINFO_BEGIN + 4) +#define FLD_DOCINFO_CHANGE (FLD_DOCINFO_BEGIN + 5) +#define FLD_DOCINFO_PRINT (FLD_DOCINFO_BEGIN + 6) +#define FLD_DOCINFO_DOCNO (FLD_DOCINFO_BEGIN + 7) +#define FLD_DOCINFO_EDIT (FLD_DOCINFO_BEGIN + 8) +#define FLD_DOCINFO_END (FLD_DOCINFO_BEGIN + 9) + +#define STR_SERVICE_UNAVAILABLE (FLD_DOCINFO_END + 1) + +#define STR_AUTH_TYPE_START (FLD_DOCINFO_END + 2) +#define STR_AUTH_TYPE_ARTICLE (STR_AUTH_TYPE_START + 0) #define STR_AUTH_TYPE_BOOK (STR_AUTH_TYPE_START + 1) #define STR_AUTH_TYPE_BOOKLET (STR_AUTH_TYPE_START + 2) #define STR_AUTH_TYPE_CONFERENCE (STR_AUTH_TYPE_START + 3) @@ -110,10 +110,10 @@ #define STR_AUTH_TYPE_CUSTOM3 (STR_AUTH_TYPE_START + 19) #define STR_AUTH_TYPE_CUSTOM4 (STR_AUTH_TYPE_START + 20) #define STR_AUTH_TYPE_CUSTOM5 (STR_AUTH_TYPE_START + 21) -#define STR_AUTH_TYPE_END (STR_AUTH_TYPE_CUSTOM5) +#define STR_AUTH_TYPE_END (STR_AUTH_TYPE_CUSTOM5) -#define STR_AUTH_FIELD_START (STR_AUTH_TYPE_END + 1) -#define STR_AUTH_FIELD_IDENTIFIER (STR_AUTH_FIELD_START + 0) +#define STR_AUTH_FIELD_START (STR_AUTH_TYPE_END + 1) +#define STR_AUTH_FIELD_IDENTIFIER (STR_AUTH_FIELD_START + 0) #define STR_AUTH_FIELD_AUTHORITY_TYPE (STR_AUTH_FIELD_START + 1) #define STR_AUTH_FIELD_ADDRESS (STR_AUTH_FIELD_START + 2) #define STR_AUTH_FIELD_ANNOTE (STR_AUTH_FIELD_START + 3) @@ -144,24 +144,24 @@ #define STR_AUTH_FIELD_CUSTOM4 (STR_AUTH_FIELD_START + 28) #define STR_AUTH_FIELD_CUSTOM5 (STR_AUTH_FIELD_START + 29) #define STR_AUTH_FIELD_ISBN (STR_AUTH_FIELD_START + 30) -#define STR_AUTH_FIELD_END (STR_AUTH_FIELD_ISBN) +#define STR_AUTH_FIELD_END (STR_AUTH_FIELD_ISBN) -#define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1) +#define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1) -#define DLG_NAVIGATION_PI (RC_UTLUI_BEGIN + 1) +#define DLG_NAVIGATION_PI (RC_UTLUI_BEGIN + 1) #define DLG_ADDR_PI (RC_UTLUI_BEGIN + 2) #define DLG_GLOSSARY_DECIDE_DLG (RC_UTLUI_BEGIN + 3) -#define IMG_NAVI_ENTRYBMP (RC_UTLUI_BEGIN + 4) +#define IMG_NAVI_ENTRYBMP (RC_UTLUI_BEGIN + 4) #define IMG_NAVI_ENTRYBMPH (RC_UTLUI_BEGIN + 5) #define ILIST_DB_DLG (RC_UTLUI_BEGIN + 6) #define ILIST_DB_DLG_HC (RC_UTLUI_BEGIN + 7) -#define IMG_ONE_LEFT_HC (RC_UTLUI_BEGIN + 8) -#define IMG_ONE_RIGHT_HC (RC_UTLUI_BEGIN + 9) -#define IMG_ALL_LEFT_HC (RC_UTLUI_BEGIN + 10) -#define IMG_ALL_RIGHT_HC (RC_UTLUI_BEGIN + 11) +#define IMG_ONE_LEFT_HC (RC_UTLUI_BEGIN + 8) +#define IMG_ONE_RIGHT_HC (RC_UTLUI_BEGIN + 9) +#define IMG_ALL_LEFT_HC (RC_UTLUI_BEGIN + 10) +#define IMG_ALL_RIGHT_HC (RC_UTLUI_BEGIN + 11) #define IMG_VIEWLAYOUT_AUTOMATIC (RC_UTLUI_BEGIN + 12) @@ -185,7 +185,7 @@ #define IMG_DBTABLE 2 #define IMG_DBQUERY 3 -#define UTLUI_ACT_END RES_FRMEX_MENU +#define UTLUI_ACT_END RES_FRMEX_MENU #if UTLUI_ACT_END > RC_UTLUI_END #error Resource-Id Ueberlauf in #file, #line diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index d63149eb7c4f..039f9ff32c05 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -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 @@ -101,8 +101,8 @@ namespace com{ namespace sun { namespace star { namespace sfx2 { class FileDialogHelper; } const long nLeftOfst = -370; -const long nScrollX = 30; -const long nScrollY = 30; +const long nScrollX = 30; +const long nScrollY = 30; #define MINZOOM 20 #define MAXZOOM 600 @@ -133,7 +133,7 @@ enum ShellModes }; /*-------------------------------------------------------------------- - Beschreibung: Anwendung einer Vorlage + Beschreibung: Anwendung einer Vorlage --------------------------------------------------------------------*/ struct SwApplyTemplate @@ -142,9 +142,9 @@ struct SwApplyTemplate { SwTxtFmtColl* pTxtColl; SwPageDesc* pPageDesc; - SwFrmFmt* pFrmFmt; - SwCharFmt* pCharFmt; - SwNumRule* pNumRule; + SwFrmFmt* pFrmFmt; + SwCharFmt* pCharFmt; + SwNumRule* pNumRule; } aColl; int eType; @@ -164,7 +164,7 @@ struct SwApplyTemplate /*-------------------------------------------------------------------- - Beschreibung: Sicht auf ein Dokument + Beschreibung: Sicht auf ein Dokument --------------------------------------------------------------------*/ class SW_DLLPUBLIC SwView: public SfxViewShell @@ -182,90 +182,90 @@ class SW_DLLPUBLIC SwView: public SfxViewShell static SvxSearchDialog *pSrchDlg; static SvxSearchItem *pSrchItem; - static USHORT nInsertCtrlState; - static USHORT nWebInsertCtrlState; - static USHORT nInsertObjectCtrlState; - static USHORT nInsertFieldCtrlState; - static USHORT nMoveType; // fuer Buttons unter dem Scrollbar (viewmdi) + static USHORT nInsertCtrlState; + static USHORT nWebInsertCtrlState; + static USHORT nInsertObjectCtrlState; + static USHORT nInsertFieldCtrlState; + static USHORT nMoveType; // fuer Buttons unter dem Scrollbar (viewmdi) static sal_Int32 nActMark; // aktuelle Sprungmarke fuer unbenannte Merker static BOOL bExtra; static BOOL bFound; - static BOOL bJustOpened; + static BOOL bJustOpened; static SearchAttrItemList* pSrchList; static SearchAttrItemList* pReplList; SvxHtmlOptions aHTMLOpt; - Timer aTimer; //Fuer verzoegerte ChgLnks waehrend + Timer aTimer; //Fuer verzoegerte ChgLnks waehrend //einer Aktion - String aPageStr; //Statusanzeige, aktuelle Seite - String sSwViewData, + String aPageStr; //Statusanzeige, aktuelle Seite + String sSwViewData, //and the new cursor position if the user double click in the PagePreView sNewCrsrPos; // to support keyboard the number of the page to go to can be set too USHORT nNewPage; - Point aTabColFromDocPos; //Verschieben von Tabellenspalten aus + Point aTabColFromDocPos; //Verschieben von Tabellenspalten aus //aus dem Dokument heraus. SwTxtNode * pNumRuleNodeFromDoc; // Moving indent of numrule #i23726# - Size aDocSz; // aktuelle Dokumentgroesse - Rectangle aVisArea; // sichtbarer Bereich + Size aDocSz; // aktuelle Dokumentgroesse + Rectangle aVisArea; // sichtbarer Bereich - SwEditWin *pEditWin; - SwWrtShell *pWrtShell; + SwEditWin *pEditWin; + SwWrtShell *pWrtShell; - SfxShell *pShell; //aktuelle SubShell auf dem Dispatcher - FmFormShell *pFormShell; // DB-FormShell + SfxShell *pShell; //aktuelle SubShell auf dem Dispatcher + FmFormShell *pFormShell; // DB-FormShell - SwView_Impl *pViewImpl; // Impl-Daten fuer UNO + Basic + SwView_Impl *pViewImpl; // Impl-Daten fuer UNO + Basic - SwScrollbar *pHScrollbar, // MDI Bedienelemente + SwScrollbar *pHScrollbar, // MDI Bedienelemente *pVScrollbar; - Window *pScrollFill; // Dummy-Window zum Fuellen der rechten + Window *pScrollFill; // Dummy-Window zum Fuellen der rechten // unteren Ecke, wenn beide Scrollbars // aktiv sind SvxRuler *pHRuler, *pVRuler; - ImageButton *pTogglePageBtn; + ImageButton *pTogglePageBtn; - SwHlpImageButton *pPageUpBtn, + SwHlpImageButton *pPageUpBtn, *pPageDownBtn; - SwNaviImageButton *pNaviBtn; - SwGlossaryHdl *pGlosHdl; // Henkel Textbausteine - SwDrawBase *pDrawActual; + SwNaviImageButton *pNaviBtn; + SwGlossaryHdl *pGlosHdl; // Henkel Textbausteine + SwDrawBase *pDrawActual; - const SwFrmFmt *pLastTableFormat; + const SwFrmFmt *pLastTableFormat; SwFormatClipboard *pFormatClipboard; //holds data for format paintbrush - SwPostItMgr *mpPostItMgr; + SwPostItMgr *mpPostItMgr; - int nSelectionType; + int nSelectionType; static const int MASTERENUMCOMMANDS = 6; - String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ]; + String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ]; USHORT nPageCnt; // Aktueller Drawmode - USHORT nDrawSfxId; + USHORT nDrawSfxId; String sDrawCustom; //some drawing types are marked with strings! - USHORT nFormSfxId; - USHORT nLastPasteDestination; + USHORT nFormSfxId; + USHORT nLastPasteDestination; // save the border distance status from SwView::StateTabWin to re-use it in SwView::ExecTabWin() USHORT nLeftBorderDistance; USHORT nRightBorderDistance; - BOOL bCenterCrsr : 1, + BOOL bCenterCrsr : 1, bTopCrsr : 1, bAllwaysShowSel : 1, bTabColFromDoc : 1, @@ -291,17 +291,17 @@ class SW_DLLPUBLIC SwView: public SfxViewShell // Methoden fuers Suchen // Suchkontext setzen - SW_DLLPRIVATE BOOL SearchAndWrap(BOOL bApi = FALSE); - SW_DLLPRIVATE BOOL SearchAll(USHORT* pFound = 0); - SW_DLLPRIVATE ULONG FUNC_Search( const SwSearchOptions& rOptions ); - SW_DLLPRIVATE void Replace(); + SW_DLLPRIVATE BOOL SearchAndWrap(BOOL bApi = FALSE); + SW_DLLPRIVATE BOOL SearchAll(USHORT* pFound = 0); + SW_DLLPRIVATE ULONG FUNC_Search( const SwSearchOptions& rOptions ); + SW_DLLPRIVATE void Replace(); - BOOL IsDocumentBorder(); + BOOL IsDocumentBorder(); - SW_DLLPRIVATE BOOL IsTextTool() const; + SW_DLLPRIVATE BOOL IsTextTool() const; // Bedienelemente verwalten anlegen - SW_DLLPRIVATE void CreateBtns(); + SW_DLLPRIVATE void CreateBtns(); SW_DLLPRIVATE DECL_LINK( BtnPage, Button * ); SW_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer * ); @@ -309,37 +309,37 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE DECL_LINK( HtmlOptionsHdl, void * ); - inline long GetXScroll() const; - inline long GetYScroll() const; - SW_DLLPRIVATE Point AlignToPixel(const Point& rPt) const; - SW_DLLPRIVATE void CalcPt( Point* pPt,const Rectangle& rRect, + inline long GetXScroll() const; + inline long GetYScroll() const; + SW_DLLPRIVATE Point AlignToPixel(const Point& rPt) const; + SW_DLLPRIVATE void CalcPt( Point* pPt,const Rectangle& rRect, USHORT nRangeX = USHRT_MAX, USHORT nRangeY = USHRT_MAX); - SW_DLLPRIVATE BOOL GetPageScrollUpOffset(SwTwips& rOff) const; - SW_DLLPRIVATE BOOL GetPageScrollDownOffset(SwTwips& rOff) const; + SW_DLLPRIVATE BOOL GetPageScrollUpOffset(SwTwips& rOff) const; + SW_DLLPRIVATE BOOL GetPageScrollDownOffset(SwTwips& rOff) const; // Scrollbar Movements - SW_DLLPRIVATE long PageUp(); - SW_DLLPRIVATE long PageDown(); - SW_DLLPRIVATE long PageUpCrsr(BOOL bSelect); - SW_DLLPRIVATE long PageDownCrsr(BOOL bSelect); - SW_DLLPRIVATE long PhyPageUp(); - SW_DLLPRIVATE long PhyPageDown(); + SW_DLLPRIVATE long PageUp(); + SW_DLLPRIVATE long PageDown(); + SW_DLLPRIVATE long PageUpCrsr(BOOL bSelect); + SW_DLLPRIVATE long PageDownCrsr(BOOL bSelect); + SW_DLLPRIVATE long PhyPageUp(); + SW_DLLPRIVATE long PhyPageDown(); SW_DLLPRIVATE int _CreateScrollbar( BOOL bHori ); SW_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * ); SW_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * ); - SW_DLLPRIVATE BOOL UpdateScrollbars(); - SW_DLLPRIVATE void CalcVisArea( const Size &rPixelSz ); + SW_DLLPRIVATE BOOL UpdateScrollbars(); + SW_DLLPRIVATE void CalcVisArea( const Size &rPixelSz ); SW_DLLPRIVATE void CreatePageButtons(BOOL bShow); // Linguistik-Funktionen - SW_DLLPRIVATE void HyphenateDocument(); - SW_DLLPRIVATE BOOL IsDrawTextHyphenate(); - SW_DLLPRIVATE void HyphenateDrawText(); - SW_DLLPRIVATE void StartThesaurus(); + SW_DLLPRIVATE void HyphenateDocument(); + SW_DLLPRIVATE BOOL IsDrawTextHyphenate(); + SW_DLLPRIVATE void HyphenateDrawText(); + SW_DLLPRIVATE void StartThesaurus(); // text conversion SW_DLLPRIVATE void StartTextConversion( LanguageType nSourceLang, LanguageType nTargetLang, const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive ); @@ -350,60 +350,60 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs = 0 ); SW_DLLPRIVATE void HyphStart( SvxSpellArea eSpell ); - SW_DLLPRIVATE BOOL CheckSpecialCntnt(); - SW_DLLPRIVATE void SpellKontext(BOOL bOn = TRUE) + SW_DLLPRIVATE BOOL CheckSpecialCntnt(); + SW_DLLPRIVATE void SpellKontext(BOOL bOn = TRUE) { bCenterCrsr = bOn; bAllwaysShowSel = bOn; } // Methoden fuers Printing - SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); - SW_DLLPRIVATE virtual PrintDialog* CreatePrintDialog( Window* pParent ); - SfxTabPage* CreatePrintOptionsPage( Window* pParent, + SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); + SW_DLLPRIVATE virtual PrintDialog* CreatePrintDialog( Window* pParent ); + SfxTabPage* CreatePrintOptionsPage( Window* pParent, const SfxItemSet& rSet); // fuer Readonly-Umschaltung - SW_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - SW_DLLPRIVATE void _CheckReadonlyState(); - SW_DLLPRIVATE void _CheckReadonlySelection(); + SW_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + SW_DLLPRIVATE void _CheckReadonlyState(); + SW_DLLPRIVATE void _CheckReadonlySelection(); // Methode fuer PageDesc drehen - SW_DLLPRIVATE void SwapPageMargin(const SwPageDesc&, SvxLRSpaceItem& rLR); + SW_DLLPRIVATE void SwapPageMargin(const SwPageDesc&, SvxLRSpaceItem& rLR); - SW_DLLPRIVATE void _SetZoom( const Size &rEditSz, + SW_DLLPRIVATE void _SetZoom( const Size &rEditSz, SvxZoomType eZoomType, short nFactor = 100, BOOL bViewOnly = FALSE); - SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, BOOL bInner ); + SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, BOOL bInner ); - SW_DLLPRIVATE void ShowAtResize(); + SW_DLLPRIVATE void ShowAtResize(); - SW_DLLPRIVATE virtual void Move(); + SW_DLLPRIVATE virtual void Move(); SW_DLLPRIVATE BOOL InsertGraphicDlg( SfxRequest& ); protected: - SwView_Impl* GetViewImpl() {return pViewImpl;} + SwView_Impl* GetViewImpl() {return pViewImpl;} void ImpSetVerb( int nSelType ); - int GetSelectionType() const { return nSelectionType; } - void SetSelectionType(int nSet) { nSelectionType = nSet;} + int GetSelectionType() const { return nSelectionType; } + void SetSelectionType(int nSet) { nSelectionType = nSet;} // fuer die SwWebView - void SetShell( SfxShell* pS ) { pShell = pS; } - void SetFormShell( FmFormShell* pSh ) { pFormShell = pSh; } + void SetShell( SfxShell* pS ) { pShell = pS; } + void SetFormShell( FmFormShell* pSh ) { pFormShell = pSh; } - virtual void SelectShell(); + virtual void SelectShell(); - virtual void Activate(BOOL); - virtual void Deactivate(BOOL); - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); - virtual Size GetOptimalSizePixel() const; + virtual void Activate(BOOL); + virtual void Deactivate(BOOL); + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); + virtual Size GetOptimalSizePixel() const; - void SetImageButtonColor(Color& rColor); + void SetImageButtonColor(Color& rColor); const SwFrmFmt* GetLastTblFrmFmt() const {return pLastTableFormat;} - void SetLastTblFrmFmt(const SwFrmFmt* pSet) {pLastTableFormat = pSet;} + void SetLastTblFrmFmt(const SwFrmFmt* pSet) {pLastTableFormat = pSet;} // form letter execution void GenerateFormLetter(BOOL bUseCurrentDocument); @@ -416,26 +416,26 @@ public: SFX_DECL_INTERFACE(SW_VIEWSHELL) TYPEINFO(); - SfxDispatcher &GetDispatcher(); + SfxDispatcher &GetDispatcher(); void GotFocus() const; - virtual SdrView* GetDrawView() const; - virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); - virtual void ShowCursor( FASTBOOL bOn = TRUE ); - virtual ErrCode DoVerb( long nVerb ); + virtual SdrView* GetDrawView() const; + virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); + virtual void ShowCursor( FASTBOOL bOn = TRUE ); + virtual ErrCode DoVerb( long nVerb ); - virtual USHORT SetPrinter( SfxPrinter* pNew, + virtual USHORT SetPrinter( SfxPrinter* pNew, USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false); - ShellModes GetShellMode(); + ShellModes GetShellMode(); - com::sun::star::view::XSelectionSupplier* GetUNOObject(); + com::sun::star::view::XSelectionSupplier* GetUNOObject(); - String GetSelectionTextParam( BOOL bCompleteWords, + String GetSelectionTextParam( BOOL bCompleteWords, BOOL bEraseTrail ); - virtual BOOL HasSelection( BOOL bText ) const; - virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); - virtual void MarginChanged(); + virtual BOOL HasSelection( BOOL bText ) const; + virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); + virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); + virtual void MarginChanged(); // replace word/selection with text from the thesaurus // (this code has special handling for "in word" character) @@ -444,12 +444,12 @@ public: String GetThesaurusLookUpText( bool bSelection ) const; // Shell sofort wechseln -> fuer GetSelectionObject - void StopShellTimer(); + void StopShellTimer(); - inline SwWrtShell& GetWrtShell () const { return *pWrtShell; } - inline SwWrtShell* GetWrtShellPtr() const { return pWrtShell; } + inline SwWrtShell& GetWrtShell () const { return *pWrtShell; } + inline SwWrtShell* GetWrtShellPtr() const { return pWrtShell; } - inline SwEditWin &GetEditWin() { return *pEditWin; } + inline SwEditWin &GetEditWin() { return *pEditWin; } inline const SwEditWin &GetEditWin () const { return *pEditWin; } #if defined WIN || defined WNT || defined UNX @@ -457,29 +457,29 @@ public: #endif //Handler fuer Textbausteine an die Textshell rausreichen, gfs. anlegen - SwGlossaryHdl* GetGlosHdl(); + SwGlossaryHdl* GetGlosHdl(); - inline const Rectangle& GetVisArea() const { return aVisArea; } + inline const Rectangle& GetVisArea() const { return aVisArea; } - BOOL IsScroll(const Rectangle& rRect) const; - void Scroll( const Rectangle& rRect, + BOOL IsScroll(const Rectangle& rRect) const; + void Scroll( const Rectangle& rRect, USHORT nRangeX = USHRT_MAX, USHORT nRangeY = USHRT_MAX); - long SetVScrollMax(long lMax); - long SetHScrollMax(long lMax); + long SetVScrollMax(long lMax); + long SetHScrollMax(long lMax); DECL_LINK( SpellError, LanguageType * ); - BOOL ExecSpellPopup( const Point& rPt ); + BOOL ExecSpellPopup( const Point& rPt ); BOOL ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM ); // SMARTTAGS BOOL ExecSmartTagPopup( const Point& rPt ); DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*); - BOOL ExecDrwTxtSpellPopup(const Point& rPt); + BOOL ExecDrwTxtSpellPopup(const Point& rPt); - void SetTabColFromDocPos( const Point &rPt ) { aTabColFromDocPos = rPt; } - void SetTabColFromDoc( BOOL b ) { bTabColFromDoc = b; } + void SetTabColFromDocPos( const Point &rPt ) { aTabColFromDocPos = rPt; } + void SetTabColFromDoc( BOOL b ) { bTabColFromDoc = b; } BOOL IsTabColFromDoc() const { return bTabColFromDoc; } void SetTabRowFromDoc( BOOL b ) { bTabRowFromDoc = b; } BOOL IsTabRowFromDoc() const { return bTabRowFromDoc; } @@ -491,26 +491,26 @@ public: BOOL IsNumIndentFromDoc() const { return NULL != pNumRuleNodeFromDoc; } // <- #i23726# - void DocSzChgd( const Size& rNewSize ); - const Size& GetDocSz() const { return aDocSz; } - virtual void SetVisArea( const Rectangle&, BOOL bUpdateScrollbar = TRUE); - void SetVisArea( const Point&, BOOL bUpdateScrollbar = TRUE); - void CheckVisArea(); + void DocSzChgd( const Size& rNewSize ); + const Size& GetDocSz() const { return aDocSz; } + virtual void SetVisArea( const Rectangle&, BOOL bUpdateScrollbar = TRUE); + void SetVisArea( const Point&, BOOL bUpdateScrollbar = TRUE); + void CheckVisArea(); static LAYOUT_NS Dialog* GetSearchDialog(); - static USHORT GetMoveType(); - static void SetMoveType(USHORT nSet); + static USHORT GetMoveType(); + static void SetMoveType(USHORT nSet); DECL_STATIC_LINK( SwView, MoveNavigationHdl, bool* ); // #i75416# - static void SetActMark(sal_Int32 nSet); + static void SetActMark(sal_Int32 nSet); - BOOL HandleWheelCommands( const CommandEvent& ); + BOOL HandleWheelCommands( const CommandEvent& ); // Rahmen einfuegen - void InsFrmMode(USHORT nCols); + void InsFrmMode(USHORT nCols); - void SetZoom( SvxZoomType eZoomType, short nFactor = 100, BOOL bViewOnly = FALSE); - virtual void SetZoomFactor( const Fraction &rX, const Fraction & ); + void SetZoom( SvxZoomType eZoomType, short nFactor = 100, BOOL bViewOnly = FALSE); + virtual void SetZoomFactor( const Fraction &rX, const Fraction & ); void SetViewLayout( USHORT nColumns, bool bBookMode, BOOL bViewOnly = FALSE ); @@ -526,63 +526,63 @@ public: int KillTab(); int StatVLineal() const { return ((Window*)pVRuler)->IsVisible(); } - void ChangeVLinealMetric(FieldUnit eUnit); + void ChangeVLinealMetric(FieldUnit eUnit); void GetVLinealMetric(FieldUnit& rToFill) const; int StatTab() const { return ((Window*)pHRuler)->IsVisible(); } SvxRuler& GetHLineal() { return *pHRuler; } SvxRuler& GetVLineal() { return *pVRuler; } - void InvalidateRulerPos(); - void ChangeTabMetric(FieldUnit eUnit); + void InvalidateRulerPos(); + void ChangeTabMetric(FieldUnit eUnit); void GetHLinealMetric(FieldUnit& rToFill) const; // Handler - void Execute(SfxRequest&); - void ExecPageMove(SfxRequest&); - void ExecStyle(SfxRequest&); - void ExecLingu(SfxRequest&); - void ExecDataBase(SfxRequest&); - void ExecDlg(SfxRequest&); - void ExecDlgExt(SfxRequest&); - void ExecDBDlg(SfxRequest &); - void ExecColl(SfxRequest&); - void ExecutePrint(SfxRequest&); - void ExecDraw(SfxRequest&); - void ExecTabWin(SfxRequest&); - void ExecuteStatusLine(SfxRequest&); + void Execute(SfxRequest&); + void ExecPageMove(SfxRequest&); + void ExecStyle(SfxRequest&); + void ExecLingu(SfxRequest&); + void ExecDataBase(SfxRequest&); + void ExecDlg(SfxRequest&); + void ExecDlgExt(SfxRequest&); + void ExecDBDlg(SfxRequest &); + void ExecColl(SfxRequest&); + void ExecutePrint(SfxRequest&); + void ExecDraw(SfxRequest&); + void ExecTabWin(SfxRequest&); + void ExecuteStatusLine(SfxRequest&); DECL_LINK( ExecRulerClick, Ruler * ); - void ExecSearch(SfxRequest&, BOOL bNoMessage = FALSE); + void ExecSearch(SfxRequest&, BOOL bNoMessage = FALSE); void ExecViewOptions(SfxRequest &); void StateViewOptions(SfxItemSet &); void StateSearch(SfxItemSet &); - void GetState(SfxItemSet&); - void StateStatusLine(SfxItemSet&); + void GetState(SfxItemSet&); + void StateStatusLine(SfxItemSet&); // Funktionen fuer Drawing - void SetDrawFuncPtr(SwDrawBase* pFuncPtr); - inline SwDrawBase* GetDrawFuncPtr(/*BOOL bBuf = FALSE*/) const { return pDrawActual; } - void GetDrawState(SfxItemSet &rSet); - void ExitDraw(); - inline BOOL IsDrawRotate() { return bDrawRotate; } - inline void FlipDrawRotate() { bDrawRotate = !bDrawRotate; } - inline BOOL IsDrawSelMode() { return bDrawSelMode; } - void SetSelDrawSlot(); - inline void FlipDrawSelMode() { bDrawSelMode = !bDrawSelMode; } - void NoRotate(); // Rotate-Mode abschalten - BOOL EnterDrawTextMode(const Point& aDocPos); + void SetDrawFuncPtr(SwDrawBase* pFuncPtr); + inline SwDrawBase* GetDrawFuncPtr(/*BOOL bBuf = FALSE*/) const { return pDrawActual; } + void GetDrawState(SfxItemSet &rSet); + void ExitDraw(); + inline BOOL IsDrawRotate() { return bDrawRotate; } + inline void FlipDrawRotate() { bDrawRotate = !bDrawRotate; } + inline BOOL IsDrawSelMode() { return bDrawSelMode; } + void SetSelDrawSlot(); + inline void FlipDrawSelMode() { bDrawSelMode = !bDrawSelMode; } + void NoRotate(); // Rotate-Mode abschalten + BOOL EnterDrawTextMode(const Point& aDocPos); void LeaveDrawCreate() { nDrawSfxId = nFormSfxId = USHRT_MAX; sDrawCustom.Erase();} - BOOL IsDrawMode() { return (nDrawSfxId != USHRT_MAX || nFormSfxId != USHRT_MAX); } - BOOL IsFormMode() const; - BOOL IsBezierEditMode(); - BOOL AreOnlyFormsSelected() const; - BOOL HasDrwObj(SdrObject *pSdrObj) const; - BOOL HasOnlyObj(SdrObject *pSdrObj, UINT32 eObjInventor) const; - BOOL BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=NULL, + BOOL IsDrawMode() { return (nDrawSfxId != USHRT_MAX || nFormSfxId != USHRT_MAX); } + BOOL IsFormMode() const; + BOOL IsBezierEditMode(); + BOOL AreOnlyFormsSelected() const; + BOOL HasDrwObj(SdrObject *pSdrObj) const; + BOOL HasOnlyObj(SdrObject *pSdrObj, UINT32 eObjInventor) const; + BOOL BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=NULL, Window* pWin=NULL, bool bIsNewObj=false, bool bSetSelectionToStart=false ); - void StateTabWin(SfxItemSet&); + void StateTabWin(SfxItemSet&); // Attribute haben sich geaendert DECL_LINK( AttrChangedNotify, SwWrtShell * ); @@ -591,34 +591,34 @@ public: DECL_LINK( FormControlActivated, FmFormShell* ); // Links bearbeiten - void EditLinkDlg(); - void AutoCaption(const USHORT nType, const SvGlobalName *pOleId = 0); - void InsertCaption(const InsCaptionOpt *pOpt); + void EditLinkDlg(); + void AutoCaption(const USHORT nType, const SvGlobalName *pOleId = 0); + void InsertCaption(const InsCaptionOpt *pOpt); // Async Aufruf durch Core void UpdatePageNums(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr); - String GetPageStr(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr); + String GetPageStr(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr); // Shell rausreichen - SfxShell *GetCurShell() { return pShell; } - SwDocShell *GetDocShell(); - inline const SwDocShell *GetDocShell() const; - inline FmFormShell *GetFormShell() { return pFormShell; } - inline const FmFormShell *GetFormShell() const { return pFormShell; } + SfxShell *GetCurShell() { return pShell; } + SwDocShell *GetDocShell(); + inline const SwDocShell *GetDocShell() const; + inline FmFormShell *GetFormShell() { return pFormShell; } + inline const FmFormShell *GetFormShell() const { return pFormShell; } //damit in DToren der SubShells ggf. pShell zurueckgesetzt werden kann - void ResetSubShell() { pShell = 0; } + void ResetSubShell() { pShell = 0; } - virtual void WriteUserData(String &, BOOL bBrowse = FALSE ); - virtual void ReadUserData(const String &, BOOL bBrowse = FALSE ); + virtual void WriteUserData(String &, BOOL bBrowse = FALSE ); + virtual void ReadUserData(const String &, BOOL bBrowse = FALSE ); virtual void ReadUserDataSequence ( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse ); virtual void WriteUserDataSequence ( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse ); void SetCrsrAtTop( BOOL bFlag, BOOL bCenter = FALSE ) { bTopCrsr = bFlag, bCenterCrsr = bCenter; } - BOOL IsCrsrAtTop() const { return bTopCrsr; } - BOOL IsCrsrAtCenter() const { return bCenterCrsr; } + BOOL IsCrsrAtTop() const { return bTopCrsr; } + BOOL IsCrsrAtCenter() const { return bCenterCrsr; } BOOL JumpToSwMark( const String& rMark ); @@ -683,14 +683,14 @@ inline long SwView::GetYScroll() const return aVisArea.GetHeight() * nScrollY / 100L; } -inline const SwDocShell *SwView::GetDocShell() const +inline const SwDocShell *SwView::GetDocShell() const { return ((SwView*)this)->GetDocShell(); } //*********************************************************** -SfxTabPage* CreatePrintOptionsPage( Window *pParent, +SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions, BOOL bPreview); diff --git a/sw/source/ui/inc/viewlayoutctrl.hxx b/sw/source/ui/inc/viewlayoutctrl.hxx index 60d05b63a79e..cc1c7a9c4260 100644 --- a/sw/source/ui/inc/viewlayoutctrl.hxx +++ b/sw/source/ui/inc/viewlayoutctrl.hxx @@ -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/inc/web.hrc b/sw/source/ui/inc/web.hrc index e9e446d62cdb..7f6f1b8c85f6 100644 --- a/sw/source/ui/inc/web.hrc +++ b/sw/source/ui/inc/web.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 @@ -30,37 +30,37 @@ #include "rcid.hrc" -#define RC_WEB_ICON (RC_WEB_BEGIN + 1) -#define RID_WEBTOOLS_TOOLBOX (RC_WEB_BEGIN + 2) -#define RID_WEBTEXT_TOOLBOX (RC_WEB_BEGIN + 3) -#define STR_HUMAN_SWWEBDOC_NAME (RC_WEB_BEGIN + 4) -#define STR_WRITER_WEBDOC_FULLTYPE_40 (RC_WEB_BEGIN + 5) -#define STR_SHELLNAME_WEBTEXT (RC_WEB_BEGIN + 6) -#define STR_SHELLNAME_WEBFRAME (RC_WEB_BEGIN + 7) -#define RID_WEBFRAME_TOOLBOX (RC_WEB_BEGIN + 8) -#define STR_WRITER_WEBDOC_FULLTYPE_50 (RC_WEB_BEGIN + 9) -#define RID_WEBGRAPHIC_TOOLBOX (RC_WEB_BEGIN + 10) -#define RID_WEBOLE_TOOLBOX (RC_WEB_BEGIN + 11) -#define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12) +#define RC_WEB_ICON (RC_WEB_BEGIN + 1) +#define RID_WEBTOOLS_TOOLBOX (RC_WEB_BEGIN + 2) +#define RID_WEBTEXT_TOOLBOX (RC_WEB_BEGIN + 3) +#define STR_HUMAN_SWWEBDOC_NAME (RC_WEB_BEGIN + 4) +#define STR_WRITER_WEBDOC_FULLTYPE_40 (RC_WEB_BEGIN + 5) +#define STR_SHELLNAME_WEBTEXT (RC_WEB_BEGIN + 6) +#define STR_SHELLNAME_WEBFRAME (RC_WEB_BEGIN + 7) +#define RID_WEBFRAME_TOOLBOX (RC_WEB_BEGIN + 8) +#define STR_WRITER_WEBDOC_FULLTYPE_50 (RC_WEB_BEGIN + 9) +#define RID_WEBGRAPHIC_TOOLBOX (RC_WEB_BEGIN + 10) +#define RID_WEBOLE_TOOLBOX (RC_WEB_BEGIN + 11) +#define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12) -#define MN_WEBFILE (RC_WEB_BEGIN + 30) -#define MN_WEBEDIT (RC_WEB_BEGIN + 31) -#define MN_WEBVIEW (RC_WEB_BEGIN + 32) -#define MN_WEBINS (RC_WEB_BEGIN + 33) -#define MN_WEBFORMAT (RC_WEB_BEGIN + 34) -#define MN_WEBEXTRA (RC_WEB_BEGIN + 35) -#define MN_WEBWIN (RC_WEB_BEGIN + 36) +#define MN_WEBFILE (RC_WEB_BEGIN + 30) +#define MN_WEBEDIT (RC_WEB_BEGIN + 31) +#define MN_WEBVIEW (RC_WEB_BEGIN + 32) +#define MN_WEBINS (RC_WEB_BEGIN + 33) +#define MN_WEBFORMAT (RC_WEB_BEGIN + 34) +#define MN_WEBEXTRA (RC_WEB_BEGIN + 35) +#define MN_WEBWIN (RC_WEB_BEGIN + 36) -#define MN_WEB_TEXT_POPUPMENU (RC_WEB_BEGIN + 46) +#define MN_WEB_TEXT_POPUPMENU (RC_WEB_BEGIN + 46) -#define MN_WEBFILE_PORT (RC_WEB_BEGIN + 47) -#define MN_WEBEDIT_PORT (RC_WEB_BEGIN + 48) -#define MN_WEBVIEW_PORT (RC_WEB_BEGIN + 49) -#define MN_WEBINS_PORT (RC_WEB_BEGIN + 50) -#define MN_WEBFORMAT_PORT (RC_WEB_BEGIN + 51) -#define MN_WEBEXTRA_PORT (RC_WEB_BEGIN + 52) -#define MN_WEBWIN_PORT (RC_WEB_BEGIN + 53) +#define MN_WEBFILE_PORT (RC_WEB_BEGIN + 47) +#define MN_WEBEDIT_PORT (RC_WEB_BEGIN + 48) +#define MN_WEBVIEW_PORT (RC_WEB_BEGIN + 49) +#define MN_WEBINS_PORT (RC_WEB_BEGIN + 50) +#define MN_WEBFORMAT_PORT (RC_WEB_BEGIN + 51) +#define MN_WEBEXTRA_PORT (RC_WEB_BEGIN + 52) +#define MN_WEBWIN_PORT (RC_WEB_BEGIN + 53) // ------------------------------------------------------------------------ diff --git a/sw/source/ui/inc/wformsh.hxx b/sw/source/ui/inc/wformsh.hxx index abd98d510e65..3f2831df86fb 100644 --- a/sw/source/ui/inc/wformsh.hxx +++ b/sw/source/ui/inc/wformsh.hxx @@ -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/inc/wfrmsh.hxx b/sw/source/ui/inc/wfrmsh.hxx index dfe5bd5f422f..894c9112bbf0 100644 --- a/sw/source/ui/inc/wfrmsh.hxx +++ b/sw/source/ui/inc/wfrmsh.hxx @@ -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/inc/wgrfsh.hxx b/sw/source/ui/inc/wgrfsh.hxx index b53743885d66..b15a51a127c8 100644 --- a/sw/source/ui/inc/wgrfsh.hxx +++ b/sw/source/ui/inc/wgrfsh.hxx @@ -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/inc/wlistsh.hxx b/sw/source/ui/inc/wlistsh.hxx index e3503a54e448..948212705321 100644 --- a/sw/source/ui/inc/wlistsh.hxx +++ b/sw/source/ui/inc/wlistsh.hxx @@ -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/inc/wolesh.hxx b/sw/source/ui/inc/wolesh.hxx index 87b48db5593e..7e8faa25ce0e 100644 --- a/sw/source/ui/inc/wolesh.hxx +++ b/sw/source/ui/inc/wolesh.hxx @@ -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/inc/wordcountdialog.hxx b/sw/source/ui/inc/wordcountdialog.hxx index a228b8bdea77..d3d7a7d75691 100644 --- a/sw/source/ui/inc/wordcountdialog.hxx +++ b/sw/source/ui/inc/wordcountdialog.hxx @@ -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 @@ -53,7 +53,7 @@ class SwWordCountDialog : public SfxModalDialog OKButton aOK; HelpButton aHelp; -public: +public: SwWordCountDialog(Window* pParent); ~SwWordCountDialog(); diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx index 4ca42086d93e..6996ea11090a 100644 --- a/sw/source/ui/inc/workctrl.hxx +++ b/sw/source/ui/inc/workctrl.hxx @@ -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 @@ -40,8 +40,8 @@ class SwView; // doppelter Eintrag! hrc und hxx // diese Ids bestimmen, was die Buttons unter dem Scrollbar tun #define NID_START 20000 -#define NID_NEXT 20000 -#define NID_PREV 20001 +#define NID_NEXT 20000 +#define NID_PREV 20001 #define NID_TBL 20002 #define NID_FRM 20003 #define NID_PGE 20004 @@ -49,17 +49,17 @@ class SwView; #define NID_CTRL 20006 #define NID_REG 20007 #define NID_BKM 20008 -#define NID_GRF 20009 -#define NID_OLE 20010 -#define NID_OUTL 20011 -#define NID_SEL 20012 -#define NID_FTN 20013 -#define NID_MARK 20014 +#define NID_GRF 20009 +#define NID_OLE 20010 +#define NID_OUTL 20011 +#define NID_SEL 20012 +#define NID_FTN 20013 +#define NID_MARK 20014 #define NID_POSTIT 20015 #define NID_SRCH_REP 20016 #define NID_INDEX_ENTRY 20017 -#define NID_TABLE_FORMULA 20018 -#define NID_TABLE_FORMULA_ERROR 20019 +#define NID_TABLE_FORMULA 20018 +#define NID_TABLE_FORMULA_ERROR 20019 #define NID_COUNT 20 @@ -70,10 +70,10 @@ class SwView; class SwTbxInsertCtrl : public SfxToolBoxControl { - USHORT nLastSlotId; + USHORT nLastSlotId; using SfxToolBoxControl::Select; - virtual void Select( BOOL bMod1 = FALSE ); + virtual void Select( BOOL bMod1 = FALSE ); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -81,9 +81,9 @@ public: SwTbxInsertCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); ~SwTbxInsertCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, + virtual SfxPopupWindowType GetPopupWindowType() const; + virtual SfxPopupWindow* CreatePopupWindow(); + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); @@ -96,20 +96,20 @@ public: class SwTbxAutoTextCtrl : public SfxToolBoxControl { - PopupMenu* pPopup; - SwView* pView; + PopupMenu* pPopup; + SwView* pView; - void DelPopup(); + void DelPopup(); public: SFX_DECL_TOOLBOX_CONTROL(); SwTbxAutoTextCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); ~SwTbxAutoTextCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, + virtual SfxPopupWindowType GetPopupWindowType() const; + virtual SfxPopupWindow* CreatePopupWindow(); + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); @@ -123,8 +123,8 @@ public: class SwScrollNaviToolBox : public ToolBox { - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); public: SwScrollNaviToolBox(Window* pParent, WinBits nWinStyle ) : @@ -136,16 +136,16 @@ class SwScrollNaviPopup : public SfxPopupWindow SwScrollNaviToolBox aToolBox; FixedLine aSeparator; FixedInfo aInfoField; - ImageList aIList; + ImageList aIList; ImageList aIListH; - String sQuickHelp[2 * NID_COUNT]; + String sQuickHelp[2 * NID_COUNT]; - USHORT nFwdId; - USHORT nBackId; + USHORT nFwdId; + USHORT nBackId; void ApplyImageList(); - + using Window::GetQuickHelpText; protected: @@ -156,8 +156,8 @@ public: SwScrollNaviPopup( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); ~SwScrollNaviPopup(); - static String GetQuickHelpText(BOOL bNext); - + static String GetQuickHelpText(BOOL bNext); + virtual SfxPopupWindow* Clone() const; void GrabFocus(){aToolBox.GrabFocus();} }; @@ -168,8 +168,8 @@ public: class SwNaviImageButton : public ImageButton { - SwScrollNaviPopup* pPopup; - Image aImage; + SwScrollNaviPopup* pPopup; + Image aImage; Image aImageH; String sQuickText; SfxPopupWindow* pPopupWindow; @@ -179,7 +179,7 @@ class SwNaviImageButton : public ImageButton protected: DECL_LINK( PopupModeEndHdl, void * ); DECL_LINK( ClosePopupWindow, SfxPopupWindow * ); - + virtual void Click(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); void SetPopupWindow( SfxPopupWindow* pWindow ); @@ -189,21 +189,21 @@ class SwNaviImageButton : public ImageButton }; //---------------------------------------------------------------------------- -// Die ImageButtons muessen sich bei Bedarf den HelpText selbst setzen +// Die ImageButtons muessen sich bei Bedarf den HelpText selbst setzen //---------------------------------------------------------------------------- class SwHlpImageButton : public ImageButton { - BOOL bUp; + BOOL bUp; public: SwHlpImageButton(Window* pParent, const ResId& rResId, BOOL bUpBtn) : ImageButton(pParent, rResId), bUp(bUpBtn){} - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); }; /* -----------------26.11.2002 09:25----------------- - * + * * --------------------------------------------------*/ class SwPreviewZoomControl : public SfxToolBoxControl { diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx index 7d435f90cd17..47486064e68c 100644 --- a/sw/source/ui/inc/wrap.hxx +++ b/sw/source/ui/inc/wrap.hxx @@ -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 @@ -52,63 +52,63 @@ class SwWrtShell; class SwWrapDlg : public SfxSingleTabDialog { - SwWrtShell* pWrtShell; + SwWrtShell* pWrtShell; public: SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode); ~SwWrapDlg(); - inline SwWrtShell* GetWrtShell() { return pWrtShell; } + inline SwWrtShell* GetWrtShell() { return pWrtShell; } }; /*-------------------------------------------------------------------- - Beschreibung: Umlauf-TabPage + Beschreibung: Umlauf-TabPage --------------------------------------------------------------------*/ class SwWrapTabPage: public SfxTabPage { // WRAPPING FixedLine aWrapFLC; - ImageRadioButton aNoWrapRB; - ImageRadioButton aWrapLeftRB; - ImageRadioButton aWrapRightRB; - ImageRadioButton aWrapParallelRB; - ImageRadioButton aWrapThroughRB; - ImageRadioButton aIdealWrapRB; + ImageRadioButton aNoWrapRB; + ImageRadioButton aWrapLeftRB; + ImageRadioButton aWrapRightRB; + ImageRadioButton aWrapParallelRB; + ImageRadioButton aWrapThroughRB; + ImageRadioButton aIdealWrapRB; // MARGIN FixedLine aMarginFL; - FixedText aLeftMarginFT; - MetricField aLeftMarginED; - FixedText aRightMarginFT; - MetricField aRightMarginED; - FixedText aTopMarginFT; - MetricField aTopMarginED; - FixedText aBottomMarginFT; - MetricField aBottomMarginED; + FixedText aLeftMarginFT; + MetricField aLeftMarginED; + FixedText aRightMarginFT; + MetricField aRightMarginED; + FixedText aTopMarginFT; + MetricField aTopMarginED; + FixedText aBottomMarginFT; + MetricField aBottomMarginED; // OPTIONS FixedLine aOptionsSepFL; FixedLine aOptionsFL; CheckBox aWrapAnchorOnlyCB; - CheckBox aWrapTransparentCB; - CheckBox aWrapOutlineCB; - CheckBox aWrapOutsideCB; + CheckBox aWrapTransparentCB; + CheckBox aWrapOutlineCB; + CheckBox aWrapOutsideCB; - ImageList aWrapIL; + ImageList aWrapIL; ImageList aWrapILH; - USHORT nOldLeftMargin; - USHORT nOldRightMargin; - USHORT nOldUpperMargin; - USHORT nOldLowerMargin; + USHORT nOldLeftMargin; + USHORT nOldRightMargin; + USHORT nOldUpperMargin; + USHORT nOldLowerMargin; RndStdIds nAnchorId; - USHORT nHtmlMode; + USHORT nHtmlMode; Size aFrmSize; - SwWrtShell* pWrtSh; + SwWrtShell* pWrtSh; BOOL bFormat; BOOL bNew; @@ -121,8 +121,8 @@ class SwWrapTabPage: public SfxTabPage void ApplyImageList(); void EnableModes(const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); virtual void DataChanged( const DataChangedEvent& rDCEvt ); DECL_LINK( RangeModifyHdl, MetricField * ); @@ -136,14 +136,14 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual BOOL FillItemSet(SfxItemSet &rSet); - virtual void Reset(const SfxItemSet &rSet); + virtual BOOL FillItemSet(SfxItemSet &rSet); + virtual void Reset(const SfxItemSet &rSet); - static USHORT* GetRanges(); - inline void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } - inline void SetFormatUsed(BOOL bFmt, BOOL bDrw) { bFormat = bFmt; + static USHORT* GetRanges(); + inline void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } + inline void SetFormatUsed(BOOL bFmt, BOOL bDrw) { bFormat = bFmt; bDrawMode = bDrw; } - inline void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; } + inline void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; } }; #endif diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index 2fce41b1a972..14b26c0391a5 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -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 @@ -68,22 +68,22 @@ namespace com { namespace sun { namespace star { namespace util { typedef sal_Int32 SelectionType; namespace nsSelectionType { - const SelectionType SEL_TXT = CNT_TXT; // Text, niemals auch Rahmen 0x0001 - const SelectionType SEL_GRF = CNT_GRF; // Grafik 0x0002 - const SelectionType SEL_OLE = CNT_OLE; // OLE 0x0010 - const SelectionType SEL_FRM = 0x000020; // Rahmen, keine Inhaltsform - const SelectionType SEL_NUM = 0x000040; // NumListe - const SelectionType SEL_TBL = 0x000080; // Cursor steht in Tabelle - const SelectionType SEL_TBL_CELLS = 0x000100; // Tabellenzellen sind selektiert - const SelectionType SEL_DRW = 0x000200; // Zeichenobjekte (Rechteck, Kreis...) - const SelectionType SEL_DRW_TXT = 0x000400; // Draw-Textobjekte im Editmode - const SelectionType SEL_BEZ = 0x000800; // Bezierobjekte editieren - const SelectionType SEL_DRW_FORM = 0x001000; // Zeichenobjekte: DB-Forms - const SelectionType SEL_FOC_FRM_CTRL = 0x002000; // a form control is focused. Neither set nor evaluated by the SwWrtShell itself, only by it's clients. - const SelectionType SEL_MEDIA = 0x004000; // Media object - const SelectionType SEL_EXTRUDED_CUSTOMSHAPE = 0x008000; // extruded custom shape - const SelectionType SEL_FONTWORK = 0x010000; // fontwork - const SelectionType SEL_POSTIT = 0x020000; //annotation + const SelectionType SEL_TXT = CNT_TXT; // Text, niemals auch Rahmen 0x0001 + const SelectionType SEL_GRF = CNT_GRF; // Grafik 0x0002 + const SelectionType SEL_OLE = CNT_OLE; // OLE 0x0010 + const SelectionType SEL_FRM = 0x000020; // Rahmen, keine Inhaltsform + const SelectionType SEL_NUM = 0x000040; // NumListe + const SelectionType SEL_TBL = 0x000080; // Cursor steht in Tabelle + const SelectionType SEL_TBL_CELLS = 0x000100; // Tabellenzellen sind selektiert + const SelectionType SEL_DRW = 0x000200; // Zeichenobjekte (Rechteck, Kreis...) + const SelectionType SEL_DRW_TXT = 0x000400; // Draw-Textobjekte im Editmode + const SelectionType SEL_BEZ = 0x000800; // Bezierobjekte editieren + const SelectionType SEL_DRW_FORM = 0x001000; // Zeichenobjekte: DB-Forms + const SelectionType SEL_FOC_FRM_CTRL = 0x002000; // a form control is focused. Neither set nor evaluated by the SwWrtShell itself, only by it's clients. + const SelectionType SEL_MEDIA = 0x004000; // Media object + const SelectionType SEL_EXTRUDED_CUSTOMSHAPE = 0x008000; // extruded custom shape + const SelectionType SEL_FONTWORK = 0x010000; // fontwork + const SelectionType SEL_POSTIT = 0x020000; //annotation } @@ -108,10 +108,10 @@ public: typedef long (SwWrtShell::*SELECTFUNC)(const Point *, BOOL bProp ); - SELECTFUNC fnDrag; - SELECTFUNC fnSetCrsr; - SELECTFUNC fnEndDrag; - SELECTFUNC fnKillSel; + SELECTFUNC fnDrag; + SELECTFUNC fnSetCrsr; + SELECTFUNC fnEndDrag; + SELECTFUNC fnKillSel; // Alle Selektionen aufheben long ResetSelect( const Point *, BOOL ); @@ -119,112 +119,112 @@ public: //setzt den Cursorstack nach dem Bewegen mit PageUp/-Down //zurueck, falls ein Stack aufgebaut ist inline void ResetCursorStack(); - SelectionType GetSelectionType() const; + SelectionType GetSelectionType() const; - BOOL IsModePushed() const { return 0 != pModeStack; } - void PushMode(); - void PopMode(); + BOOL IsModePushed() const { return 0 != pModeStack; } + void PushMode(); + void PopMode(); - void SttSelect(); - void EndSelect(); - BOOL IsInSelect() const { return bInSelect; } - void SetInSelect(BOOL bSel = TRUE) { bInSelect = bSel; } + void SttSelect(); + void EndSelect(); + BOOL IsInSelect() const { return bInSelect; } + void SetInSelect(BOOL bSel = TRUE) { bInSelect = bSel; } // Liegt eine Text- oder Rahmenselektion vor? BOOL HasSelection() const { return SwCrsrShell::HasSelection() || IsMultiSelection() || IsSelFrmMode() || IsObjSelected(); } BOOL Pop( BOOL bOldCrsr = TRUE ); - void EnterStdMode(); - BOOL IsStdMode() const { return !bExtMode && !bAddMode && !bBlockMode; } + void EnterStdMode(); + BOOL IsStdMode() const { return !bExtMode && !bAddMode && !bBlockMode; } - void EnterExtMode(); - void LeaveExtMode(); - long ToggleExtMode(); - BOOL IsExtMode() const { return bExtMode; } + void EnterExtMode(); + void LeaveExtMode(); + long ToggleExtMode(); + BOOL IsExtMode() const { return bExtMode; } - void EnterAddMode(); - void LeaveAddMode(); - long ToggleAddMode(); - BOOL IsAddMode() const { return bAddMode; } + void EnterAddMode(); + void LeaveAddMode(); + long ToggleAddMode(); + BOOL IsAddMode() const { return bAddMode; } - void EnterBlockMode(); - void LeaveBlockMode(); - long ToggleBlockMode(); - BOOL IsBlockMode() const { return bBlockMode; } + void EnterBlockMode(); + void LeaveBlockMode(); + long ToggleBlockMode(); + BOOL IsBlockMode() const { return bBlockMode; } - void SetInsMode( BOOL bOn = TRUE ); - void ToggleInsMode() { SetInsMode( !bIns ); } - BOOL IsInsMode() const { return bIns; } + void SetInsMode( BOOL bOn = TRUE ); + void ToggleInsMode() { SetInsMode( !bIns ); } + BOOL IsInsMode() const { return bIns; } void SetRedlineModeAndCheckInsMode( USHORT eMode ); - void EnterSelFrmMode(const Point *pStartDrag = 0); - void LeaveSelFrmMode(); - BOOL IsSelFrmMode() const { return bLayoutMode; } + void EnterSelFrmMode(const Point *pStartDrag = 0); + void LeaveSelFrmMode(); + BOOL IsSelFrmMode() const { return bLayoutMode; } // Selektion von Rahmen aufheben - void UnSelectFrm(); + void UnSelectFrm(); - void Invalidate(); + void Invalidate(); // Tabellenzellen selektieren fuer Bearbeiten von Formeln in der Ribbonbar inline void SelTblCells( const Link &rLink, BOOL bMark = TRUE ); - inline void EndSelTblCells(); + inline void EndSelTblCells(); //Wortweisen oder zeilenweisen Selektionsmodus verlassen. Wird //in der Regel in MB-Up gerufen. - BOOL IsExtSel() const { return bSelWrd || bSelLn; } + BOOL IsExtSel() const { return bSelWrd || bSelLn; } // erfrage, ob der akt. fnDrag - Pointer auf BeginDrag gesetzt ist // Wird fuer MouseMove gebraucht, um die Bugs 55592/55931 zu umgehen. - inline BOOL Is_FnDragEQBeginDrag() const; + inline BOOL Is_FnDragEQBeginDrag() const; //Basisabfragen - BOOL IsInWrd() { return IsInWord(); } - BOOL IsSttWrd() { return IsStartWord(); } - BOOL IsEndWrd(); - BOOL IsSttOfPara() const { return IsSttPara(); } - BOOL IsEndOfPara() const { return IsEndPara(); } + BOOL IsInWrd() { return IsInWord(); } + BOOL IsSttWrd() { return IsStartWord(); } + BOOL IsEndWrd(); + BOOL IsSttOfPara() const { return IsSttPara(); } + BOOL IsEndOfPara() const { return IsEndPara(); } //Word bzw. Satz selektieren. - BOOL SelNearestWrd(); - BOOL SelWrd (const Point * = 0, BOOL bProp=FALSE ); + BOOL SelNearestWrd(); + BOOL SelWrd (const Point * = 0, BOOL bProp=FALSE ); // --> FME 2004-07-30 #i32329# Enhanced selection void SelSentence (const Point * = 0, BOOL bProp=FALSE ); void SelPara (const Point * = 0, BOOL bProp=FALSE ); // <-- - long SelAll(); + long SelAll(); //Basiscursortravelling typedef BOOL (SwWrtShell:: *FNSimpleMove)(); BOOL SimpleMove( FNSimpleMove, BOOL bSelect ); - BOOL Left ( USHORT nMode, BOOL bSelect, + BOOL Left ( USHORT nMode, BOOL bSelect, USHORT nCount, BOOL bBasicCall, BOOL bVisual = FALSE ); - BOOL Right ( USHORT nMode, BOOL bSelect, + BOOL Right ( USHORT nMode, BOOL bSelect, USHORT nCount, BOOL bBasicCall, BOOL bVisual = FALSE ); - BOOL Up ( BOOL bSelect = FALSE, USHORT nCount = 1, + BOOL Up ( BOOL bSelect = FALSE, USHORT nCount = 1, BOOL bBasicCall = FALSE ); - BOOL Down ( BOOL bSelect = FALSE, USHORT nCount = 1, + BOOL Down ( BOOL bSelect = FALSE, USHORT nCount = 1, BOOL bBasicCall = FALSE ); - BOOL NxtWrd ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); } - BOOL PrvWrd ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); } + BOOL NxtWrd ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); } + BOOL PrvWrd ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); } - BOOL LeftMargin ( BOOL bSelect, BOOL bBasicCall ); + BOOL LeftMargin ( BOOL bSelect, BOOL bBasicCall ); BOOL RightMargin( BOOL bSelect, BOOL bBasicCall ); - BOOL SttDoc ( BOOL bSelect = FALSE ); - BOOL EndDoc ( BOOL bSelect = FALSE ); - - BOOL SttNxtPg ( BOOL bSelect = FALSE ); - BOOL SttPrvPg ( BOOL bSelect = FALSE ); - BOOL EndNxtPg ( BOOL bSelect = FALSE ); - BOOL EndPrvPg ( BOOL bSelect = FALSE ); - BOOL SttPg ( BOOL bSelect = FALSE ); - BOOL EndPg ( BOOL bSelect = FALSE ); - BOOL SttPara ( BOOL bSelect = FALSE ); - BOOL EndPara ( BOOL bSelect = FALSE ); - BOOL FwdPara ( BOOL bSelect = FALSE ) + BOOL SttDoc ( BOOL bSelect = FALSE ); + BOOL EndDoc ( BOOL bSelect = FALSE ); + + BOOL SttNxtPg ( BOOL bSelect = FALSE ); + BOOL SttPrvPg ( BOOL bSelect = FALSE ); + BOOL EndNxtPg ( BOOL bSelect = FALSE ); + BOOL EndPrvPg ( BOOL bSelect = FALSE ); + BOOL SttPg ( BOOL bSelect = FALSE ); + BOOL EndPg ( BOOL bSelect = FALSE ); + BOOL SttPara ( BOOL bSelect = FALSE ); + BOOL EndPara ( BOOL bSelect = FALSE ); + BOOL FwdPara ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_FwdPara, bSelect ); } - BOOL BwdPara ( BOOL bSelect = FALSE ) + BOOL BwdPara ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_BwdPara, bSelect ); } BOOL FwdSentence( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_FwdSentence, bSelect ); } @@ -241,30 +241,30 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); BOOL SelectTxtAttr( USHORT nWhich, const SwTxtAttr* pAttr = 0 ); // Spaltenweise Spruenge - BOOL StartOfColumn ( BOOL bSelect = FALSE ); - BOOL EndOfColumn ( BOOL bSelect = FALSE ); - BOOL StartOfNextColumn ( BOOL bSelect = FALSE ); - BOOL EndOfNextColumn ( BOOL bSelect = FALSE ); - BOOL StartOfPrevColumn ( BOOL bSelect = FALSE ); - BOOL EndOfPrevColumn ( BOOL bSelect = FALSE ); + BOOL StartOfColumn ( BOOL bSelect = FALSE ); + BOOL EndOfColumn ( BOOL bSelect = FALSE ); + BOOL StartOfNextColumn ( BOOL bSelect = FALSE ); + BOOL EndOfNextColumn ( BOOL bSelect = FALSE ); + BOOL StartOfPrevColumn ( BOOL bSelect = FALSE ); + BOOL EndOfPrevColumn ( BOOL bSelect = FALSE ); // setze den Cursor auf die Seite "nPage" an den Anfang // zusaetzlich zu der gleichnamigen Implementierung in crsrsh.hxx // werden hier alle bestehenden Selektionen vor dem Setzen des // Cursors aufgehoben - BOOL GotoPage( USHORT nPage, BOOL bRecord ); + BOOL GotoPage( USHORT nPage, BOOL bRecord ); //setzen des Cursors; merken der alten Position fuer Zurueckblaettern. DECL_LINK( ExecFlyMac, void * ); - BOOL PageCrsr(SwTwips lOffset, BOOL bSelect); + BOOL PageCrsr(SwTwips lOffset, BOOL bSelect); // Felder Update - void UpdateInputFlds( SwInputFieldList* pLst = 0, BOOL bOnlyInSel = FALSE ); + void UpdateInputFlds( SwInputFieldList* pLst = 0, BOOL bOnlyInSel = FALSE ); - void NoEdit(BOOL bHideCrsr = TRUE); - void Edit(); - BOOL IsNoEdit() const { return bNoEdit; } + void NoEdit(BOOL bHideCrsr = TRUE); + void Edit(); + BOOL IsNoEdit() const { return bNoEdit; } BOOL IsRetainSelection() const { return mbRetainSelection; } void SetRetainSelection( BOOL bRet ) { mbRetainSelection = bRet; } @@ -273,20 +273,20 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); void ChgDBData(const SwDBData& SwDBData); // Loeschen - long DelToEndOfLine(); - long DelToStartOfLine(); - long DelLine(); - long DelLeft(); + long DelToEndOfLine(); + long DelToStartOfLine(); + long DelLine(); + long DelLeft(); // loescht auch Rahmen bzw. setzt den Cursor in den Rahmen, // wenn bDelFrm == FALSE ist long DelRight(); - long DelToEndOfPara(); - long DelToStartOfPara(); - long DelToEndOfSentence(); - long DelToStartOfSentence(); - long DelNxtWord(); - long DelPrvWord(); + long DelToEndOfPara(); + long DelToStartOfPara(); + long DelToEndOfSentence(); + long DelToStartOfSentence(); + long DelNxtWord(); + long DelPrvWord(); // Prueft, ob eine Wortselektion vorliegt. // Gemaess den Regeln fuer intelligentes Cut / Paste @@ -298,30 +298,30 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); WORD_SPACE_AFTER = 2, WORD_NO_SPACE = 3 }; - int IntelligentCut(int nSelectionType, BOOL bCut = TRUE); + int IntelligentCut(int nSelectionType, BOOL bCut = TRUE); // Editieren - void Insert(SwField &); - void Insert(const String &); + void Insert(SwField &); + void Insert(const String &); // Graphic - void Insert( const String &rPath, const String &rFilter, + void Insert( const String &rPath, const String &rFilter, const Graphic &, SwFlyFrmAttrMgr * = 0, BOOL bRule = FALSE ); - void InsertByWord( const String & ); - void InsertPageBreak(const String *pPageDesc = 0, USHORT nPgNum = 0 ); - void InsertLineBreak(); - void InsertColumnBreak(); - void InsertFootnote(const String &, BOOL bEndNote = FALSE, BOOL bEdit = TRUE ); - void SplitNode( BOOL bAutoFormat = FALSE, BOOL bCheckTableStart = TRUE ); - BOOL CanInsert(); + void InsertByWord( const String & ); + void InsertPageBreak(const String *pPageDesc = 0, USHORT nPgNum = 0 ); + void InsertLineBreak(); + void InsertColumnBreak(); + void InsertFootnote(const String &, BOOL bEndNote = FALSE, BOOL bEdit = TRUE ); + void SplitNode( BOOL bAutoFormat = FALSE, BOOL bCheckTableStart = TRUE ); + BOOL CanInsert(); // Verzeichnisse - void InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); - BOOL UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); + void InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); + BOOL UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); // new fields - BOOL UpdateField( sw::mark::IFieldmark &fieldBM); + BOOL UpdateField( sw::mark::IFieldmark &fieldBM); // Numerierung und Bullets /** @@ -330,21 +330,21 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); @param bNum TRUE: turn on numbering FALSE: turn on bullets */ - void NumOrBulletOn(BOOL bNum); // #i29560# - void NumOrBulletOff(); // #i29560# + void NumOrBulletOn(BOOL bNum); // #i29560# + void NumOrBulletOff(); // #i29560# void NumOn(); - void BulletOn(); + void BulletOn(); //OLE void InsertObject( /*SvInPlaceObjectRef *pObj, */ // != 0 fuer Clipboard const svt::EmbeddedObjectRef&, - SvGlobalName *pName = 0, // != 0 entspr. Object erzeugen. + SvGlobalName *pName = 0, // != 0 entspr. Object erzeugen. BOOL bActivate = TRUE, USHORT nSlotId = 0); // SlotId fuer Dialog BOOL InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 ); - void LaunchOLEObj( long nVerb = 0 ); // Server starten - BOOL IsOLEObj() const { return GetCntType() == CNT_OLE;} + void LaunchOLEObj( long nVerb = 0 ); // Server starten + BOOL IsOLEObj() const { return GetCntType() == CNT_OLE;} virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ); virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect = 0, @@ -355,29 +355,29 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); // Vorlagen und Formate // enum gibt an, was geschehen soll, wenn das Style nicht gefunden wurde - enum GetStyle { GETSTYLE_NOCREATE, // keins anlegen + enum GetStyle { GETSTYLE_NOCREATE, // keins anlegen GETSTYLE_CREATESOME, // falls auf PoolId mapt anlegen - GETSTYLE_CREATEANY }; // ggfs Standard returnen + GETSTYLE_CREATEANY }; // ggfs Standard returnen - SwTxtFmtColl* GetParaStyle(const String &rCollName, + SwTxtFmtColl* GetParaStyle(const String &rCollName, GetStyle eCreate = GETSTYLE_NOCREATE); - SwCharFmt* GetCharStyle(const String &rFmtName, + SwCharFmt* GetCharStyle(const String &rFmtName, GetStyle eCreate = GETSTYLE_NOCREATE); - SwFrmFmt* GetTblStyle(const String &rFmtName); + SwFrmFmt* GetTblStyle(const String &rFmtName); - void SetPageStyle(const String &rCollName); + void SetPageStyle(const String &rCollName); - String GetCurPageStyle( const BOOL bCalcFrm = TRUE ) const; + String GetCurPageStyle( const BOOL bCalcFrm = TRUE ) const; // Aktuelle Vorlage anhand der geltenden Attribute aendern - void QuickUpdateStyle(); + void QuickUpdateStyle(); enum DoType { UNDO, REDO, REPEAT }; - void Do( DoType eDoType, USHORT nCnt = 1 ); - String GetDoString( DoType eDoType ) const; - String GetRepeatString() const; - USHORT GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const; + void Do( DoType eDoType, USHORT nCnt = 1 ); + String GetDoString( DoType eDoType ) const; + String GetRepeatString() const; + USHORT GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const; //Suchen oder Ersetzen ULONG SearchPattern(const com::sun::star::util::SearchOptions& rSearchOpt, @@ -402,7 +402,7 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); // Aktion vor Cursorbewegung // Hebt gfs. Selektionen auf, triggert Timer und GCAttr() - void MoveCrsr( BOOL bWithSelect = FALSE ); + void MoveCrsr( BOOL bWithSelect = FALSE ); // Eingabefelder updaten BOOL StartInputFldDlg(SwField*, BOOL bNextButton, Window* pParentWin = 0, ByteString* pWindowState = 0); @@ -428,8 +428,8 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); BOOL SelectNextPrevHyperlink( BOOL bNext = TRUE ); // Zugehoerige SwView ermitteln - const SwView& GetView() const { return rView; } - SwView& GetView() { return rView; } + const SwView& GetView() const { return rView; } + SwView& GetView() { return rView; } //Weil es sonst keiner macht, gibt es hier eine ExecMacro() void ExecMacro( const SvxMacro& rMacro, String* pRet = 0, SbxArray* pArgs = 0 ); @@ -476,17 +476,17 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); private: - SW_DLLPRIVATE void OpenMark(); - SW_DLLPRIVATE void CloseMark( BOOL bOkFlag ); + SW_DLLPRIVATE void OpenMark(); + SW_DLLPRIVATE void CloseMark( BOOL bOkFlag ); - SW_DLLPRIVATE String GetWrdDelim(); - SW_DLLPRIVATE String GetSDelim(); - SW_DLLPRIVATE String GetBothDelim(); + SW_DLLPRIVATE String GetWrdDelim(); + SW_DLLPRIVATE String GetSDelim(); + SW_DLLPRIVATE String GetBothDelim(); struct ModeStack { - ModeStack *pNext; - BOOL bAdd, + ModeStack *pNext; + BOOL bAdd, bBlock, bExt, bIns; @@ -529,13 +529,13 @@ private: } *pCrsrStack; - SwView &rView; + SwView &rView; - Point aDest; - BOOL bDestOnStack; - BOOL HasCrsrStack() const { return 0 != pCrsrStack; } - SW_DLLPRIVATE BOOL PushCrsr(SwTwips lOffset, BOOL bSelect); - SW_DLLPRIVATE BOOL PopCrsr(BOOL bUpdate, BOOL bSelect = FALSE); + Point aDest; + BOOL bDestOnStack; + BOOL HasCrsrStack() const { return 0 != pCrsrStack; } + SW_DLLPRIVATE BOOL PushCrsr(SwTwips lOffset, BOOL bSelect); + SW_DLLPRIVATE BOOL PopCrsr(BOOL bUpdate, BOOL bSelect = FALSE); // ENDE Cursor bei PageUp / -Down mitnehmen SW_DLLPRIVATE BOOL _SttWrd(); @@ -551,63 +551,63 @@ private: BOOL _FwdPara(); SW_DLLPRIVATE BOOL _BwdPara(); - // Selektionen - BOOL bIns :1; - BOOL bInSelect :1; - BOOL bExtMode :1; - BOOL bAddMode :1; + // Selektionen + BOOL bIns :1; + BOOL bInSelect :1; + BOOL bExtMode :1; + BOOL bAddMode :1; BOOL bBlockMode :1; - BOOL bLayoutMode :1; - BOOL bNoEdit :1; - BOOL bCopy :1; - BOOL bSelWrd :1; - BOOL bSelLn :1; - BOOL bIsInClickToEdit:1; - BOOL bClearMark :1; // Selektion fuer ChartAutoPilot nicht loeschen + BOOL bLayoutMode :1; + BOOL bNoEdit :1; + BOOL bCopy :1; + BOOL bSelWrd :1; + BOOL bSelLn :1; + BOOL bIsInClickToEdit:1; + BOOL bClearMark :1; // Selektion fuer ChartAutoPilot nicht loeschen BOOL mbRetainSelection :1; // Do not remove selections - Point aStart; - Link aSelTblLink; + Point aStart; + Link aSelTblLink; - SELECTFUNC fnLeaveSelect; + SELECTFUNC fnLeaveSelect; //setzt den Cursorstack nach dem Bewegen mit PageUp/-Down zurueck. - SW_DLLPRIVATE void _ResetCursorStack(); + SW_DLLPRIVATE void _ResetCursorStack(); - SW_DLLPRIVATE void SttDragDrop(Timer *); + SW_DLLPRIVATE void SttDragDrop(Timer *); using SwCrsrShell::SetCrsr; - SW_DLLPRIVATE long SetCrsr(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long SetCrsr(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long SetCrsrKillSel(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long SetCrsrKillSel(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long StdSelect(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long BeginDrag(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long Drag(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long EndDrag(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long StdSelect(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long BeginDrag(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long Drag(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long EndDrag(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long ExtSelWrd(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long ExtSelLn(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long ExtSelWrd(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long ExtSelLn(const Point *, BOOL bProp=FALSE ); //Verschieben von Text aus Drag and Drop; Point ist //Destination fuer alle Selektionen. - SW_DLLPRIVATE long MoveText(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long MoveText(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long BeginFrmDrag(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long BeginFrmDrag(const Point *, BOOL bProp=FALSE ); //nach SSize/Move eines Frames Update; Point ist Destination. - SW_DLLPRIVATE long UpdateLayoutFrm(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long UpdateLayoutFrm(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long SttLeaveSelect(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long AddLeaveSelect(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long Ignore(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long SttLeaveSelect(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long AddLeaveSelect(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long Ignore(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE void LeaveExtSel() { bSelWrd = bSelLn = FALSE;} - SW_DLLPRIVATE BOOL _CanInsert(); + SW_DLLPRIVATE void LeaveExtSel() { bSelWrd = bSelLn = FALSE;} + SW_DLLPRIVATE BOOL _CanInsert(); - SW_DLLPRIVATE BOOL GoStart(BOOL KeepArea = FALSE, BOOL * = 0, + SW_DLLPRIVATE BOOL GoStart(BOOL KeepArea = FALSE, BOOL * = 0, BOOL bSelect = FALSE, BOOL bDontMoveRegion = FALSE); - SW_DLLPRIVATE BOOL GoEnd(BOOL KeepArea = FALSE, BOOL * = 0); + SW_DLLPRIVATE BOOL GoEnd(BOOL KeepArea = FALSE, BOOL * = 0); enum BookMarkMove { @@ -640,10 +640,10 @@ inline void SwWrtShell::EndSelTblCells() inline BOOL SwWrtShell::IsInClickToEdit() const { return bIsInClickToEdit; } -inline BOOL SwWrtShell::Is_FnDragEQBeginDrag() const +inline BOOL SwWrtShell::Is_FnDragEQBeginDrag() const { #ifdef GCC - SELECTFUNC fnTmp = &SwWrtShell::BeginDrag; + SELECTFUNC fnTmp = &SwWrtShell::BeginDrag; return fnDrag == fnTmp; #else return sal::static_int_cast< BOOL >(fnDrag == &SwWrtShell::BeginDrag); diff --git a/sw/source/ui/inc/wtabsh.hxx b/sw/source/ui/inc/wtabsh.hxx index 5ab809821de8..63f4eeed439b 100644 --- a/sw/source/ui/inc/wtabsh.hxx +++ b/sw/source/ui/inc/wtabsh.hxx @@ -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/inc/wtextsh.hxx b/sw/source/ui/inc/wtextsh.hxx index cc03de602400..2dc2f8c12b6a 100644 --- a/sw/source/ui/inc/wtextsh.hxx +++ b/sw/source/ui/inc/wtextsh.hxx @@ -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/inc/wview.hxx b/sw/source/ui/inc/wview.hxx index 2b36bbf97dce..935a677a7144 100644 --- a/sw/source/ui/inc/wview.hxx +++ b/sw/source/ui/inc/wview.hxx @@ -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 @@ -37,7 +37,7 @@ class SW_DLLPUBLIC SwWebView: public SwView { protected: - virtual void SelectShell(); + virtual void SelectShell(); public: SFX_DECL_VIEWFACTORY(SwWebView); diff --git a/sw/source/ui/inc/zoomctrl.hxx b/sw/source/ui/inc/zoomctrl.hxx index f2d1843828fb..53a36d6dcc3d 100644 --- a/sw/source/ui/inc/zoomctrl.hxx +++ b/sw/source/ui/inc/zoomctrl.hxx @@ -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 @@ -35,7 +35,7 @@ private: String sPreviewZoom; public: virtual void Command( const CommandEvent& rCEvt ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 40400f591753..6eb78b7da846 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -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 @@ -312,18 +312,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 )); @@ -486,12 +486,12 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( } } /* - const String& GetAutoMarkURL() const { return sAutoMarkURL;} - const String& GetMainEntryCharStyle() const {return sMainEntryCharStyle;} + const String& GetAutoMarkURL() const { return sAutoMarkURL;} + const String& GetMainEntryCharStyle() const {return sMainEntryCharStyle;} - String GetAuthBrackets() const {return sAuthBrackets;} - sal_Bool IsAuthSequence() const {return bIsAuthSequence;} - sal_Bool IsSortByDocument()const {return bSortByDocument ;} + String GetAuthBrackets() const {return sAuthBrackets;} + sal_Bool IsAuthSequence() const {return bIsAuthSequence;} + sal_Bool IsSortByDocument()const {return bSortByDocument ;} SwTOXSortKey GetSortKey1() const {return eSortKey1;} SwTOXSortKey GetSortKey2() const {return eSortKey2;} @@ -501,10 +501,10 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( pxIndexSectionsArr[nTOXIndex]->xDocumentIndex->update(); //#if OSL_DEBUG_LEVEL > 1 -// uno::Reference< frame::XStorable > xStor(xModel, uno::UNO_QUERY); -// String sURL("file:///e|/temp/sw/idxexample.sdw"); -// uno::Sequence< beans::PropertyValue > aArgs(0); -// xStor->storeToURL(S2U(sURL), aArgs); +// uno::Reference< frame::XStorable > xStor(xModel, uno::UNO_QUERY); +// String sURL("file:///e|/temp/sw/idxexample.sdw"); +// uno::Sequence< beans::PropertyValue > aArgs(0); +// xStor->storeToURL(S2U(sURL), aArgs); //#endif } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index a8a01a4f8222..5d9a39060083 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -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 @@ -122,12 +122,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" )) @@ -178,8 +178,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), @@ -192,63 +192,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: @@ -281,7 +281,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)), @@ -365,9 +365,9 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet DBG_ASSERT(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); @@ -410,7 +410,7 @@ SwMultiTOXTabDialog::~SwMultiTOXTabDialog() /*-- 14.06.99 13:11:40--------------------------------------------------- -----------------------------------------------------------------------*/ -void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) +void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { if( TP_BACKGROUND == nId ) { @@ -436,7 +436,7 @@ void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) /*-- 14.06.99 13:11:40--------------------------------------------------- -----------------------------------------------------------------------*/ -short SwMultiTOXTabDialog::Ok() +short SwMultiTOXTabDialog::Ok() { short nRet = SfxTabDialog::Ok(); SwTOXDescription& rDesc = GetTOXDescription(eCurrentTOXType); @@ -479,7 +479,7 @@ SwForm* SwMultiTOXTabDialog::GetForm(CurTOXType eType) /* -----------------09.09.99 11:29------------------- --------------------------------------------------*/ -SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType) +SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType) { sal_uInt16 nIndex = eType.GetFlatIndex(); if(!pDescArr[nIndex]) @@ -640,14 +640,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; @@ -662,9 +662,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;} }; /* -----------------14.07.99 16:03------------------- @@ -685,7 +685,7 @@ long SwIndexTreeLB::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) /* -----------------25.08.99 11:14------------------- --------------------------------------------------*/ -void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt ) +void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt ) { SvLBoxEntry* pEntry = FirstSelected(); KeyCode aCode = rKEvt.GetKeyCode(); @@ -724,16 +724,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(); }; /* -----------------16.07.99 10:11------------------- @@ -757,7 +757,7 @@ SwHeaderTree::SwHeaderTree(Window* pParent, const ResId rResId) : /* -----------------25.08.99 10:38------------------- --------------------------------------------------*/ -void SwHeaderTree::GetFocus() +void SwHeaderTree::GetFocus() { Control::GetFocus(); aStylesTLB.GrabFocus(); @@ -767,17 +767,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*); @@ -822,7 +822,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(); @@ -843,7 +843,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 ) @@ -1044,20 +1044,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); @@ -1116,17 +1116,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; @@ -1153,18 +1153,18 @@ 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: DBG_ERROR("what a type?"); } return eRet; @@ -1172,7 +1172,7 @@ CurTOXType lcl_UserData2TOXTypes(sal_uInt16 nData) /* -----------------02.09.99 08:16------------------- --------------------------------------------------*/ -void SwTOXSelectTabPage::ApplyTOXDescription() +void SwTOXSelectTabPage::ApplyTOXDescription() { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType(); @@ -1374,7 +1374,7 @@ void SwTOXSelectTabPage::FillTOXDescription() break; } - rDesc.SetLevelFromChapter( aLevelFromChapterCB.IsVisible() && + rDesc.SetLevelFromChapter( aLevelFromChapterCB.IsVisible() && aLevelFromChapterCB.IsChecked()); if(aTOXMarksCB.IsChecked() && aTOXMarksCB.IsVisible()) nContentOptions |= nsSwTOXElement::TOX_MARK; @@ -1455,14 +1455,14 @@ int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet ) /* -----------------14.06.99 13:10------------------- --------------------------------------------------*/ -SfxTabPage* SwTOXSelectTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) +SfxTabPage* SwTOXSelectTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwTOXSelectTabPage(pParent, rAttrSet); } /* -----------------14.06.99 13:10------------------- --------------------------------------------------*/ -IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox) +IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); if(!bFirstCall) @@ -1516,14 +1516,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 ) @@ -1534,7 +1534,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); } @@ -1547,8 +1547,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) ); @@ -1585,7 +1585,7 @@ IMPL_LINK(SwTOXSelectTabPage, ModifyHdl, void*, EMPTYARG) /* -----------------05.07.99 10:13------------------- --------------------------------------------------*/ -IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox ) +IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox ) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType(); @@ -1671,13 +1671,13 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox) /* -----------------14.06.99 13:10------------------- --------------------------------------------------*/ -IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl, ListBox*, pBox) +IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl, ListBox*, pBox) { DBG_WARNING("not implemented"); switch((long)pBox->GetEntryData( pBox->GetSelectEntryPos() )) { case AREA_DOCUMENT : break; - case AREA_CHAPTER : break; + case AREA_CHAPTER : break; } return 0; } @@ -1687,38 +1687,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; //} /* -----------------14.06.99 13:10------------------- @@ -1779,9 +1779,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, @@ -1794,35 +1794,35 @@ 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(); @@ -1864,9 +1864,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, @@ -1879,12 +1879,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) { @@ -1899,7 +1899,7 @@ public: { aFormToken.cTabFillChar = cSet; } void SetTabAlign(SvxTabAdjust eAlign) - { aFormToken.eTabAlign = eAlign;} + { aFormToken.eTabAlign = eAlign;} //---> i89791 //used for entry number format, in TOC only @@ -1957,7 +1957,7 @@ public: }; //--------------------------------------------------- -void SwTOXButton::KeyInput( const KeyEvent& rKEvt ) +void SwTOXButton::KeyInput( const KeyEvent& rKEvt ) { sal_Bool bCall = sal_False; KeyCode aCode = rKEvt.GetKeyCode(); @@ -1983,7 +1983,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); @@ -2064,8 +2064,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 )), @@ -2127,7 +2127,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(); @@ -2253,7 +2253,7 @@ SwTOXEntryTabPage::~SwTOXEntryTabPage() /*-- 16.06.99 10:47:33--------------------------------------------------- -----------------------------------------------------------------------*/ -sal_Bool SwTOXEntryTabPage::FillItemSet( SfxItemSet& ) +sal_Bool SwTOXEntryTabPage::FillItemSet( SfxItemSet& ) { // nothing to do return sal_True; @@ -2397,20 +2397,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); @@ -2450,42 +2450,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; @@ -2527,7 +2527,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()); @@ -2546,7 +2546,7 @@ int SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/) /*-- 16.06.99 10:47:34--------------------------------------------------- -----------------------------------------------------------------------*/ -SfxTabPage* SwTOXEntryTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) +SfxTabPage* SwTOXEntryTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwTOXEntryTabPage(pParent, rAttrSet); } @@ -2560,7 +2560,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(). @@ -2737,7 +2737,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 ); DBG_ASSERT(LISTBOX_ENTRY_NOTFOUND != nLstBoxPos, "Entry not found?"); aAuthFieldsLB.RemoveEntry(nLstBoxPos); } @@ -3061,7 +3061,7 @@ void SwTOXEntryTabPage::SetWrtShell(SwWrtShell& rSh) /* -----------------------------23.12.99 14:23-------------------------------- ---------------------------------------------------------------------------*/ -String SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const +String SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const { String sRet; SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); @@ -3083,7 +3083,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), @@ -3119,8 +3119,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 ) { @@ -3138,7 +3138,7 @@ SwTokenWindow::~SwTokenWindow() /* -----------------16.06.99 13:56------------------- --------------------------------------------------*/ -void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) +void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) { SetActiveControl(0); bValid = sal_True; @@ -3189,7 +3189,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; @@ -3247,7 +3247,7 @@ void SwTokenWindow::SetActiveControl(Control* pSet) /* -----------------17.06.99 09:53------------------- --------------------------------------------------*/ -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(); @@ -3303,7 +3303,7 @@ Control* SwTokenWindow::InsertItem(const String& rText, const SwFormToken& rT /* -----------------16.07.99 11:50------------------- --------------------------------------------------*/ -void SwTokenWindow::InsertAtSelection( +void SwTokenWindow::InsertAtSelection( const String& rText, const SwFormToken& rToken) { @@ -3389,7 +3389,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) @@ -3679,7 +3679,7 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn ) /* -----------------17.06.99 11:59------------------- --------------------------------------------------*/ -String SwTokenWindow::GetPattern() const +String SwTokenWindow::GetPattern() const { String sRet; const Control* pControl = ((SwTokenWindow*)this)->aControlList.First(); @@ -3741,8 +3741,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 { @@ -3900,13 +3900,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) { @@ -3915,12 +3915,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)); } /* -----------------25.03.99 15:17------------------- * @@ -3932,21 +3932,21 @@ SwTOXStylesTabPage::~SwTOXStylesTabPage() /* -----------------25.03.99 15:17------------------- * * --------------------------------------------------*/ -sal_Bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& ) +sal_Bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& ) { return sal_True; } /* -----------------25.03.99 15:17------------------- * * --------------------------------------------------*/ -void SwTOXStylesTabPage::Reset( const SfxItemSet& rSet ) +void SwTOXStylesTabPage::Reset( const SfxItemSet& rSet ) { ActivatePage(rSet); } /* -----------------25.03.99 15:17------------------- * * --------------------------------------------------*/ -void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& ) +void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& ) { m_pCurrentForm = new SwForm(GetForm()); aParaLayLB.Clear(); @@ -3958,7 +3958,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() ) { @@ -4024,7 +4024,7 @@ int SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ ) /* -----------------25.03.99 15:17------------------- * * --------------------------------------------------*/ -SfxTabPage* SwTOXStylesTabPage::Create( Window* pParent, +SfxTabPage* SwTOXStylesTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwTOXStylesTabPage(pParent, rAttrSet); @@ -4038,7 +4038,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(); @@ -4054,9 +4054,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)); @@ -4085,7 +4085,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); @@ -4143,12 +4143,12 @@ IMPL_LINK(SwTOXStylesTabPage, ModifyHdl, void*, EMPTYARG) /****************************************************************************** ******************************************************************************/ -#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 @@ -4162,7 +4162,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, const ResId& rId, BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_AUTO_VSCROLL| - BROWSER_HIDECURSOR ), + BROWSER_HIDECURSOR ), aCellEdit(&GetDataWindow(), 0), aCellCheckBox(&GetDataWindow()), @@ -4230,13 +4230,13 @@ 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; @@ -4245,7 +4245,7 @@ String SwEntryBrowseBox::GetCellText(long nRow, USHORT nColumn) const /* -----------------------------19.01.00 11:29-------------------------------- ---------------------------------------------------------------------------*/ -void SwEntryBrowseBox::PaintCell(OutputDevice& rDev, +void SwEntryBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const { String sPaint = GetCellText( nCurrentRow, nColumnId ); @@ -4285,13 +4285,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()) { @@ -4308,7 +4308,7 @@ sal_Bool SwEntryBrowseBox::SaveModified() /* -----------------------------19.01.00 14:32-------------------------------- ---------------------------------------------------------------------------*/ -void SwEntryBrowseBox::InitController( +void SwEntryBrowseBox::InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) { String rTxt = GetCellText( nRow, nCol ); @@ -4329,7 +4329,7 @@ void SwEntryBrowseBox::InitController( /* -----------------------------19.01.00 12:19-------------------------------- ---------------------------------------------------------------------------*/ -void SwEntryBrowseBox::ReadEntries(SvStream& rInStr) +void SwEntryBrowseBox::ReadEntries(SvStream& rInStr) { AutoMarkEntry* pToInsert = 0; const String sZero('0'); @@ -4353,10 +4353,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; @@ -4384,7 +4384,7 @@ void SwEntryBrowseBox::ReadEntries(SvStream& rInStr) /* -----------------------------19.01.00 12:19-------------------------------- ---------------------------------------------------------------------------*/ -void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr) +void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr) { //check if the current controller is modified sal_uInt16 nCol = GetCurColumnId(); @@ -4447,10 +4447,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 24a3c7ddf91e..7d3e1694eb90 100644 --- a/sw/source/ui/index/idxmrk.cxx +++ b/sw/source/ui/index/idxmrk.cxx @@ -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 @@ -60,7 +60,7 @@ #include <view.hxx> #endif #include <multmrk.hxx> -#include <swundo.hxx> // fuer Undo-Ids +#include <swundo.hxx> // fuer Undo-Ids #ifndef _CMDID_H #include <cmdid.h> #endif @@ -85,7 +85,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 ) : @@ -96,7 +96,7 @@ SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( Window *pParentWindow, pAbstDlg = pFact->CreateIndexMarkFloatDlg( DLG_INSIDXMARK , pBindings, this, pParentWindow, pInfo ); DBG_ASSERT(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; } @@ -110,7 +110,7 @@ SfxChildWinInfo SwInsertIdxMarkWrapper::GetInfo() const return aInfo; } -void SwInsertIdxMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell) +void SwInsertIdxMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell) { pAbstDlg->ReInitDlg(rWrtShell); } @@ -121,7 +121,7 @@ void SwInsertIdxMarkWrapper::ReInitDlg(SwWrtShell& 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 ) : @@ -146,7 +146,7 @@ SfxChildWinInfo SwInsertAuthMarkWrapper::GetInfo() const /* -----------------19.10.99 11:16------------------- --------------------------------------------------*/ -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 c17f4b683906..ec329f19853a 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -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 @@ -48,9 +48,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)), @@ -73,7 +73,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 6083da00da06..be034b3909e9 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -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 @@ -64,7 +64,7 @@ #include <view.hxx> #endif #include <multmrk.hxx> -#include <swundo.hxx> // fuer Undo-Ids +#include <swundo.hxx> // fuer Undo-Ids #ifndef _CMDID_H #include <cmdid.h> #endif @@ -108,7 +108,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, @@ -117,7 +117,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 )), @@ -179,43 +179,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)); @@ -247,7 +247,7 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent, } /*-------------------------------------------------------------------- - Beschreibung: Controls neu initialisieren mit der aktuellen + Beschreibung: Controls neu initialisieren mit der aktuellen Markierung --------------------------------------------------------------------*/ @@ -339,7 +339,7 @@ void SwIndexMarkDlg::InitControls() UpdateDialog(); } else - { // aktuelle Selektion (1.Element) anzeigen ???? + { // aktuelle Selektion (1.Element) anzeigen ???? sal_uInt16 nCnt = pSh->GetCrsrCnt(); if (nCnt < 2) { @@ -359,7 +359,7 @@ void SwIndexMarkDlg::InitControls() } // Verzeichnistyp ist default - if( sTmpTypeSelection.Len() && + if( sTmpTypeSelection.Len() && LISTBOX_ENTRY_NOTFOUND != aTypeDCB.GetEntryPos( sTmpTypeSelection ) ) aTypeDCB.SelectEntry(sTmpTypeSelection); else @@ -368,7 +368,7 @@ void SwIndexMarkDlg::InitControls() } } -void SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading() +void SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading() { //no phonetic reading if no global cjk support if( !xExtendedIndexEntrySupplier.is() ) @@ -424,7 +424,7 @@ void SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading() */ } -String SwIndexMarkDlg::GetDefaultPhoneticReading( const String& rText ) +String SwIndexMarkDlg::GetDefaultPhoneticReading( const String& rText ) { if( !bIsPhoneticReadingEnabled ) return aEmptyStr; @@ -437,7 +437,7 @@ String SwIndexMarkDlg::GetDefaultPhoneticReading( const String& rText ) Change the content of aEntryED if text is selected --------------------------------------------------*/ -void SwIndexMarkDlg::Activate() +void SwIndexMarkDlg::Activate() { // aktuelle Selektion (1.Element) anzeigen ???? if(bNewMark) @@ -464,7 +464,7 @@ void SwIndexMarkDlg::Activate() } /*-------------------------------------------------------------------- - Beschreibung: Ok-Button auswerten + Beschreibung: Ok-Button auswerten --------------------------------------------------------------------*/ void SwIndexMarkDlg::Apply() { @@ -515,7 +515,7 @@ void SwIndexMarkDlg::InsertUpdate() } /*-------------------------------------------------------------------- - Beschreibung: Marke einfuegen + Beschreibung: Marke einfuegen --------------------------------------------------------------------*/ static void lcl_SelectSameStrings(SwWrtShell& rSh, BOOL bWordOnly, BOOL bCaseSensitive) { @@ -553,7 +553,7 @@ void SwIndexMarkDlg::InsertMark() switch(nPos) { case POS_CONTENT : break; - case POS_INDEX: // Stichwortverzeichnismarke + case POS_INDEX: // Stichwortverzeichnismarke { UpdateKeyBoxes(); String aPrim(aKeyDCB.GetText()); @@ -595,13 +595,13 @@ 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()) @@ -649,7 +649,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); } @@ -657,7 +657,7 @@ void SwIndexMarkDlg::UpdateKeyBoxes() nPos = aKey2DCB.GetEntryPos(aKey); if(nPos == LISTBOX_ENTRY_NOTFOUND && aKey.Len() > 0) - { // neuen Key erzeugen + { // neuen Key erzeugen aKey2DCB.InsertEntry(aKey); } } @@ -666,14 +666,14 @@ void SwIndexMarkDlg::UpdateKeyBoxes() --------------------------------------------------*/ 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*); @@ -694,8 +694,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() { @@ -758,7 +758,7 @@ IMPL_LINK( SwIndexMarkDlg, CloseHdl, Button *, EMPTYARG ) return 0; } /*-------------------------------------------------------------------- - Beschreibung: VerzeichnisTyp auswaehlen nur bei Einfuegen + Beschreibung: VerzeichnisTyp auswaehlen nur bei Einfuegen --------------------------------------------------------------------*/ IMPL_LINK( SwIndexMarkDlg, ModifyHdl, ListBox *, pBox ) { @@ -767,12 +767,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()) @@ -919,9 +919,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) @@ -1072,8 +1072,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); @@ -1130,7 +1130,7 @@ SfxModelessDialog(_pBindings, pChild, pParent, SvtCJKOptions().IsCJKFontEnabled( /* -----------------06.10.99 10:27------------------- --------------------------------------------------*/ -void SwIndexMarkFloatDlg::Activate() +void SwIndexMarkFloatDlg::Activate() { SfxModelessDialog::Activate(); aDlg.Activate(); @@ -1154,7 +1154,7 @@ SvxStandardDialog(pParent, SvtCJKOptions().IsCJKFontEnabled()?SW_RES(DLG_EDIT_ID /* -----------------06.10.99 10:46------------------- --------------------------------------------------*/ -void SwIndexMarkModalDlg::Apply() +void SwIndexMarkModalDlg::Apply() { aDlg.Apply(); } @@ -1165,21 +1165,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*); @@ -1193,9 +1193,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;} }; /*-- 15.09.99 08:43:24--------------------------------------------------- @@ -1285,11 +1285,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)); @@ -1321,7 +1321,7 @@ SwAuthMarkDlg::~SwAuthMarkDlg() /*-- 15.09.99 08:43:25--------------------------------------------------- -----------------------------------------------------------------------*/ -void SwAuthMarkDlg::ReInitDlg(SwWrtShell& rWrtShell) +void SwAuthMarkDlg::ReInitDlg(SwWrtShell& rWrtShell) { pSh = &rWrtShell; InitControls(); @@ -1395,7 +1395,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; @@ -1425,7 +1425,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) @@ -1570,7 +1570,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)); } @@ -1759,7 +1759,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)); } @@ -1831,7 +1831,7 @@ SwCreateAuthEntryDlg_Impl::~SwCreateAuthEntryDlg_Impl() /* -----------------16.09.99 14:27------------------- --------------------------------------------------*/ -String SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) const +String SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) const { String sRet; if( AUTH_FIELD_AUTHORITY_TYPE == eField ) @@ -1928,7 +1928,7 @@ SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* _pBindings, /* -----------------06.10.99 10:27------------------- --------------------------------------------------*/ -void SwAuthMarkFloatDlg::Activate() +void SwAuthMarkFloatDlg::Activate() { SfxModelessDialog::Activate(); aDlg.Activate(); @@ -1952,7 +1952,7 @@ SwAuthMarkModalDlg::SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh) : /* -----------------06.10.99 10:46------------------- --------------------------------------------------*/ -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 8564000d26ac..f705dc0d94c1 100644 --- a/sw/source/ui/index/toxmgr.cxx +++ b/sw/source/ui/index/toxmgr.cxx @@ -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 @@ -88,7 +88,7 @@ void SwTOXMgr::DeleteTOXMark() /* -----------------20.08.99 10:48------------------- --------------------------------------------------*/ -void SwTOXMgr::InsertTOXMark(const SwTOXMarkDescription& rDesc) +void SwTOXMgr::InsertTOXMark(const SwTOXMarkDescription& rDesc) { SwTOXMark* pMark = 0; switch(rDesc.GetTOXType()) @@ -200,7 +200,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() ); @@ -227,7 +227,7 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc) /*-------------------------------------------------------------------- - Beschreibung: UserTypeID ermitteln + Beschreibung: UserTypeID ermitteln --------------------------------------------------------------------*/ @@ -346,9 +346,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; } } @@ -407,7 +407,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()); } diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx index da07c73f6c8e..9d7771e11ae6 100644 --- a/sw/source/ui/lingu/hhcwrp.cxx +++ b/sw/source/ui/lingu/hhcwrp.cxx @@ -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 @@ -57,7 +57,7 @@ #include <doc.hxx> #include <docsh.hxx> #include <txatritr.hxx> -#include <mdiexp.hxx> // Progress +#include <mdiexp.hxx> // Progress #include <edtwin.hxx> #include <crsskip.hxx> #include <index.hxx> @@ -551,7 +551,7 @@ void SwHHCWrapper::ReplaceUnit( if (pNewUnitLanguage) { //DBG_ASSERT(!IsSimilarChinese( *pNewUnitLanguage, nOldLang ), - // "similar language should not be changed!"); + // "similar language should not be changed!"); aSet.Put( SvxLanguageItem( *pNewUnitLanguage, RES_CHRATR_CJK_LANGUAGE ) ); } @@ -602,7 +602,7 @@ void SwHHCWrapper::Convert() pSttPos->nNode.GetNode().GetTxtNode(), pSttPos->nContent, pEndPos->nNode.GetNode().GetTxtNode(), pEndPos->nContent ); } - else // we are not in the text (maybe a graphic or OLE object is selected) let's start from the top + else // we are not in the text (maybe a graphic or OLE object is selected) let's start from the top { // get PaM that points to the start of the document SwNode& rNode = pView->GetDocShell()->GetDoc()->GetNodes().GetEndOfContent(); diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx index 69c3db509fed..6e2c555dd347 100644 --- a/sw/source/ui/lingu/hyp.cxx +++ b/sw/source/ui/lingu/hyp.cxx @@ -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 @@ -50,8 +50,8 @@ #include <unomid.h> -#define HYPHHERE '-' -#define PSH (&pView->GetWrtShell()) +#define HYPHHERE '-' +#define PSH (&pView->GetWrtShell()) using namespace ::com::sun::star; using ::rtl::OUString; @@ -158,7 +158,7 @@ sal_Bool SwHyphWrapper::SpellMore() void SwHyphWrapper::InsertHyphen( const sal_uInt16 nPos ) { if( nPos) - PSH->InsertSoftHyph( nPos + 1); // does nPos == 1 really mean + PSH->InsertSoftHyph( nPos + 1); // does nPos == 1 really mean // insert hyphen after first char? // (instead of nPos == 0) else diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 0c7d7909ad7a..933959d17236 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -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 @@ -126,7 +126,7 @@ LanguageType lcl_CheckLanguage( sal_Bool bIsParaText ) { LanguageType nLang = LANGUAGE_NONE; - if (bIsParaText) // check longer texts with language-guessing... + if (bIsParaText) // check longer texts with language-guessing... { if (!xLangGuess.is()) return nLang; @@ -151,7 +151,7 @@ LanguageType lcl_CheckLanguage( if (nLang == LANGUAGE_DONTKNOW) nLang = LANGUAGE_NONE; } - else // check single word + else // check single word { if (!xSpell.is()) return nLang; @@ -224,7 +224,7 @@ void SwSpellPopup::fillLangPopupMenu( return; SvtLanguageTable aLanguageTable; - + // set of languages to be displayed in the sub menus std::set< OUString > aLangItems; @@ -440,7 +440,7 @@ bGrammarResults(false) pMenu->InsertItem( nAutoCorrItemId, aEntry ); pMenu->SetHelpId( nAutoCorrItemId, HID_LINGU_AUTOCORR); - + ++nAutoCorrItemId; ++nItemId; } @@ -573,7 +573,7 @@ bGrammarResults(false) SetItemImage( MN_SPELLING_DLG, rImg ); ////////////////////////////////////////////////////////////////////////////////// - + RemoveDisabledEntries( TRUE, TRUE ); } @@ -729,7 +729,7 @@ void SwSpellPopup::Execute( USHORT nId ) return; if (/*bGrammarResults && */nId == MN_SHORT_COMMENT) - return; // nothing to do since it is the error message (short comment) + return; // nothing to do since it is the error message (short comment) if ((MN_SUGGESTION_START <= nId && nId <= MN_SUGGESTION_END) || (MN_AUTOCORR_START <= nId && nId <= MN_AUTOCORR_END)) @@ -770,7 +770,7 @@ void SwSpellPopup::Execute( USHORT nId ) pSh->DelLeft(); pSh->Insert( aTmp ); - + /* #102505# EndAction/EndUndo moved down since insertion of temporary auto correction is now undoable two and must reside in the same undo group.*/ @@ -807,24 +807,24 @@ void SwSpellPopup::Execute( USHORT nId ) pSh->GetView().GetViewFrame()->GetDispatcher()-> Execute( FN_SPELL_GRAMMAR_DIALOG, SFX_CALLMODE_ASYNCHRON ); } - } + } else if (nId == MN_IGNORE_SELECTION) { SwPaM *pPaM = pSh->GetCrsr(); if (pPaM) pSh->IgnoreGrammarErrorAt( *pPaM ); - } + } else if (nId == MN_IGNORE_WORD) { uno::Reference< linguistic2::XDictionary > xDictionary( SvxGetIgnoreAllList(), uno::UNO_QUERY ); linguistic::AddEntryToDic( xDictionary, xSpellAlt->getWord(), sal_False, aEmptyStr, LANGUAGE_NONE ); - } + } else if (MN_DICTIONARIES_START <= nId && nId <= MN_DICTIONARIES_END) { OUString aWord( xSpellAlt->getWord() ); - DBG_ASSERT( nDicIdx < aDics.getLength(), "dictionary index out of range" ); - + //DBG_ASSERT( nDicIdx < aDics.getLength(), "dictionary index out of range" ); + PopupMenu *pMenu = GetPopupMenu(MN_ADD_TO_DIC); String aDicName ( pMenu->GetItemText(nId) ); @@ -849,18 +849,18 @@ void SwSpellPopup::Execute( USHORT nId ) nAddRes ); } } - } - else + } + else { // Set language for selection or for paragraph... - + SfxItemSet aCoreSet( pSh->GetView().GetPool(), RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_LANGUAGE, 0 ); String aNewLangTxt; - + if (MN_SET_LANGUAGE_SELECTION_START <= nId && nId <= MN_SET_LANGUAGE_SELECTION_END) { //Set language for current selection @@ -933,7 +933,7 @@ void SwSpellPopup::Execute( USHORT nId ) } } #endif - } + } pSh->EnterStdMode(); } diff --git a/sw/source/ui/lingu/olmenu.hrc b/sw/source/ui/lingu/olmenu.hrc index 887f8a2ad3af..6afce9516bfd 100644 --- a/sw/source/ui/lingu/olmenu.hrc +++ b/sw/source/ui/lingu/olmenu.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 diff --git a/sw/source/ui/lingu/olmenu.src b/sw/source/ui/lingu/olmenu.src index b8d9124d2e52..9173509a69f6 100644 --- a/sw/source/ui/lingu/olmenu.src +++ b/sw/source/ui/lingu/olmenu.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 @@ -113,25 +113,25 @@ String STR_HYP_OK }; String STR_LANGSTATUS_NONE { - Text [ en-US ] = "None (Do not check spelling)" ; + Text [ en-US ] = "None (Do not check spelling)" ; }; String STR_RESET_TO_DEFAULT_LANGUAGE { - Text [ en-US ] = "Reset to Default Language" ; - Text [ x-comment ] = " "; + Text [ en-US ] = "Reset to Default Language" ; + Text [ x-comment ] = " "; }; String STR_LANGSTATUS_MORE { - Text [ en-US ] = "More..." ; + Text [ en-US ] = "More..." ; }; String STR_IGNORE_SELECTION { - Text [ en-US ] = "Ignore" ; + Text [ en-US ] = "Ignore" ; }; Image IMG_INFO_16 { ImageBitmap = Bitmap { File = "info_16.png" ; }; MASKCOLOR -}; +}; diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx index 32127f413e1a..1173774d5f01 100644 --- a/sw/source/ui/lingu/sdrhhcwrap.cxx +++ b/sw/source/ui/lingu/sdrhhcwrap.cxx @@ -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 @@ -51,7 +51,7 @@ #ifndef _VIEW_HXX #include <view.hxx> #endif -#include <dcontact.hxx> // Spelling von DrawObj +#include <dcontact.hxx> // Spelling von DrawObj #include <doc.hxx> // " " " #include <docary.hxx> #include <edtwin.hxx> @@ -92,7 +92,7 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, pOutlView->GetOutliner()->SetRefDevice(pView->GetWrtShell().getIDocumentDeviceAccess()->getPrinter( false )); // Hack: Es sollten alle SdrTextObj-Attribute an die EditEngine - // uebertragen werden. + // uebertragen werden. pOutlView->SetBackgroundColor( Color( COL_WHITE ) ); @@ -100,7 +100,7 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, Point aPoint( 0, 0 ); Rectangle aRect( aPoint, aSize ); pOutlView->SetOutputArea( aRect ); -// SetText( NULL ); +// SetText( NULL ); ClearModifyFlag(); } @@ -113,9 +113,9 @@ SdrHHCWrapper::~SdrHHCWrapper() pSdrView->SdrEndTextEdit( sal_True ); SetUpdateMode(sal_False); pOutlView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) ); -// SetPaperSize( Size(1, 1) ); -// SetText(NULL); -// pTextObj = NULL; +// SetPaperSize( Size(1, 1) ); +// SetText(NULL); +// pTextObj = NULL; } RemoveView( pOutlView ); delete pOutlView; @@ -215,7 +215,7 @@ sal_Bool SdrHHCWrapper::ConvertNextDocument() SetPaperSize( pTextObj->GetLogicRect().GetSize() ); SetUpdateMode(sal_True); pView->GetWrtShell().MakeVisible(pTextObj->GetLogicRect()); - + pSdrView->SdrBeginTextEdit(pTextObj, pPV, &pView->GetEditWin(), sal_False, this, pOutlView, sal_True, sal_True); } else diff --git a/sw/source/ui/lingu/sdrhhcwrap.hxx b/sw/source/ui/lingu/sdrhhcwrap.hxx index 795e357e28c3..197587e916e0 100644 --- a/sw/source/ui/lingu/sdrhhcwrap.hxx +++ b/sw/source/ui/lingu/sdrhhcwrap.hxx @@ -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 @@ -40,10 +40,10 @@ class SdrHHCWrapper : public SdrOutliner { // modified version of SdrSpeller - SwView* pView; - SdrTextObj* pTextObj; - OutlinerView* pOutlView; - SdrObjListIter* pListIter; + SwView* pView; + SdrTextObj* pTextObj; + OutlinerView* pOutlView; + SdrObjListIter* pListIter; sal_Int32 nOptions; sal_uInt16 nDocIndex; LanguageType nSourceLang; @@ -52,11 +52,11 @@ class SdrHHCWrapper : public SdrOutliner sal_Bool bIsInteractive; public: - SdrHHCWrapper( SwView* pVw, + SdrHHCWrapper( SwView* pVw, LanguageType nSourceLanguage, LanguageType nTargetLanguage, const Font* pTargetFnt, sal_Int32 nConvOptions, sal_Bool bInteractive ); - + virtual ~SdrHHCWrapper(); virtual sal_Bool ConvertNextDocument(); diff --git a/sw/source/ui/misc/autocorr.src b/sw/source/ui/misc/autocorr.src index 1807d12744e4..3c5ab355aa38 100644 --- a/sw/source/ui/misc/autocorr.src +++ b/sw/source/ui/misc/autocorr.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/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index feae6a64398a..22da987d5719 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -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 @@ -40,10 +40,10 @@ #include "view.hxx" #include "basesh.hxx" -#include "wrtsh.hxx" // +#include "wrtsh.hxx" // #include "cmdid.h" -#include "bookmark.hxx" // SwInsertBookmarkDlg -#include "IMark.hxx" +#include "bookmark.hxx" // SwInsertBookmarkDlg +#include "IMark.hxx" #include "bookmark.hrc" #include "misc.hrc" @@ -79,8 +79,8 @@ IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox ) } - aOkBtn.Enable(!bSelEntries); // neue Textmarke - aDeleteBtn.Enable(bSelEntries); // loeschbar? + aOkBtn.Enable(!bSelEntries); // neue Textmarke + aDeleteBtn.Enable(bSelEntries); // loeschbar? return 0; } @@ -97,10 +97,10 @@ IMPL_LINK( SwInsertBookmarkDlg, DeleteHdl, Button *, EMPTYARG ) aBookmarkBox.RemoveEntry(aBookmarkBox.GetSelectEntryPos(i - 1)); aBookmarkBox.SetText(aEmptyStr); - aDeleteBtn.Enable(FALSE); // keine weiteren Eintraege vorhanden + aDeleteBtn.Enable(FALSE); // keine weiteren Eintraege vorhanden // aBookmarkBox.SetText(aEmptyStr); - aOkBtn.Enable(); // Im OK Handler wird geloescht + aOkBtn.Enable(); // Im OK Handler wird geloescht return 0; } @@ -126,8 +126,8 @@ void SwInsertBookmarkDlg::Apply() } // Textmarke einfuegen - USHORT nLen = aBookmarkBox.GetText().Len(); - SwBoxEntry aTmpEntry(aBookmarkBox.GetText(), 0 ); + USHORT nLen = aBookmarkBox.GetText().Len(); + SwBoxEntry aTmpEntry(aBookmarkBox.GetText(), 0 ); if ( nLen && (aBookmarkBox.GetEntryPos(aTmpEntry) == COMBOBOX_ENTRY_NOTFOUND) ) { diff --git a/sw/source/ui/misc/bookmark.hrc b/sw/source/ui/misc/bookmark.hrc index 3320e3774516..ce808a6fa52f 100644 --- a/sw/source/ui/misc/bookmark.hrc +++ b/sw/source/ui/misc/bookmark.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 @@ -26,9 +26,9 @@ ************************************************************************/ -#define CB_BOOKMARK 1 +#define CB_BOOKMARK 1 #define FL_BOOKMARK 2 -#define BT_OK 20 -#define BT_CANCEL 21 -#define BT_DELETE 22 +#define BT_OK 20 +#define BT_CANCEL 21 +#define BT_DELETE 22 diff --git a/sw/source/ui/misc/bookmark.src b/sw/source/ui/misc/bookmark.src index 4e7a4ec0a01f..9ca4254eb680 100644 --- a/sw/source/ui/misc/bookmark.src +++ b/sw/source/ui/misc/bookmark.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/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 06a2e1ae69f4..b6f075b6b40a 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -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 @@ -167,10 +167,10 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& ) if(PTR_CAST(SwWebDocShell, pDocSh)) { - aParaTemplLbl .Hide(); - aParaTemplBox .Hide(); - aPageTemplLbl .Hide(); - aPageTemplBox .Hide(); + aParaTemplLbl .Hide(); + aParaTemplBox .Hide(); + aPageTemplLbl .Hide(); + aPageTemplBox .Hide(); aFtnCharTextTemplLbl.Hide(); aFtnCharTextTemplBox.Hide(); aFtnCharAnchorTemplLbl.Hide(); @@ -250,7 +250,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& ) SwTxtFmtColl* pColl = pInf->GetFtnTxtColl(); if( !pColl ) - aParaTemplBox.SelectEntry( sStr ); // Default + aParaTemplBox.SelectEntry( sStr ); // Default else { ASSERT(!pColl->IsDefault(), "Defaultvorlage fuer Fussnoten ist falsch."); @@ -290,7 +290,7 @@ SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet &rSet } /*------------------------------------------------------------------------ - Beschreibung: Unterschiedliche Arten der Numerierung; da die Listbox + Beschreibung: Unterschiedliche Arten der Numerierung; da die Listbox unterschiedlich viele Eintraege hat, hier Funktionen fuer das Setzen und Erfragen der gemeinten Art der Numerierung. @@ -343,7 +343,7 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell ) } /*------------------------------------------------------------------------ - Beschreibung: Handler hinter dem Button fuer Sammeln der Fussnote + Beschreibung: Handler hinter dem Button fuer Sammeln der Fussnote auf der Seite. In diesem Fall koennen alle Numerierungsarten verwendet werden. @@ -385,7 +385,7 @@ IMPL_LINK( SwEndNoteOptionPage, NumCountHdl, ListBox*, EMPTYARG ) } /*------------------------------------------------------------------------ - Beschreibung: Handler hinter dem Button fuer Sammeln der Fussnote + Beschreibung: Handler hinter dem Button fuer Sammeln der Fussnote am Kapitel oder Dokumentende. In diesem Fall kann keine seitenweise Numerierung verwendet werden. diff --git a/sw/source/ui/misc/docfnote.hrc b/sw/source/ui/misc/docfnote.hrc index f826f276620e..fc40676715ef 100644 --- a/sw/source/ui/misc/docfnote.hrc +++ b/sw/source/ui/misc/docfnote.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,37 +24,37 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define RB_POS_PAGE 1 -#define RB_POS_CHAPTER 2 -#define FT_POS 3 +#define RB_POS_PAGE 1 +#define RB_POS_CHAPTER 2 +#define FT_POS 3 #define FT_NUMTYPE 4 #define FT_NUMCOUNT 5 -#define LB_NUMVIEW 10 -#define LB_NUMCOUNT 11 -#define FLD_OFFSET 12 -#define FT_OFFSET 13 +#define LB_NUMVIEW 10 +#define LB_NUMCOUNT 11 +#define FLD_OFFSET 12 +#define FT_OFFSET 13 #define FL_NUM 14 -#define LB_PARA_TEMPL 30 -#define LB_PAGE_TEMPL 31 -#define FT_PARA_TEMPL 32 -#define FT_PAGE_TEMPL 33 +#define LB_PARA_TEMPL 30 +#define LB_PAGE_TEMPL 31 +#define FT_PARA_TEMPL 32 +#define FT_PAGE_TEMPL 33 #define FL_TEMPL 34 -#define FT_CONT 40 -#define ED_CONT 41 -#define FT_CONT_FROM 42 -#define ED_CONT_FROM 43 +#define FT_CONT 40 +#define ED_CONT 41 +#define FT_CONT_FROM 42 +#define ED_CONT_FROM 43 #define FL_CONT 44 #define FT_PREFIX 45 #define ED_PREFIX 46 #define FT_SUFFIX 47 #define ED_SUFFIX 48 -#define FT_TEXT_CHARFMT 49 -#define LB_TEXT_CHARFMT 50 -#define FT_ANCHR_CHARFMT 51 +#define FT_TEXT_CHARFMT 49 +#define LB_TEXT_CHARFMT 50 +#define FT_ANCHR_CHARFMT 51 #define FL_CHAR_TEMPL 52 -#define LB_ANCHR_CHARFMT 53 +#define LB_ANCHR_CHARFMT 53 diff --git a/sw/source/ui/misc/docfnote.src b/sw/source/ui/misc/docfnote.src index fbc1ba24393c..bdb4d55eb2e9 100644 --- a/sw/source/ui/misc/docfnote.src +++ b/sw/source/ui/misc/docfnote.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/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 59a918fc4030..5374ddd2e292 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -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 @@ -65,9 +65,9 @@ #define PATH_CASE_SENSITIVE 0x01 -#define PATH_READONLY 0x02 +#define PATH_READONLY 0x02 -#define RENAME_TOKEN_DELIM (sal_Unicode)1 +#define RENAME_TOKEN_DELIM (sal_Unicode)1 /*-----------------09.06.97 13:05------------------- @@ -77,8 +77,8 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent, SwGlossaryHdl *pHdl) : SvxStandardDialog(pParent, SW_RES(DLG_BIB_BASE)), - aNameED( this, SW_RES(ED_NAME)), - aPathLB( this, SW_RES(LB_PATH)), + aNameED( this, SW_RES(ED_NAME)), + aPathLB( this, SW_RES(LB_PATH)), aGroupTLB( this, SW_RES(TLB_GROUPS)), aOkPB( this, SW_RES(BT_OK)), @@ -101,7 +101,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent, FreeResource(); long nTabs[] = - { 2, // Number of Tabs + { 2, // Number of Tabs 0, 160 }; @@ -287,7 +287,7 @@ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG ) IMPL_LINK( SwGlossaryGroupDlg, NewHdl, Button*, EMPTYARG ) { String sGroup(aNameED.GetText()); -// sGroup.ToLower(); +// sGroup.ToLower(); sGroup += GLOS_DELIM; sGroup += String::CreateFromInt32(aPathLB.GetSelectEntryPos()); DBG_ASSERT(!pGlosHdl->FindGroupName(sGroup), "Gruppe bereits vorhanden!"); @@ -295,7 +295,7 @@ IMPL_LINK( SwGlossaryGroupDlg, NewHdl, Button*, EMPTYARG ) pInsertedArr = new SvStrings; pInsertedArr->Insert(new String(sGroup), pInsertedArr->Count()); String sTemp(aNameED.GetText()); -// sTemp.ToLower(); +// sTemp.ToLower(); sTemp += '\t'; sTemp += aPathLB.GetSelectEntry(); SvLBoxEntry* pEntry = aGroupTLB.InsertEntry(sTemp); @@ -426,7 +426,7 @@ IMPL_LINK( SwGlossaryGroupDlg, RenameHdl, Button *, EMPTYARG ) delete (GlosBibUserData*)pEntry->GetUserData(); aGroupTLB.GetModel()->Remove(pEntry); String sTemp(aNameED.GetText()); -// sTemp.ToLower(); +// sTemp.ToLower(); sTemp += '\t'; sTemp += aPathLB.GetSelectEntry(); pEntry = aGroupTLB.InsertEntry(sTemp); @@ -446,7 +446,7 @@ IMPL_LINK( SwGlossaryGroupDlg, RenameHdl, Button *, EMPTYARG ) IMPL_LINK( SwGlossaryGroupDlg, ModifyHdl, Edit*, EMPTYARG ) { String sEntry(aNameED.GetText()); -// sEntry.ToLower(); +// sEntry.ToLower(); BOOL bEnableNew = TRUE; BOOL bEnableDel = FALSE; ULONG nCaseReadonly = @@ -492,10 +492,10 @@ IMPL_LINK( SwGlossaryGroupDlg, ModifyHdl, Edit*, EMPTYARG ) GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData(); bEnableDel = IsDeleteAllowed(pUserData->sGroupName); -// String sGroup = aGroupTLB.GetEntryText(pEntry, 0); -// sGroup += GLOS_DELIM; -// sGroup += String::CreateFromInt32(aPathLB.GetEntryPos(aGroupTLB.GetEntryText(pEntry, 1))); -// bEnableDel = IsDeleteAllowed(sGroup); +// String sGroup = aGroupTLB.GetEntryText(pEntry, 0); +// sGroup += GLOS_DELIM; +// sGroup += String::CreateFromInt32(aPathLB.GetEntryPos(aGroupTLB.GetEntryText(pEntry, 1))); +// bEnableDel = IsDeleteAllowed(sGroup); } aDelPB.Enable(bEnableDel); @@ -548,7 +548,7 @@ void FEdit::KeyInput( const KeyEvent& rKEvent ) /* -----------------------------08.02.00 15:07-------------------------------- ---------------------------------------------------------------------------*/ -void SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt ) +void SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); SvLBoxEntry* pEntry = GetEntry( aPos ); diff --git a/sw/source/ui/misc/glosbib.hrc b/sw/source/ui/misc/glosbib.hrc index 834163d52fe0..2322dc63f285 100644 --- a/sw/source/ui/misc/glosbib.hrc +++ b/sw/source/ui/misc/glosbib.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 @@ -28,14 +28,14 @@ #define FT_BIB 1 #define FT_PATH 2 #define FT_SELECT 3 -#define CO_NAME 2 -#define PB_NEW 3 -#define PB_DELETE 4 -#define BT_OK 5 -#define BT_CANCEL 6 +#define CO_NAME 2 +#define PB_NEW 3 +#define PB_DELETE 4 +#define BT_OK 5 +#define BT_CANCEL 6 #define BT_HELP 7 #define LB_PATH 8 #define TLB_GROUPS 9 #define ED_NAME 10 -#define PB_RENAME 11 +#define PB_RENAME 11 diff --git a/sw/source/ui/misc/glosbib.src b/sw/source/ui/misc/glosbib.src index 30a4a9e81930..75a03eb85e64 100644 --- a/sw/source/ui/misc/glosbib.src +++ b/sw/source/ui/misc/glosbib.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/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx index 9ce1038eb898..8c13ab80fddb 100644 --- a/sw/source/ui/misc/glosdoc.cxx +++ b/sw/source/ui/misc/glosdoc.cxx @@ -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 @@ -48,7 +48,7 @@ #include <unotools/pathoptions.hxx> #include <unotools/tempfile.hxx> #include <swtypes.hxx> -#include <errhdl.hxx> // ASSERT +#include <errhdl.hxx> // ASSERT #include <uitool.hxx> #include <glosdoc.hxx> #include <shellio.hxx> @@ -76,7 +76,7 @@ String lcl_CheckFileName( const String& rNewFilePath, for( xub_StrLen i = 0; i < rNewGroupName.Len(); i++ ) { sal_Unicode cChar = rNewGroupName.GetChar(i); - if( (cChar >= 'A' && cChar <= 'Z') || + if( (cChar >= 'A' && cChar <= 'Z') || (cChar >= 'a' && cChar <= 'z') || (cChar >= '0' && cChar <= '9') || cChar == '_' || cChar == 0x20 ) @@ -116,7 +116,7 @@ String lcl_CheckFileName( const String& rNewFilePath, ------------------------------------------------------------------------*/ -String SwGlossaries::GetDefName() +String SwGlossaries::GetDefName() { return String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "standard" )); @@ -135,7 +135,7 @@ sal_uInt16 SwGlossaries::GetGroupCnt() ------------------------------------------------------------------------*/ sal_Bool SwGlossaries::FindGroupName(String & rGroup) { - // enthaelt der Gruppenname keinen Pfad, kann hier ein passender + // enthaelt der Gruppenname keinen Pfad, kann hier ein passender // Gruppeneintrag gesucht werden; sal_uInt16 nCount = GetGroupCnt(); sal_uInt16 i; @@ -177,9 +177,9 @@ String SwGlossaries::GetGroupName(sal_uInt16 nGroupId) /* -----------------------------08.02.00 13:04-------------------------------- ---------------------------------------------------------------------------*/ -String SwGlossaries::GetGroupTitle( const String& rGroupName ) +String SwGlossaries::GetGroupTitle( const String& rGroupName ) { - String sRet; + String sRet; String sGroup(rGroupName); if(STRING_NOTFOUND == sGroup.Search(GLOS_DELIM)) FindGroupName(sGroup); @@ -213,7 +213,7 @@ SwTextBlocks* SwGlossaries::GetGroupDoc(const String &rName, break; } if(i == nCount) - { // Baustein nicht in der Liste + { // Baustein nicht in der Liste String *pTmp = new String(aName); m_pGlosArr->Insert(pTmp, m_pGlosArr->Count()); } @@ -222,14 +222,14 @@ SwTextBlocks* SwGlossaries::GetGroupDoc(const String &rName, } /*------------------------------------------------------------------------ - Beschreibung: Loeschen Textblock + Beschreibung: Loeschen Textblock ------------------------------------------------------------------------*/ void SwGlossaries::PutGroupDoc(SwTextBlocks *pBlock) { delete pBlock; } /*------------------------------------------------------------------------ - Beschreibung: Erzeugt ein neues Dokument mit dem Gruppenname + Beschreibung: Erzeugt ein neues Dokument mit dem Gruppenname Wird temp. auch als File angelegt, damit die Gruppen auch spaeter (ohne Zugriff) vorhanden sind. ------------------------------------------------------------------------*/ @@ -259,7 +259,7 @@ sal_Bool SwGlossaries::NewGroupDoc(String& rGroupName, const String& rTitle) /* -----------------23.11.98 13:13------------------- * * --------------------------------------------------*/ -sal_Bool SwGlossaries::RenameGroupDoc( +sal_Bool SwGlossaries::RenameGroupDoc( const String& rOldGroup, String& rNewGroup, const String& rNewTitle ) { sal_Bool bRet = sal_False; @@ -470,7 +470,7 @@ SwGlossaries::SwGlossaries() : ------------------------------------------------------------------------*/ /* -----------------21.01.99 15:36------------------- -* #61050# Doppelte Pfade fuehren zu Verwirrung - als raus damit +* #61050# Doppelte Pfade fuehren zu Verwirrung - als raus damit * --------------------------------------------------*/ sal_Bool lcl_FindSameEntry(const SvStrings& rDirArr, const String& rEntryURL) { @@ -582,7 +582,7 @@ void SwGlossaries::RemoveFileFromList( const String& rGroup ) rtl::OUString aUName = rGroup; { // tell the UNO AutoTextGroup object that it's not valid anymore - for ( UnoAutoTextGroups::iterator aLoop = m_aGlossaryGroups.begin(); + for ( UnoAutoTextGroups::iterator aLoop = m_aGlossaryGroups.begin(); aLoop != m_aGlossaryGroups.end(); ++aLoop ) @@ -601,7 +601,7 @@ void SwGlossaries::RemoveFileFromList( const String& rGroup ) { // tell all our UNO AutoTextEntry objects that they're not valid anymore - for ( UnoAutoTextEntries::iterator aLoop = m_aGlossaryEntries.begin(); + for ( UnoAutoTextEntries::iterator aLoop = m_aGlossaryEntries.begin(); aLoop != m_aGlossaryEntries.end(); ) { @@ -654,7 +654,7 @@ String SwGlossaries::GetCompleteGroupName( const rtl::OUString& GroupName ) void SwGlossaries::InvalidateUNOOjects() { // invalidate all the AutoTextGroup-objects - for ( UnoAutoTextGroups::iterator aGroupLoop = m_aGlossaryGroups.begin(); + for ( UnoAutoTextGroups::iterator aGroupLoop = m_aGlossaryGroups.begin(); aGroupLoop != m_aGlossaryGroups.end(); ++aGroupLoop ) @@ -667,7 +667,7 @@ void SwGlossaries::InvalidateUNOOjects() m_aGlossaryGroups.swap( aTmpg ); // invalidate all the AutoTextEntry-objects - for ( UnoAutoTextEntries::const_iterator aEntryLoop = m_aGlossaryEntries.begin(); + for ( UnoAutoTextEntries::const_iterator aEntryLoop = m_aGlossaryEntries.begin(); aEntryLoop != m_aGlossaryEntries.end(); ++aEntryLoop ) @@ -713,9 +713,9 @@ Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const ::rtl::O } if ( _rGroupName == pSwGroup->getName() ) - { // the group is already cached + { // the group is already cached if ( sCompleteGroupName.Len() ) - { // the group still exists -> return it + { // the group still exists -> return it xGroup = pSwGroup; break; } @@ -780,9 +780,9 @@ Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry( const String& continue; } - if ( pEntry - && ( COMPARE_EQUAL == pEntry->GetGroupName().CompareTo( sGroupName ) ) - && ( COMPARE_EQUAL == pEntry->GetEntryName().CompareTo( sEntryName ) ) + if ( pEntry + && ( COMPARE_EQUAL == pEntry->GetGroupName().CompareTo( sGroupName ) ) + && ( COMPARE_EQUAL == pEntry->GetEntryName().CompareTo( sEntryName ) ) ) { xReturn = pEntry; diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index a2b6b85a7449..faec81b63965 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -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 @@ -69,7 +69,7 @@ #include <glossary.hxx> #include <gloshdl.hxx> #include <glosbib.hxx> -#include <initui.hxx> // fuer ::GetGlossaries() +#include <initui.hxx> // fuer ::GetGlossaries() #include <glosdoc.hxx> #include <macassgn.hxx> #include <swevent.hxx> @@ -132,31 +132,31 @@ String lcl_GetValidShortCut( const String& rName ) ---------------------------------------------------------------------------*/ struct GroupUserData { - String sGroupName; - sal_uInt16 nPathIdx; - BOOL bReadonly; + String sGroupName; + sal_uInt16 nPathIdx; + BOOL bReadonly; GroupUserData() : nPathIdx(0), - bReadonly(FALSE) {} + bReadonly(FALSE) {} }; /*------------------------------------------------------------------------ - Beschreibung: Dialog fuer neuen Bausteinnamen + Beschreibung: Dialog fuer neuen Bausteinnamen ------------------------------------------------------------------------*/ class SwNewGlosNameDlg : public ModalDialog { - FixedText aNNFT; - Edit aNewName; - FixedText aNSFT; - NoSpaceEdit aNewShort; - OKButton aOk; - CancelButton aCancel; + FixedText aNNFT; + Edit aNewName; + FixedText aNSFT; + NoSpaceEdit aNewShort; + OKButton aOk; + CancelButton aCancel; FixedLine aFL; - FixedText aONFT; - Edit aOldName; - FixedText aOSFT; - Edit aOldShort; + FixedText aONFT; + Edit aOldName; + FixedText aOSFT; + Edit aOldShort; protected: DECL_LINK( Modify, Edit * ); @@ -179,12 +179,12 @@ SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent, aNewName(this, SW_RES( ED_NN )), aNSFT (this, SW_RES( FT_NS )), aNewShort(this,SW_RES( ED_NS )), - aOk (this, SW_RES( BT_OKNEW)), - aCancel (this, SW_RES( BT_CANCEL)), + aOk (this, SW_RES( BT_OKNEW)), + aCancel (this, SW_RES( BT_CANCEL)), aFL (this, SW_RES( FL_NN )), - aONFT (this, SW_RES( FT_ON )), + aONFT (this, SW_RES( FT_ON )), aOldName(this, SW_RES( ED_ON )), - aOSFT (this, SW_RES( FT_OS )), + aOSFT (this, SW_RES( FT_OS )), aOldShort(this,SW_RES( ED_OS )) { FreeResource(); @@ -199,7 +199,7 @@ SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent, } /*------------------------------------------------------------------------ - Beschreibung: aktuell eingestellte Gruppe erfragen / setzen + Beschreibung: aktuell eingestellte Gruppe erfragen / setzen ------------------------------------------------------------------------*/ String SwGlossaryDlg::GetCurrGroup() @@ -226,7 +226,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, SvxStandardDialog(&pViewFrame->GetWindow(), SW_RES(DLG_GLOSSARY)), aInsertTipCB (this, SW_RES(CB_INSERT_TIP)), - aNameLbl (this, SW_RES(FT_NAME)), + aNameLbl (this, SW_RES(FT_NAME)), aNameED (this, SW_RES(ED_NAME)), aShortNameLbl (this, SW_RES(FT_SHORTNAME)), aShortNameEdit(this, SW_RES(ED_SHORTNAME)), @@ -241,8 +241,8 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, aCloseBtn (this, SW_RES(PB_CLOSE)), aHelpBtn (this, SW_RES(PB_HELP)), aEditBtn (this, SW_RES(PB_EDIT)), - aBibBtn (this, SW_RES(PB_BIB)), - aPathBtn (this, SW_RES(PB_PATH)), + aBibBtn (this, SW_RES(PB_BIB)), + aPathBtn (this, SW_RES(PB_PATH)), sReadonlyPath (SW_RES(ST_READONLY_PATH)), pExampleFrame(0), @@ -296,7 +296,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, aCategoryBox.SetHelpId(HID_MD_GLOS_CATEGORY); aCategoryBox.SetWindowBits(WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL|WB_VSCROLL|WB_CLIPCHILDREN|WB_SORT); aCategoryBox.GetModel()->SetSortMode(SortAscending); - aCategoryBox.SetHighlightRange(); // ueber volle Breite selektieren + aCategoryBox.SetHighlightRange(); // ueber volle Breite selektieren aCategoryBox.SetNodeDefaultImages( ); Init(); @@ -317,7 +317,7 @@ SwGlossaryDlg::~SwGlossaryDlg() delete pExampleFrame; } /*------------------------------------------------------------------------ - Beschreibung: Auswahl neue Gruppe + Beschreibung: Auswahl neue Gruppe ------------------------------------------------------------------------*/ @@ -371,7 +371,7 @@ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox ) void SwGlossaryDlg::Apply() { const String aGlosName(aShortNameEdit.GetText()); - if(aGlosName.Len()) pGlossaryHdl->InsertGlossary(aGlosName); + if(aGlosName.Len()) pGlossaryHdl->InsertGlossary(aGlosName); if( SfxRequest::HasMacroRecorder( pSh->GetView().GetViewFrame() ) ) { SfxRequest aReq( pSh->GetView().GetViewFrame(), FN_INSERT_GLOSSARY ); @@ -521,7 +521,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) { case FN_GL_REPLACE: case FN_GL_REPLACE_TEXT: - pGlossaryHdl->NewGlossary( aNameED.GetText(), + pGlossaryHdl->NewGlossary( aNameED.GetText(), aShortNameEdit.GetText(), sal_False, pMn->GetCurItemId() == FN_GL_REPLACE_TEXT); @@ -550,7 +550,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) pChild->SetUserData(new String(aShortName)); aNameED.SetText(aStr); aShortNameEdit.SetText(aShortName); - NameModify(&aNameED); // fuer Schalten der Buttons + NameModify(&aNameED); // fuer Schalten der Buttons if( SfxRequest::HasMacroRecorder( pSh->GetView().GetViewFrame() ) ) { @@ -696,7 +696,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) return 1; } /*-------------------------------------------------------------------- - Beschreibung: Dialog Verwaltung Bereiche + Beschreibung: Dialog Verwaltung Bereiche --------------------------------------------------------------------*/ @@ -775,7 +775,7 @@ IMPL_LINK( SwGlossaryDlg, BibHdl, Button *, EMPTYARG ) } /*------------------------------------------------------------------------ - Beschreibung: Initialisierung; aus Ctor und nach Bearbeiten Bereiche + Beschreibung: Initialisierung; aus Ctor und nach Bearbeiten Bereiche ------------------------------------------------------------------------*/ @@ -850,9 +850,9 @@ void SwGlossaryDlg::Init() GrpSelect(&aCategoryBox); } //JP 16.11.99: the SvxTreeListBox has a Bug. The Box dont recalc the - // outputsize, when all entries are insertet. The result is, that - // the Focus/Highlight rectangle is to large and paintet over the - // HScrollbar. -> Fix: call the resize + // outputsize, when all entries are insertet. The result is, that + // the Focus/Highlight rectangle is to large and paintet over the + // HScrollbar. -> Fix: call the resize aCategoryBox.Resize(); aCategoryBox.GetModel()->Resort(); @@ -888,7 +888,7 @@ IMPL_LINK_INLINE_START( SwGlossaryDlg, EditHdl, Button *, EMPTYARG ) IMPL_LINK_INLINE_END( SwGlossaryDlg, EditHdl, Button *, EMPTYARG ) /*------------------------------------------------------------------------ - Beschreibung: KeyInput fuer ShortName - Edits ohne Spaces + Beschreibung: KeyInput fuer ShortName - Edits ohne Spaces ------------------------------------------------------------------------*/ IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox ) @@ -947,7 +947,7 @@ IMPL_LINK( SwGlossaryDlg, CheckBoxHdl, CheckBox *, pBox ) * --------------------------------------------------*/ SwGlTreeListBox::SwGlTreeListBox(Window* pParent, const ResId& rResId) : SvTreeListBox(pParent, rResId), - sReadonly (SW_RES(ST_READONLY)), + sReadonly (SW_RES(ST_READONLY)), pDragEntry(0) { FreeResource(); @@ -1265,7 +1265,7 @@ void SwGlossaryDlg::ShowAutoText(const String& rGroup, const String& rShortName) /* -----------------------------21.12.00 11:33-------------------------------- ---------------------------------------------------------------------------*/ -void SwGlossaryDlg::ResumeShowAutoText() +void SwGlossaryDlg::ResumeShowAutoText() { String sGroup, sShortName; if(GetResumeData(sGroup, sShortName) && aExampleWIN.IsVisible()) diff --git a/sw/source/ui/misc/glossary.hrc b/sw/source/ui/misc/glossary.hrc index 4ee5aaaa7ede..52208bc962f7 100644 --- a/sw/source/ui/misc/glossary.hrc +++ b/sw/source/ui/misc/glossary.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 @@ -27,57 +27,57 @@ // Box Textbausteine -#define FT_SHORTNAME 1 -#define ED_SHORTNAME 2 -#define FT_NAME 3 -//#define DCB_NAME 4 -#define ED_NAME 4 +#define FT_SHORTNAME 1 +#define ED_SHORTNAME 2 +#define FT_NAME 3 +//#define DCB_NAME 4 +#define ED_NAME 4 #define CB_INSERT_TIP 5 -//#define FT_BIB 10 +//#define FT_BIB 10 -#define PB_INSERT 50 -#define PB_EDIT 52 -#define PB_BIB 54 -#define PB_CLOSE 55 -#define PB_PATH 56 +#define PB_INSERT 50 +#define PB_EDIT 52 +#define PB_BIB 54 +#define PB_CLOSE 55 +#define PB_PATH 56 #define PB_HELP 57 -#define MNU_EDIT 60 -#define FN_GL_DEFINE 61 -#define FN_GL_DEFINE_TEXT 62 -#define FN_GL_REPLACE 63 -#define FN_GL_EDIT 64 -#define FN_GL_DELETE 65 -#define FN_GL_RENAME 66 -#define FN_GL_MACRO 67 -#define CB_FILE_REL 68 +#define MNU_EDIT 60 +#define FN_GL_DEFINE 61 +#define FN_GL_DEFINE_TEXT 62 +#define FN_GL_REPLACE 63 +#define FN_GL_EDIT 64 +#define FN_GL_DELETE 65 +#define FN_GL_RENAME 66 +#define FN_GL_MACRO 67 +#define CB_FILE_REL 68 #define CB_NET_REL 69 #define FL_RELATIVE 70 #define WIN_EXAMPLE 72 -#define CB_SHOW_EXAMPLE 73 +#define CB_SHOW_EXAMPLE 73 #define FN_GL_COPY_TO_CLIPBOARD 74 -#define FN_GL_IMPORT 75 -#define ST_READONLY 76 -#define ST_READONLY_PATH 77 -#define FN_GL_REPLACE_TEXT 78 +#define FN_GL_IMPORT 75 +#define ST_READONLY 76 +#define ST_READONLY_PATH 77 +#define FN_GL_REPLACE_TEXT 78 #define WIN_EXAMPLE_DUMMY 79 // Box Bibliothek Textbausteine #define FL_EDIT 1 #define FL_BIB 2 -#define ED_BIB 3 +#define ED_BIB 3 -#define PB_NEW 10 -#define PB_DELETE 11 +#define PB_NEW 10 +#define PB_DELETE 11 -#define BT_OK 100 +#define BT_OK 100 // beide -#define LB_BIB 80 +#define LB_BIB 80 // Dialog Namensaenderung -#define FT_ON 1 +#define FT_ON 1 #define FT_OS 2 #define FT_NN 3 #define FT_NS 4 @@ -86,6 +86,6 @@ #define ED_NN 7 #define ED_NS 8 #define FL_NN 9 -#define BT_CANCEL 10 -#define BT_OKNEW 11 +#define BT_CANCEL 10 +#define BT_OKNEW 11 diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src index 3ed5c4939791..12d6ab9e8127 100644 --- a/sw/source/ui/misc/glossary.src +++ b/sw/source/ui/misc/glossary.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/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx index 4d93f8d7542f..d25c570ed0ee 100644 --- a/sw/source/ui/misc/glshell.cxx +++ b/sw/source/ui/misc/glshell.cxx @@ -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 @@ -51,7 +51,7 @@ #include <doc.hxx> #include <glosdoc.hxx> #include <shellio.hxx> -#include <initui.hxx> // fuer ::GetGlossaries() +#include <initui.hxx> // fuer ::GetGlossaries() #ifndef _CMDID_H #include <cmdid.h> #endif diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index a1b305b3b7db..0ea21406b5c6 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -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 @@ -46,31 +46,31 @@ class SwWrtShell; class SwEndNoteOptionPage : public SfxTabPage { - FixedText aNumTypeFT; - SwNumberingTypeListBox aNumViewBox; - FixedText aOffsetLbl; - NumericField aOffsetFld; - FixedText aNumCountFT; - ListBox aNumCountBox; - FixedText aPrefixFT; - Edit aPrefixED; - FixedText aSuffixFT; - Edit aSuffixED; - FixedText aPosFT; - RadioButton aPosPageBox; - RadioButton aPosChapterBox; + FixedText aNumTypeFT; + SwNumberingTypeListBox aNumViewBox; + FixedText aOffsetLbl; + NumericField aOffsetFld; + FixedText aNumCountFT; + ListBox aNumCountBox; + FixedText aPrefixFT; + Edit aPrefixED; + FixedText aSuffixFT; + Edit aSuffixED; + FixedText aPosFT; + RadioButton aPosPageBox; + RadioButton aPosChapterBox; FixedLine aNumFL; - FixedText aParaTemplLbl; - ListBox aParaTemplBox; - FixedText aPageTemplLbl; - ListBox aPageTemplBox; + FixedText aParaTemplLbl; + ListBox aParaTemplBox; + FixedText aPageTemplLbl; + ListBox aPageTemplBox; FixedLine aTemplFL; - FixedText aFtnCharAnchorTemplLbl; - ListBox aFtnCharAnchorTemplBox; - FixedText aFtnCharTextTemplLbl; - ListBox aFtnCharTextTemplBox; + FixedText aFtnCharAnchorTemplLbl; + ListBox aFtnCharAnchorTemplBox; + FixedText aFtnCharTextTemplLbl; + ListBox aFtnCharTextTemplBox; FixedLine aCharTemplFL; FixedText aContLbl; @@ -83,8 +83,8 @@ class SwEndNoteOptionPage : public SfxTabPage String aNumPage; String aNumChapter; SwWrtShell *pSh; - BOOL bPosDoc; - BOOL bEndNote; + BOOL bPosDoc; + BOOL bEndNote; inline void SelectNumbering(int eNum); int GetNumbering() const; diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 5cc82f8473eb..586de971fd35 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -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 @@ -55,7 +55,7 @@ static BOOL bFootnote = TRUE; /*------------------------------------------------------------------------ - Beschreibung: Einfuegen der Fussnote durch OK + Beschreibung: Einfuegen der Fussnote durch OK ------------------------------------------------------------------------*/ void __EXPORT SwInsFootNoteDlg::Apply() @@ -233,21 +233,21 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, BOOL bEd rSh(rShell), bExtCharAvailable(FALSE), bEdit(bEd), - aNumberAutoBtn (this,SW_RES(RB_NUMBER_AUTO)), - aNumberCharBtn (this,SW_RES(RB_NUMBER_CHAR)), - aNumberCharEdit (this,SW_RES(ED_NUMBER_CHAR)), - aNumberExtChar (this,SW_RES(BT_NUMBER_CHAR)), + aNumberAutoBtn (this,SW_RES(RB_NUMBER_AUTO)), + aNumberCharBtn (this,SW_RES(RB_NUMBER_CHAR)), + aNumberCharEdit (this,SW_RES(ED_NUMBER_CHAR)), + aNumberExtChar (this,SW_RES(BT_NUMBER_CHAR)), aNumberFL (this,SW_RES(FL_NUMBER)), aFtnBtn (this,SW_RES(RB_TYPE_FTN)), - aEndNoteBtn (this,SW_RES(RB_TYPE_ENDNOTE)), + aEndNoteBtn (this,SW_RES(RB_TYPE_ENDNOTE)), aTypeFL (this,SW_RES(FL_TYPE)), - aOkBtn (this,SW_RES(BT_OK)), - aCancelBtn (this,SW_RES(BT_CANCEL)), - aHelpBtn (this,SW_RES(BT_HELP)), - aPrevBT (this,SW_RES(BT_PREV)), - aNextBT (this,SW_RES(BT_NEXT)) + aOkBtn (this,SW_RES(BT_OK)), + aCancelBtn (this,SW_RES(BT_CANCEL)), + aHelpBtn (this,SW_RES(BT_HELP)), + aPrevBT (this,SW_RES(BT_PREV)), + aNextBT (this,SW_RES(BT_NEXT)) { aNumberAutoBtn.SetClickHdl(LINK(this,SwInsFootNoteDlg,NumberAutoBtnHdl)); aNumberExtChar.SetClickHdl(LINK(this,SwInsFootNoteDlg,NumberExtCharHdl)); diff --git a/sw/source/ui/misc/insfnote.hrc b/sw/source/ui/misc/insfnote.hrc index 8ac15b4f9fc3..104693acea19 100644 --- a/sw/source/ui/misc/insfnote.hrc +++ b/sw/source/ui/misc/insfnote.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 @@ -25,17 +25,17 @@ * ************************************************************************/ -#define RB_NUMBER_AUTO 1 -#define RB_NUMBER_CHAR 2 -#define ED_NUMBER_CHAR 3 -#define BT_NUMBER_CHAR 4 +#define RB_NUMBER_AUTO 1 +#define RB_NUMBER_CHAR 2 +#define ED_NUMBER_CHAR 3 +#define BT_NUMBER_CHAR 4 #define FL_NUMBER 5 #define FL_TYPE 6 -#define RB_TYPE_FTN 7 -#define RB_TYPE_ENDNOTE 8 +#define RB_TYPE_FTN 7 +#define RB_TYPE_ENDNOTE 8 -#define BT_OK 100 -#define BT_CANCEL 101 -#define BT_HELP 102 -#define BT_PREV 103 -#define BT_NEXT 104 +#define BT_OK 100 +#define BT_CANCEL 101 +#define BT_HELP 102 +#define BT_PREV 103 +#define BT_NEXT 104 diff --git a/sw/source/ui/misc/insfnote.src b/sw/source/ui/misc/insfnote.src index 1bf5f77dcb2e..fda4b92b0d87 100644 --- a/sw/source/ui/misc/insfnote.src +++ b/sw/source/ui/misc/insfnote.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/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx index c053030201ad..c508f83dd24d 100644 --- a/sw/source/ui/misc/insrule.cxx +++ b/sw/source/ui/misc/insrule.cxx @@ -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 @@ -147,7 +147,7 @@ void __EXPORT SwRulerValueSet::UserDraw( const UserDrawEvent& rUDEvt ) { Rectangle aRect = rUDEvt.GetRect(); OutputDevice* pDev = rUDEvt.GetDevice(); - USHORT nItemId = rUDEvt.GetItemId(); + USHORT nItemId = rUDEvt.GetItemId(); Point aBLPos = aRect.TopLeft(); // Itemzaehlung beginnt bei 1, und die 1. ist die einfache Linie diff --git a/sw/source/ui/misc/insrule.hrc b/sw/source/ui/misc/insrule.hrc index 47289f2c366a..8e2477bc349f 100644 --- a/sw/source/ui/misc/insrule.hrc +++ b/sw/source/ui/misc/insrule.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 @@ -28,8 +28,8 @@ #include "misc.hrc" #define FL_SEL 1 -#define VS_EXAMPLE 2 -#define PB_OK 3 -#define PB_CANCEL 4 -#define PB_HELP 5 +#define VS_EXAMPLE 2 +#define PB_OK 3 +#define PB_CANCEL 4 +#define PB_HELP 5 #define ST_SIMPLE 6 diff --git a/sw/source/ui/misc/insrule.src b/sw/source/ui/misc/insrule.src index 89890e5904af..41e10db2266a 100644 --- a/sw/source/ui/misc/insrule.src +++ b/sw/source/ui/misc/insrule.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/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 213c0e99e413..918d18128d09 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -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 @@ -104,28 +104,28 @@ IMPL_LINK( SwLineNumberingDlg, OKHdl, Button *, EMPTYARG ) SwLineNumberingPage::SwLineNumberingPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, SW_RES(TP_LINENUMBERING), rSet), - aNumberingOnCB ( this, SW_RES( CB_NUMBERING_ON )), - aCharStyleFT ( this, SW_RES( FT_CHAR_STYLE )), - aCharStyleLB ( this, SW_RES( LB_CHAR_STYLE )), - aFormatFT ( this, SW_RES( FT_FORMAT )), - aFormatLB ( this, SW_RES( LB_FORMAT ), INSERT_NUM_EXTENDED_TYPES), - aPosFT ( this, SW_RES( FT_POS )), - aPosLB ( this, SW_RES( LB_POS )), - aOffsetFT ( this, SW_RES( FT_OFFSET )), - aOffsetMF ( this, SW_RES( MF_OFFSET )), - aNumIntervalFT ( this, SW_RES( FT_NUM_INVERVAL )), - aNumIntervalNF ( this, SW_RES( NF_NUM_INVERVAL )), - aNumRowsFT ( this, SW_RES( FT_NUM_ROWS )), + aNumberingOnCB ( this, SW_RES( CB_NUMBERING_ON )), + aCharStyleFT ( this, SW_RES( FT_CHAR_STYLE )), + aCharStyleLB ( this, SW_RES( LB_CHAR_STYLE )), + aFormatFT ( this, SW_RES( FT_FORMAT )), + aFormatLB ( this, SW_RES( LB_FORMAT ), INSERT_NUM_EXTENDED_TYPES), + aPosFT ( this, SW_RES( FT_POS )), + aPosLB ( this, SW_RES( LB_POS )), + aOffsetFT ( this, SW_RES( FT_OFFSET )), + aOffsetMF ( this, SW_RES( MF_OFFSET )), + aNumIntervalFT ( this, SW_RES( FT_NUM_INVERVAL )), + aNumIntervalNF ( this, SW_RES( NF_NUM_INVERVAL )), + aNumRowsFT ( this, SW_RES( FT_NUM_ROWS )), aDisplayFL ( this, SW_RES( FL_DISPLAY )), - aDivisorFT ( this, SW_RES( FT_DIVISOR )), - aDivisorED ( this, SW_RES( ED_DIVISOR )), - aDivIntervalFT ( this, SW_RES( FT_DIV_INTERVAL )), - aDivIntervalNF ( this, SW_RES( NF_DIV_INTERVAL )), - aDivRowsFT ( this, SW_RES( FT_DIV_ROWS )), + aDivisorFT ( this, SW_RES( FT_DIVISOR )), + aDivisorED ( this, SW_RES( ED_DIVISOR )), + aDivIntervalFT ( this, SW_RES( FT_DIV_INTERVAL )), + aDivIntervalNF ( this, SW_RES( NF_DIV_INTERVAL )), + aDivRowsFT ( this, SW_RES( FT_DIV_ROWS )), aDivisorFL ( this, SW_RES( FL_DIVISOR )), - aCountEmptyLinesCB ( this, SW_RES( CB_COUNT_EMPTYLINES )), - aCountFrameLinesCB ( this, SW_RES( CB_COUNT_FRAMELINES )), - aRestartEachPageCB ( this, SW_RES( CB_RESTART_PAGE )), + aCountEmptyLinesCB ( this, SW_RES( CB_COUNT_EMPTYLINES )), + aCountFrameLinesCB ( this, SW_RES( CB_COUNT_FRAMELINES )), + aRestartEachPageCB ( this, SW_RES( CB_RESTART_PAGE )), aCountFL ( this, SW_RES( FL_COUNT )) { @@ -148,7 +148,7 @@ __EXPORT SwLineNumberingPage::~SwLineNumberingPage() Beschreibung: -----------------------------------------------------------------------*/ -SfxTabPage* __EXPORT SwLineNumberingPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* __EXPORT SwLineNumberingPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SwLineNumberingPage( pParent, rSet ); } @@ -177,22 +177,22 @@ void __EXPORT SwLineNumberingPage::Reset( const SfxItemSet& ) } // Format -// SwFldMgr aMgr( pSh ); +// SwFldMgr aMgr( pSh ); USHORT nSelFmt = rInf.GetNumType().GetNumberingType(); -// USHORT nCnt = aMgr.GetFormatCount( TYP_SEQFLD, FALSE ); - -// for( USHORT i = 0; i < nCnt; i++) -// { -// aFormatLB.InsertEntry(aMgr.GetFormatStr( TYP_SEQFLD, i)); -// USHORT nFmtId = aMgr.GetFormatId( TYP_SEQFLD, i ); -// aFormatLB.SetEntryData( i, (void*)nFmtId ); -// if( nFmtId == nSelFmt ) -// aFormatLB.SelectEntryPos( i ); -// } +// USHORT nCnt = aMgr.GetFormatCount( TYP_SEQFLD, FALSE ); + +// for( USHORT i = 0; i < nCnt; i++) +// { +// aFormatLB.InsertEntry(aMgr.GetFormatStr( TYP_SEQFLD, i)); +// USHORT nFmtId = aMgr.GetFormatId( TYP_SEQFLD, i ); +// aFormatLB.SetEntryData( i, (void*)nFmtId ); +// if( nFmtId == nSelFmt ) +// aFormatLB.SelectEntryPos( i ); +// } aFormatLB.SelectNumberingType(nSelFmt); -// if ( !aFormatLB.GetSelectEntryCount() ) -// aFormatLB.SelectEntryPos(aFormatLB.GetEntryCount() - 1); +// if ( !aFormatLB.GetSelectEntryCount() ) +// aFormatLB.SelectEntryPos(aFormatLB.GetEntryCount() - 1); // Position aPosLB.SelectEntryPos((USHORT)rInf.GetPos()); diff --git a/sw/source/ui/misc/linenum.hrc b/sw/source/ui/misc/linenum.hrc index 235d13576aa3..93e17b64eb9d 100644 --- a/sw/source/ui/misc/linenum.hrc +++ b/sw/source/ui/misc/linenum.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,27 +24,27 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define CB_NUMBERING_ON 1 +#define CB_NUMBERING_ON 1 #define FT_CHAR_STYLE 2 #define LB_CHAR_STYLE 3 #define FT_FORMAT 4 #define LB_FORMAT 5 #define FT_POS 6 -#define LB_POS 7 -#define FT_OFFSET 8 -#define MF_OFFSET 9 +#define LB_POS 7 +#define FT_OFFSET 8 +#define MF_OFFSET 9 #define FT_NUM_INVERVAL 10 #define NF_NUM_INVERVAL 11 -#define FT_NUM_ROWS 12 +#define FT_NUM_ROWS 12 #define FL_DISPLAY 13 #define FT_DIVISOR 14 #define ED_DIVISOR 15 #define FT_DIV_INTERVAL 16 #define NF_DIV_INTERVAL 17 -#define FT_DIV_ROWS 18 +#define FT_DIV_ROWS 18 #define FL_DIVISOR 19 #define CB_COUNT_EMPTYLINES 20 #define CB_COUNT_FRAMELINES 21 #define FL_COUNT 22 -#define CB_RESTART_PAGE 23 +#define CB_RESTART_PAGE 23 diff --git a/sw/source/ui/misc/linenum.src b/sw/source/ui/misc/linenum.src index b82828a86362..61cee918d72f 100644 --- a/sw/source/ui/misc/linenum.src +++ b/sw/source/ui/misc/linenum.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/misc/num.cxx b/sw/source/ui/misc/num.cxx index 43c92a72a3f7..2e9e318c7622 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -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 @@ -214,7 +214,7 @@ SwNumPositionTabPage::~SwNumPositionTabPage() --------------------------------------------------*/ void SwNumPositionTabPage::InitControls() { - bInInintControl = TRUE; + bInInintControl = TRUE; // --> OD 2008-02-01 #newlistlevelattrs# const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive && aRelativeCB.IsEnabled() && aRelativeCB.IsChecked(); @@ -332,7 +332,7 @@ void SwNumPositionTabPage::InitControls() bSetDistEmpty = TRUE; if(bSameDist) - aDistNumMF .SetValue(aDistNumMF.Normalize(aNumFmtArr[nLvl]->GetCharTextDistance()), FUNIT_TWIP); + aDistNumMF .SetValue(aDistNumMF.Normalize(aNumFmtArr[nLvl]->GetCharTextDistance()), FUNIT_TWIP); else aDistNumMF.SetText(aEmptyStr); if(bSameIndent) @@ -425,7 +425,7 @@ void SwNumPositionTabPage::InitControls() if(TRUE == bSetDistEmpty) aDistBorderMF.SetText(aEmptyStr); - bInInintControl = FALSE; + bInInintControl = FALSE; } /*-----------------03.12.97 10:02------------------- @@ -603,7 +603,7 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() /*-----------------03.12.97 10:02------------------- --------------------------------------------------*/ -SfxTabPage* SwNumPositionTabPage::Create( Window* pParent, +SfxTabPage* SwNumPositionTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwNumPositionTabPage(pParent, rAttrSet); @@ -644,8 +644,8 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh) if(eMetric == FUNIT_MM) { aDistBorderMF .SetDecimalDigits(1); - aDistNumMF .SetDecimalDigits(1); - aIndentMF .SetDecimalDigits(1); + aDistNumMF .SetDecimalDigits(1); + aIndentMF .SetDecimalDigits(1); // --> OD 2008-02-18 #newlistlevelattrs# aListtabMF.SetDecimalDigits(1); aAlignedAtMF.SetDecimalDigits(1); @@ -653,8 +653,8 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh) // <-- } aDistBorderMF .SetUnit( eMetric ); - aDistNumMF .SetUnit( eMetric ); - aIndentMF .SetUnit( eMetric ); + aDistNumMF .SetUnit( eMetric ); + aIndentMF .SetUnit( eMetric ); // --> OD 2008-02-18 #newlistlevelattrs# aListtabMF.SetUnit( eMetric ); aAlignedAtMF.SetUnit( eMetric ); @@ -839,7 +839,7 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox ) } if(bSetValue) - aDistBorderMF.SetValue(aDistBorderMF.Normalize(nValue), FUNIT_TWIP); + aDistBorderMF.SetValue(aDistBorderMF.Normalize(nValue), FUNIT_TWIP); else aDistBorderMF.SetText(aEmptyStr); aDistBorderMF.Enable(bOn || bSingleSelection||0 != pOutlineDlg); @@ -1123,7 +1123,7 @@ void SwSvxNumBulletTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage) rCharFmtLB.Clear(); rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone ); SwDocShell* pDocShell = rWrtSh.GetView().GetDocShell(); - ::FillCharStyleListBox(rCharFmtLB, pDocShell); + ::FillCharStyleListBox(rCharFmtLB, pDocShell); List aList; for(USHORT j = 0; j < rCharFmtLB.GetEntryCount(); j++) { @@ -1147,7 +1147,7 @@ void SwSvxNumBulletTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage) SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< USHORT >(eMetric)) ); rPage.PageCreated(aSet); -// ((SvxNumPositionTabPage&)rPage).SetWrtShell(&rWrtSh); +// ((SvxNumPositionTabPage&)rPage).SetWrtShell(&rWrtSh); } break; } diff --git a/sw/source/ui/misc/num.hrc b/sw/source/ui/misc/num.hrc index 379c8cb3e56d..6156208ff989 100644 --- a/sw/source/ui/misc/num.hrc +++ b/sw/source/ui/misc/num.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 @@ -27,20 +27,20 @@ #define FL_LEVEL 1 -#define LB_LEVEL 2 +#define LB_LEVEL 2 #define FL_POSITION 3 #define FT_BORDERDIST 4 #define MF_BORDERDIST 5 #define CB_RELATIVE 6 -#define FT_INDENT 7 -#define MF_INDENT 8 -#define FT_NUMDIST 9 -#define MF_NUMDIST 10 -#define FT_ALIGN 11 +#define FT_INDENT 7 +#define MF_INDENT 8 +#define FT_NUMDIST 9 +#define MF_NUMDIST 10 +#define FT_ALIGN 11 #define LB_ALIGN 12 #define PB_STANDARD 13 #define WIN_PREVIEW 15 -#define ST_RESET 16 +#define ST_RESET 16 #define FT_LABEL_FOLLOWED_BY 17 #define LB_LABEL_FOLLOWED_BY 18 diff --git a/sw/source/ui/misc/num.src b/sw/source/ui/misc/num.src index a89c30bb032a..0fbc45eb1c2f 100644 --- a/sw/source/ui/misc/num.src +++ b/sw/source/ui/misc/num.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 @@ -36,7 +36,7 @@ /**************************************************************************/ /* */ -/* TabPage Positionen */ +/* TabPage Positionen */ /* */ /**************************************************************************/ TabPage TP_NUM_POSITION diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx index 964d04738755..86e4f12ed545 100644 --- a/sw/source/ui/misc/numberingtypelistbox.cxx +++ b/sw/source/ui/misc/numberingtypelistbox.cxx @@ -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 @@ -102,7 +102,7 @@ void SwNumberingTypeListBox::Reload(USHORT nTypeFlags) bInsert = 0 != (nTypeFlags&INSERT_NUM_TYPE_NO_NUMBERING); nPos = 0; break; - case style::NumberingType::CHAR_SPECIAL: bInsert = 0 != (nTypeFlags&INSERT_NUM_TYPE_BULLET); break; + case style::NumberingType::CHAR_SPECIAL: bInsert = 0 != (nTypeFlags&INSERT_NUM_TYPE_BULLET); break; case style::NumberingType::PAGE_DESCRIPTOR:bInsert = 0 != (nTypeFlags&INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING); break; case style::NumberingType::BITMAP:bInsert = 0 != (nTypeFlags&INSERT_NUM_TYPE_BITMAP ); break; default: @@ -153,7 +153,7 @@ void SwNumberingTypeListBox::Reload(USHORT nTypeFlags) /* -----------------------------01.03.01 14:46-------------------------------- ---------------------------------------------------------------------------*/ -sal_Int16 SwNumberingTypeListBox::GetSelectedNumberingType() +sal_Int16 SwNumberingTypeListBox::GetSelectedNumberingType() { sal_Int16 nRet = 0; USHORT nSelPos = GetSelectEntryPos(); @@ -168,7 +168,7 @@ sal_Int16 SwNumberingTypeListBox::GetSelectedNumberingType() /* -----------------------------01.03.01 14:46-------------------------------- ---------------------------------------------------------------------------*/ -sal_Bool SwNumberingTypeListBox::SelectNumberingType(sal_Int16 nType) +sal_Bool SwNumberingTypeListBox::SelectNumberingType(sal_Int16 nType) { USHORT nPos = GetEntryPos((void*)(ULONG)nType); SelectEntryPos( nPos ); diff --git a/sw/source/ui/misc/numberingtypelistbox.src b/sw/source/ui/misc/numberingtypelistbox.src index 8ca6e214e614..96bf9142a63f 100644 --- a/sw/source/ui/misc/numberingtypelistbox.src +++ b/sw/source/ui/misc/numberingtypelistbox.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 @@ -34,16 +34,16 @@ Resource STRRES_NUMTYPES ItemList [ en-US ] = { - < "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC */; > ; - < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ; - < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ; - < "I, II, III, ..." ; 2/*SVX_NUM_ROMAN_UPPER */; > ; - < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ; - < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; + < "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC */; > ; + < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ; + < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ; + < "I, II, III, ..." ; 2/*SVX_NUM_ROMAN_UPPER */; > ; + < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ; + < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; - < "Bullet" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; - < "Graphics" ; 8/*SVX_NUM_BITMAP */; > ; - < "None" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "Bullet" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; + < "Graphics" ; 8/*SVX_NUM_BITMAP */; > ; + < "None" ; 5/*SVX_NUM_NUMBER_NONE */; > ; < "Native Numbering" ; 12 /*NATIVE_NUMBERING */; > ; < "Ð, Б, .., Ðа, Ðб, ... (Bulgarian)" ; 38 /*CHARS_CYRILLIC_UPPER_LETTER_BG */; > ; < "а, б, .., аа, аб, ... (Bulgarian)" ; 39 /*CHARS_CYRILLIC_LOWER_LETTER_BG */; > ; diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index e733aa0389c2..d0bc7b5b3890 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -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 @@ -71,7 +71,7 @@ #include <helpid.h> #endif #ifndef _GLOBALS_HRC -#include <globals.hrc> // fuer Vorlagenname 'keins' +#include <globals.hrc> // fuer Vorlagenname 'keins' #endif #ifndef _MISC_HRC #include <misc.hrc> @@ -246,8 +246,8 @@ SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent, pNumRule = new SwNumRule( *rSh.GetOutlineNumRule() ); GetCancelButton().SetClickHdl(LINK(this, SwOutlineTabDialog, CancelHdl)); - AddTabPage(TP_NUM_POSITION , &SwNumPositionTabPage::Create, 0); - AddTabPage(TP_OUTLINE_NUM , &SwOutlineSettingsTabPage::Create, 0); + AddTabPage(TP_NUM_POSITION , &SwNumPositionTabPage::Create, 0); + AddTabPage(TP_OUTLINE_NUM , &SwOutlineSettingsTabPage::Create, 0); String sHeadline; USHORT i; @@ -268,7 +268,7 @@ SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent, SwTxtFmtColl &rTxtColl = rWrtSh.GetTxtFmtColl(i); if(!rTxtColl.IsDefault()) { - //BYTE nOutLevel = rTxtColl.GetOutlineLevel(); //<-#outline level, removed out by zhaojianwei + //BYTE nOutLevel = rTxtColl.GetOutlineLevel(); //<-#outline level, removed out by zhaojianwei //if(nOutLevel != NO_NUMBERING) //->added by zhaojianwei if(rTxtColl.IsAssignedToListLevelOfOutlineStyle()) @@ -292,7 +292,7 @@ SwOutlineTabDialog::~SwOutlineTabDialog() /* -----------------07.07.98 14:13------------------- * * --------------------------------------------------*/ -void SwOutlineTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage) +void SwOutlineTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage) { switch ( nPageId ) { @@ -340,15 +340,15 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu ) BYTE nLevelNo = 0; switch(pMenu->GetCurItemId()) { - case MN_FORM1: nLevelNo = 1; break; - case MN_FORM2: nLevelNo = 2; break; - case MN_FORM3: nLevelNo = 3; break; - case MN_FORM4: nLevelNo = 4; break; - case MN_FORM5: nLevelNo = 5; break; - case MN_FORM6: nLevelNo = 6; break; - case MN_FORM7: nLevelNo = 7; break; - case MN_FORM8: nLevelNo = 8; break; - case MN_FORM9: nLevelNo = 9; break; + case MN_FORM1: nLevelNo = 1; break; + case MN_FORM2: nLevelNo = 2; break; + case MN_FORM3: nLevelNo = 3; break; + case MN_FORM4: nLevelNo = 4; break; + case MN_FORM5: nLevelNo = 5; break; + case MN_FORM6: nLevelNo = 6; break; + case MN_FORM7: nLevelNo = 7; break; + case MN_FORM8: nLevelNo = 8; break; + case MN_FORM9: nLevelNo = 9; break; case MN_SAVE: { @@ -389,8 +389,8 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu ) *pNumRule = *rWrtSh.GetOutlineNumRule(); } - USHORT nPageId = GetCurPageId(); - SfxTabPage* pPage = GetTabPage( nPageId ); + USHORT nPageId = GetCurPageId(); + SfxTabPage* pPage = GetTabPage( nPageId ); pPage->Reset(*GetOutputItemSet()); return 0; @@ -398,14 +398,14 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu ) /* -----------------07.07.98 14:19------------------- * * --------------------------------------------------*/ -USHORT SwOutlineTabDialog::GetLevel(const String &rFmtName) const +USHORT SwOutlineTabDialog::GetLevel(const String &rFmtName) const { for(USHORT i = 0; i < MAXLEVEL; ++i) { if(aCollNames[i] == rFmtName) return i; } - return MAXLEVEL;//NO_NUMBERING; //#outline level,zhaojianwei + return MAXLEVEL;//NO_NUMBERING; //#outline level,zhaojianwei } /* -----------------07.07.98 16:30------------------- @@ -437,22 +437,22 @@ short SwOutlineTabDialog::Ok() const SfxPoolItem & rItem = rTxtColl.GetFmtAttr(RES_PARATR_NUMRULE, FALSE); - //if ((BYTE)GetLevel(rTxtColl.GetName()) == NO_NUMBERING) //#outline level,removed by zhaojianwei + //if ((BYTE)GetLevel(rTxtColl.GetName()) == NO_NUMBERING) //#outline level,removed by zhaojianwei //{ - // if (static_cast<const SwNumRuleItem &>(rItem).GetValue() == - // pOutlineRule->GetName()) - // { - // rTxtColl.ResetFmtAttr(RES_PARATR_NUMRULE); - // } + // if (static_cast<const SwNumRuleItem &>(rItem).GetValue() == + // pOutlineRule->GetName()) + // { + // rTxtColl.ResetFmtAttr(RES_PARATR_NUMRULE); + // } //} //else //{ - // if (static_cast<const SwNumRuleItem &>(rItem).GetValue() != - // pOutlineRule->GetName()) - // { - // SwNumRuleItem aItem(pOutlineRule->GetName()); - // rTxtColl.SetFmtAttr(aItem); - // } + // if (static_cast<const SwNumRuleItem &>(rItem).GetValue() != + // pOutlineRule->GetName()) + // { + // SwNumRuleItem aItem(pOutlineRule->GetName()); + // rTxtColl.SetFmtAttr(aItem); + // } //} if ((BYTE)GetLevel(rTxtColl.GetName()) == MAXLEVEL) //add by zhaojianwei { @@ -468,7 +468,7 @@ short SwOutlineTabDialog::Ok() } else { - rTxtColl.AssignToListLevelOfOutlineStyle(GetLevel(rTxtColl.GetName())); + rTxtColl.AssignToListLevelOfOutlineStyle(GetLevel(rTxtColl.GetName())); if (static_cast<const SwNumRuleItem &>(rItem).GetValue() != pOutlineRule->GetName()) @@ -476,7 +476,7 @@ short SwOutlineTabDialog::Ok() SwNumRuleItem aItem(pOutlineRule->GetName()); rTxtColl.SetFmtAttr(aItem); } - } //<-end,zhaojianwei + } //<-end,zhaojianwei } } @@ -488,30 +488,30 @@ short SwOutlineTabDialog::Ok() SwTxtFmtColl* pColl = rWrtSh.FindTxtFmtCollByName( sHeadline ); if( !pColl ) { - //if( !aCollNames[i].Len() ) //#outline level,removed by zhaojianwei + //if( !aCollNames[i].Len() ) //#outline level,removed by zhaojianwei //{ - // SwTxtFmtColl* pTxtColl = rWrtSh.GetTxtCollFromPool( - // static_cast< USHORT >(RES_POOLCOLL_HEADLINE1 + i) ); - // pTxtColl->SetOutlineLevel( NO_NUMBERING ); - // pTxtColl->ResetFmtAttr(RES_PARATR_NUMRULE); + // SwTxtFmtColl* pTxtColl = rWrtSh.GetTxtCollFromPool( + // static_cast< USHORT >(RES_POOLCOLL_HEADLINE1 + i) ); + // pTxtColl->SetOutlineLevel( NO_NUMBERING ); + // pTxtColl->ResetFmtAttr(RES_PARATR_NUMRULE); //} //else if(aCollNames[i] != sHeadline) //{ - // SwTxtFmtColl* pTxtColl = rWrtSh.GetParaStyle( - // aCollNames[i], SwWrtShell::GETSTYLE_CREATESOME); - // if(pTxtColl) - // { - // pTxtColl->SetOutlineLevel( static_cast< BYTE >(i) ); - - // SwNumRuleItem aItem(pOutlineRule->GetName()); - // pTxtColl->SetFmtAttr(aItem); - // } + // SwTxtFmtColl* pTxtColl = rWrtSh.GetParaStyle( + // aCollNames[i], SwWrtShell::GETSTYLE_CREATESOME); + // if(pTxtColl) + // { + // pTxtColl->SetOutlineLevel( static_cast< BYTE >(i) ); + + // SwNumRuleItem aItem(pOutlineRule->GetName()); + // pTxtColl->SetFmtAttr(aItem); + // } //} if(aCollNames[i] != sHeadline)//->added by zhaojianwei { SwTxtFmtColl* pTxtColl = rWrtSh.GetTxtCollFromPool( static_cast< USHORT >(RES_POOLCOLL_HEADLINE1 + i) ); - pTxtColl->DeleteAssignmentToListLevelOfOutlineStyle(); + pTxtColl->DeleteAssignmentToListLevelOfOutlineStyle(); pTxtColl->ResetFmtAttr(RES_PARATR_NUMRULE); if( aCollNames[i].Len() ) @@ -520,7 +520,7 @@ short SwOutlineTabDialog::Ok() aCollNames[i], SwWrtShell::GETSTYLE_CREATESOME); if(pTxtColl) { - pTxtColl->AssignToListLevelOfOutlineStyle(i); + pTxtColl->AssignToListLevelOfOutlineStyle(i); SwNumRuleItem aItem(pOutlineRule->GetName()); pTxtColl->SetFmtAttr(aItem); } @@ -551,8 +551,8 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxIte aNumberBox(this, SW_RES(LB_NUMBER), INSERT_NUM_TYPE_NO_NUMBERING|INSERT_NUM_EXTENDED_TYPES), aCharFmtFT(this, SW_RES(FT_CHARFMT)), aCharFmtLB(this, SW_RES(LB_CHARFMT)), - aAllLevelFT( this, SW_RES(FT_ALL_LEVEL)), - aAllLevelNF( this, SW_RES(NF_ALL_LEVEL)), + aAllLevelFT( this, SW_RES(FT_ALL_LEVEL)), + aAllLevelNF( this, SW_RES(NF_ALL_LEVEL)), aDelim(this, SW_RES(FT_DELIM)), aPrefixFT(this, SW_RES(FT_PREFIX)), aPrefixED(this, SW_RES(ED_PREFIX)), @@ -572,21 +572,21 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxIte SetExchangeSupport(); aCollBox.InsertEntry(aNoFmtName); - aLevelLB.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, LevelHdl)); + aLevelLB.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, LevelHdl)); aAllLevelNF.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, ToggleComplete)); - aCollBox.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, CollSelect)); - aCollBox.SetGetFocusHdl(LINK(this, SwOutlineSettingsTabPage, CollSelectGetFocus)); - aNumberBox.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, NumberSelect)); - aPrefixED.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, DelimModify)); - aSuffixED.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, DelimModify)); - aStartEdit.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, StartModified)); - aCharFmtLB.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, CharFmtHdl)); + aCollBox.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, CollSelect)); + aCollBox.SetGetFocusHdl(LINK(this, SwOutlineSettingsTabPage, CollSelectGetFocus)); + aNumberBox.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, NumberSelect)); + aPrefixED.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, DelimModify)); + aSuffixED.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, DelimModify)); + aStartEdit.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, StartModified)); + aCharFmtLB.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, CharFmtHdl)); } /* -----------------07.07.98 14:19------------------- * * --------------------------------------------------*/ -void SwOutlineSettingsTabPage::Update() +void SwOutlineSettingsTabPage::Update() { // falls eine Vorlage fuer diese Ebene bereits selektiert wurde, // diese in der ListBox auswaehlean @@ -611,13 +611,13 @@ void SwOutlineSettingsTabPage::Update() pFirstFmt = aNumFmtArr[i]->GetCharFmt(); else { - bSameType &= aNumFmtArr[i]->GetNumberingType() == aNumFmtArr[0]->GetNumberingType(); - bSameStart &= aNumFmtArr[i]->GetStart() == aNumFmtArr[0]->GetStart(); + bSameType &= aNumFmtArr[i]->GetNumberingType() == aNumFmtArr[0]->GetNumberingType(); + bSameStart &= aNumFmtArr[i]->GetStart() == aNumFmtArr[0]->GetStart(); bSamePrefix &= aNumFmtArr[i]->GetPrefix() == aNumFmtArr[0]->GetPrefix(); bSameSuffix &= aNumFmtArr[i]->GetSuffix() == aNumFmtArr[0]->GetSuffix(); bSameComplete &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[0]->GetIncludeUpperLevels(); const SwCharFmt* pFmt = aNumFmtArr[i]->GetCharFmt(); - bSameCharFmt &= !pFirstFmt && !pFmt + bSameCharFmt &= !pFirstFmt && !pFmt || pFirstFmt && pFmt && pFmt->GetName() == pFirstFmt->GetName(); } } @@ -860,7 +860,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, StartModified, NumericField *, pFld ) * --------------------------------------------------*/ IMPL_LINK( SwOutlineSettingsTabPage, CharFmtHdl, ListBox *, EMPTYARG ) { -// bAutomaticCharStyles = FALSE; +// bAutomaticCharStyles = FALSE; String sEntry = aCharFmtLB.GetSelectEntry(); USHORT nMask = 1; BOOL bFormatNone = sEntry == ViewShell::GetShellRes()->aStrNone; @@ -1003,14 +1003,14 @@ BOOL SwOutlineSettingsTabPage::FillItemSet( SfxItemSet& ) /* -----------------07.07.98 14:19------------------- * * --------------------------------------------------*/ -void SwOutlineSettingsTabPage::Reset( const SfxItemSet& rSet ) +void SwOutlineSettingsTabPage::Reset( const SfxItemSet& rSet ) { ActivatePage(rSet); } /* -----------------07.07.98 14:19------------------- * * --------------------------------------------------*/ -SfxTabPage* SwOutlineSettingsTabPage::Create( Window* pParent, +SfxTabPage* SwOutlineSettingsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwOutlineSettingsTabPage(pParent, rAttrSet); @@ -1326,7 +1326,7 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ ) } } } - DrawOutDev( Point(0,0), aSize, + DrawOutDev( Point(0,0), aSize, Point(0,0), aSize, *pVDev ); delete pVDev; diff --git a/sw/source/ui/misc/outline.hrc b/sw/source/ui/misc/outline.hrc index 2f8a4a469cb4..2d24c719543a 100644 --- a/sw/source/ui/misc/outline.hrc +++ b/sw/source/ui/misc/outline.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 @@ -53,7 +53,7 @@ #define CB_COMPLETE 29 #define FL_NUMBER 30 -#define LB_ALIGN 31 +#define LB_ALIGN 31 #define FL_ALIGN 33 #define FT_START 40 @@ -71,7 +71,7 @@ #define FT_ALL_LEVEL 108 #define NF_ALL_LEVEL 109 -#define MN_FORM 110 +#define MN_FORM 110 #define MN_FORM1 111 #define MN_FORMBASE MN_FORM1 #define MN_FORM2 112 @@ -85,14 +85,14 @@ #define MN_SAVE 120 #define FL_LEVEL 130 -#define LB_LEVEL 131 +#define LB_LEVEL 131 #define WIN_PREVIEW 132 -#define FT_SUFFIX 134 -#define ED_SUFFIX 135 -#define FT_PREFIX 136 -#define ED_PREFIX 137 -#define ST_NO_COLL 138 +#define FT_SUFFIX 134 +#define ED_SUFFIX 135 +#define FT_PREFIX 136 +#define ED_PREFIX 137 +#define ST_NO_COLL 138 -#define ST_FORM 140 -#define FT_CHARFMT 141 +#define ST_FORM 140 +#define FT_CHARFMT 141 #define LB_CHARFMT 141 diff --git a/sw/source/ui/misc/outline.src b/sw/source/ui/misc/outline.src index d7dffb4a000b..64dd97494a4e 100644 --- a/sw/source/ui/misc/outline.src +++ b/sw/source/ui/misc/outline.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 @@ -200,7 +200,7 @@ TabDialog DLG_TAB_OUTLINE }; /**************************************************************************/ /* */ -/* TabPage */ +/* TabPage */ /* */ /**************************************************************************/ TabPage TP_OUTLINE_NUM diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 9d940b33d332..a8c75455c419 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -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 @@ -88,7 +88,7 @@ static USHORT __FAR_DATA aPageRg[] = { /*------------------------------------------------------------------------ - Beschreibung: liefert zurueck, ob die Linienbreite nWidth bereits + Beschreibung: liefert zurueck, ob die Linienbreite nWidth bereits in der Listbox enthalten ist. ------------------------------------------------------------------------*/ @@ -103,7 +103,7 @@ BOOL lcl_HasLineWidth(USHORT nWidth) } /*------------------------------------------------------------------------ - Beschreibung: Handler fuer umschalten zwischen den unterschiedlichen + Beschreibung: Handler fuer umschalten zwischen den unterschiedlichen Arten, wie die Hoehe des Fussnotenbereiches angegeben werden kann. ------------------------------------------------------------------------*/ @@ -126,7 +126,7 @@ IMPL_LINK_INLINE_START( SwFootNotePage, HeightMetric, Button *, EMPTYARG ) IMPL_LINK_INLINE_END( SwFootNotePage, HeightMetric, Button *, EMPTYARG ) /*------------------------------------------------------------------------ - Beschreibung: Handler Grenzwerte + Beschreibung: Handler Grenzwerte ------------------------------------------------------------------------*/ @@ -158,29 +158,29 @@ SwFootNotePage::SwFootNotePage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, SW_RES(TP_FOOTNOTE_PAGE), rSet), aMaxHeightPageBtn(this, SW_RES(RB_MAXHEIGHT_PAGE)), - aMaxHeightBtn(this, SW_RES(RB_MAXHEIGHT)), - aMaxHeightEdit(this, SW_RES(ED_MAXHEIGHT)), - aDistLbl(this, SW_RES(FT_DIST)), - aDistEdit(this, SW_RES(ED_DIST)), - aPosHeader(this, SW_RES(FL_FOOTNOTE_SIZE)), - - aLinePosLbl(this, SW_RES(FT_LINEPOS)), - aLinePosBox(this, SW_RES(DLB_LINEPOS)), - aLineTypeLbl(this, SW_RES(FT_LINETYPE)), - aLineTypeBox(this, SW_RES(DLB_LINETYPE)), - aLineWidthLbl(this, SW_RES(FT_LINEWIDTH)), - aLineWidthEdit(this, SW_RES(ED_LINEWIDTH)), - aLineDistLbl(this, SW_RES(FT_LINEDIST)), - aLineDistEdit(this, SW_RES(ED_LINEDIST)), - aLineHeader(this, SW_RES(FL_LINE)) + aMaxHeightBtn(this, SW_RES(RB_MAXHEIGHT)), + aMaxHeightEdit(this, SW_RES(ED_MAXHEIGHT)), + aDistLbl(this, SW_RES(FT_DIST)), + aDistEdit(this, SW_RES(ED_DIST)), + aPosHeader(this, SW_RES(FL_FOOTNOTE_SIZE)), + + aLinePosLbl(this, SW_RES(FT_LINEPOS)), + aLinePosBox(this, SW_RES(DLB_LINEPOS)), + aLineTypeLbl(this, SW_RES(FT_LINETYPE)), + aLineTypeBox(this, SW_RES(DLB_LINETYPE)), + aLineWidthLbl(this, SW_RES(FT_LINEWIDTH)), + aLineWidthEdit(this, SW_RES(ED_LINEWIDTH)), + aLineDistLbl(this, SW_RES(FT_LINEDIST)), + aLineDistEdit(this, SW_RES(ED_LINEDIST)), + aLineHeader(this, SW_RES(FL_LINE)) { FreeResource(); SetExchangeSupport(); FieldUnit aMetric = ::GetDfltMetric(FALSE); - SetMetric( aMaxHeightEdit, aMetric ); - SetMetric( aDistEdit, aMetric ); - SetMetric( aLineDistEdit, aMetric ); + SetMetric( aMaxHeightEdit, aMetric ); + SetMetric( aDistEdit, aMetric ); + SetMetric( aLineDistEdit, aMetric ); MeasurementSystem eSys = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); long nHeightValue = MEASURE_METRIC != eSys ? 1440 : 1134; aMaxHeightEdit.SetValue(aMaxHeightEdit.Normalize(nHeightValue),FUNIT_TWIP);; @@ -265,7 +265,7 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: Attribute in den Set stopfen bei OK + Beschreibung: Attribute in den Set stopfen bei OK --------------------------------------------------------------------*/ diff --git a/sw/source/ui/misc/pgfnote.hrc b/sw/source/ui/misc/pgfnote.hrc index fe94849c6d66..c213f29f309c 100644 --- a/sw/source/ui/misc/pgfnote.hrc +++ b/sw/source/ui/misc/pgfnote.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 @@ -25,20 +25,20 @@ * ************************************************************************/ -#define RB_MAXHEIGHT_PAGE 1 -#define RB_MAXHEIGHT 2 -#define ED_MAXHEIGHT 3 -#define FT_DIST 4 -#define ED_DIST 5 -#define FL_FOOTNOTE_SIZE 10 +#define RB_MAXHEIGHT_PAGE 1 +#define RB_MAXHEIGHT 2 +#define ED_MAXHEIGHT 3 +#define FT_DIST 4 +#define ED_DIST 5 +#define FL_FOOTNOTE_SIZE 10 -#define FT_LINETYPE 20 -#define DLB_LINETYPE 21 -#define FT_LINEPOS 22 -#define DLB_LINEPOS 23 -#define FT_LINEWIDTH 24 -#define ED_LINEWIDTH 25 -#define FT_LINEDIST 26 -#define ED_LINEDIST 27 -#define FL_LINE 30 +#define FT_LINETYPE 20 +#define DLB_LINETYPE 21 +#define FT_LINEPOS 22 +#define DLB_LINEPOS 23 +#define FT_LINEWIDTH 24 +#define ED_LINEWIDTH 25 +#define FT_LINEDIST 26 +#define ED_LINEDIST 27 +#define FL_LINE 30 diff --git a/sw/source/ui/misc/pgfnote.src b/sw/source/ui/misc/pgfnote.src index 4ad558da0117..18acc28267ec 100644 --- a/sw/source/ui/misc/pgfnote.src +++ b/sw/source/ui/misc/pgfnote.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/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index a6e20cc56dc3..9fa851542c4a 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -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 @@ -51,6 +51,7 @@ #include <editeng/ulspitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/frmdiritem.hxx> +#include <svx/ruler.hxx> #include <pggrid.hxx> #include <tgrditem.hxx> #include <pggrid.hrc> @@ -74,10 +75,12 @@ SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) : aLayoutFL (this, SW_RES(FL_LAYOUT )), aLinesPerPageFT (this, SW_RES(FT_LINESPERPAGE )), aLinesPerPageNF (this, SW_RES(NF_LINESPERPAGE )), + aLinesRangeFT (this, SW_RES(FT_LINERANGE )), aTextSizeFT (this, SW_RES(FT_TEXTSIZE )), aTextSizeMF (this, SW_RES(MF_TEXTSIZE )), aCharsPerLineFT (this, SW_RES(FT_CHARSPERLINE )), aCharsPerLineNF (this, SW_RES(NF_CHARSPERLINE )), + aCharsRangeFT (this, SW_RES(FT_CHARRANGE )), aCharWidthFT (this, SW_RES(FT_CHARWIDTH )), aCharWidthMF (this, SW_RES(MF_CHARWIDTH )), aRubySizeFT (this, SW_RES(FT_RUBYSIZE )), @@ -92,7 +95,9 @@ SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) : m_bRubyUserValue(sal_False), m_aPageSize(MM50, MM50), m_bVertical(sal_False), - m_bSquaredMode(sal_False) + m_bSquaredMode(sal_False), + m_bHRulerChanged( sal_False ), + m_bVRulerChanged( sal_False ) { FreeResource(); @@ -106,14 +111,16 @@ SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) : aControls[7] =&aCharWidthFT; aControls[8] =&aCharWidthMF; aControls[9] =&aRubySizeFT; - aControls[10] =&aRubySizeMF; + aControls[10] =&aRubySizeMF; aControls[11] =&aRubyBelowCB; aControls[12] =&aDisplayFL; aControls[13] =&aDisplayCB; aControls[14] =&aPrintCB; aControls[15] =&aColorFT; aControls[16] =&aColorLB; - aControls[17] =0; + aControls[17] =&aLinesRangeFT; + aControls[18] =&aCharsRangeFT; + aControls[19] =0; Link aLink = LINK(this, SwTextGridPage, CharorLineChangedHdl); aCharsPerLineNF.SetUpHdl(aLink); @@ -122,18 +129,18 @@ SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) : aLinesPerPageNF.SetUpHdl(aLink); aLinesPerPageNF.SetDownHdl(aLink); aLinesPerPageNF.SetLoseFocusHdl(aLink); - + Link aSizeLink = LINK(this, SwTextGridPage, TextSizeChangedHdl); aTextSizeMF.SetUpHdl(aSizeLink); aTextSizeMF.SetDownHdl(aSizeLink); aTextSizeMF.SetLoseFocusHdl(aSizeLink); aRubySizeMF.SetUpHdl(aSizeLink); aRubySizeMF.SetDownHdl(aSizeLink); - aRubySizeMF.SetLoseFocusHdl(aSizeLink); + aRubySizeMF.SetLoseFocusHdl(aSizeLink); aCharWidthMF.SetUpHdl(aSizeLink); aCharWidthMF.SetDownHdl(aSizeLink); aCharWidthMF.SetLoseFocusHdl(aSizeLink); - + Link aGridTypeHdl = LINK(this, SwTextGridPage, GridTypeHdl); aNoGridRB .SetClickHdl(aGridTypeHdl); aLinesGridRB.SetClickHdl(aGridTypeHdl); @@ -142,7 +149,7 @@ SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) : Link aModifyLk = LINK(this, SwTextGridPage, GridModifyHdl); aColorLB.SetSelectHdl(aModifyLk); aPrintCB.SetClickHdl(aModifyLk); - aRubyBelowCB.SetClickHdl(aModifyLk); + aRubyBelowCB.SetClickHdl(aModifyLk); aDisplayCB.SetClickHdl(LINK(this, SwTextGridPage, DisplayGridHdl)); @@ -224,6 +231,12 @@ BOOL SwTextGridPage::FillItemSet(SfxItemSet &rSet) bRet = TRUE; } + // draw ticks of ruler + SwView * pView = ::GetActiveView(); + if ( m_bHRulerChanged ) + pView->GetHLineal().DrawTicks(); + if ( m_bVRulerChanged ) + pView->GetVLineal().DrawTicks(); return bRet; } /*-- 06.02.2002 15:25:40--------------------------------------------------- @@ -246,6 +259,7 @@ void SwTextGridPage::Reset(const SfxItemSet &rSet) GridTypeHdl(pButton); aSnapToCharsCB.Check(rGridItem.IsSnapToChars()); aLinesPerPageNF.SetValue(rGridItem.GetLines()); + SetLinesOrCharsRanges( aLinesRangeFT , aLinesPerPageNF.GetMax() ); m_nRubyUserValue = rGridItem.GetBaseHeight(); m_bRubyUserValue = sal_True; aTextSizeMF.SetValue(aTextSizeMF.Normalize(m_nRubyUserValue), FUNIT_TWIP); @@ -309,6 +323,18 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet) aGridItem.SetPrintGrid(aPrintCB.IsChecked()); aGridItem.SetColor(aColorLB.GetSelectEntryColor()); rSet.Put(aGridItem); +/// Amelia + SwView * pView = ::GetActiveView(); + if ( aGridItem.GetGridType() != GRID_NONE ) + { + if ( aGridItem.GetGridType() == GRID_LINES_CHARS ) + { + m_bHRulerChanged = sal_True; + } + m_bVRulerChanged = sal_True; + pView->GetHLineal().SetCharWidth((long)(aCharWidthMF.GetValue(FUNIT_TWIP)/56.7)); + pView->GetVLineal().SetLineHeight((long)(aTextSizeMF.GetValue(FUNIT_TWIP)/56.7)); + } } /* -----------------------------08.02.2002 10:54------------------------------ @@ -330,7 +356,7 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet) const SvxLRSpaceItem& rLRSpace = (const SvxLRSpaceItem&)rSet.Get( RES_LR_SPACE ); const SvxULSpaceItem& rULSpace = (const SvxULSpaceItem&)rSet.Get( - RES_UL_SPACE ); + RES_UL_SPACE ); const SvxBoxItem& rBox = (const SvxBoxItem&) rSet.Get(RES_BOX); sal_Int32 nDistanceLR = rLRSpace.GetLeft() + rLRSpace.GetRight(); sal_Int32 nDistanceUL = rULSpace.GetUpper() + rULSpace.GetLower(); @@ -355,22 +381,40 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet) sal_Int32 nTextSize = static_cast< sal_Int32 >(m_bRubyUserValue ? m_nRubyUserValue : aTextSizeMF.Denormalize(aTextSizeMF.GetValue(FUNIT_TWIP))); - + if ( m_bSquaredMode ) { aCharsPerLineNF.SetValue(m_aPageSize.Width() / nTextSize); + aCharsPerLineNF.SetMax( aCharsPerLineNF.GetValue() ); + aLinesPerPageNF.SetMax( m_aPageSize.Height() / + ( aTextSizeMF.Denormalize(aTextSizeMF.GetValue(FUNIT_TWIP)) + + aRubySizeMF.Denormalize(aRubySizeMF.GetValue(FUNIT_TWIP)))); + SetLinesOrCharsRanges( aCharsRangeFT , aCharsPerLineNF.GetMax() ); + SetLinesOrCharsRanges( aLinesRangeFT , aLinesPerPageNF.GetMax() ); } else { sal_Int32 nTextWidth = static_cast< sal_Int32 >(aCharWidthMF.Denormalize(aCharWidthMF.GetValue(FUNIT_TWIP))); aLinesPerPageNF.SetValue(m_aPageSize.Height() / nTextSize); if (nTextWidth) - aCharsPerLineNF.SetValue(m_aPageSize.Width() / nTextWidth); + aCharsPerLineNF.SetValue(m_aPageSize.Width() / nTextWidth); else aCharsPerLineNF.SetValue( 45 ); + SetLinesOrCharsRanges( aCharsRangeFT , aCharsPerLineNF.GetMax() ); + SetLinesOrCharsRanges( aLinesRangeFT , aLinesPerPageNF.GetMax() ); } } } +/* -----------------------------30.05.2008 14:12------------------------------ + + ---------------------------------------------------------------------------*/ +void SwTextGridPage::SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue ) +{ + String aFieldStr = String::CreateFromAscii("( 1 -"); + aFieldStr += String::CreateFromInt32( nValue ); + aFieldStr += String::CreateFromAscii(" )"); + rField.SetText( aFieldStr ); +} /* -----------------------------06.02.2002 15:24------------------------------ ---------------------------------------------------------------------------*/ @@ -396,7 +440,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField*, pField) //prevent rounding errors in the MetricField by saving the used value m_nRubyUserValue = nWidth; m_bRubyUserValue = sal_True; - + } //set maximum line per page { @@ -405,6 +449,8 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField*, pField) aRubySizeMF.Denormalize(aRubySizeMF.GetValue(FUNIT_TWIP)))); aLinesPerPageNF.SetMax(nMaxLines); } + SetLinesOrCharsRanges( aLinesRangeFT , aLinesPerPageNF.GetMax() ); + SetLinesOrCharsRanges( aCharsRangeFT , aCharsPerLineNF.GetMax() ); } else//in normal mode { @@ -413,7 +459,8 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField*, pField) long nHeight = static_cast< sal_Int32 >(m_aPageSize.Height() / aLinesPerPageNF.GetValue()); aTextSizeMF.SetValue(aTextSizeMF.Normalize(nHeight), FUNIT_TWIP); aRubySizeMF.SetValue(0, FUNIT_TWIP); - + SetLinesOrCharsRanges( aLinesRangeFT , aLinesPerPageNF.GetMax() ); + m_nRubyUserValue = nHeight; m_bRubyUserValue = sal_True; } @@ -421,6 +468,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField*, pField) { long nWidth = static_cast< sal_Int32 >(m_aPageSize.Width() / aCharsPerLineNF.GetValue()); aCharWidthMF.SetValue(aCharWidthMF.Normalize(nWidth), FUNIT_TWIP); + SetLinesOrCharsRanges( aCharsRangeFT , aCharsPerLineNF.GetMax() ); } } GridModifyHdl(0); @@ -436,7 +484,6 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField*, pField) if (&aTextSizeMF == pField) { sal_Int32 nTextSize = static_cast< sal_Int32 >(aTextSizeMF.Denormalize(aTextSizeMF.GetValue(FUNIT_TWIP))); - aCharsPerLineNF.SetValue(m_aPageSize.Width() / nTextSize); m_bRubyUserValue = sal_False; } //set maximum line per page @@ -445,6 +492,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField*, pField) ( aTextSizeMF.Denormalize(aTextSizeMF.GetValue(FUNIT_TWIP)) + aRubySizeMF.Denormalize(aRubySizeMF.GetValue(FUNIT_TWIP)))); aLinesPerPageNF.SetMax(nMaxLines); + SetLinesOrCharsRanges( aLinesRangeFT , aLinesPerPageNF.GetMax() ); } } else @@ -454,14 +502,16 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField*, pField) sal_Int32 nTextSize = static_cast< sal_Int32 >(aTextSizeMF.Denormalize(aTextSizeMF.GetValue(FUNIT_TWIP))); aLinesPerPageNF.SetValue(m_aPageSize.Height() / nTextSize); m_bRubyUserValue = sal_False; + SetLinesOrCharsRanges( aLinesRangeFT , aLinesPerPageNF.GetMax() ); } else if (&aCharWidthMF == pField) { sal_Int32 nTextWidth = static_cast< sal_Int32 >(aCharWidthMF.Denormalize(aCharWidthMF.GetValue(FUNIT_TWIP))); + sal_Int32 nMaxChar = 45 ; if (nTextWidth) - aCharsPerLineNF.SetValue(m_aPageSize.Width() / nTextWidth); - else - aCharsPerLineNF.SetValue( 45 ); + nMaxChar = m_aPageSize.Width() / nTextWidth; + aCharsPerLineNF.SetValue( nMaxChar ); + SetLinesOrCharsRanges( aCharsRangeFT , aCharsPerLineNF.GetMax() ); } //rubySize is disabled } @@ -480,19 +530,20 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, RadioButton*, pButton) //one special case if(bEnable) DisplayGridHdl(&aDisplayCB); - + bEnable = &aCharsGridRB == pButton; aSnapToCharsCB.Enable(bEnable); - + bEnable = &aLinesGridRB == pButton; if(bEnable && !m_bSquaredMode ) { aCharsPerLineFT.Enable(sal_False); aCharsPerLineNF.Enable(sal_False); + aCharsRangeFT.Enable(sal_False); aCharWidthFT.Enable(sal_False); aCharWidthMF.Enable(sal_False); } - + GridModifyHdl(0); return 0; } diff --git a/sw/source/ui/misc/pggrid.hrc b/sw/source/ui/misc/pggrid.hrc index e156792c955d..567a1df33a5c 100644 --- a/sw/source/ui/misc/pggrid.hrc +++ b/sw/source/ui/misc/pggrid.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 @@ -50,3 +50,5 @@ #define CB_SNAPTOCHARS 23 #define FT_CHARWIDTH 24 #define MF_CHARWIDTH 25 +#define FT_LINERANGE 26 +#define FT_CHARRANGE 27 diff --git a/sw/source/ui/misc/pggrid.src b/sw/source/ui/misc/pggrid.src index b03ec2a687c1..a6377dd25f84 100644 --- a/sw/source/ui/misc/pggrid.src +++ b/sw/source/ui/misc/pggrid.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 @@ -97,6 +97,12 @@ TabPage TP_TEXTGRID_PAGE Last = 154 ; SpinSize = 1 ; }; + FixedText FT_LINERANGE + { + Pos = MAP_APPFONT ( 103 , 82 ) ; + Size = MAP_APPFONT ( 25 , 8 ); + Text [ en-US ] = "( 1 - 48 )" ; + }; FixedText FT_TEXTSIZE { Pos = MAP_APPFONT ( 133 , 82 ) ; @@ -166,6 +172,12 @@ TabPage TP_TEXTGRID_PAGE Last = 5600 ; SpinSize = 5 ; }; + FixedText FT_CHARRANGE + { + Pos = MAP_APPFONT ( 103 , 96 ) ; + Size = MAP_APPFONT ( 25 , 8 ) ; + Text [ en-US ] = "( 1 - 45 )" ; + }; FixedText FT_RUBYSIZE { Pos = MAP_APPFONT ( 133 , 98 ) ; diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index b87060bd19b0..e2b7e6a1511f 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -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 @@ -128,7 +128,7 @@ BOOL SwRedlineAcceptChild::ReInitDlg(SwDocShell *pDocSh) { BOOL bRet; - if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel + if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel ((SwModelessRedlineAcceptDlg*)GetWindow())->Activate(); return bRet; @@ -142,7 +142,7 @@ SwModelessRedlineAcceptDlg::SwModelessRedlineAcceptDlg( SfxBindings* _pBindings, SwChildWinWrapper* pChild, Window *_pParent) : SfxModelessDialog(_pBindings, pChild, _pParent, SW_RES(DLG_REDLINE_ACCEPT)), - pChildWin (pChild) + pChildWin (pChild) { pImplDlg = new SwRedlineAcceptDlg(this); @@ -157,17 +157,17 @@ void SwModelessRedlineAcceptDlg::Activate() { SwView *pView = ::GetActiveView(); - if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn - return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug) + if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn + return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug) SwDocShell *pDocSh = pView->GetDocShell(); if (pChildWin->GetOldDocShell() != pDocSh) - { // Dok-Wechsel + { // Dok-Wechsel SwWait aWait( *pDocSh, FALSE ); SwWrtShell* pSh = pView->GetWrtShellPtr(); - pChildWin->SetOldDocShell(pDocSh); // Rekursion vermeiden (durch Modified-Hdl) + pChildWin->SetOldDocShell(pDocSh); // Rekursion vermeiden (durch Modified-Hdl) BOOL bMod = pSh->IsModified(); SfxBoolItem aShow(FN_REDLINE_SHOW, TRUE); @@ -230,7 +230,7 @@ SwModelessRedlineAcceptDlg::~SwModelessRedlineAcceptDlg() ------------------------------------------------------------------------*/ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt) : - pParentDlg (pParent), + pParentDlg (pParent), aTabPagesCTRL (pParent, SW_RES(CTRL_TABPAGES)), aPopup (SW_RES(MN_REDLINE_POPUP)), sInserted (SW_RES(STR_REDLINE_INSERTED)), @@ -240,8 +240,8 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt) : sFmtCollSet (SW_RES(STR_REDLINE_FMTCOLLSET)), sAutoFormat (SW_RES(STR_REDLINE_AUTOFMT)), bOnlyFormatedRedlines( FALSE ), - bHasReadonlySel ( FALSE ), - bRedlnAutoFmt (bAutoFmt), + bHasReadonlySel ( FALSE ), + bRedlnAutoFmt (bAutoFmt), bInhibitActivate( false ) { aTabPagesCTRL.SetHelpId(HID_REDLINE_CTRL); @@ -268,7 +268,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt) : pActLB->InsertEntry(sFmtCollSet); pActLB->InsertEntry(sAutoFormat); pTPView->ShowUndo(TRUE); - pTPView->DisableUndo(); // Noch gibts keine UNDO-Events + pTPView->DisableUndo(); // Noch gibts keine UNDO-Events } pActLB->SelectEntryPos(0); @@ -385,8 +385,8 @@ void SwRedlineAcceptDlg::InitAuthors() bOnlyFormatedRedlines = FALSE; //JP 27.9.2001: make no sense if we handle readonly sections -// if( !bHasReadonlySel && rRedln.HasReadonlySel() ) -// bHasReadonlySel = TRUE; +// if( !bHasReadonlySel && rRedln.HasReadonlySel() ) +// bHasReadonlySel = TRUE; String *pAuthor = new String(rRedln.GetAuthorString()); if (!aStrings.Insert(pAuthor)) @@ -457,11 +457,11 @@ const String &SwRedlineAcceptDlg::GetActionText(const SwRedline& rRedln, USHORT { switch( rRedln.GetType(nStack) ) { - case nsRedlineType_t::REDLINE_INSERT: return sInserted; - case nsRedlineType_t::REDLINE_DELETE: return sDeleted; - case nsRedlineType_t::REDLINE_FORMAT: return sFormated; - case nsRedlineType_t::REDLINE_TABLE: return sTableChgd; - case nsRedlineType_t::REDLINE_FMTCOLL: return sFmtCollSet; + case nsRedlineType_t::REDLINE_INSERT: return sInserted; + case nsRedlineType_t::REDLINE_DELETE: return sDeleted; + case nsRedlineType_t::REDLINE_FORMAT: return sFormated; + case nsRedlineType_t::REDLINE_TABLE: return sTableChgd; + case nsRedlineType_t::REDLINE_FMTCOLL: return sFmtCollSet; default:;//prevent warning } @@ -499,10 +499,10 @@ void SwRedlineAcceptDlg::Activate() aUsedSeqNo.Remove((USHORT)0, aUsedSeqNo.Count()); - if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn - return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug) + if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn + return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug) -/* if (HasRedlineAutoFmt()) +/* if (HasRedlineAutoFmt()) { Init(); return; @@ -606,13 +606,13 @@ USHORT SwRedlineAcceptDlg::CalcDiff(USHORT nStart, BOOL bChild) } pTable->SetUpdateMode(FALSE); - SwView *pView = ::GetActiveView(); - SwWrtShell* pSh = pView->GetWrtShellPtr(); + SwView *pView = ::GetActiveView(); + SwWrtShell* pSh = pView->GetWrtShellPtr(); USHORT nAutoFmt = HasRedlineAutoFmt() ? nsRedlineType_t::REDLINE_FORM_AUTOFMT : 0; SwRedlineDataParent *pParent = aRedlineParents[nStart]; const SwRedline& rRedln = pSh->GetRedline(nStart); - if (bChild) // Sollte eigentlich nie vorkommen, aber sicher ist sicher... + if (bChild) // Sollte eigentlich nie vorkommen, aber sicher ist sicher... { // Alle Childs des Eintrags wegwerfen und neu initialisieren SwRedlineDataChildPtr pBackupData = (SwRedlineDataChildPtr)pParent->pNext; @@ -666,7 +666,7 @@ USHORT SwRedlineAcceptDlg::CalcDiff(USHORT nStart, BOOL bChild) } pTable->SetUpdateMode(TRUE); - Init(nStart); // Alle Eintraege bis zum Ende abgleichen + Init(nStart); // Alle Eintraege bis zum Ende abgleichen return USHRT_MAX; } @@ -688,7 +688,7 @@ void SwRedlineAcceptDlg::InsertChilds(SwRedlineDataParent *pParent, const SwRedl { USHORT nPos; - if (pParent->pData->GetSeqNo() && !aUsedSeqNo.Insert(pParent, nPos)) // Gibts schon + if (pParent->pData->GetSeqNo() && !aUsedSeqNo.Insert(pParent, nPos)) // Gibts schon { if (pParent->pTLBParent) { @@ -783,7 +783,7 @@ void SwRedlineAcceptDlg::RemoveParents(USHORT nStart, USHORT nEnd) if (pCurEntry) pTable->SetCurEntry(pCurEntry); - SvLBoxTreeList* pModel = pTable->GetModel(); + SvLBoxTreeList* pModel = pTable->GetModel(); for (USHORT i = nStart; i <= nEnd; i++) { @@ -837,16 +837,16 @@ void SwRedlineAcceptDlg::RemoveParents(USHORT nStart, USHORT nEnd) void SwRedlineAcceptDlg::InsertParents(USHORT nStart, USHORT nEnd) { - SwView *pView = ::GetActiveView(); - SwWrtShell* pSh = pView->GetWrtShellPtr(); - USHORT nAutoFmt = HasRedlineAutoFmt() ? nsRedlineType_t::REDLINE_FORM_AUTOFMT : 0; + SwView *pView = ::GetActiveView(); + SwWrtShell* pSh = pView->GetWrtShellPtr(); + USHORT nAutoFmt = HasRedlineAutoFmt() ? nsRedlineType_t::REDLINE_FORM_AUTOFMT : 0; String sParent; USHORT nCount = pSh->GetRedlineCount(); - nEnd = Min((USHORT)nEnd, (USHORT)(nCount - 1)); // Handelt auch nEnd=USHRT_MAX (bis zum Ende) ab + nEnd = Min((USHORT)nEnd, (USHORT)(nCount - 1)); // Handelt auch nEnd=USHRT_MAX (bis zum Ende) ab if (nEnd == USHRT_MAX) - return; // Keine Redlines im Dokument + return; // Keine Redlines im Dokument RedlinData *pData; SvLBoxEntry *pParent; @@ -872,8 +872,8 @@ void SwRedlineAcceptDlg::InsertParents(USHORT nStart, USHORT nEnd) const SwRedlineData *pRedlineData = &rRedln.GetRedlineData(); pRedlineParent = new SwRedlineDataParent; - pRedlineParent->pData = pRedlineData; - pRedlineParent->pNext = 0; + pRedlineParent->pData = pRedlineData; + pRedlineParent->pNext = 0; String sComment(rRedln.GetComment()); sComment.SearchAndReplaceAll((sal_Unicode)_LF,(sal_Unicode)' '); pRedlineParent->sComment = sComment; @@ -1146,7 +1146,7 @@ IMPL_LINK( SwRedlineAcceptDlg, GotoHdl, void*, EMPTYARG ) if (pTable->IsSelected(pActEntry)) { pSelEntry = pActEntry = pTable->NextSelected(pSelEntry); - continue; // Nicht zweimal selektieren + continue; // Nicht zweimal selektieren } } else @@ -1161,8 +1161,8 @@ IMPL_LINK( SwRedlineAcceptDlg, GotoHdl, void*, EMPTYARG ) bIsNotFormated |= nsRedlineType_t::REDLINE_FORMAT != rRedln.GetType(); //JP 27.9.2001: make no sense if we handle readonly sections -// if( !bReadonlySel && rRedln.HasReadonlySel() ) -// bReadonlySel = TRUE; +// if( !bReadonlySel && rRedln.HasReadonlySel() ) +// bReadonlySel = TRUE; if (pSh->GotoRedline(nPos, TRUE)) { @@ -1224,7 +1224,7 @@ IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG ) !pTable->GetParent(pEntry) && !pTable->NextSelected(pEntry) //JP 27.9.2001: make no sense if we handle readonly sections -// && pRed->HasReadonlySel() +// && pRed->HasReadonlySel() ); aPopup.EnableItem( MN_SUB_SORT, pTable->First() != 0 ); @@ -1333,11 +1333,11 @@ IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG ) { bSortDir = TRUE; if (nRet - MN_SORT_ACTION == 4 && pTable->GetSortedCol() == 0xffff) - break; // Haben wir schon + break; // Haben wir schon nSortMode = nRet - MN_SORT_ACTION; if (nSortMode == 4) - nSortMode = 0xffff; // unsortiert bzw sortiert nach Position + nSortMode = 0xffff; // unsortiert bzw sortiert nach Position if (pTable->GetSortedCol() == nSortMode) bSortDir = !pTable->GetSortDirection(); @@ -1345,7 +1345,7 @@ IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG ) SwWait aWait( *::GetActiveView()->GetDocShell(), FALSE ); pTable->SortByCol(nSortMode, bSortDir); if (nSortMode == 0xffff) - Init(); // Alles neu fuellen + Init(); // Alles neu fuellen } break; } @@ -1405,7 +1405,7 @@ void SwRedlineAcceptDlg::FillInfo(String &rExtraData) const { rExtraData.AppendAscii("AcceptChgDat:("); - USHORT nCount = pTable->TabCount(); + USHORT nCount = pTable->TabCount(); rExtraData += String::CreateFromInt32(nCount); rExtraData += ';'; diff --git a/sw/source/ui/misc/redlndlg.hrc b/sw/source/ui/misc/redlndlg.hrc index 838b79f37d48..927d247c7948 100644 --- a/sw/source/ui/misc/redlndlg.hrc +++ b/sw/source/ui/misc/redlndlg.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,15 +24,15 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define CTRL_TABPAGES 1 +#define CTRL_TABPAGES 1 -#define MN_EDIT_COMMENT 1 -#define MN_SUB_SORT 2 -#define MN_SORT_ACTION 3 -#define MN_SORT_AUTHOR 4 -#define MN_SORT_DATE 5 -#define MN_SORT_COMMENT 6 -#define MN_SORT_POSITION 7 +#define MN_EDIT_COMMENT 1 +#define MN_SUB_SORT 2 +#define MN_SORT_ACTION 3 +#define MN_SORT_AUTHOR 4 +#define MN_SORT_DATE 5 +#define MN_SORT_COMMENT 6 +#define MN_SORT_POSITION 7 -#define XBORDER 3 -#define YBORDER 3 +#define XBORDER 3 +#define YBORDER 3 diff --git a/sw/source/ui/misc/redlndlg.src b/sw/source/ui/misc/redlndlg.src index 39418495363c..3af8626ee81b 100644 --- a/sw/source/ui/misc/redlndlg.src +++ b/sw/source/ui/misc/redlndlg.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/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index be7622319626..fcac6325113f 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -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 @@ -74,13 +74,13 @@ static USHORT nType3 = 0; static USHORT nLang = LANGUAGE_NONE; -static BOOL bAsc1 = TRUE; -static BOOL bAsc2 = TRUE; -static BOOL bAsc3 = TRUE; -static BOOL bCol = FALSE; -static BOOL bCsSens= FALSE; +static BOOL bAsc1 = TRUE; +static BOOL bAsc2 = TRUE; +static BOOL bAsc3 = TRUE; +static BOOL bCol = FALSE; +static BOOL bCsSens= FALSE; -static sal_Unicode cDeli = '\t'; +static sal_Unicode cDeli = '\t'; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; @@ -97,7 +97,7 @@ void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox ) } /*-------------------------------------------------------------------- - Beschreibung: Fuer Tabellenselektion sel. Zeilen und Spalten + Beschreibung: Fuer Tabellenselektion sel. Zeilen und Spalten feststellen --------------------------------------------------------------------*/ @@ -133,45 +133,45 @@ BOOL lcl_GetSelTbl( SwWrtShell &rSh, USHORT& rX, USHORT& rY ) SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) : SvxStandardDialog(pParent, SW_RES(DLG_SORTING)), - aColLbl(this, SW_RES(FT_COL )), - aTypLbl(this, SW_RES(FT_KEYTYP)), - aDirLbl(this, SW_RES(FT_DIR )), + aColLbl(this, SW_RES(FT_COL )), + aTypLbl(this, SW_RES(FT_KEYTYP)), + aDirLbl(this, SW_RES(FT_DIR )), aDirFL(this, SW_RES(FL_DIR )), aKeyCB1(this, SW_RES(CB_KEY1 )), - aColEdt1(this, SW_RES(ED_KEY1 )), - aTypDLB1(this, SW_RES(DLB_KEY1 )), - aSortUpRB(this, SW_RES(RB_UP )), - aSortDnRB(this, SW_RES(RB_DN )), + aColEdt1(this, SW_RES(ED_KEY1 )), + aTypDLB1(this, SW_RES(DLB_KEY1 )), + aSortUpRB(this, SW_RES(RB_UP )), + aSortDnRB(this, SW_RES(RB_DN )), aKeyCB2(this, SW_RES(CB_KEY2 )), - aColEdt2(this, SW_RES(ED_KEY2 )), - aTypDLB2(this, SW_RES(DLB_KEY2 )), - aSortUp2RB(this, SW_RES(RB_UP2 )), - aSortDn2RB(this, SW_RES(RB_DN2 )), + aColEdt2(this, SW_RES(ED_KEY2 )), + aTypDLB2(this, SW_RES(DLB_KEY2 )), + aSortUp2RB(this, SW_RES(RB_UP2 )), + aSortDn2RB(this, SW_RES(RB_DN2 )), aKeyCB3(this, SW_RES(CB_KEY3 )), - aColEdt3(this, SW_RES(ED_KEY3 )), - aTypDLB3(this, SW_RES(DLB_KEY3 )), - aSortUp3RB(this, SW_RES(RB_UP3 )), - aSortDn3RB(this, SW_RES(RB_DN3 )), + aColEdt3(this, SW_RES(ED_KEY3 )), + aTypDLB3(this, SW_RES(DLB_KEY3 )), + aSortUp3RB(this, SW_RES(RB_UP3 )), + aSortDn3RB(this, SW_RES(RB_DN3 )), aSortFL(this, SW_RES(FL_SORT_2 )), - aColumnRB(this, SW_RES(RB_COL )), - aRowRB(this, SW_RES(RB_ROW )), + aColumnRB(this, SW_RES(RB_COL )), + aRowRB(this, SW_RES(RB_ROW )), aDelimFL(this, SW_RES(FL_DELIM )), aDelimTabRB(this, SW_RES(RB_TAB )), - aDelimFreeRB(this, SW_RES(RB_TABCH )), - aDelimEdt(this, SW_RES(ED_TABCH )), - aDelimPB(this, SW_RES( PB_DELIM)), + aDelimFreeRB(this, SW_RES(RB_TABCH )), + aDelimEdt(this, SW_RES(ED_TABCH )), + aDelimPB(this, SW_RES( PB_DELIM)), aLangFL(this, SW_RES( FL_LANG )), - aLangLB(this, SW_RES( LB_LANG )), + aLangLB(this, SW_RES( LB_LANG )), aSortOptFL(this, SW_RES( FL_SORT )), - aCaseCB(this, SW_RES( CB_CASE )), + aCaseCB(this, SW_RES( CB_CASE )), aOkBtn(this, SW_RES(BT_OK )), aCancelBtn(this, SW_RES(BT_CANCEL)), @@ -179,7 +179,7 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) : aColTxt( SW_RES(STR_COL)), aRowTxt( SW_RES(STR_ROW)), - aNumericTxt( SW_RES(STR_NUMERIC)), + aNumericTxt( SW_RES(STR_NUMERIC)), rSh(rShell), pColRes( 0 ), nX( 99 ), @@ -272,7 +272,7 @@ SwSortDlg::~SwSortDlg() delete pColRes; } -sal_Unicode SwSortDlg::GetDelimChar() const +sal_Unicode SwSortDlg::GetDelimChar() const { sal_Unicode cRet = '\t'; if( !aDelimTabRB.IsChecked() ) diff --git a/sw/source/ui/misc/srtdlg.hrc b/sw/source/ui/misc/srtdlg.hrc index 101f819b8739..034852718d12 100644 --- a/sw/source/ui/misc/srtdlg.hrc +++ b/sw/source/ui/misc/srtdlg.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 @@ -48,15 +48,15 @@ #define RB_TABCH 22 #define ED_TABCH 23 #define FL_DELIM 24 -#define STR_ROW 25 -#define STR_COL 26 +#define STR_ROW 25 +#define STR_COL 26 #define BT_HELP 27 -#define FT_DIR 28 +#define FT_DIR 28 #define RB_UP2 29 #define RB_DN2 30 #define RB_UP3 31 #define RB_DN3 32 -#define STR_NUMERIC 33 +#define STR_NUMERIC 33 #define PB_DELIM 34 #define FL_LANG 35 #define LB_LANG 36 diff --git a/sw/source/ui/misc/srtdlg.src b/sw/source/ui/misc/srtdlg.src index a1e6caad6c5e..8a1eb3a3ee1c 100644 --- a/sw/source/ui/misc/srtdlg.src +++ b/sw/source/ui/misc/srtdlg.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/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index 954d1a017a77..2e11521aaab5 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -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 @@ -90,7 +90,7 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(Window *pParent) : pImplDlg = new SwRedlineAcceptDlg(this, TRUE); pImplDlg->Initialize(GetExtraData()); - pImplDlg->Activate(); // Zur Initialisierung der Daten + pImplDlg->Activate(); // Zur Initialisierung der Daten FreeResource(); } @@ -101,7 +101,7 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(Window *pParent) : SwModalRedlineAcceptDlg::~SwModalRedlineAcceptDlg() { - AcceptAll(FALSE); // Alles uebriggebliebene ablehnen + AcceptAll(FALSE); // Alles uebriggebliebene ablehnen pImplDlg->FillInfo(GetExtraData()); delete pImplDlg; @@ -136,7 +136,7 @@ void SwModalRedlineAcceptDlg::AcceptAll( BOOL bAccept ) if (pFilterTP->IsDate() || pFilterTP->IsAuthor() || pFilterTP->IsRange() || pFilterTP->IsAction()) { - pFilterTP->CheckDate(FALSE); // Alle Filter abschalten + pFilterTP->CheckDate(FALSE); // Alle Filter abschalten pFilterTP->CheckAuthor(FALSE); pFilterTP->CheckRange(FALSE); pFilterTP->CheckAction(FALSE); diff --git a/sw/source/ui/ribbar/conarc.cxx b/sw/source/ui/ribbar/conarc.cxx index 4b2fafbd6040..d20cef3c921d 100644 --- a/sw/source/ui/ribbar/conarc.cxx +++ b/sw/source/ui/ribbar/conarc.cxx @@ -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 @@ -49,7 +49,7 @@ ConstArc::ConstArc(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView) - : SwDrawBase(pWrtShell, pEditWin, pSwView), nAnzButUp(0) + : SwDrawBase(pWrtShell, pEditWin, pSwView), nAnzButUp(0) { } @@ -94,9 +94,9 @@ BOOL ConstArc::MouseButtonUp( const MouseEvent& rMEvt ) bReturn = TRUE; } else - { nAnzButUp++; + { nAnzButUp++; - if (nAnzButUp == 3) // Kreisbogenerzeugung beendet + if (nAnzButUp == 3) // Kreisbogenerzeugung beendet { SwDrawBase::MouseButtonUp(rMEvt); nAnzButUp = 0; @@ -106,7 +106,7 @@ BOOL ConstArc::MouseButtonUp( const MouseEvent& rMEvt ) m_pSh->EndCreate(SDRCREATE_NEXTPOINT); } } -/* else if ( pView->IsCreateObj() && rMEvt.IsRight() ) +/* else if ( pView->IsCreateObj() && rMEvt.IsRight() ) { pView->EndCreateObj( SDRCREATE_FORCEEND ); bReturn = TRUE; diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/ui/ribbar/concustomshape.cxx index 66ba929fae47..ca6e437da2cc 100644 --- a/sw/source/ui/ribbar/concustomshape.cxx +++ b/sw/source/ui/ribbar/concustomshape.cxx @@ -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 @@ -187,7 +187,7 @@ void ConstCustomShape::SetAttributes( SdrObject* pObj ) if( pSourceObj ) { const SfxItemSet& rSource = pSourceObj->GetMergedItemSet(); - SfxItemSet aDest( pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj + SfxItemSet aDest( pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj SDRATTR_START, SDRATTR_SHADOW_LAST, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, diff --git a/sw/source/ui/ribbar/conform.cxx b/sw/source/ui/ribbar/conform.cxx index 8682e1d34462..60ff9e7e138d 100644 --- a/sw/source/ui/ribbar/conform.cxx +++ b/sw/source/ui/ribbar/conform.cxx @@ -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/ribbar/conpoly.cxx b/sw/source/ui/ribbar/conpoly.cxx index 0dbf109cc783..3fdeff53f8b1 100644 --- a/sw/source/ui/ribbar/conpoly.cxx +++ b/sw/source/ui/ribbar/conpoly.cxx @@ -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/ribbar/conrect.cxx b/sw/source/ui/ribbar/conrect.cxx index 3d77ae4829af..dbaa6c23bf39 100644 --- a/sw/source/ui/ribbar/conrect.cxx +++ b/sw/source/ui/ribbar/conrect.cxx @@ -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/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx index 61dcd3f23505..ecf1ba07ae76 100644 --- a/sw/source/ui/ribbar/drawbase.cxx +++ b/sw/source/ui/ribbar/drawbase.cxx @@ -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 @@ -50,7 +50,7 @@ using namespace ::com::sun::star; -extern BOOL bNoInterrupt; // in mainwn.cxx +extern BOOL bNoInterrupt; // in mainwn.cxx #define MINMOVE ((USHORT)m_pSh->GetOut()->PixelToLogic(Size(m_pSh->GetDrawView()->GetMarkHdlSizePixel()/2,0)).Width()) @@ -187,7 +187,7 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt) ******************************************************************/ if (pSdrView->HasMarkablePoints() && (!pSdrView->IsPointMarked(*aVEvt.pHdl) || rMEvt.IsShift())) { - SdrHdl* pHdl = NULL; + SdrHdl* pHdl = NULL; if (!rMEvt.IsShift()) { @@ -240,7 +240,7 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt) if (!pSdrView->HasMarkablePoints()) { //JP 10.10.2001: Bug 89619 - don't scroll the - // cursor into the visible area + // cursor into the visible area BOOL bUnlockView = !m_pSh->IsViewLocked(); m_pSh->LockView( TRUE ); //lock visible section m_pSh->SelectObj(Point(LONG_MAX, LONG_MAX)); // Alles deselektieren @@ -402,7 +402,7 @@ BOOL SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt) } m_pView->NoRotate(); - bCheckShell = TRUE; // ggf BezierShell anwerfen + bCheckShell = TRUE; // ggf BezierShell anwerfen } else if (!m_pSh->IsObjSelected() && !m_pWin->IsDrawAction()) { @@ -462,7 +462,7 @@ BOOL SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt) } m_pView->NoRotate(); - bCheckShell = TRUE; // ggf BezierShell anwerfen + bCheckShell = TRUE; // ggf BezierShell anwerfen } } diff --git a/sw/source/ui/ribbar/dselect.cxx b/sw/source/ui/ribbar/dselect.cxx index b7651eba981e..08ac58062dde 100644 --- a/sw/source/ui/ribbar/dselect.cxx +++ b/sw/source/ui/ribbar/dselect.cxx @@ -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 @@ -37,7 +37,7 @@ #include "drawbase.hxx" #include "dselect.hxx" -extern BOOL bNoInterrupt; // in mainwn.cxx +extern BOOL bNoInterrupt; // in mainwn.cxx /************************************************************************* |* diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx index c14f91632a4c..174634af4808 100644 --- a/sw/source/ui/ribbar/inputwin.cxx +++ b/sw/source/ui/ribbar/inputwin.cxx @@ -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 @@ -65,10 +65,10 @@ SFX_IMPL_POS_CHILDWINDOW( SwInputChild, FN_EDIT_FORMULA, SFX_OBJECTBAR_OBJECT ) //================================================================== SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind ) - : ToolBox( pParent , SW_RES( RID_TBX_FORMULA )), + : ToolBox( pParent , SW_RES( RID_TBX_FORMULA )), aPos( this, SW_RES(ED_POS)), aEdit( this, WB_3DLOOK|WB_TABSTOP|WB_BORDER|WB_NOHIDESELECTION), - aPopMenu( SW_RES(MN_CALC_POPUP)), + aPopMenu( SW_RES(MN_CALC_POPUP)), pMgr(0), pWrtShell(0), pView(0), @@ -100,12 +100,12 @@ SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind ) SetItemBits( FN_FORMULA_CALC, GetItemBits( FN_FORMULA_CALC ) | TIB_DROPDOWNONLY ); SetDropdownClickHdl( LINK( this, SwInputWindow, DropdownClickHdl )); - Size aSizeTbx = CalcWindowSizePixel(); + Size aSizeTbx = CalcWindowSizePixel(); Size aSize = GetSizePixel(); aSize.Height() = aSizeTbx.Height(); SetSizePixel( aSize ); - Size aPosSize = aPos.GetSizePixel(); - Size aEditSize = aEdit.GetSizePixel(); + Size aPosSize = aPos.GetSizePixel(); + Size aEditSize = aEdit.GetSizePixel(); aPosSize.Height() = aEditSize.Height() = GetItemRect(FN_FORMULA_CALC).GetHeight() - 2; Point aPosPos = aPos.GetPosPixel(); @@ -169,9 +169,9 @@ void __EXPORT SwInputWindow::Resize() { ToolBox::Resize(); - long nWidth = GetSizePixel().Width(); - long nLeft = aEdit.GetPosPixel().X(); - Size aEditSize = aEdit.GetSizePixel(); + long nWidth = GetSizePixel().Width(); + long nLeft = aEdit.GetPosPixel().X(); + Size aEditSize = aEdit.GetSizePixel(); aEditSize.Width() = Max( ((long)(nWidth - nLeft - 5)), (long)0 ); aEdit.SetSizePixel( aEditSize ); @@ -214,7 +214,7 @@ void SwInputWindow::ShowWin() pMgr = new SwFldMgr; // JP 13.01.97: Formel soll immer mit einem "=" beginnen, hier - // also setzen + // also setzen String sEdit( '=' ); if( pMgr->GetCurFld() && TYP_FORMELFLD == pMgr->GetCurTypeId() ) { @@ -324,7 +324,7 @@ static const char * __READONLY_DATA aStrArr[] = { IMPL_LINK( SwInputWindow, DropdownClickHdl, ToolBox*, EMPTYARG ) { USHORT nCurID = GetCurItemId(); - EndSelection(); // setzt CurItemId zurueck ! + EndSelection(); // setzt CurItemId zurueck ! switch ( nCurID ) { case FN_FORMULA_CALC : @@ -345,7 +345,7 @@ IMPL_LINK( SwInputWindow, DropdownClickHdl, ToolBox*, EMPTYARG ) void __EXPORT SwInputWindow::Click( ) { USHORT nCurID = GetCurItemId(); - EndSelection(); // setzt CurItemId zurueck ! + EndSelection(); // setzt CurItemId zurueck ! switch ( nCurID ) { case FN_FORMULA_CANCEL: @@ -379,7 +379,7 @@ void SwInputWindow::ApplyFormula() pWrtShell->Pop( FALSE ); // JP 13.01.97: Formel soll immer mit einem "=" beginnen, hier - // also wieder entfernen + // also wieder entfernen String sEdit( aEdit.GetText() ); sEdit.EraseLeadingChars().EraseTrailingChars(); if( sEdit.Len() && '=' == sEdit.GetChar( 0 ) ) @@ -542,7 +542,7 @@ void __EXPORT InputEdit::UpdateRange(const String& rBoxes, GrabFocus(); return; } - const sal_Unicode cOpen = '<', cClose = '>', + const sal_Unicode cOpen = '<', cClose = '>', cOpenBracket = '('; String aPrefix = rName; if(rName.Len()) @@ -626,7 +626,7 @@ void __EXPORT InputEdit::UpdateRange(const String& rBoxes, { SetText( aActText ); SetSelection( Selection( nPos, nPos ) ); -// GetModifyHdl().Call( this ); +// GetModifyHdl().Call( this ); } } GrabFocus(); @@ -657,7 +657,7 @@ __EXPORT SwInputChild::~SwInputChild() SfxChildWinInfo __EXPORT SwInputChild::GetInfo() const { - SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \ + SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \ return aInfo; } diff --git a/sw/source/ui/ribbar/inputwin.hrc b/sw/source/ui/ribbar/inputwin.hrc index 96e45ac38708..e55fa18e3ef9 100644 --- a/sw/source/ui/ribbar/inputwin.hrc +++ b/sw/source/ui/ribbar/inputwin.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 @@ -29,40 +29,40 @@ //PopupMenu Id's -#define MN_CALC_PHD 1 -#define MN_CALC_SQRT 2 -#define MN_CALC_OR 3 -#define MN_CALC_XOR 4 -#define MN_CALC_AND 5 -#define MN_CALC_NOT 6 -#define MN_CALC_EQ 7 -#define MN_CALC_NEQ 8 -#define MN_CALC_LEQ 9 -#define MN_CALC_GEQ 10 -#define MN_CALC_LES 11 -#define MN_CALC_GRE 12 -#define MN_CALC_SUM 13 -#define MN_CALC_MEAN 14 -#define MN_CALC_MIN 15 -#define MN_CALC_MAX 16 -#define MN_CALC_SIN 17 -#define MN_CALC_COS 18 -#define MN_CALC_TAN 19 -#define MN_CALC_ASIN 20 -#define MN_CALC_ACOS 21 -#define MN_CALC_ATAN 22 -#define MN_CALC_POW 23 -#define MN_CALC_LISTSEP 24 -#define MN_CALC_ROUND 25 - -#define MN_POP_OPS 29 -#define MN_POP_STATISTICS 30 -#define MN_POP_FUNC 31 -#define MN_RSC_END 32 - -#define TBX_FORMULA 1 -#define ED_POS 2 -#define ED_FORMULA 3 +#define MN_CALC_PHD 1 +#define MN_CALC_SQRT 2 +#define MN_CALC_OR 3 +#define MN_CALC_XOR 4 +#define MN_CALC_AND 5 +#define MN_CALC_NOT 6 +#define MN_CALC_EQ 7 +#define MN_CALC_NEQ 8 +#define MN_CALC_LEQ 9 +#define MN_CALC_GEQ 10 +#define MN_CALC_LES 11 +#define MN_CALC_GRE 12 +#define MN_CALC_SUM 13 +#define MN_CALC_MEAN 14 +#define MN_CALC_MIN 15 +#define MN_CALC_MAX 16 +#define MN_CALC_SIN 17 +#define MN_CALC_COS 18 +#define MN_CALC_TAN 19 +#define MN_CALC_ASIN 20 +#define MN_CALC_ACOS 21 +#define MN_CALC_ATAN 22 +#define MN_CALC_POW 23 +#define MN_CALC_LISTSEP 24 +#define MN_CALC_ROUND 25 + +#define MN_POP_OPS 29 +#define MN_POP_STATISTICS 30 +#define MN_POP_FUNC 31 +#define MN_RSC_END 32 + +#define TBX_FORMULA 1 +#define ED_POS 2 +#define ED_FORMULA 3 #endif diff --git a/sw/source/ui/ribbar/inputwin.src b/sw/source/ui/ribbar/inputwin.src index 13d5fcdd0eae..e8f8fa58f58b 100644 --- a/sw/source/ui/ribbar/inputwin.src +++ b/sw/source/ui/ribbar/inputwin.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/ribbar/tblctrl.cxx b/sw/source/ui/ribbar/tblctrl.cxx index ad5046af6b42..dbbbfcb44a04 100644 --- a/sw/source/ui/ribbar/tblctrl.cxx +++ b/sw/source/ui/ribbar/tblctrl.cxx @@ -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 @@ -32,7 +32,7 @@ #include <svl/intitem.hxx> #include <vcl/toolbox.hxx> -#include <sfx2/app.hxx> +#include <sfx2/app.hxx> #include "cmdid.h" #include "swtypes.hxx" @@ -50,7 +50,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SwTableOptimizeCtrl, SfxUInt16Item ); -SwTableOptimizeCtrl::SwTableOptimizeCtrl( +SwTableOptimizeCtrl::SwTableOptimizeCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : @@ -87,7 +87,7 @@ SfxPopupWindow* SwTableOptimizeCtrl::CreatePopupWindow() -SfxPopupWindowType SwTableOptimizeCtrl::GetPopupWindowType() const +SfxPopupWindowType SwTableOptimizeCtrl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } diff --git a/sw/source/ui/ribbar/tblctrl.hrc b/sw/source/ui/ribbar/tblctrl.hrc index 7cfa32d7bb5d..fcc31d473eda 100644 --- a/sw/source/ui/ribbar/tblctrl.hrc +++ b/sw/source/ui/ribbar/tblctrl.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 @@ -28,7 +28,7 @@ #define _TBLCTRL_HRC #include "ribbar.hrc" -#define TBX_OPTIMIZE_TABLE 1 +#define TBX_OPTIMIZE_TABLE 1 #endif diff --git a/sw/source/ui/ribbar/tblctrl.src b/sw/source/ui/ribbar/tblctrl.src index 0c783172af74..afc594998330 100644 --- a/sw/source/ui/ribbar/tblctrl.src +++ b/sw/source/ui/ribbar/tblctrl.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/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx index 6c20f9dd818d..ba6865e82765 100644 --- a/sw/source/ui/ribbar/tbxanchr.cxx +++ b/sw/source/ui/ribbar/tbxanchr.cxx @@ -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 @@ -58,7 +58,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SwTbxAnchor, SfxUInt16Item); /****************************************************************************** - * Beschreibung: + * Beschreibung: ******************************************************************************/ SwTbxAnchor::SwTbxAnchor( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : @@ -69,7 +69,7 @@ SwTbxAnchor::SwTbxAnchor( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : } /****************************************************************************** - * Beschreibung: + * Beschreibung: ******************************************************************************/ SwTbxAnchor::~SwTbxAnchor() @@ -77,7 +77,7 @@ SwTbxAnchor::SwTbxAnchor( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : } /****************************************************************************** - * Beschreibung: + * Beschreibung: ******************************************************************************/ void SwTbxAnchor::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) @@ -94,7 +94,7 @@ void SwTbxAnchor::StateChanged( USHORT /*nSID*/, SfxItemState eState, const Sfx } /****************************************************************************** - * Beschreibung: + * Beschreibung: ******************************************************************************/ SfxPopupWindow* SwTbxAnchor::CreatePopupWindow() @@ -104,7 +104,7 @@ SfxPopupWindow* SwTbxAnchor::CreatePopupWindow() } /****************************************************************************** - * Beschreibung: + * Beschreibung: ******************************************************************************/ void SwTbxAnchor::Click() diff --git a/sw/source/ui/ribbar/tbxanchr.src b/sw/source/ui/ribbar/tbxanchr.src index 41067b18fb08..9aa3763ea445 100644 --- a/sw/source/ui/ribbar/tbxanchr.src +++ b/sw/source/ui/ribbar/tbxanchr.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/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index c75cb3f0dfc4..bb69819b8d4d 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -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 @@ -180,7 +180,7 @@ SfxPopupWindow* SwTbxInsertCtrl::CreatePopupWindow() **********************************************************************/ -SfxPopupWindowType SwTbxInsertCtrl::GetPopupWindowType() const +SfxPopupWindowType SwTbxInsertCtrl::GetPopupWindowType() const { return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK; } @@ -644,7 +644,7 @@ void SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt ) /*-----------------20.06.97 13:41------------------- --------------------------------------------------*/ -String SwScrollNaviPopup::GetQuickHelpText(BOOL bNext) +String SwScrollNaviPopup::GetQuickHelpText(BOOL bNext) { USHORT nResId = STR_IMGBTN_START; nResId += SwView::GetMoveType() - NID_START; diff --git a/sw/source/ui/ribbar/workctrl.hrc b/sw/source/ui/ribbar/workctrl.hrc index 5e5180f363aa..108cf44ee848 100644 --- a/sw/source/ui/ribbar/workctrl.hrc +++ b/sw/source/ui/ribbar/workctrl.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 @@ -28,11 +28,11 @@ #define _WORKCTRL_HRC #include "ribbar.hrc" -#define TBX_INSERT 1 -#define TBX_OBJ_INSERT 2 -#define TBX_FIELD_INSERT 3 +#define TBX_INSERT 1 +#define TBX_OBJ_INSERT 2 +#define TBX_FIELD_INSERT 3 #define TBX_NAVIGATION 4 -#define IL_VALUES 5 +#define IL_VALUES 5 #define IMG_BTN 6 #define ST_QUICK 7 #define FI_INFO 8 @@ -63,8 +63,8 @@ // doppelter Eintrag! hrc und hxx // diese Ids bestimmen, was die Buttons unter dem Scrollbar tun #define NID_START 20000 -#define NID_NEXT 20000 -#define NID_PREV 20001 +#define NID_NEXT 20000 +#define NID_PREV 20001 #define NID_TBL 20002 #define NID_FRM 20003 #define NID_PGE 20004 @@ -72,17 +72,17 @@ #define NID_CTRL 20006 #define NID_REG 20007 #define NID_BKM 20008 -#define NID_GRF 20009 -#define NID_OLE 20010 -#define NID_OUTL 20011 -#define NID_SEL 20012 -#define NID_FTN 20013 -#define NID_MARK 20014 +#define NID_GRF 20009 +#define NID_OLE 20010 +#define NID_OUTL 20011 +#define NID_SEL 20012 +#define NID_FTN 20013 +#define NID_MARK 20014 #define NID_POSTIT 20015 #define NID_SRCH_REP 20016 #define NID_INDEX_ENTRY 20017 -#define NID_TABLE_FORMULA 20018 -#define NID_TABLE_FORMULA_ERROR 20019 +#define NID_TABLE_FORMULA 20018 +#define NID_TABLE_FORMULA_ERROR 20019 #define NID_COUNT 20 #endif diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src index 93681f526502..c50da95313bf 100644 --- a/sw/source/ui/ribbar/workctrl.src +++ b/sw/source/ui/ribbar/workctrl.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/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index e795c123d3a2..3486fd06a8ae 100755 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -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 @@ -622,7 +622,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break; case SID_ATTR_CHAR_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE;break; case SID_ATTR_CHAR_OVERLINE: nEEWhich = EE_CHAR_OVERLINE;break; - case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break; + case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break; case SID_ATTR_CHAR_SHADOWED: nEEWhich = EE_CHAR_SHADOW;break; case SID_ATTR_CHAR_STRIKEOUT: nEEWhich = EE_CHAR_STRIKEOUT;break; case SID_ATTR_CHAR_LANGUAGE : nEEWhich = EE_CHAR_LANGUAGE;break; @@ -820,7 +820,7 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq) SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( &rView.GetEditWin() ); pDlg->Insert( SOT_FORMAT_STRING, aEmptyStr ); - pDlg->Insert( SOT_FORMAT_RTF, aEmptyStr ); + pDlg->Insert( SOT_FORMAT_RTF, aEmptyStr ); TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &rView.GetEditWin() ) ); @@ -1135,7 +1135,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) aOldSelection = pOLV->GetSelection(); if (!pOLV->GetEditView().HasSelection()) { - bRestoreSelection = true; + bRestoreSelection = true; pOLV->GetEditView().SelectCurrentWord(); } @@ -1151,7 +1151,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) if (aReplaceText.Len() > 0) ReplaceTextWithSynonym( pOLV->GetEditView(), aReplaceText ); break; - } + } case SID_THESAURUS: { pOLV->StartThesaurus(); @@ -1260,7 +1260,7 @@ void SwAnnotationShell::GetLinguState(SfxItemSet &rSet) SwLangHelper::GetLanguageStatus(pOLV,rSet); break; } - + case SID_THES: { String aStatusVal; @@ -1275,8 +1275,8 @@ void SwAnnotationShell::GetLinguState(SfxItemSet &rSet) !xThes.is() || nLang == LANGUAGE_NONE || !xThes->hasLocale( aLocale )) rSet.DisableItem( SID_THES ); break; - } - + } + // disable "Thesaurus" if the language is not supported case SID_THESAURUS: { @@ -1652,7 +1652,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) // attributieren (Font setzen) SfxItemSet aSetFont( *aFontSet.GetPool(), aFontSet.GetRanges() ); - SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(), + SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(), aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ); diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 0500b4a88310..025403cc08f2 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -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 @@ -151,12 +151,12 @@ static BYTE nFooterPos; #include <sfx2/msg.hxx> #include "swslots.hxx" -#define SWCONTOURDLG(rView) ( (SvxContourDlg*) ( rView.GetViewFrame()->GetChildWindow( \ - SvxContourDlgChildWindow::GetChildWindowId() )-> \ +#define SWCONTOURDLG(rView) ( (SvxContourDlg*) ( rView.GetViewFrame()->GetChildWindow( \ + SvxContourDlgChildWindow::GetChildWindowId() )-> \ GetWindow() ) ) -#define SWIMAPDLG(rView) ( (SvxIMapDlg*) ( rView.GetViewFrame()->GetChildWindow( \ - SvxIMapDlgChildWindow::GetChildWindowId() )-> \ +#define SWIMAPDLG(rView) ( (SvxIMapDlg*) ( rView.GetViewFrame()->GetChildWindow( \ + SvxIMapDlgChildWindow::GetChildWindowId() )-> \ GetWindow() ) ) @@ -175,7 +175,7 @@ SFX_IMPL_INTERFACE(SwBaseShell, SfxShell, SW_RES(0)) TYPEINIT1(SwBaseShell,SfxShell) /*-------------------------------------------------------------------- - Beschreibung: statics + Beschreibung: statics --------------------------------------------------------------------*/ @@ -223,7 +223,7 @@ BOOL lcl_UpdateContourDlg( SwWrtShell &rSh, int nSel ) } /*-------------------------------------------------------------------- - Beschreibung: loeschen + Beschreibung: loeschen --------------------------------------------------------------------*/ void SwBaseShell::ExecDelete(SfxRequest &rReq) @@ -252,8 +252,8 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq) } else // JP 15.07.96: wenns nicht mehr nach vorne geht, die - // Numerierung aufheben. Z.B. am Doc-/ - // Rahmen-/Tabellen-/Bereichs-Anfang + // Numerierung aufheben. Z.B. am Doc-/ + // Rahmen-/Tabellen-/Bereichs-Anfang rSh.DelNumRules(); rSh.EndCrsrMove(); @@ -441,7 +441,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) } /*-------------------------------------------------------------------- - Beschreibung: ClipBoard-Status + Beschreibung: ClipBoard-Status --------------------------------------------------------------------*/ void SwBaseShell::StateClpbrd(SfxItemSet &rSet) @@ -498,7 +498,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: Undo ausfuehren + Beschreibung: Undo ausfuehren --------------------------------------------------------------------*/ void SwBaseShell::ExecUndo(SfxRequest &rReq) @@ -539,7 +539,7 @@ void SwBaseShell::ExecUndo(SfxRequest &rReq) } /*-------------------------------------------------------------------- - Beschreibung: Zustand Undo + Beschreibung: Zustand Undo --------------------------------------------------------------------*/ void SwBaseShell::StateUndo(SfxItemSet &rSet) @@ -570,7 +570,7 @@ void SwBaseShell::StateUndo(SfxItemSet &rSet) break; } case SID_REPEAT: - { // Repeat nur moeglich wenn kein REDO moeglich - UI-Restriktion + { // Repeat nur moeglich wenn kein REDO moeglich - UI-Restriktion if(rSh.GetRedoIds() == UNDO_EMPTY && !rSh.IsSelFrmMode() && rSh.GetRepeatIds() ) @@ -607,7 +607,7 @@ void SwBaseShell::StateUndo(SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: Slot-Id auswerten bzw. Dispatchen + Beschreibung: Slot-Id auswerten bzw. Dispatchen --------------------------------------------------------------------*/ void SwBaseShell::Execute(SfxRequest &rReq) @@ -968,7 +968,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) break; case SID_IMAP: { - USHORT nId = SvxIMapDlgChildWindow::GetChildWindowId(); + USHORT nId = SvxIMapDlgChildWindow::GetChildWindowId(); SfxViewFrame* pVFrame = GetView().GetViewFrame(); pVFrame->ToggleChildWindow( nId ); @@ -980,7 +980,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) break; case SID_IMAP_EXEC: { - SvxIMapDlg* pDlg = SWIMAPDLG(GetView()); + SvxIMapDlg* pDlg = SWIMAPDLG(GetView()); // Kontrolle, ob Zuweisung ueberhaupt sinnvoll/erlaubt if ( rSh.IsFrmSelected() && @@ -1209,7 +1209,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) case RES_SHADOW: { rSh.StartAllAction(); - SfxItemSet aSet( rSh.GetAttrPool(), + SfxItemSet aSet( rSh.GetAttrPool(), RES_SHADOW, RES_SHADOW, RES_BACKGROUND, RES_BACKGROUND, 0 ); @@ -1426,7 +1426,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) break; case RES_SHADOW: { - SfxItemSet aSet( rSh.GetAttrPool(), + SfxItemSet aSet( rSh.GetAttrPool(), RES_SHADOW, RES_SHADOW ); // Tabellenzelle(n) selektiert? @@ -1817,7 +1817,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) } /*-------------------------------------------------------------------- - Beschreibung: Slots mit dieser Statusmethode disablen + Beschreibung: Slots mit dieser Statusmethode disablen --------------------------------------------------------------------*/ @@ -1834,7 +1834,7 @@ void SwBaseShell::StateDisableItems( SfxItemSet &rSet ) } /*-------------------------------------------------------------------- - Beschreibung: Slots mit dieser Statusmethode disablen + Beschreibung: Slots mit dieser Statusmethode disablen --------------------------------------------------------------------*/ @@ -1956,7 +1956,7 @@ void SwBaseShell::SetWrapMode( USHORT nSlot ) } /*-------------------------------------------------------------------- - Beschreibung: Update der Statuszeile erzwingen + Beschreibung: Update der Statuszeile erzwingen --------------------------------------------------------------------*/ void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh ) @@ -1968,7 +1968,7 @@ void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh ) (pSh && (pSh->IsFrmSelected() || pSh->IsObjSelected())) ) { const SfxPointItem aTmp1( SID_ATTR_POSITION, pSh->GetAnchorObjDiff()); - const SvxSizeItem aTmp2( SID_ATTR_SIZE, pSh->GetObjSize()); + const SvxSizeItem aTmp2( SID_ATTR_SIZE, pSh->GetObjSize()); rBnd.SetState( aTmp1 ); rBnd.SetState( aTmp2 ); } @@ -1983,7 +1983,7 @@ void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh ) } /*-------------------------------------------------------------------- - Beschreibung: Ctor + Beschreibung: Ctor --------------------------------------------------------------------*/ SwBaseShell::SwBaseShell(SwView& rVw) : @@ -2239,7 +2239,7 @@ void SwBaseShell::GetBckColState(SfxItemSet &rSet) USHORT nWhich = aIter.FirstWhich(); int nSelType = rSh.GetSelectionType(); -// if ( nSelType & nsSelectionType::SEL_GRF || +// if ( nSelType & nsSelectionType::SEL_GRF || if( nSelType & nsSelectionType::SEL_OLE ) { rSet.DisableItem( SID_BACKGROUND_COLOR ); @@ -2323,7 +2323,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq) aBrushItem = (const SvxBrushItem&)aCoreSet.Get(RES_BACKGROUND); } -// BOOL bMsgOk = FALSE; +// BOOL bMsgOk = FALSE; switch (nSlot) { @@ -2336,7 +2336,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq) //Brush &rBrush = aBrushItem.GetBrush(); if(pArgs) { - const SvxColorItem& rNewColorItem = (const SvxColorItem&) + const SvxColorItem& rNewColorItem = (const SvxColorItem&) pArgs->Get(SID_BACKGROUND_COLOR); const Color& rNewColor = rNewColorItem.GetValue(); aBrushItem.SetColor( rNewColor ); @@ -2359,7 +2359,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq) } break; default: -// bMsgOk = FALSE; +// bMsgOk = FALSE; rReq.Ignore(); DBG_ERROR( "Unbekannte Message bei ExecuteAttr!" ); return; @@ -2384,7 +2384,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq) else { SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl(); - if( pColl && pColl->IsAutoUpdateFmt()) + if( pColl && pColl->IsAutoUpdateFmt()) { SfxItemSet aSet(GetPool(), RES_BACKGROUND, RES_BACKGROUND ); aSet.Put(aBrushItem); @@ -2474,8 +2474,8 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) break; case FN_FORMAT_BORDER_DLG: { - SfxItemSet aSet( rSh.GetAttrPool(), - RES_BOX , RES_SHADOW, + SfxItemSet aSet( rSh.GetAttrPool(), + RES_BOX , RES_SHADOW, SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, 0 ); SfxAbstractDialog * pDlg = 0; @@ -2762,7 +2762,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest ) aRewriter.AddRule(UNDO_ARG3, SW_RES(STR_END_QUOTE)); } - rSh.EndUndo(UNDO_INSTABLE, &aRewriter); // wegen moegl. Shellwechsel + rSh.EndUndo(UNDO_INSTABLE, &aRewriter); // wegen moegl. Shellwechsel } } } @@ -2783,7 +2783,7 @@ void SwBaseShell::GetGalleryState( SfxItemSet &rSet ) List *pLst = aLst.GetList(); nParagraphPos = nGraphicPos = nOlePos = nFramePos = nTablePos = nTableRowPos = nTableCellPos = nPagePos = - nHeaderPos = nFooterPos = 0; + nHeaderPos = nFooterPos = 0; BYTE nPos = 1; pLst->Insert( (void*) new SW_RESSTR( STR_SWBG_PAGE ), pLst->Count() ); nPagePos = nPos++; diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx index cc6a3176643f..b227f3df144d 100644 --- a/sw/source/ui/shells/beziersh.cxx +++ b/sw/source/ui/shells/beziersh.cxx @@ -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 @@ -75,7 +75,7 @@ SwBezierShell::SwBezierShell(SwView &_rView): SetHelpId(SW_BEZIERSHELL); SwWrtShell *pSh = &GetShell(); - SdrView* pSdrView = pSh->GetDrawView(); + SdrView* pSdrView = pSh->GetDrawView(); pSdrView->SetEliminatePolyPointLimitAngle(1500L); } @@ -87,10 +87,10 @@ SwBezierShell::SwBezierShell(SwView &_rView): void SwBezierShell::Execute(SfxRequest &rReq) { SwWrtShell *pSh = &GetShell(); - SdrView* pSdrView = pSh->GetDrawView(); + SdrView* pSdrView = pSh->GetDrawView(); const SfxItemSet *pArgs = rReq.GetArgs(); - USHORT nSlotId = rReq.GetSlot(); - BOOL bChanged = pSdrView->GetModel()->IsChanged(); + USHORT nSlotId = rReq.GetSlot(); + BOOL bChanged = pSdrView->GetModel()->IsChanged(); pSdrView->GetModel()->SetChanged(FALSE); const SfxPoolItem* pItem; if(pArgs) diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx index 56b783a25711..fad82ace6f60 100644 --- a/sw/source/ui/shells/drawdlg.cxx +++ b/sw/source/ui/shells/drawdlg.cxx @@ -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 @@ -62,10 +62,10 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq) { - SwWrtShell* pSh = &GetShell(); - SdrView* pView = pSh->GetDrawView(); - SdrModel* pDoc = pView->GetModel(); - BOOL bChanged = pDoc->IsChanged(); + SwWrtShell* pSh = &GetShell(); + SdrView* pView = pSh->GetDrawView(); + SdrModel* pDoc = pView->GetModel(); + BOOL bChanged = pDoc->IsChanged(); pDoc->SetChanged(FALSE); SfxItemSet aNewAttr( pDoc->GetItemPool() ); @@ -194,9 +194,9 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq) void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq) { SwWrtShell* pSh = &GetShell(); - SdrView* pView = pSh->GetDrawView(); + SdrView* pView = pSh->GetDrawView(); const SfxItemSet* pArgs = rReq.GetArgs(); - BOOL bChanged = pView->GetModel()->IsChanged(); + BOOL bChanged = pView->GetModel()->IsChanged(); pView->GetModel()->SetChanged(FALSE); GetView().NoRotate(); diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx index eb571036e322..c29b296ad0ce 100644 --- a/sw/source/ui/shells/drawsh.cxx +++ b/sw/source/ui/shells/drawsh.cxx @@ -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 @@ -90,12 +90,12 @@ TYPEINIT1(SwDrawShell,SwDrawBaseShell) void SwDrawShell::Execute(SfxRequest &rReq) { - SwWrtShell &rSh = GetShell(); - SdrView *pSdrView = rSh.GetDrawView(); - const SfxItemSet *pArgs = rReq.GetArgs(); - SfxBindings &rBnd = GetView().GetViewFrame()->GetBindings(); - USHORT nSlotId = rReq.GetSlot(); - BOOL bChanged = pSdrView->GetModel()->IsChanged(); + SwWrtShell &rSh = GetShell(); + SdrView *pSdrView = rSh.GetDrawView(); + const SfxItemSet *pArgs = rReq.GetArgs(); + SfxBindings &rBnd = GetView().GetViewFrame()->GetBindings(); + USHORT nSlotId = rReq.GetSlot(); + BOOL bChanged = pSdrView->GetModel()->IsChanged(); pSdrView->GetModel()->SetChanged(FALSE); @@ -312,7 +312,7 @@ void SwDrawShell::GetState(SfxItemSet& rSet) USHORT nWhich = aIter.FirstWhich(); BOOL bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT); - if (!bProtected) // Im Parent nachsehen + if (!bProtected) // Im Parent nachsehen bProtected |= rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0; while( nWhich ) @@ -401,8 +401,8 @@ SwDrawShell::SwDrawShell(SwView &_rView) : void SwDrawShell::ExecFormText(SfxRequest& rReq) { SwWrtShell &rSh = GetShell(); - SdrView* pDrView = rSh.GetDrawView(); - BOOL bChanged = pDrView->GetModel()->IsChanged(); + SdrView* pDrView = rSh.GetDrawView(); + BOOL bChanged = pDrView->GetModel()->IsChanged(); pDrView->GetModel()->SetChanged(FALSE); const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); @@ -472,7 +472,7 @@ void SwDrawShell::GetFormTextState(SfxItemSet& rSet) if ( pObj == NULL || !pObj->ISA(SdrTextObj) || !((SdrTextObj*) pObj)->HasText() ) { -#define XATTR_ANZ 12 +#define XATTR_ANZ 12 static const USHORT nXAttr[ XATTR_ANZ ] = { XATTR_FORMTXTSTYLE, XATTR_FORMTXTADJUST, XATTR_FORMTXTDISTANCE, diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx index 13b1f1059b8d..9b68f28f84c4 100644 --- a/sw/source/ui/shells/drformsh.cxx +++ b/sw/source/ui/shells/drformsh.cxx @@ -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 @@ -114,7 +114,7 @@ void SwDrawFormShell::Execute(SfxRequest &rReq) //issue a new command to insert the link rTempView.GetViewFrame()->GetDispatcher()->Execute( SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON, &rHLinkItem, 0); - } + } else { uno::Reference< awt::XControlModel > xControlModel = pUnoCtrl->GetUnoControlModel(); diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index 2bd3a59d0810..a99abc989589 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -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 @@ -125,10 +125,10 @@ SwDrawBaseShell::~SwDrawBaseShell() void SwDrawBaseShell::Execute(SfxRequest &rReq) { SwWrtShell *pSh = &GetShell(); - SdrView* pSdrView = pSh->GetDrawView(); + SdrView* pSdrView = pSh->GetDrawView(); const SfxItemSet *pArgs = rReq.GetArgs(); - USHORT nSlotId = rReq.GetSlot(); - BOOL bChanged = pSdrView->GetModel()->IsChanged(); + USHORT nSlotId = rReq.GetSlot(); + BOOL bChanged = pSdrView->GetModel()->IsChanged(); pSdrView->GetModel()->SetChanged(FALSE); const SfxPoolItem* pItem = 0; if(pArgs) @@ -160,7 +160,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); if( rMarkList.GetMark(0) != 0 ) { - SfxItemSet aSet(GetPool(), RES_SURROUND, RES_SURROUND, + SfxItemSet aSet(GetPool(), RES_SURROUND, RES_SURROUND, RES_ANCHOR, RES_ANCHOR, RES_LR_SPACE, RES_UL_SPACE, SID_HTML_MODE, SID_HTML_MODE, @@ -414,7 +414,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) GetView().GetDrawFuncPtr()->Deactivate(); GetView().SetDrawFuncPtr(NULL); } - GetView().LeaveDrawCreate(); // In Selektionsmode wechseln + GetView().LeaveDrawCreate(); // In Selektionsmode wechseln } if (pSh->IsSelFrmMode()) @@ -430,7 +430,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) case SID_GROUP: if (pSh->IsObjSelected() > 1 && pSh->IsGroupAllowed()) { - pSh->GroupSelection(); // Objekt gruppieren + pSh->GroupSelection(); // Objekt gruppieren rBind.Invalidate(SID_UNGROUP); } break; @@ -438,7 +438,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) case SID_UNGROUP: if (pSh->IsGroupSelected()) { - pSh->UnGroupSelection(); // Objektgruppierung aufheben + pSh->UnGroupSelection(); // Objektgruppierung aufheben rBind.Invalidate(SID_GROUP); } break; @@ -471,7 +471,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); if( rMarkList.GetMarkCount() == 1 && bAlignPossible ) - { // Objekte nicht aneinander ausrichten + { // Objekte nicht aneinander ausrichten USHORT nAnchor = pSh->GetAnchorId(); if (nAnchor == FLY_AS_CHAR) @@ -505,7 +505,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) break; } if (nAnchor == FLY_AT_PARA) - break; // Absatzverankerte Rahmen nicht ausrichten + break; // Absatzverankerte Rahmen nicht ausrichten } pSh->StartAction(); @@ -689,7 +689,7 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet) USHORT nWhich = aIter.FirstWhich(); BOOL bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT); - if (!bProtected) // Im Parent nachsehen + if (!bProtected) // Im Parent nachsehen bProtected |= rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0; while( nWhich ) diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index c95ad7e64c1c..3004ebd4d48d 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -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 @@ -163,14 +163,14 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) aOldSelection = pOLV->GetSelection(); if (!pOLV->GetEditView().HasSelection()) { - bRestoreSelection = true; + bRestoreSelection = true; pOLV->GetEditView().SelectCurrentWord(); } bRestoreSelection = SwLangHelper::SetLanguageStatus(pOLV,rReq,GetView(),rSh); break; } - + case SID_THES: { String aReplaceText; @@ -180,8 +180,8 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) if (aReplaceText.Len() > 0) ReplaceTextWithSynonym( pOLV->GetEditView(), aReplaceText ); break; - } - + } + case SID_ATTR_CHAR_FONT: case SID_ATTR_CHAR_FONTHEIGHT: case SID_ATTR_CHAR_WEIGHT: @@ -445,8 +445,8 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) break; case SID_AUTOSPELL_CHECK: { -//!! JP 16.03.2001: why?? pSdrView = rSh.GetDrawView(); -//!! JP 16.03.2001: why?? pOutliner = pSdrView->GetTextEditOutliner(); +//!! JP 16.03.2001: why?? pSdrView = rSh.GetDrawView(); +//!! JP 16.03.2001: why?? pOutliner = pSdrView->GetTextEditOutliner(); SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner(); sal_uInt32 nCtrl = pOutliner->GetControlWord(); @@ -581,7 +581,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) void SwDrawTextShell::GetState(SfxItemSet& rSet) { - if (!IsTextEdit()) // Sonst manchmal Absturz! + if (!IsTextEdit()) // Sonst manchmal Absturz! return; OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); @@ -603,30 +603,30 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet) nSlotId = SwLangHelper::GetLanguageStatus(pOLV,rSet);; break; } - + case SID_THES: { String aStatusVal; LanguageType nLang = LANGUAGE_NONE; bool bIsLookUpWord = GetStatusValueForThesaurusFromContext( aStatusVal, nLang, pOLV->GetEditView() ); rSet.Put( SfxStringItem( SID_THES, aStatusVal ) ); - + // disable "Thesaurus" context menu entry if there is nothing to look up uno::Reference< linguistic2::XThesaurus > xThes( ::GetThesaurus() ); lang::Locale aLocale( SvxCreateLocale( nLang ) ); if (!bIsLookUpWord || !xThes.is() || nLang == LANGUAGE_NONE || !xThes->hasLocale( aLocale )) rSet.DisableItem( SID_THES ); - + //! avoid puting the same item as SfxBoolItem at the end of this function nSlotId = 0; break; - } - + } + case SID_ATTR_PARA_ADJUST_LEFT: eAdjust = SVX_ADJUST_LEFT; goto ASK_ADJUST; - case SID_ATTR_PARA_ADJUST_RIGHT: eAdjust = SVX_ADJUST_RIGHT; goto ASK_ADJUST; - case SID_ATTR_PARA_ADJUST_CENTER: eAdjust = SVX_ADJUST_CENTER; goto ASK_ADJUST; - case SID_ATTR_PARA_ADJUST_BLOCK: eAdjust = SVX_ADJUST_BLOCK; goto ASK_ADJUST; + case SID_ATTR_PARA_ADJUST_RIGHT: eAdjust = SVX_ADJUST_RIGHT; goto ASK_ADJUST; + case SID_ATTR_PARA_ADJUST_CENTER: eAdjust = SVX_ADJUST_CENTER; goto ASK_ADJUST; + case SID_ATTR_PARA_ADJUST_BLOCK: eAdjust = SVX_ADJUST_BLOCK; goto ASK_ADJUST; ASK_ADJUST: { if( !pAdjust ) @@ -639,9 +639,9 @@ ASK_ADJUST: } break; - case SID_ATTR_PARA_LINESPACE_10: nLSpace = 100; goto ASK_LINESPACE; - case SID_ATTR_PARA_LINESPACE_15: nLSpace = 150; goto ASK_LINESPACE; - case SID_ATTR_PARA_LINESPACE_20: nLSpace = 200; goto ASK_LINESPACE; + case SID_ATTR_PARA_LINESPACE_10: nLSpace = 100; goto ASK_LINESPACE; + case SID_ATTR_PARA_LINESPACE_15: nLSpace = 150; goto ASK_LINESPACE; + case SID_ATTR_PARA_LINESPACE_20: nLSpace = 200; goto ASK_LINESPACE; ASK_LINESPACE: { if( !pLSpace ) @@ -657,9 +657,9 @@ ASK_LINESPACE: } break; - case FN_SET_SUPER_SCRIPT: nEsc = SVX_ESCAPEMENT_SUPERSCRIPT; + case FN_SET_SUPER_SCRIPT: nEsc = SVX_ESCAPEMENT_SUPERSCRIPT; goto ASK_ESCAPE; - case FN_SET_SUB_SCRIPT: nEsc = SVX_ESCAPEMENT_SUBSCRIPT; + case FN_SET_SUB_SCRIPT: nEsc = SVX_ESCAPEMENT_SUBSCRIPT; goto ASK_ESCAPE; ASK_ESCAPE: { @@ -790,7 +790,7 @@ ASK_ESCAPE: } break; default: - nSlotId = 0; // don't know this slot + nSlotId = 0; // don't know this slot break; } @@ -806,7 +806,7 @@ ASK_ESCAPE: --------------------------------------------------------------------*/ void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet) { - if (!IsTextEdit()) // Sonst Absturz! + if (!IsTextEdit()) // Sonst Absturz! return; OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); @@ -873,7 +873,7 @@ void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet) --------------------------------------------------------------------*/ void SwDrawTextShell::ExecClpbrd(SfxRequest &rReq) { - if (!IsTextEdit()) // Sonst Absturz! + if (!IsTextEdit()) // Sonst Absturz! return; OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); @@ -904,11 +904,11 @@ void SwDrawTextShell::ExecClpbrd(SfxRequest &rReq) } /*-------------------------------------------------------------------- - Beschreibung: ClipBoard-Status + Beschreibung: ClipBoard-Status --------------------------------------------------------------------*/ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet) { - if (!IsTextEdit()) // Sonst Absturz! + if (!IsTextEdit()) // Sonst Absturz! return; OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); @@ -956,12 +956,12 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: Hyperlink-Status + Beschreibung: Hyperlink-Status --------------------------------------------------------------------*/ void SwDrawTextShell::StateInsert(SfxItemSet &rSet) { - if (!IsTextEdit()) // Sonst Absturz! + if (!IsTextEdit()) // Sonst Absturz! return; OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index 78a9b05ce70b..a46210639a41 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -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 @@ -123,8 +123,8 @@ void SwDrawTextShell::Init() SwWrtShell &rSh = GetShell(); pSdrView = rSh.GetDrawView(); SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner(); - //#97471# mouse click _and_ key input at the same time - if( !pOutliner ) + //#97471# mouse click _and_ key input at the same time + if( !pOutliner ) return ; OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); ULONG nCtrl = pOutliner->GetControlWord(); @@ -182,9 +182,9 @@ __EXPORT SwDrawTextShell::~SwDrawTextShell() //Dann wird vor dem Flush wieder ein DrawTextShell gepusht und der Mode ist //eingeschaltet. In diesem Moment wird der Dispatcher geflusht und die alte //DrawTextShell zerstoert. -// ASSERT( !pSdrView->IsTextEdit(), "TextEdit in DTor DrwTxtSh?" ); +// ASSERT( !pSdrView->IsTextEdit(), "TextEdit in DTor DrwTxtSh?" ); // if (pSdrView->IsTextEdit()) -// GetShell().EndTextEdit(); // Danebengeklickt, Ende mit Edit +// GetShell().EndTextEdit(); // Danebengeklickt, Ende mit Edit // GetShell().Edit(); } @@ -196,7 +196,7 @@ SwWrtShell& SwDrawTextShell::GetShell() /*-------------------------------------------------------------------- - Beschreibung: Slots mit dieser Statusmethode disablen + Beschreibung: Slots mit dieser Statusmethode disablen --------------------------------------------------------------------*/ void SwDrawTextShell::StateDisableItems( SfxItemSet &rSet ) @@ -229,7 +229,7 @@ void SwDrawTextShell::SetAttrToMarked(const SfxItemSet& rAttr) if (aNullRect != aOutRect) { GetShell().GetDrawView()->SetAttributes(rAttr); -// Init(); +// Init(); } } @@ -360,9 +360,9 @@ void SwDrawTextShell::GetFormTextState(SfxItemSet& rSet) if ( pObj == NULL || !pObj->ISA(SdrTextObj) || !((SdrTextObj*) pObj)->HasText() ) { -#define XATTR_ANZ 12 +#define XATTR_ANZ 12 static const USHORT nXAttr[ XATTR_ANZ ] = - { XATTR_FORMTXTSTYLE, XATTR_FORMTXTADJUST, XATTR_FORMTXTDISTANCE, + { XATTR_FORMTXTSTYLE, XATTR_FORMTXTADJUST, XATTR_FORMTXTDISTANCE, XATTR_FORMTXTSTART, XATTR_FORMTXTMIRROR, XATTR_FORMTXTSTDFORM, XATTR_FORMTXTHIDEFORM, XATTR_FORMTXTOUTLINE, XATTR_FORMTXTSHADOW, XATTR_FORMTXTSHDWCOLOR, XATTR_FORMTXTSHDWXVAL, XATTR_FORMTXTSHDWYVAL @@ -542,7 +542,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq) } break; - case FN_FORMAT_RESET: // delete hard text attributes + case FN_FORMAT_RESET: // delete hard text attributes { pOLV->RemoveAttribsKeepLanguages( true ); pOLV->GetEditView().GetEditEngine()->RemoveFields(TRUE); @@ -600,7 +600,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq) } /*-------------------------------------------------------------------- - Beschreibung: Undo ausfuehren + Beschreibung: Undo ausfuehren --------------------------------------------------------------------*/ @@ -648,7 +648,7 @@ void SwDrawTextShell::ExecUndo(SfxRequest &rReq) } /*-------------------------------------------------------------------- - Beschreibung: Zustand Undo + Beschreibung: Zustand Undo --------------------------------------------------------------------*/ @@ -761,7 +761,7 @@ void SwDrawTextShell::ExecTransliteration( SfxRequest & rReq ) } /*-------------------------------------------------------------------- - Beschreibung: Sonderzeichen einfuegen (siehe SDraw: FUBULLET.CXX) + Beschreibung: Sonderzeichen einfuegen (siehe SDraw: FUBULLET.CXX) --------------------------------------------------------------------*/ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) @@ -864,7 +864,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) // attributieren (Font setzen) SfxItemSet aFontAttribSet( *aFontSet.GetPool(), aFontSet.GetRanges() ); - SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(), + SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(), aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ); diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 5d972af52f72..b2dfee2fa471 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -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 @@ -395,18 +395,18 @@ void SwFrameShell::Execute(SfxRequest &rReq) } else { - SfxItemSet aSet(GetPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, - FN_GET_PRINT_AREA, FN_GET_PRINT_AREA, - SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, - SID_ATTR_BRUSH, SID_ATTR_BRUSH, - SID_ATTR_LRSPACE, SID_ATTR_ULSPACE, - FN_SURROUND, FN_HORI_ORIENT, - FN_SET_FRM_NAME, FN_SET_FRM_NAME, - FN_KEEP_ASPECT_RATIO, FN_KEEP_ASPECT_RATIO, - SID_DOCFRAME, SID_DOCFRAME, - SID_HTML_MODE, SID_HTML_MODE, - FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME, + SfxItemSet aSet(GetPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1, + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, + FN_GET_PRINT_AREA, FN_GET_PRINT_AREA, + SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, + SID_ATTR_BRUSH, SID_ATTR_BRUSH, + SID_ATTR_LRSPACE, SID_ATTR_ULSPACE, + FN_SURROUND, FN_HORI_ORIENT, + FN_SET_FRM_NAME, FN_SET_FRM_NAME, + FN_KEEP_ASPECT_RATIO, FN_KEEP_ASPECT_RATIO, + SID_DOCFRAME, SID_DOCFRAME, + SID_HTML_MODE, SID_HTML_MODE, + FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME, FN_PARAM_CHAIN_PREVIOUS, FN_PARAM_CHAIN_NEXT, 0); @@ -495,9 +495,9 @@ void SwFrameShell::Execute(SfxRequest &rReq) // gesetzt werden if(SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_NAME, FALSE, &pItem)) rSh.SetFlyName(((SfxStringItem*)pItem)->GetValue()); - SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE, - RES_SURROUND, RES_SURROUND, - RES_ANCHOR, RES_ANCHOR, + SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE, + RES_SURROUND, RES_SURROUND, + RES_ANCHOR, RES_ANCHOR, RES_VERT_ORIENT,RES_HORI_ORIENT, 0); aShellSet.Put(*pOutSet); @@ -743,10 +743,10 @@ void SwFrameShell::GetState(SfxItemSet& rSet) { case SID_OBJECT_ALIGN_UP : case FN_FRAME_ALIGN_VERT_TOP: - nId = STR_TOP_BASE; break; + nId = STR_TOP_BASE; break; case SID_OBJECT_ALIGN_MIDDLE : case FN_FRAME_ALIGN_VERT_CENTER: - nId = STR_CENTER_BASE; break; + nId = STR_CENTER_BASE; break; case SID_OBJECT_ALIGN_DOWN : case FN_FRAME_ALIGN_VERT_BOTTOM: if(!bHtmlMode) @@ -891,7 +891,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) } /*-------------------------------------------------------------------- - Beschreibung: Ctor fuer FrameShell + Beschreibung: Ctor fuer FrameShell --------------------------------------------------------------------*/ diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 037758450081..1ba55d45ddeb 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -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,20 +124,20 @@ void SwGrfShell::Execute(SfxRequest &rReq) SwViewOption aUsrPref( *pVOpt ); SfxItemSet aSet(GetPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1, - RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, + RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF, + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, SID_ATTR_GRAF_KEEP_ZOOM, SID_ATTR_GRAF_KEEP_ZOOM, SID_ATTR_GRAF_FRMSIZE, SID_ATTR_GRAF_FRMSIZE, SID_ATTR_GRAF_FRMSIZE_PERCENT, SID_ATTR_GRAF_FRMSIZE_PERCENT, SID_ATTR_GRAF_GRAPHIC, SID_ATTR_GRAF_GRAPHIC, - FN_PARAM_GRF_CONNECT, FN_PARAM_GRF_CONNECT, - SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, - FN_GET_PRINT_AREA, FN_GET_PRINT_AREA, - FN_SET_FRM_NAME, FN_KEEP_ASPECT_RATIO, - FN_PARAM_GRF_DIALOG, FN_PARAM_GRF_DIALOG, - SID_DOCFRAME, SID_DOCFRAME, - SID_HTML_MODE, SID_HTML_MODE, - FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME, + FN_PARAM_GRF_CONNECT, FN_PARAM_GRF_CONNECT, + SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, + FN_GET_PRINT_AREA, FN_GET_PRINT_AREA, + FN_SET_FRM_NAME, FN_KEEP_ASPECT_RATIO, + FN_PARAM_GRF_DIALOG, FN_PARAM_GRF_DIALOG, + SID_DOCFRAME, SID_DOCFRAME, + SID_HTML_MODE, SID_HTML_MODE, + FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME, 0); USHORT nHtmlMode = ::GetHtmlMode(GetView().GetDocShell()); @@ -181,7 +181,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) aSet.Put( aSzItm ); Size aSz( aSizeCopy.GetWidthPercent(), aSizeCopy.GetHeightPercent() ); - if( 0xff == aSz.Width() ) aSz.Width() = 0; + if( 0xff == aSz.Width() ) aSz.Width() = 0; if( 0xff == aSz.Height() ) aSz.Height() = 0; aSzItm.SetSize( aSz ); @@ -265,9 +265,9 @@ void SwGrfShell::Execute(SfxRequest &rReq) if(pFmt && pFmt->IsAutoUpdateFmt()) { pFmt->SetFmtAttr(*pSet); - SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE, - RES_SURROUND, RES_SURROUND, - RES_ANCHOR, RES_ANCHOR, + SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE, + RES_SURROUND, RES_SURROUND, + RES_ANCHOR, RES_ANCHOR, RES_VERT_ORIENT,RES_HORI_ORIENT, 0); aShellSet.Put(*pSet); diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx index fe2e7502a3df..ec0cd2a6c2e9 100644 --- a/sw/source/ui/shells/grfshex.cxx +++ b/sw/source/ui/shells/grfshex.cxx @@ -90,10 +90,10 @@ using ::rtl::OUString; bool SwTextShell::InsertMediaDlg( SfxRequest& rReq ) { - ::rtl::OUString aURL; - const SfxItemSet* pReqArgs = rReq.GetArgs(); - Window* pWindow = &GetView().GetViewFrame()->GetWindow(); - bool bAPI = false, bRet = false; + ::rtl::OUString aURL; + const SfxItemSet* pReqArgs = rReq.GetArgs(); + Window* pWindow = &GetView().GetViewFrame()->GetWindow(); + bool bAPI = false, bRet = false; if( pReqArgs ) { @@ -123,15 +123,15 @@ bool SwTextShell::InsertMediaDlg( SfxRequest& rReq ) } else { - SwWrtShell& rSh = GetShell(); + SwWrtShell& rSh = GetShell(); if( !rSh.HasDrawView() ) rSh.MakeDrawView(); - Size aDocSz( rSh.GetDocSize() ); - const SwRect& rVisArea = rSh.VisArea(); - Point aPos( rVisArea.Center() ); - Size aSize; + Size aDocSz( rSh.GetDocSize() ); + const SwRect& rVisArea = rSh.VisArea(); + Point aPos( rVisArea.Center() ); + Size aSize; if( rVisArea.Width() > aDocSz.Width()) aPos.X() = aDocSz.Width() / 2 + rVisArea.Left(); diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx index 37d5e1ed5d69..878d18fc425d 100644 --- a/sw/source/ui/shells/langhelper.cxx +++ b/sw/source/ui/shells/langhelper.cxx @@ -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 @@ -74,20 +74,20 @@ namespace SwLangHelper EditEngine* pEditEngine=rEditView.GetEditEngine(); // the value of used script types - const USHORT nScriptType =pOLV->GetSelectedScriptType(); + const USHORT nScriptType =pOLV->GetSelectedScriptType(); String aScriptTypesInUse( String::CreateFromInt32( nScriptType ) );//pEditEngine->GetScriptType(aSelection) SvtLanguageTable aLangTable; - + // get keyboard language String aKeyboardLang; LanguageType nLang = LANGUAGE_DONTKNOW; - + Window* pWin = rEditView.GetWindow(); if(pWin) nLang = pWin->GetInputLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) - aKeyboardLang = aLangTable.GetString( nLang ); + aKeyboardLang = aLangTable.GetString( nLang ); // get the language that is in use const String aMultipleLanguages = String::CreateFromAscii("*"); @@ -96,14 +96,14 @@ namespace SwLangHelper nLang = SwLangHelper::GetCurrentLanguage( aSet,nScriptType ); if (nLang != LANGUAGE_DONTKNOW) aCurrentLang = aLangTable.GetString( nLang ); - + // build sequence for status value uno::Sequence< ::rtl::OUString > aSeq( 4 ); aSeq[0] = aCurrentLang; aSeq[1] = aScriptTypesInUse; aSeq[2] = aKeyboardLang; aSeq[3] = SwLangHelper::GetTextForLanguageGuessing( pEditEngine, aSelection ); - + // set sequence as status value SfxStringListItem aItem( SID_LANGUAGE_STATUS ); aItem.SetStringList( aSeq ); @@ -121,7 +121,7 @@ namespace SwLangHelper // get the language String aNewLangTxt; - + SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, SID_LANGUAGE_STATUS , sal_False ); if (pItem) aNewLangTxt = pItem->GetValue(); @@ -130,15 +130,15 @@ namespace SwLangHelper //!! (call to GetView().GetViewFrame() will break if the //!! SwTextShell got destroyed meanwhile.) SfxViewFrame *pViewFrame = rView.GetViewFrame(); - + if (aNewLangTxt.EqualsAscii( "*" )) { // open the dialog "Tools/Options/Language Settings - Language" SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); if (pFact) - { - VclAbstractDialog* pDlg = pFact->CreateVclDialog( rView.GetWindow(), SID_LANGUAGE_OPTIONS ); - pDlg->Execute(); + { + VclAbstractDialog* pDlg = pFact->CreateVclDialog( rView.GetWindow(), SID_LANGUAGE_OPTIONS ); + pDlg->Execute(); delete pDlg; } } @@ -187,22 +187,22 @@ namespace SwLangHelper rSh.StartAction(); rSh.LockView( TRUE ); rSh.Push(); - + // prepare to apply new language to all text in document rSh.SelAll(); rSh.ExtendedSelectAll(); } - + if (aNewLangTxt == aStrNone) SwLangHelper::SetLanguage_None( rSh, pOLV, aSelection, bForSelection, aEditAttr ); else if (aNewLangTxt == aStrResetLangs) SwLangHelper::ResetLanguages( rSh, pOLV, aSelection, bForSelection ); else SwLangHelper::SetLanguage( rSh, pOLV, aSelection, aNewLangTxt, bForSelection, aEditAttr ); - + // ugly hack, as it seems that EditView/EditEngine does not update their spellchecking marks // when setting a new language attribute - if (bForSelection) + if (bForSelection) { const SwViewOption* pVOpt = rView.GetWrtShellPtr()->GetViewOptions(); ULONG nCntrl = pEditEngine->GetControlWord(); @@ -224,7 +224,7 @@ namespace SwLangHelper rEditView.Invalidate(); } - if (!bForSelection) + if (!bForSelection) { // need to release view and restore selection... rSh.Pop( FALSE ); @@ -233,14 +233,14 @@ namespace SwLangHelper } } } - + // invalidate slot to get the new language displayed pViewFrame->GetBindings().Invalidate( rReq.GetSlot() ); - + rReq.Done(); return bRestoreSelection; } - + void SetLanguage( SwWrtShell &rWrtSh, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet ) { @@ -253,7 +253,7 @@ namespace SwLangHelper if (nLang != LANGUAGE_DONTKNOW) { USHORT nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ); - + EditEngine* pEditEngine = pOLV ? pOLV->GetEditView().GetEditEngine() : NULL; DBG_ASSERT( !pOLV || pEditEngine, "OutlinerView without EditEngine???" ); @@ -265,7 +265,7 @@ namespace SwLangHelper case SCRIPTTYPE_LATIN : nLangWhichId = pEditEngine ? EE_CHAR_LANGUAGE : RES_CHRATR_LANGUAGE; break; case SCRIPTTYPE_ASIAN : nLangWhichId = pEditEngine ? EE_CHAR_LANGUAGE_CJK : RES_CHRATR_CJK_LANGUAGE; break; case SCRIPTTYPE_COMPLEX : nLangWhichId = pEditEngine ? EE_CHAR_LANGUAGE_CTL : RES_CHRATR_CTL_LANGUAGE; break; - default: + default: bIsSingleScriptType = false; DBG_ERROR( "unexpected case" ); } @@ -299,8 +299,8 @@ namespace SwLangHelper case EE_CHAR_LANGUAGE_CTL : nLangWhichId = RES_CHRATR_CTL_LANGUAGE; break; } rWrtSh.SetDefault( SvxLanguageItem( nLang, nLangWhichId ) ); - - // set respective language attribute in text document to default + + // set respective language attribute in text document to default // (for all text in the document - which should be selected by now...) SvUShortsSort aAttribs; aAttribs.Insert( nLangWhichId ); @@ -381,8 +381,8 @@ namespace SwLangHelper (void) aSelection; // reset language for current selection. - // The selection should already have been expanded to the whole paragraph or - // to all text in the document if those are the ranges where to reset + // The selection should already have been expanded to the whole paragraph or + // to all text in the document if those are the ranges where to reset // the language attributes if (pOLV) @@ -430,7 +430,7 @@ namespace SwLangHelper } else if (nState == SFX_ITEM_DEFAULT) { - // since the attribute is not set: retrieve the default value + // since the attribute is not set: retrieve the default value nLang = (dynamic_cast< const SvxLanguageItem& >(aSet.GetPool()->GetDefaultItem( nLangWhichId ))).GetLanguage(); } else if (nState == SFX_ITEM_DONTCARE) @@ -510,7 +510,7 @@ namespace SwLangHelper case SCRIPTTYPE_COMPLEX : nLangWhichId = EE_CHAR_LANGUAGE_CTL; break; default: bIsSingleScriptType = false; } - + // get language according to the script type(s) in use LanguageType nCurrentLang = LANGUAGE_SYSTEM; if (bIsSingleScriptType) @@ -534,7 +534,7 @@ namespace SwLangHelper { nCurrentLang = LANGUAGE_DONTKNOW; break; - } + } } } DBG_ASSERT( nCurrentLang != LANGUAGE_SYSTEM, "failed to get the language?" ); @@ -569,7 +569,7 @@ namespace SwLangHelper { // string for guessing language String aText; - + aText = rEditEngine->GetText(aDocSelection); if (aText.Len() > 0) { @@ -581,7 +581,7 @@ namespace SwLangHelper nEnd = aText.Len() - nEnd > 100 ? nEnd + 100 : aText.Len(); aText = aText.Copy( nStt, nEnd - nStt ); } - + return aText; } diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index 24a8c12d992b..6178d5b173ad 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -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 @@ -169,7 +169,7 @@ void SwListShell::Execute(SfxRequest &rReq) rSh.NumUpDown( ( nSlot == FN_NUM_BULLET_DOWN ) ? TRUE : FALSE ); - pFrame->GetBindings().Invalidate( SID_TABLE_CELL ); // StatusZeile updaten! + pFrame->GetBindings().Invalidate( SID_TABLE_CELL ); // StatusZeile updaten! } break; diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx index 36aa18f2d01c..d5c3dd3ecd37 100644 --- a/sw/source/ui/shells/mediash.cxx +++ b/sw/source/ui/shells/mediash.cxx @@ -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 @@ -99,12 +99,12 @@ SFX_IMPL_INTERFACE(SwMediaShell, SwBaseShell, SW_RES(STR_SHELLNAME_MEDIA)) void SwMediaShell::ExecMedia(SfxRequest &rReq) { SwWrtShell* pSh = &GetShell(); - SdrView* pSdrView = pSh->GetDrawView(); + SdrView* pSdrView = pSh->GetDrawView(); if( pSdrView ) { const SfxItemSet* pArgs = rReq.GetArgs(); - USHORT nSlotId = rReq.GetSlot(); + USHORT nSlotId = rReq.GetSlot(); BOOL bChanged = pSdrView->GetModel()->IsChanged(); pSdrView->GetModel()->SetChanged( FALSE ); @@ -130,7 +130,7 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq) { if( pSh->IsObjSelected() ) { - const SfxPoolItem* pItem; + const SfxPoolItem* pItem; if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, FALSE, &pItem ) ) ) pItem = NULL; @@ -171,16 +171,16 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq) void SwMediaShell::GetMediaState(SfxItemSet &rSet) { - SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter( rSet ); + USHORT nWhich = aIter.FirstWhich(); while( nWhich ) { if( SID_AVMEDIA_TOOLBOX == nWhich ) { - SwWrtShell& rSh = GetShell(); - SdrView* pView = rSh.GetDrawView(); - bool bDisable = true; + SwWrtShell& rSh = GetShell(); + SdrView* pView = rSh.GetDrawView(); + bool bDisable = true; if( pView ) { diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/ui/shells/olesh.cxx index a4eef5cdbf1d..537af7b0f230 100644 --- a/sw/source/ui/shells/olesh.cxx +++ b/sw/source/ui/shells/olesh.cxx @@ -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/shells/shells.src b/sw/source/ui/shells/shells.src index 7e9a20bb6fc0..42b3b0029a7b 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.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/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index 9d162f57aa6f..67d842dde186 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.cxx @@ -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/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 5f3389791122..3e17c83893a7 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -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 @@ -136,25 +136,25 @@ TYPEINIT1(SwTableShell,SwBaseShell) const USHORT __FAR_DATA aUITableAttrRange[] = { - FN_PARAM_TABLE_NAME, FN_PARAM_TABLE_NAME, - FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE, - FN_PARAM_TABLE_SPACE, FN_PARAM_TABLE_SPACE, - FN_TABLE_REP, FN_TABLE_REP, + FN_PARAM_TABLE_NAME, FN_PARAM_TABLE_NAME, + FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE, + FN_PARAM_TABLE_SPACE, FN_PARAM_TABLE_SPACE, + FN_TABLE_REP, FN_TABLE_REP, SID_RULER_BORDERS, SID_RULER_BORDERS, - RES_LR_SPACE, RES_UL_SPACE, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW, - RES_BOX, RES_SHADOW, - RES_BACKGROUND, RES_BACKGROUND, - SID_BACKGRND_DESTINATION, SID_BACKGRND_DESTINATION, - SID_HTML_MODE, SID_HTML_MODE, - SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE, - RES_PAGEDESC, RES_BREAK, - RES_KEEP, RES_KEEP, - RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT, - FN_TABLE_SET_VERT_ALIGN, FN_TABLE_SET_VERT_ALIGN, + RES_LR_SPACE, RES_UL_SPACE, + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW, + RES_BOX, RES_SHADOW, + RES_BACKGROUND, RES_BACKGROUND, + SID_BACKGRND_DESTINATION, SID_BACKGRND_DESTINATION, + SID_HTML_MODE, SID_HTML_MODE, + SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE, + RES_PAGEDESC, RES_BREAK, + RES_KEEP, RES_KEEP, + RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT, + FN_TABLE_SET_VERT_ALIGN, FN_TABLE_SET_VERT_ALIGN, RES_FRAMEDIR, RES_FRAMEDIR, RES_ROW_SPLIT, RES_ROW_SPLIT, - FN_TABLE_BOX_TEXTDIRECTION, FN_TABLE_BOX_TEXTDIRECTION, + FN_TABLE_BOX_TEXTDIRECTION, FN_TABLE_BOX_TEXTDIRECTION, // --> collapsing borders FME 2005-05-27 #i29550# RES_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS, // <-- collapsing borders @@ -195,8 +195,8 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh ) USHORT nBackgroundDestination = rSh.GetViewOptions()->GetTblDest(); rSet.Put(SwBackgroundDestinationItem(SID_BACKGRND_DESTINATION, nBackgroundDestination )); SvxBrushItem aBrush( RES_BACKGROUND ); -// rSh.GetBoxBackground(aBrush); -// rSet.Put( aBrush ); +// rSh.GetBoxBackground(aBrush); +// rSet.Put( aBrush ); if(rSh.GetRowBackground(aBrush)) rSet.Put( aBrush, SID_ATTR_BRUSH_ROW ); else @@ -219,7 +219,7 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh ) SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER ); // Tabellenvariante, wenn mehrere Tabellenzellen selektiert - rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert + rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert aBoxInfo.SetTable (rSh.IsTableMode() && rSh.GetCrsrCnt() > 1 || !bTableSel); // Abstandsfeld immer anzeigen @@ -518,7 +518,7 @@ void SwTableShell::Execute(SfxRequest &rReq) { case SID_ATTR_BORDER: { -/* BOOL bPopCrsr = FALSE; +/* BOOL bPopCrsr = FALSE; if ( !rReq.IsAPI() ) { //Keine Tabellenselektion -> Aenderung wird auf die gesamte @@ -610,8 +610,8 @@ void SwTableShell::Execute(SfxRequest &rReq) if ((pBorderLine = aInfo.GetVert()) != NULL) aInfo.SetLine(&aBorderLine, BOXINFO_LINE_VERT), bLine |= TRUE; -// if ( bPopCrsr && !bLine ) -// aBox.SetDistance( 0 ); +// if ( bPopCrsr && !bLine ) +// aBox.SetDistance( 0 ); aCoreSet.Put( aBox ); aCoreSet.Put( aInfo ); @@ -624,7 +624,7 @@ void SwTableShell::Execute(SfxRequest &rReq) rReq.AppendItem( aInfo ); bCallDone = TRUE; -/* if ( bPopCrsr ) +/* if ( bPopCrsr ) { rSh.KillPams(); rSh.Pop(FALSE); @@ -813,7 +813,7 @@ void SwTableShell::Execute(SfxRequest &rReq) case TBLMERGE_OK: bCallDone = TRUE; //no break; - case TBLMERGE_NOSELECTION: break; + case TBLMERGE_NOSELECTION: break; case TBLMERGE_TOOCOMPLEX: { InfoBox aInfoBox( GetView().GetWindow(), @@ -1078,7 +1078,7 @@ void SwTableShell::Execute(SfxRequest &rReq) case FN_TABLE_MODE_FIX : case FN_TABLE_MODE_FIX_PROP : - case FN_TABLE_MODE_VARIABLE : + case FN_TABLE_MODE_VARIABLE : { rSh.SetTblChgMode( ( FN_TABLE_MODE_FIX == nSlot ? TBLFIX_CHGABS : FN_TABLE_MODE_FIX_PROP == nSlot @@ -1295,7 +1295,7 @@ void SwTableShell::GetState(SfxItemSet &rSet) case FN_INSERT_TABLE: // Irgendeinen Wert "putten", damit Controller enabled bleibt. // Statt "Insert:Table" erscheint dann "Format:Table". -// rSet.Put(SfxUInt16Item(nSlot, 1)); +// rSet.Put(SfxUInt16Item(nSlot, 1)); break; case FN_TABLE_OPTIMAL_HEIGHT: @@ -1338,7 +1338,7 @@ void SwTableShell::GetState(SfxItemSet &rSet) case FN_TABLE_MODE_FIX : case FN_TABLE_MODE_FIX_PROP : - case FN_TABLE_MODE_VARIABLE : + case FN_TABLE_MODE_VARIABLE : { TblChgMode nMode = rSh.GetTblChgMode(); BOOL bSet = nSlot == FN_TABLE_MODE_FIX && nMode == TBLFIX_CHGABS || @@ -1467,7 +1467,7 @@ void SwTableShell::ExecTableStyle(SfxRequest& rReq) case SID_FRAME_LINESTYLE: case SID_FRAME_LINECOLOR: { -/* Tabellenselektion ist abgeschafft +/* Tabellenselektion ist abgeschafft BOOL bPopCrsr = FALSE; if ( !rReq.IsAPI() ) { @@ -1500,7 +1500,7 @@ void SwTableShell::ExecTableStyle(SfxRequest& rReq) } rReq.Done(); -/* if ( bPopCrsr ) +/* if ( bPopCrsr ) { rSh.KillPams(); rSh.Pop(FALSE); @@ -1541,7 +1541,7 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq) if(pArgs) pArgs->GetItemState(GetPool().GetWhich(nSlot), FALSE, &pItem); - // Sprache immer von Cursorposition besorgen + // Sprache immer von Cursorposition besorgen LanguageType eLang = rSh.GetCurLang(); SvNumberFormatter* pFormatter = rSh.GetNumberFormatter(); sal_uInt32 nNumberFormat = NUMBERFORMAT_ENTRY_NOT_FOUND; @@ -1552,12 +1552,12 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq) case FN_NUMBER_FORMAT: if( pItem ) { - // Index fuer String bestimmen + // Index fuer String bestimmen String aCode( ((const SfxStringItem*)pItem)->GetValue() ); nNumberFormat = pFormatter->GetEntryKey( aCode, eLang ); if( NUMBERFORMAT_ENTRY_NOT_FOUND == nNumberFormat ) { - // neu eintragen + // neu eintragen xub_StrLen nErrPos; short nType; if( !pFormatter->PutEntry( aCode, nErrPos, nType, @@ -1566,14 +1566,14 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq) } } break; - case FN_NUMBER_STANDARD: nFmtType = NUMBERFORMAT_NUMBER; break; - case FN_NUMBER_SCIENTIFIC: nFmtType = NUMBERFORMAT_SCIENTIFIC; break; + case FN_NUMBER_STANDARD: nFmtType = NUMBERFORMAT_NUMBER; break; + case FN_NUMBER_SCIENTIFIC: nFmtType = NUMBERFORMAT_SCIENTIFIC; break; case FN_NUMBER_DATE: nFmtType = NUMBERFORMAT_DATE; break; - case FN_NUMBER_TIME: nFmtType = NUMBERFORMAT_TIME; break; - case FN_NUMBER_CURRENCY: nFmtType = NUMBERFORMAT_CURRENCY; break; - case FN_NUMBER_PERCENT: nFmtType = NUMBERFORMAT_PERCENT; break; + case FN_NUMBER_TIME: nFmtType = NUMBERFORMAT_TIME; break; + case FN_NUMBER_CURRENCY: nFmtType = NUMBERFORMAT_CURRENCY; break; + case FN_NUMBER_PERCENT: nFmtType = NUMBERFORMAT_PERCENT; break; - case FN_NUMBER_TWODEC: // #.##0,00 + case FN_NUMBER_TWODEC: // #.##0,00 nFmtType = NUMBERFORMAT_NUMBER; nOffset = NF_NUMBER_1000DEC2; break; @@ -1584,7 +1584,7 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq) } if( nFmtType ) - nNumberFormat = pFormatter->GetStandardFormat( nFmtType, eLang ) + nOffset; + nNumberFormat = pFormatter->GetStandardFormat( nFmtType, eLang ) + nOffset; if( NUMBERFORMAT_ENTRY_NOT_FOUND != nNumberFormat ) { diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 3f26e47c8823..7bef6d526564 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -29,7 +29,7 @@ #include "precompiled_sw.hxx" #include <crsskip.hxx> -#include <hintids.hxx> //_immer_ vor den solar-Items +#include <hintids.hxx> //_immer_ vor den solar-Items #include <sfx2/lnkbase.hxx> #include <fmtfld.hxx> @@ -85,18 +85,18 @@ using namespace nsSwDocInfoSubType; -extern BOOL bNoInterrupt; // in mainwn.cxx +extern BOOL bNoInterrupt; // in mainwn.cxx String& lcl_AppendRedlineStr( String& rStr, USHORT nRedlId ) { USHORT nResId = 0; switch( nRedlId ) { - case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERTED; break; - case nsRedlineType_t::REDLINE_DELETE: nResId = STR_REDLINE_DELETED; break; - case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMATED; break; - case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLECHG; break; - case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLLSET; break; + case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERTED; break; + case nsRedlineType_t::REDLINE_DELETE: nResId = STR_REDLINE_DELETED; break; + case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMATED; break; + case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLECHG; break; + case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLLSET; break; } if( nResId ) rStr += SW_RESSTR( nResId ); @@ -303,7 +303,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) { SfxViewFrame* pVFrame = GetView().GetViewFrame(); if (!pVFrame->HasChildWindow(FN_INSERT_FIELD)) - pVFrame->ToggleChildWindow(FN_INSERT_FIELD); // Dialog anzeigen + pVFrame->ToggleChildWindow(FN_INSERT_FIELD); // Dialog anzeigen // Flddlg auf neue TabPage umschalten USHORT nId = SwFldDlgWrapper::GetChildWindowId(); @@ -371,7 +371,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) rSh.Push(); rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS, FALSE); pPostIt = (SwPostItField*)aFldMgr.GetCurFld(); - rSh.Pop(FALSE); // Cursorpos restaurieren + rSh.Pop(FALSE); // Cursorpos restaurieren } if (pPostIt) @@ -394,7 +394,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) break; case FN_REDLINE_COMMENT: { - /* this code can be used once we want redline comments in the margin, all other stuff can + /* this code can be used once we want redline comments in the margin, all other stuff can then be deleted String sComment; const SwRedline *pRedline = rSh.GetCurrRedline(); @@ -437,8 +437,8 @@ void SwTextShell::ExecField(SfxRequest &rReq) const SwRedline *pActRed = rSh.SelPrevRedline(); if (pActRed == pRedline) - { // Neuer Cursor steht am Anfang des Current Redlines - rSh.Pop(); // Alten Cursor wegwerfen + { // Neuer Cursor steht am Anfang des Current Redlines + rSh.Pop(); // Alten Cursor wegwerfen rSh.Push(); pActRed = rSh.SelPrevRedline(); } @@ -448,13 +448,13 @@ void SwTextShell::ExecField(SfxRequest &rReq) rSh.EndAction(); rSh.ClearMark(); - rSh.SelNextRedline(); // Aktueller Redline wird selektiert + rSh.SelNextRedline(); // Aktueller Redline wird selektiert rSh.StartAction(); rSh.Push(); pActRed = rSh.SelNextRedline(); BOOL bNext = pActRed != 0; - rSh.Pop(FALSE); // Cursorpos restaurieren + rSh.Pop(FALSE); // Cursorpos restaurieren if( rSh.IsCrsrPtAtEnd() ) rSh.SwapPam(); @@ -655,7 +655,7 @@ void SwTextShell::StateField( SfxItemSet &rSet ) } USHORT nTempWhich = pField ? pField->GetTyp()->Which() : USHRT_MAX; - if( USHRT_MAX == nTempWhich || + if( USHRT_MAX == nTempWhich || RES_POSTITFLD == nTempWhich || RES_SCRIPTFLD == nTempWhich || RES_AUTHORITY == nTempWhich ) @@ -803,7 +803,7 @@ IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn ) { // Traveling nur bei mehr als einem Feld if( !pSh->IsCrsrPtAtEnd() ) - pSh->SwapPam(); // Cursor hinter den Redline stellen + pSh->SwapPam(); // Cursor hinter den Redline stellen pSh->Push(); const SwRedline *pActRed = pSh->SelNextRedline(); diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx index a1a9f87ca918..117320a9c9cc 100644 --- a/sw/source/ui/shells/textglos.cxx +++ b/sw/source/ui/shells/textglos.cxx @@ -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/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx index 135a3435ca31..d9b4593e81a1 100644 --- a/sw/source/ui/shells/textidx.cxx +++ b/sw/source/ui/shells/textidx.cxx @@ -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 @@ -42,7 +42,7 @@ #include "cmdid.h" #include "view.hxx" #include "wrtsh.hxx" -#include "swundo.hxx" // fuer Undo-Ids +#include "swundo.hxx" // fuer Undo-Ids #include "textsh.hxx" #include "idxmrk.hxx" #include "cnttab.hxx" @@ -95,7 +95,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq) SwTOXMgr aMgr(GetShellPtr()); USHORT nRet = RET_OK; if(aMgr.GetTOXMarkCount() > 1) - { // Mehrere Marken, welche solls denn sein ? + { // Mehrere Marken, welche solls denn sein ? // SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); @@ -105,7 +105,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq) nRet = pMultDlg->Execute(); delete pMultDlg; } - if( nRet == RET_OK) + if( nRet == RET_OK) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); @@ -130,7 +130,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq) SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, RES_LR_SPACE, RES_LR_SPACE, FN_PARAM_TOX_TYPE, FN_PARAM_TOX_TYPE, - 0 ); + 0 ); SwWrtShell& rSh = GetShell(); SwRect aRect; rSh.CalcBoundRect(aRect, FLY_AS_CHAR); @@ -250,7 +250,7 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet) else rSet.Put(SfxBoolItem(FN_INSERT_AUTH_ENTRY_DLG, 0 != pAuthMark)); - if( bInReadonly || !pField || + if( bInReadonly || !pField || pField->GetTyp()->Which() != RES_AUTHORITY) rSet.DisableItem(FN_EDIT_AUTH_ENTRY_DLG); rSet.DisableItem(FN_REMOVE_CUR_TOX); diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 0de14dc3dacb..e437de58d495 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -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 @@ -86,7 +86,7 @@ #include <textsh.hxx> #include <frmfmt.hxx> #include <tablemgr.hxx> -#include <swundo.hxx> // fuer Undo-IDs +#include <swundo.hxx> // fuer Undo-IDs #include <shellio.hxx> #include <frmdlg.hxx> #include <usrpref.hxx> @@ -925,7 +925,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet ) aHLinkItem.SetInsertMode((SvxLinkInsertMode)(aHLinkItem.GetInsertMode() | ((nHtmlMode & HTMLMODE_ON) != 0 ? HLINK_HTMLMODE : 0))); - aHLinkItem.SetMacroEvents ( HYPERDLG_EVENT_MOUSEOVER_OBJECT| + aHLinkItem.SetMacroEvents ( HYPERDLG_EVENT_MOUSEOVER_OBJECT| HYPERDLG_EVENT_MOUSECLICK_OBJECT | HYPERDLG_EVENT_MOUSEOUT_OBJECT ); rSet.Put(aHLinkItem); @@ -1210,9 +1210,9 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) bFontChanged = TRUE; SvxFontItem aNewFontItem( aFont ); aNewFontItem.GetFamilyName() = aNewFont.GetName(); - aNewFontItem.GetFamily() = aNewFont.GetFamily(); - aNewFontItem.GetPitch() = aNewFont.GetPitch(); - aNewFontItem.GetCharSet() = aNewFont.GetCharSet(); + aNewFontItem.GetFamily() = aNewFont.GetFamily(); + aNewFontItem.GetPitch() = aNewFont.GetPitch(); + aNewFontItem.GetCharSet() = aNewFont.GetCharSet(); SfxItemSet aRestoreSet( GetPool(), RES_CHRATR_FONT, RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONT, diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index e7d7ef613f2b..f41d28c4c0ab 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -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 @@ -83,7 +83,7 @@ #include <docstat.hxx> #include <outline.hxx> #include <tablemgr.hxx> -#include <swundo.hxx> // fuer Undo-IDs +#include <swundo.hxx> // fuer Undo-IDs #include <reffld.hxx> #include <docsh.hxx> #include <mdiexp.hxx> @@ -508,8 +508,6 @@ void SwTextShell::Execute(SfxRequest &rReq) RES_CHRATR_CJK_LANGUAGE + 1, RES_CHRATR_CTL_LANGUAGE - 1, RES_CHRATR_CTL_LANGUAGE + 1, RES_CHRATR_END-1, RES_PARATR_BEGIN, RES_PARATR_END-1, - RES_TXTATR_INETFMT, RES_TXTATR_INETFMT, - RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT, RES_TXTATR_CJK_RUBY, RES_TXTATR_CJK_RUBY, RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, @@ -668,7 +666,7 @@ void SwTextShell::Execute(SfxRequest &rReq) break; case FN_AUTOFORMAT_AUTO: { - SvxAutoCorrCfg* pACfg = SvxAutoCorrCfg::Get(); + SvxAutoCorrCfg* pACfg = SvxAutoCorrCfg::Get(); BOOL bSet = pItem ? ((const SfxBoolItem*)pItem)->GetValue() : !pACfg->IsAutoFmtByInput(); if( bSet != pACfg->IsAutoFmtByInput() ) { @@ -848,10 +846,10 @@ void SwTextShell::Execute(SfxRequest &rReq) break; case SID_CHAR_DLG_FOR_PARAGRAPH: { - rWrtSh.Push(); //save current cursor + rWrtSh.Push(); //save current cursor SwLangHelper::SelectCurrentPara( rWrtSh ); lcl_CharDialog( rWrtSh, bUseDialog, nSlot, pArgs, &rReq ); - rWrtSh.Pop( FALSE ); //restore old cursor + rWrtSh.Pop( FALSE ); //restore old cursor } break; case SID_ATTR_LRSPACE : @@ -877,6 +875,10 @@ void SwTextShell::Execute(SfxRequest &rReq) { FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, &GetView())); SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< UINT16 >(eMetric))); + + BOOL bApplyCharUnit = ::HasCharUnit(0 != PTR_CAST(SwWebView, &GetView())); + SW_MOD()->PutItem(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bApplyCharUnit)); + SfxItemSet aCoreSet( GetPool(), RES_PARATR_BEGIN, RES_PARATR_END - 1, // --> OD 2008-02-25 #refactorlists# @@ -1124,7 +1126,7 @@ void SwTextShell::Execute(SfxRequest &rReq) } rReq.Done(); -/* OS 22.02.97 18:40 Das alte Verhalten ist unerwuenscht +/* OS 22.02.97 18:40 Das alte Verhalten ist unerwuenscht SwEditWin& rEdtWin = GetView().GetEditWin(); SwApplyTemplate* pApply = rEdtWin.GetApplyTemplate(); @@ -1165,7 +1167,7 @@ void SwTextShell::Execute(SfxRequest &rReq) rReq.Done(); -/* OS 22.02.97 18:40 Das alte Verhalten ist unerwuenscht +/* OS 22.02.97 18:40 Das alte Verhalten ist unerwuenscht if(!pApply || pApply->nColor != SID_ATTR_CHAR_COLOR_BACKGROUND_EXT) { Brush aBrush(pItem ? BRUSH_SOLID : BRUSH_NULL); @@ -1429,7 +1431,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) rSet.DisableItem( SID_THES ); } break; - + case FN_NUMBER_NEWSTART : if(!rSh.GetCurNumRule()) rSet.DisableItem(nWhich); @@ -1592,7 +1594,6 @@ void SwTextShell::GetState( SfxItemSet &rSet ) GetViewFrame()->GetChildWindow( nWhich ) )); break; case FN_EDIT_HYPERLINK: - case FN_REMOVE_HYPERLINK: case FN_COPY_HYPERLINK_LOCATION: { SfxItemSet aSet(GetPool(), @@ -1605,6 +1606,20 @@ void SwTextShell::GetState( SfxItemSet &rSet ) } } break; + case FN_REMOVE_HYPERLINK: + { + SfxItemSet aSet(GetPool(), + RES_TXTATR_INETFMT, + RES_TXTATR_INETFMT); + rSh.GetCurAttr(aSet); + + // If a hyperlink is selected, either alone or along with other text... + if( ((SFX_ITEM_DONTCARE & aSet.GetItemState( RES_TXTATR_INETFMT, TRUE )) == 0) || rSh.HasReadonlySel()) + { + rSet.DisableItem(nWhich); + } + } + break; case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx index 2d267e926fc8..e08db985ec78 100644 --- a/sw/source/ui/shells/textsh2.cxx +++ b/sw/source/ui/shells/textsh2.cxx @@ -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 @@ -97,8 +97,8 @@ struct DBTextStruct_Impl { SwDBData aDBData; Sequence<Any> aSelection; - Reference<XResultSet> xCursor; - Reference<XConnection> xConnection; + Reference<XResultSet> xCursor; + Reference<XConnection> xConnection; }; inline void AddSelList( List& rLst, long nRow ) { @@ -166,15 +166,15 @@ void SwTextShell::ExecDB(SfxRequest &rReq) { if(pSourceItem && pCommandItem && pCommandTypeItem) { - DBTextStruct_Impl* pNew = new DBTextStruct_Impl; - pNew->aDBData.sDataSource = sSourceArg; - pNew->aDBData.sCommand = sCommandArg; - pNew->aDBData.nCommandType = nCommandTypeArg; - pNew->aSelection = aSelection; + DBTextStruct_Impl* pNew = new DBTextStruct_Impl; + pNew->aDBData.sDataSource = sSourceArg; + pNew->aDBData.sCommand = sCommandArg; + pNew->aDBData.nCommandType = nCommandTypeArg; + pNew->aSelection = aSelection; //if the cursor is NULL, it must be created inside InsertDBTextHdl // because it called via a PostUserEvent - pNew->xCursor = xCursor; - pNew->xConnection = xConnection; + pNew->xCursor = xCursor; + pNew->xConnection = xConnection; Application::PostUserEvent( STATIC_LINK( this, SwBaseShell, InsertDBTextHdl ), pNew ); @@ -195,10 +195,10 @@ void SwTextShell::ExecDB(SfxRequest &rReq) ODataAccessDescriptor aDescriptor; aDescriptor.setDataSource(sSourceArg); - aDescriptor[daCommand] <<= sCommandArg; - aDescriptor[daCursor] <<= xCursor; - aDescriptor[daSelection] <<= aSelection; - aDescriptor[daCommandType] <<= nCommandTypeArg; + aDescriptor[daCommand] <<= sCommandArg; + aDescriptor[daCursor] <<= xCursor; + aDescriptor[daSelection] <<= aSelection; + aDescriptor[daCommandType] <<= nCommandTypeArg; SwMergeDescriptor aMergeDesc( DBMGR_MERGE, *GetShellPtr(), aDescriptor ); pNewDBMgr->MergeNew(aMergeDesc); diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index 9e89620bed28..10547000c5bc 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -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 @@ -78,8 +78,8 @@ #include <SwStyleNameMapper.hxx> #include "swabstdlg.hxx" #include "chrdlg.hrc" -const SwTwips lFontInc = 2 * 20; // ==> PointToTwips(2) -const SwTwips lFontMaxSz = 72 * 20; // ==> PointToTwips(72) +const SwTwips lFontInc = 2 * 20; // ==> PointToTwips(2) +const SwTwips lFontMaxSz = 72 * 20; // ==> PointToTwips(72) @@ -265,7 +265,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq) if (bGrow) { if( lSize == lFontMaxSz ) - break; // das wars, hoeher gehts nicht + break; // das wars, hoeher gehts nicht if( ( lSize += lFontInc ) > lFontMaxSz ) lSize = lFontMaxSz; } @@ -327,14 +327,14 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq) switch (rReq.GetSlot()) { - case FN_SET_LEFT_PARA: lcl_SetAdjust(ADJLEFT,aSet); break; - case FN_SET_RIGHT_PARA: lcl_SetAdjust(ADJRIGHT,aSet); break; - case FN_SET_CENTER_PARA: lcl_SetAdjust(ADJCENTER,aSet); break; - case SID_ATTR_PARA_ADJUST_BLOCK:lcl_SetAdjust(ADJBLOCK,aSet); break; + case FN_SET_LEFT_PARA: lcl_SetAdjust(ADJLEFT,aSet); break; + case FN_SET_RIGHT_PARA: lcl_SetAdjust(ADJRIGHT,aSet); break; + case FN_SET_CENTER_PARA: lcl_SetAdjust(ADJCENTER,aSet); break; + case SID_ATTR_PARA_ADJUST_BLOCK:lcl_SetAdjust(ADJBLOCK,aSet); break; - case FN_SET_LINE_SPACE_1: lcl_SetLineSpace(100,aSet); break; - case FN_SET_LINE_SPACE_15: lcl_SetLineSpace(150,aSet); break; - case FN_SET_LINE_SPACE_2: lcl_SetLineSpace(200,aSet); break; + case FN_SET_LINE_SPACE_1: lcl_SetLineSpace(100,aSet); break; + case FN_SET_LINE_SPACE_15: lcl_SetLineSpace(150,aSet); break; + case FN_SET_LINE_SPACE_2: lcl_SetLineSpace(200,aSet); break; default: DBG_ERROR("SwTextShell::ExecParaAttr falscher Dispatcher"); @@ -388,10 +388,10 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq) } } break; - case SID_ATTR_PARA_ADJUST_LEFT: eAdjst = SVX_ADJUST_LEFT; goto SET_ADJUST; - case SID_ATTR_PARA_ADJUST_RIGHT: eAdjst = SVX_ADJUST_RIGHT; goto SET_ADJUST; - case SID_ATTR_PARA_ADJUST_CENTER: eAdjst = SVX_ADJUST_CENTER; goto SET_ADJUST; - case SID_ATTR_PARA_ADJUST_BLOCK: eAdjst = SVX_ADJUST_BLOCK; goto SET_ADJUST; + case SID_ATTR_PARA_ADJUST_LEFT: eAdjst = SVX_ADJUST_LEFT; goto SET_ADJUST; + case SID_ATTR_PARA_ADJUST_RIGHT: eAdjst = SVX_ADJUST_RIGHT; goto SET_ADJUST; + case SID_ATTR_PARA_ADJUST_CENTER: eAdjst = SVX_ADJUST_CENTER; goto SET_ADJUST; + case SID_ATTR_PARA_ADJUST_BLOCK: eAdjst = SVX_ADJUST_BLOCK; goto SET_ADJUST; SET_ADJUST: { aSet.Put(SvxAdjustItem(eAdjst,RES_PARATR_ADJUST)); @@ -407,9 +407,9 @@ SET_ADJUST: aSet.Put( aLineSpace ); } break; - case SID_ATTR_PARA_LINESPACE_10: ePropL = 100; goto SET_LINESPACE; - case SID_ATTR_PARA_LINESPACE_15: ePropL = 150; goto SET_LINESPACE; - case SID_ATTR_PARA_LINESPACE_20: ePropL = 200; goto SET_LINESPACE; + case SID_ATTR_PARA_LINESPACE_10: ePropL = 100; goto SET_LINESPACE; + case SID_ATTR_PARA_LINESPACE_15: ePropL = 150; goto SET_LINESPACE; + case SID_ATTR_PARA_LINESPACE_20: ePropL = 200; goto SET_LINESPACE; SET_LINESPACE: { @@ -560,7 +560,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!"); - SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( GetView().GetWindow(), aSet, + SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( GetView().GetWindow(), aSet, rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), DLG_SWDROPCAPS ); DBG_ASSERT(pDlg, "Dialogdiet fail!"); if (pDlg->Execute() == RET_OK) @@ -593,7 +593,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq) if(pItem) { SfxItemSet aCoreSet( GetPool(), - RES_PAGEDESC, RES_PAGEDESC, + RES_PAGEDESC, RES_PAGEDESC, SID_ATTR_PARA_MODEL, SID_ATTR_PARA_MODEL, 0); aCoreSet.Put(*pItem); SfxToSwPageDescAttr( rSh, aCoreSet); @@ -623,7 +623,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) sal_Bool bFlag = sal_False; SfxBoolItem aFlagItem; const SfxPoolItem* pItem = 0; - int eAdjust = -1; // Illegaler Wert, um DONTCARE zu erkennen + int eAdjust = -1; // Illegaler Wert, um DONTCARE zu erkennen SfxItemState eState = aCoreSet.GetItemState(RES_PARATR_ADJUST, FALSE, &pItem); if( SFX_ITEM_DEFAULT == eState ) diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/ui/shells/txtcrsr.cxx index 69f82ebf902d..cf0a5f99acdd 100644 --- a/sw/source/ui/shells/txtcrsr.cxx +++ b/sw/source/ui/shells/txtcrsr.cxx @@ -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 @@ -125,25 +125,25 @@ void SwTextShell::ExecMove(SfxRequest &rReq) switch ( nSlot ) { case FN_START_OF_LINE_SEL: - case FN_START_OF_LINE: bRet = rSh.LeftMargin ( FN_START_OF_LINE_SEL == nSlot, FALSE ); + case FN_START_OF_LINE: bRet = rSh.LeftMargin ( FN_START_OF_LINE_SEL == nSlot, FALSE ); break; case FN_END_OF_LINE_SEL: - case FN_END_OF_LINE: bRet = rSh.RightMargin( FN_END_OF_LINE_SEL == nSlot, FALSE ); + case FN_END_OF_LINE: bRet = rSh.RightMargin( FN_END_OF_LINE_SEL == nSlot, FALSE ); break; case FN_START_OF_DOCUMENT_SEL: - case FN_START_OF_DOCUMENT: bRet = rSh.SttDoc ( FN_START_OF_DOCUMENT_SEL == nSlot); + case FN_START_OF_DOCUMENT: bRet = rSh.SttDoc ( FN_START_OF_DOCUMENT_SEL == nSlot); break; case FN_END_OF_DOCUMENT_SEL: - case FN_END_OF_DOCUMENT: bRet = rSh.EndDoc( FN_END_OF_DOCUMENT_SEL == nSlot ); + case FN_END_OF_DOCUMENT: bRet = rSh.EndDoc( FN_END_OF_DOCUMENT_SEL == nSlot ); break; - case FN_SELECT_WORD: bRet = rSh.SelNearestWrd(); break; + case FN_SELECT_WORD: bRet = rSh.SelNearestWrd(); break; case SID_SELECTALL: bRet = 0 != rSh.SelAll(); break; - default: ASSERT(FALSE, falscher Dispatcher); return; + default: ASSERT(FALSE, falscher Dispatcher); return; } if ( bRet ) @@ -167,7 +167,7 @@ void SwTextShell::ExecMovePage(SfxRequest &rReq) case FN_START_OF_NEXT_PAGE: rSh.SttNxtPg( FN_START_OF_NEXT_PAGE_SEL == nSlot ); break; case FN_END_OF_NEXT_PAGE_SEL: - case FN_END_OF_NEXT_PAGE: rSh.EndNxtPg( FN_END_OF_NEXT_PAGE_SEL == nSlot ); break; + case FN_END_OF_NEXT_PAGE: rSh.EndNxtPg( FN_END_OF_NEXT_PAGE_SEL == nSlot ); break; case FN_START_OF_PREV_PAGE_SEL: case FN_START_OF_PREV_PAGE: rSh.SttPrvPg( FN_START_OF_PREV_PAGE_SEL == nSlot ); break; @@ -176,11 +176,11 @@ void SwTextShell::ExecMovePage(SfxRequest &rReq) case FN_END_OF_PREV_PAGE: rSh.EndPrvPg( FN_END_OF_PREV_PAGE_SEL == nSlot ); break; case FN_START_OF_PAGE_SEL: - case FN_START_OF_PAGE: rSh.SttPg ( FN_START_OF_PAGE_SEL == nSlot ); break; + case FN_START_OF_PAGE: rSh.SttPg ( FN_START_OF_PAGE_SEL == nSlot ); break; case FN_END_OF_PAGE_SEL: - case FN_END_OF_PAGE: rSh.EndPg ( FN_END_OF_PAGE_SEL == nSlot ); break; - default: ASSERT(FALSE, falscher Dispatcher); return; + case FN_END_OF_PAGE: rSh.EndPg ( FN_END_OF_PAGE_SEL == nSlot ); break; + default: ASSERT(FALSE, falscher Dispatcher); return; } rReq.Done(); } @@ -191,13 +191,13 @@ void SwTextShell::ExecMoveCol(SfxRequest &rReq) SwWrtShell &rSh = GetShell(); switch ( rReq.GetSlot() ) { - case FN_START_OF_COLUMN: rSh.StartOfColumn ( FALSE ); break; - case FN_END_OF_COLUMN: rSh.EndOfColumn ( FALSE ); break; + case FN_START_OF_COLUMN: rSh.StartOfColumn ( FALSE ); break; + case FN_END_OF_COLUMN: rSh.EndOfColumn ( FALSE ); break; case FN_START_OF_NEXT_COLUMN: rSh.StartOfNextColumn( FALSE ) ; break; - case FN_END_OF_NEXT_COLUMN: rSh.EndOfNextColumn ( FALSE ); break; + case FN_END_OF_NEXT_COLUMN: rSh.EndOfNextColumn ( FALSE ); break; case FN_START_OF_PREV_COLUMN: rSh.StartOfPrevColumn( FALSE ); break; - case FN_END_OF_PREV_COLUMN: rSh.EndOfPrevColumn ( FALSE ); break; - default: ASSERT(FALSE, falscher Dispatcher); return; + case FN_END_OF_PREV_COLUMN: rSh.EndOfPrevColumn ( FALSE ); break; + default: ASSERT(FALSE, falscher Dispatcher); return; } rReq.Done(); } @@ -212,7 +212,7 @@ void SwTextShell::ExecMoveLingu(SfxRequest &rReq) switch ( nSlot ) { case FN_NEXT_WORD_SEL: - case FN_NEXT_WORD: bRet = rSh.NxtWrd( FN_NEXT_WORD_SEL == nSlot ); + case FN_NEXT_WORD: bRet = rSh.NxtWrd( FN_NEXT_WORD_SEL == nSlot ); break; case FN_START_OF_PARA_SEL: diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index 0e89b96a8d6a..0cdb405df7f3 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -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/smartmenu/stmenu.cxx b/sw/source/ui/smartmenu/stmenu.cxx index 4c7b473dfc50..c27f206d0112 100644 --- a/sw/source/ui/smartmenu/stmenu.cxx +++ b/sw/source/ui/smartmenu/stmenu.cxx @@ -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/smartmenu/stmenu.hrc b/sw/source/ui/smartmenu/stmenu.hrc index 56afc5752f79..a31fbca218be 100644 --- a/sw/source/ui/smartmenu/stmenu.hrc +++ b/sw/source/ui/smartmenu/stmenu.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 diff --git a/sw/source/ui/smartmenu/stmenu.src b/sw/source/ui/smartmenu/stmenu.src index 9775b829e7a0..e4e30192d72c 100644 --- a/sw/source/ui/smartmenu/stmenu.src +++ b/sw/source/ui/smartmenu/stmenu.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/table/chartins.cxx b/sw/source/ui/table/chartins.cxx index a11f04d55656..5649fca2b834 100644 --- a/sw/source/ui/table/chartins.cxx +++ b/sw/source/ui/table/chartins.cxx @@ -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 @@ -211,7 +211,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings ) if( xInit.is() ) { uno::Reference< awt::XWindow > xDialogParentWindow(0); - // initialize dialog + // initialize dialog uno::Sequence<uno::Any> aSeq(2); uno::Any* pArray = aSeq.getArray(); beans::PropertyValue aParam1; diff --git a/sw/source/ui/table/chartins.hrc b/sw/source/ui/table/chartins.hrc index 91bbb0f424c6..92b4d1ff4b97 100644 --- a/sw/source/ui/table/chartins.hrc +++ b/sw/source/ui/table/chartins.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 @@ -31,15 +31,15 @@ #include "rcid.hrc" #include "table.hrc" -#define ED_RANGE 1 +#define ED_RANGE 1 #define FT_RANGE 2 -#define BT_NEXT 3 +#define BT_NEXT 3 #define BT_FINISH 4 #define BT_HELP 5 #define BT_CANCEL 6 -#define CB_FIRST_ROW 7 +#define CB_FIRST_ROW 7 #define CB_FIRST_COL 8 -#define BT_PREV 9 +#define BT_PREV 9 #define FL_HLINE 10 #define FT_TEXT 11 #define FL_1 12 diff --git a/sw/source/ui/table/chartins.src b/sw/source/ui/table/chartins.src index 6a3c4fb5b34a..6c30097791b9 100644 --- a/sw/source/ui/table/chartins.src +++ b/sw/source/ui/table/chartins.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/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index dc28f6331566..a5b4d9cf9c19 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -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 @@ -77,14 +77,14 @@ SwTableWidthDlg::SwTableWidthDlg(Window *pParent, SwTableFUNC &rTableFnc ) : SvxStandardDialog( pParent, SW_RES(DLG_COL_WIDTH) ), - aColFT(this, SW_RES(FT_COL)), - aColEdit(this, SW_RES(ED_COL)), - aWidthFT(this, SW_RES(FT_WIDTH)), - aWidthEdit(this, SW_RES(ED_WIDTH)), + aColFT(this, SW_RES(FT_COL)), + aColEdit(this, SW_RES(ED_COL)), + aWidthFT(this, SW_RES(FT_WIDTH)), + aWidthEdit(this, SW_RES(ED_WIDTH)), aWidthFL(this, SW_RES(FL_WIDTH)), - aOKBtn(this, SW_RES(BT_OK)), - aCancelBtn(this, SW_RES(BT_CANCEL)), - aHelpBtn(this, SW_RES(BT_HELP)), + aOKBtn(this, SW_RES(BT_OK)), + aCancelBtn(this, SW_RES(BT_CANCEL)), + aHelpBtn(this, SW_RES(BT_HELP)), rFnc(rTableFnc) { FreeResource(); diff --git a/sw/source/ui/table/colwd.hrc b/sw/source/ui/table/colwd.hrc index 4ac7358a65a9..e7526f79d5ed 100644 --- a/sw/source/ui/table/colwd.hrc +++ b/sw/source/ui/table/colwd.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,13 +24,13 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FT_COL 1 -#define ED_COL 2 -#define FT_WIDTH 3 -#define ED_WIDTH 4 +#define FT_COL 1 +#define ED_COL 2 +#define FT_WIDTH 3 +#define ED_WIDTH 4 #define FL_WIDTH 5 -#define BT_OK 100 -#define BT_CANCEL 101 -#define BT_HELP 102 +#define BT_OK 100 +#define BT_CANCEL 101 +#define BT_HELP 102 diff --git a/sw/source/ui/table/colwd.src b/sw/source/ui/table/colwd.src index aa1cf468867f..cd34b41bd55b 100644 --- a/sw/source/ui/table/colwd.src +++ b/sw/source/ui/table/colwd.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/table/convert.cxx b/sw/source/ui/table/convert.cxx index 8be2bbdbb498..9418e7fbaf76 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -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 @@ -122,15 +122,15 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable ) #pragma warning (disable : 4355) #endif aTabBtn (this, SW_RES(CB_TAB)), - aSemiBtn (this, SW_RES(CB_SEMI)), - aParaBtn (this, SW_RES(CB_PARA)), + aSemiBtn (this, SW_RES(CB_SEMI)), + aParaBtn (this, SW_RES(CB_PARA)), aOtherBtn (this, SW_RES(RB_OTHER)), aOtherEd (this, SW_RES(ED_OTHER)), aKeepColumn (this, SW_RES(CB_KEEPCOLUMN)), aDelimFL (this, SW_RES(FL_DELIM)), aHeaderCB (this, SW_RES(CB_HEADER)), - aRepeatHeaderCB (this, SW_RES(CB_REPEAT_HEADER)), + aRepeatHeaderCB (this, SW_RES(CB_REPEAT_HEADER)), aRepeatHeaderFT (this, SW_RES(FT_REPEAT_HEADER)), aRepeatHeaderBeforeFT (this), @@ -139,8 +139,8 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable ) aRepeatHeaderCombo (this, SW_RES(WIN_REPEAT_HEADER), aRepeatHeaderNF, aRepeatHeaderBeforeFT, aRepeatHeaderAfterFT), aOptionsFL (this, SW_RES(FL_OPTIONS)), - aDontSplitCB (this, SW_RES(CB_DONT_SPLIT)), - aBorderCB (this, SW_RES(CB_BORDER)), + aDontSplitCB (this, SW_RES(CB_DONT_SPLIT)), + aBorderCB (this, SW_RES(CB_BORDER)), aAutoFmtBtn(this,SW_RES(BT_AUTOFORMAT)), aOkBtn(this,SW_RES(BT_OK)), @@ -184,10 +184,10 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable ) else { //Einfuege-Optionen verstecken - aHeaderCB .Show(FALSE); - aRepeatHeaderCB .Show(FALSE); - aDontSplitCB .Show(FALSE); - aBorderCB .Show(FALSE); + aHeaderCB .Show(FALSE); + aRepeatHeaderCB .Show(FALSE); + aDontSplitCB .Show(FALSE); + aBorderCB .Show(FALSE); aOptionsFL .Show(FALSE); aRepeatHeaderCombo.Show(FALSE); @@ -223,7 +223,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable ) CheckBoxHdl(); } -SwConvertTableDlg:: ~SwConvertTableDlg() +SwConvertTableDlg:: ~SwConvertTableDlg() { delete pTAutoFmt; } diff --git a/sw/source/ui/table/convert.hrc b/sw/source/ui/table/convert.hrc index 7f7cbbec768f..e86906dd2085 100644 --- a/sw/source/ui/table/convert.hrc +++ b/sw/source/ui/table/convert.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,24 +24,24 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define CB_TAB 1 -#define CB_SEMI 3 -#define CB_PARA 4 +#define CB_TAB 1 +#define CB_SEMI 3 +#define CB_PARA 4 #define FL_DELIM 5 -#define RB_OTHER 6 -#define ED_OTHER 7 -#define CB_KEEPCOLUMN 8 -#define STR_CONVERT_TEXT_TABLE 9 -#define CB_HEADER 13 -#define CB_REPEAT_HEADER 14 +#define RB_OTHER 6 +#define ED_OTHER 7 +#define CB_KEEPCOLUMN 8 +#define STR_CONVERT_TEXT_TABLE 9 +#define CB_HEADER 13 +#define CB_REPEAT_HEADER 14 #define CB_DONT_SPLIT 15 -#define CB_BORDER 16 +#define CB_BORDER 16 #define FL_OPTIONS 17 -#define FT_REPEAT_HEADER 18 -#define NF_REPEAT_HEADER 19 +#define FT_REPEAT_HEADER 18 +#define NF_REPEAT_HEADER 19 -#define BT_OK 100 -#define BT_CANCEL 101 -#define BT_AUTOFORMAT 102 -#define BT_HELP 103 +#define BT_OK 100 +#define BT_CANCEL 101 +#define BT_AUTOFORMAT 102 +#define BT_HELP 103 #define WIN_REPEAT_HEADER 104 diff --git a/sw/source/ui/table/convert.src b/sw/source/ui/table/convert.src index e2ff4ed1c2e3..50baa2bb9a46 100644 --- a/sw/source/ui/table/convert.src +++ b/sw/source/ui/table/convert.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/table/instable.cxx b/sw/source/ui/table/instable.cxx index 40c9f5a220f7..a81074c8df2f 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -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 @@ -91,30 +91,30 @@ void SwInsTableDlg::GetValues( String& rName, USHORT& rRow, USHORT& rCol, SwInsTableDlg::SwInsTableDlg( SwView& rView ) : SfxModalDialog( rView.GetWindow(), SW_RES(DLG_INSERT_TABLE) ), aNameFT (this, SW_RES(FT_NAME)), - aNameEdit (this, SW_RES(ED_NAME)), + aNameEdit (this, SW_RES(ED_NAME)), aFL (this, SW_RES(FL_TABLE)), aColLbl (this, SW_RES(FT_COL)), - aColEdit (this, SW_RES(ED_COL)), - aRowLbl (this, SW_RES(FT_ROW)), - aRowEdit (this, SW_RES(ED_ROW)), + aColEdit (this, SW_RES(ED_COL)), + aRowLbl (this, SW_RES(FT_ROW)), + aRowEdit (this, SW_RES(ED_ROW)), aOptionsFL (this, SW_RES(FL_OPTIONS)), aHeaderCB (this, SW_RES(CB_HEADER)), - aRepeatHeaderCB (this, SW_RES(CB_REPEAT_HEADER)), - aRepeatHeaderFT (this, SW_RES(FT_REPEAT_HEADER)), - aRepeatHeaderBeforeFT (this), - aRepeatHeaderNF (this, SW_RES(NF_REPEAT_HEADER)), - aRepeatHeaderAfterFT (this), - aRepeatHeaderCombo (this, SW_RES(WIN_REPEAT_HEADER), aRepeatHeaderNF, aRepeatHeaderBeforeFT, aRepeatHeaderAfterFT), + aRepeatHeaderCB (this, SW_RES(CB_REPEAT_HEADER)), + aRepeatHeaderFT (this, SW_RES(FT_REPEAT_HEADER)), + aRepeatHeaderBeforeFT (this), + aRepeatHeaderNF (this, SW_RES(NF_REPEAT_HEADER)), + aRepeatHeaderAfterFT (this), + aRepeatHeaderCombo (this, SW_RES(WIN_REPEAT_HEADER), aRepeatHeaderNF, aRepeatHeaderBeforeFT, aRepeatHeaderAfterFT), aDontSplitCB (this, SW_RES(CB_DONT_SPLIT)), - aBorderCB (this, SW_RES(CB_BORDER)), + aBorderCB (this, SW_RES(CB_BORDER)), aOkBtn (this, SW_RES(BT_OK)), - aCancelBtn (this, SW_RES(BT_CANCEL)), - aHelpBtn (this, SW_RES(BT_HELP)), - aAutoFmtBtn (this, SW_RES(BT_AUTOFORMAT)), + aCancelBtn (this, SW_RES(BT_CANCEL)), + aHelpBtn (this, SW_RES(BT_HELP)), + aAutoFmtBtn (this, SW_RES(BT_AUTOFORMAT)), pShell(&rView.GetWrtShell()), pTAutoFmt( 0 ), diff --git a/sw/source/ui/table/instable.hrc b/sw/source/ui/table/instable.hrc index 6077541a3c01..b11bf61929b9 100644 --- a/sw/source/ui/table/instable.hrc +++ b/sw/source/ui/table/instable.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 @@ -25,25 +25,25 @@ * ************************************************************************/ -#define FT_COL 1 -#define FT_ROW 2 -#define ED_COL 4 -#define ED_ROW 5 +#define FT_COL 1 +#define FT_ROW 2 +#define ED_COL 4 +#define ED_ROW 5 #define FL_TABLE 10 -#define ED_NAME 11 +#define ED_NAME 11 #define FT_NAME 12 -#define CB_HEADER 13 -#define CB_REPEAT_HEADER 14 +#define CB_HEADER 13 +#define CB_REPEAT_HEADER 14 #define CB_DONT_SPLIT 15 -#define CB_BORDER 16 +#define CB_BORDER 16 #define FL_OPTIONS 17 -#define FT_REPEAT_HEADER 18 -#define NF_REPEAT_HEADER 19 +#define FT_REPEAT_HEADER 18 +#define NF_REPEAT_HEADER 19 -#define BT_OK 20 -#define BT_CANCEL 21 -#define BT_HELP 22 -#define BT_AUTOFORMAT 23 +#define BT_OK 20 +#define BT_CANCEL 21 +#define BT_HELP 22 +#define BT_AUTOFORMAT 23 -#define WIN_REPEAT_HEADER 25 +#define WIN_REPEAT_HEADER 25 diff --git a/sw/source/ui/table/instable.src b/sw/source/ui/table/instable.src index e5f83f2a1ee3..3930bb36abd7 100644 --- a/sw/source/ui/table/instable.src +++ b/sw/source/ui/table/instable.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/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx index 486bb0af87b7..2e96a588467b 100644 --- a/sw/source/ui/table/mergetbl.cxx +++ b/sw/source/ui/table/mergetbl.cxx @@ -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 @@ -45,13 +45,13 @@ SwMergeTblDlg::SwMergeTblDlg( Window *pParent, BOOL& rWithPrev ) : SvxStandardDialog(pParent, SW_RES(DLG_MERGE_TABLE)), - aOKPB( this, SW_RES(PB_OK )), - aCancelPB( this, SW_RES(PB_CANCEL )), - aHelpPB( this, SW_RES(PB_HELP )), + aOKPB( this, SW_RES(PB_OK )), + aCancelPB( this, SW_RES(PB_CANCEL )), + aHelpPB( this, SW_RES(PB_HELP )), aMergeFL( this, SW_RES(FL_MERGE )), - aMergePrevRB( this, SW_RES(RB_MERGE_PREV)), - aMergeNextRB( this, SW_RES(RB_MERGE_NEXT)), - rMergePrev( rWithPrev ) + aMergePrevRB( this, SW_RES(RB_MERGE_PREV)), + aMergeNextRB( this, SW_RES(RB_MERGE_NEXT)), + rMergePrev( rWithPrev ) { FreeResource(); aMergePrevRB.Check(); diff --git a/sw/source/ui/table/mergetbl.hrc b/sw/source/ui/table/mergetbl.hrc index cee06b6ef20d..f4598011adac 100644 --- a/sw/source/ui/table/mergetbl.hrc +++ b/sw/source/ui/table/mergetbl.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,9 +24,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define PB_OK 1 +#define PB_OK 1 #define PB_CANCEL 2 -#define PB_HELP 3 +#define PB_HELP 3 #define FL_MERGE 4 #define RB_MERGE_PREV 5 #define RB_MERGE_NEXT 6 diff --git a/sw/source/ui/table/mergetbl.src b/sw/source/ui/table/mergetbl.src index 81ea30f9b003..97ef9cb2cdb4 100644 --- a/sw/source/ui/table/mergetbl.src +++ b/sw/source/ui/table/mergetbl.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/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index 1fb108276bc1..9bfdbe74e546 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -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/table/rowht.hrc b/sw/source/ui/table/rowht.hrc index e844f3c65a8d..564c5bf61b07 100644 --- a/sw/source/ui/table/rowht.hrc +++ b/sw/source/ui/table/rowht.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 ED_HEIGHT 1 -#define CB_AUTOHEIGHT 2 +#define ED_HEIGHT 1 +#define CB_AUTOHEIGHT 2 #define FL_HEIGHT 3 -#define BT_OK 100 -#define BT_CANCEL 101 -#define BT_HELP 102 +#define BT_OK 100 +#define BT_CANCEL 101 +#define BT_HELP 102 diff --git a/sw/source/ui/table/rowht.src b/sw/source/ui/table/rowht.src index 71a616bef045..ea3ac27474fa 100644 --- a/sw/source/ui/table/rowht.src +++ b/sw/source/ui/table/rowht.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/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx index 7037e2b0aa05..9763755886a5 100644 --- a/sw/source/ui/table/splittbl.cxx +++ b/sw/source/ui/table/splittbl.cxx @@ -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,16 +43,16 @@ --------------------------------------------------*/ SwSplitTblDlg::SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ) : SvxStandardDialog(pParent, SW_RES(DLG_SPLIT_TABLE)), - aOKPB( this, SW_RES(PB_OK )), - aCancelPB( this, SW_RES(PB_CANCEL )), - aHelpPB( this, SW_RES(PB_HELP )), + aOKPB( this, SW_RES(PB_OK )), + aCancelPB( this, SW_RES(PB_CANCEL )), + aHelpPB( this, SW_RES(PB_HELP )), aSplitFL( this, SW_RES(FL_SPLIT )), - aCntntCopyRB( this, SW_RES(RB_CNTNT )), - aBoxAttrCopyWithParaRB( this, SW_RES(RB_BOX_PARA )), - aBoxAttrCopyNoParaRB( this, SW_RES(RB_BOX_NOPARA)), - aBorderCopyRB( this, SW_RES(RB_BORDER )), + aCntntCopyRB( this, SW_RES(RB_CNTNT )), + aBoxAttrCopyWithParaRB( this, SW_RES(RB_BOX_PARA )), + aBoxAttrCopyNoParaRB( this, SW_RES(RB_BOX_NOPARA)), + aBorderCopyRB( this, SW_RES(RB_BORDER )), rShell(rSh), - m_nSplit( HEADLINE_CNTNTCOPY ) + m_nSplit( HEADLINE_CNTNTCOPY ) { FreeResource(); aCntntCopyRB.Check(); diff --git a/sw/source/ui/table/splittbl.hrc b/sw/source/ui/table/splittbl.hrc index 83882b374ecb..c57b0e499fcb 100644 --- a/sw/source/ui/table/splittbl.hrc +++ b/sw/source/ui/table/splittbl.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 PB_OK 1 +#define PB_OK 1 #define PB_CANCEL 2 -#define PB_HELP 3 +#define PB_HELP 3 #define FL_SPLIT 4 -#define RB_CNTNT 5 +#define RB_CNTNT 5 #define RB_BOX_NOPARA 6 -#define RB_BOX_PARA 7 +#define RB_BOX_PARA 7 #define RB_BORDER 8 diff --git a/sw/source/ui/table/splittbl.src b/sw/source/ui/table/splittbl.src index 879d4528d7de..e58d64ab96d2 100644 --- a/sw/source/ui/table/splittbl.src +++ b/sw/source/ui/table/splittbl.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/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx index ab7df943e201..ae561b2bc569 100644 --- a/sw/source/ui/table/swtablerep.cxx +++ b/sw/source/ui/table/swtablerep.cxx @@ -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 @@ -163,7 +163,7 @@ BOOL SwTableRep::FillTabCols( SwTabCols& rTabCols ) const { // die unsichtbaren Trenner werden aus den alten TabCols genommen // die sichtbaren kommen aus pTColumns - TColumn* pOldTColumns = new TColumn[nAllCols + 1]; + TColumn* pOldTColumns = new TColumn[nAllCols + 1]; SwTwips nStart = 0, nEnd; for(i = 0; i < nAllCols - 1; i++) diff --git a/sw/source/ui/table/table.src b/sw/source/ui/table/table.src index 7a0ab5472347..7c0194be7791 100644 --- a/sw/source/ui/table/table.src +++ b/sw/source/ui/table/table.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/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index f5ad209d195a..e1fe1b19a295 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -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 @@ -128,11 +128,11 @@ void DbgTblRep(SwTableRep* pRep) SwFormatTablePage::SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, SW_RES( TP_FORMAT_TABLE ), rSet ), aOptionsFL(this, SW_RES( FL_OPTIONS )), - aNameFT(this, SW_RES( FT_NAME )), - aNameED(this, SW_RES( ED_NAME )), - aWidthFT(this, SW_RES( FT_WIDTH )), - aWidthMF(this, SW_RES( ED_WIDTH )), - aRelWidthCB(this, SW_RES( CB_REL_WIDTH )), + aNameFT(this, SW_RES( FT_NAME )), + aNameED(this, SW_RES( ED_NAME )), + aWidthFT(this, SW_RES( FT_WIDTH )), + aWidthMF(this, SW_RES( ED_WIDTH )), + aRelWidthCB(this, SW_RES( CB_REL_WIDTH )), aPosFL(this, SW_RES( FL_POS )), aFullBtn(this, SW_RES( RB_FULL )), @@ -144,13 +144,13 @@ SwFormatTablePage::SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ) aDistFL(this, SW_RES( FL_DIST )), aLeftFT(this, SW_RES( FT_LEFT_DIST )), - aLeftMF(this, SW_RES( ED_LEFT_DIST )), - aRightFT(this, SW_RES( FT_RIGHT_DIST )), - aRightMF(this, SW_RES( ED_RIGHT_DIST )), - aTopFT (this, SW_RES( FT_TOP_DIST )), - aTopMF(this, SW_RES( ED_TOP_DIST )), - aBottomFT(this, SW_RES( FT_BOTTOM_DIST )), - aBottomMF(this, SW_RES( ED_BOTTOM_DIST )), + aLeftMF(this, SW_RES( ED_LEFT_DIST )), + aRightFT(this, SW_RES( FT_RIGHT_DIST )), + aRightMF(this, SW_RES( ED_RIGHT_DIST )), + aTopFT (this, SW_RES( FT_TOP_DIST )), + aTopMF(this, SW_RES( ED_TOP_DIST )), + aBottomFT(this, SW_RES( FT_BOTTOM_DIST )), + aBottomMF(this, SW_RES( ED_BOTTOM_DIST )), aPropertiesFL(this, SW_RES( FL_PROPERTIES )), aTextDirectionFT(this, SW_RES( FT_TEXTDIRECTION )), @@ -238,13 +238,13 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn ) aRightMF.SetRefValue(pTblData->GetSpace()); aLeftMF.MetricField::SetMin(0); // wird vom Percentfield ueberschrieben aRightMF.MetricField::SetMin(0);// -""- - aLeftMF.MetricField::SetMax(99); // - aRightMF.MetricField::SetMax(99);// + aLeftMF.MetricField::SetMax(99); // + aRightMF.MetricField::SetMax(99);// aLeftMF.SetPrcntValue(aLeftMF.NormalizePercent(nLeft ), FUNIT_TWIP ); aRightMF.SetPrcntValue(aRightMF.NormalizePercent(nRight ), FUNIT_TWIP ); } else - ModifyHdl(&aLeftMF); // Werte wieder korrigieren + ModifyHdl(&aLeftMF); // Werte wieder korrigieren if(aFreeBtn.IsChecked()) { @@ -330,9 +330,9 @@ IMPL_LINK( SwFormatTablePage, RightModifyHdl, MetricField *, EMPTYARG ) if(aFreeBtn.IsChecked()) { BOOL bEnable = aRightMF.GetValue() == 0; -// aWidthMF.Enable(bEnable); +// aWidthMF.Enable(bEnable); aRelWidthCB.Enable(bEnable); -// aWidthFT.Enable(bEnable); +// aWidthFT.Enable(bEnable); if ( !bEnable ) { aRelWidthCB.Check(FALSE); @@ -418,7 +418,7 @@ void SwFormatTablePage::ModifyHdl( Edit* pEdit ) nRight -= nDiff/2; } } - if( pEdit == &aRightMF ) + if( pEdit == &aRightMF ) { if( nRight + nLeft > pTblData->GetSpace() - MINLAY ) @@ -435,9 +435,9 @@ void SwFormatTablePage::ModifyHdl( Edit* pEdit ) nRight = nLeft; if(nRight + nLeft > pTblData->GetSpace() - MINLAY ) { - nLeft = bCenter ? (pTblData->GetSpace() - MINLAY) /2 : + nLeft = bCenter ? (pTblData->GetSpace() - MINLAY) /2 : (pTblData->GetSpace() - MINLAY) - nRight; - nRight = bCenter ? (pTblData->GetSpace() - MINLAY) /2 : nRight; + nRight = bCenter ? (pTblData->GetSpace() - MINLAY) /2 : nRight; } nCurWidth = pTblData->GetSpace() - nLeft - nRight; } @@ -498,7 +498,7 @@ BOOL SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) } if(aNameED.GetText() != aNameED.GetSavedValue()) { - rCoreSet.Put(SfxStringItem( FN_PARAM_TABLE_NAME, aNameED.GetText())); + rCoreSet.Put(SfxStringItem( FN_PARAM_TABLE_NAME, aNameED.GetText())); bModified = TRUE; } @@ -520,13 +520,13 @@ BOOL SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) void SwFormatTablePage::Reset( const SfxItemSet& ) { const SfxItemSet& rSet = GetItemSet(); - const SfxPoolItem* pItem; + const SfxPoolItem* pItem; if(bHtmlMode) { - aNameED .Disable(); - aTopFT .Hide(); - aTopMF .Hide(); + aNameED .Disable(); + aTopFT .Hide(); + aTopMF .Hide(); aBottomFT.Hide(); aBottomMF.Hide(); aFreeBtn.Enable(FALSE); @@ -667,7 +667,7 @@ void SwFormatTablePage::Reset( const SfxItemSet& ) /*------------------------------------------------------------------------ ------------------------------------------------------------------------*/ -void SwFormatTablePage::ActivatePage( const SfxItemSet& rSet ) +void SwFormatTablePage::ActivatePage( const SfxItemSet& rSet ) { DBG_ASSERT(pTblData, "Tabellendaten nicht da?"); if(SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_REP )) @@ -820,24 +820,24 @@ DbgTblRep(pTblData) SwTableColumnPage::SwTableColumnPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, SW_RES( TP_TABLE_COLUMN ), rSet ), - aModifyTableCB(this, SW_RES(CB_MOD_TBL)), - aProportionalCB(this, SW_RES(CB_PROP)), - aSpaceFT(this, SW_RES(FT_SPACE)), - aSpaceED(this, SW_RES(ED_SPACE)), + aModifyTableCB(this, SW_RES(CB_MOD_TBL)), + aProportionalCB(this, SW_RES(CB_PROP)), + aSpaceFT(this, SW_RES(FT_SPACE)), + aSpaceED(this, SW_RES(ED_SPACE)), aUpBtn(this, SW_RES(COL_BTN_UP)), aFT1(this, SW_RES(COL_FT_1)), - aMF1(this, SW_RES(COL_MF_1)), - aFT2(this, SW_RES(COL_FT_2)), - aMF2(this, SW_RES(COL_MF_2)), - aFT3(this, SW_RES(COL_FT_3)), - aMF3(this, SW_RES(COL_MF_3)), - aFT4(this, SW_RES(COL_FT_4)), - aMF4(this, SW_RES(COL_MF_4)), - aFT5(this, SW_RES(COL_FT_5)), - aMF5(this, SW_RES(COL_MF_5)), - aFT6(this, SW_RES(COL_FT_6)), - aMF6(this, SW_RES(COL_MF_6)), + aMF1(this, SW_RES(COL_MF_1)), + aFT2(this, SW_RES(COL_FT_2)), + aMF2(this, SW_RES(COL_MF_2)), + aFT3(this, SW_RES(COL_FT_3)), + aMF3(this, SW_RES(COL_MF_3)), + aFT4(this, SW_RES(COL_FT_4)), + aMF4(this, SW_RES(COL_MF_4)), + aFT5(this, SW_RES(COL_FT_5)), + aMF5(this, SW_RES(COL_MF_5)), + aFT6(this, SW_RES(COL_FT_6)), + aMF6(this, SW_RES(COL_MF_6)), aDownBtn(this, SW_RES(COL_BTN_DOWN)), aColFL(this, SW_RES(COL_FL_LAYOUT)), @@ -1098,8 +1098,8 @@ void SwTableColumnPage::UpdateCols( USHORT nAktPos ) if(!bModifyTable && !bProp ) { -// Tabellenbreite bleibt, Differenz wird mit der/den -// naechsten Zellen ausgeglichen +// Tabellenbreite bleibt, Differenz wird mit der/den +// naechsten Zellen ausgeglichen while( nDiff ) { if( ++nAktPos == nNoOfVisibleCols) @@ -1132,8 +1132,8 @@ void SwTableColumnPage::UpdateCols( USHORT nAktPos ) } else if(bModifyTable && !bProp) { -// Differenz wird ueber die Tabellenbreite ausgeglichen, -// andere Spalten bleiben unveraendert +// Differenz wird ueber die Tabellenbreite ausgeglichen, +// andere Spalten bleiben unveraendert DBG_ASSERT(nDiff <= pTblData->GetSpace() - nTableWidth, "Maximum falsch eingestellt" ); SwTwips nActSpace = pTblData->GetSpace() - nTableWidth; if(nDiff > nActSpace) @@ -1148,8 +1148,8 @@ void SwTableColumnPage::UpdateCols( USHORT nAktPos ) } else if(bModifyTable & bProp) { -// Alle Spalten werden proportional mitveraendert, die Tabellenbreite wird -// entsprechend angepasst +// Alle Spalten werden proportional mitveraendert, die Tabellenbreite wird +// entsprechend angepasst DBG_ASSERT(nDiff * nNoOfVisibleCols <= pTblData->GetSpace() - nTableWidth, "Maximum falsch eingestellt" ); long nAdd = nDiff; if(nDiff * nNoOfVisibleCols > pTblData->GetSpace() - nTableWidth) @@ -1181,8 +1181,8 @@ void SwTableColumnPage::UpdateCols( USHORT nAktPos ) } else { -// Die Differenz wird gleichmaessig auf alle anderen Spalten aufgeteilt -// die Tabellenbreite bleibt konstant +// Die Differenz wird gleichmaessig auf alle anderen Spalten aufgeteilt +// die Tabellenbreite bleibt konstant /* SwTwips nDiffn = nDiff/(nNoOfVisibleCols - 1); if(nDiff < 0 && (nNoOfVisibleCols - 1) * nDiffn != nDiff) @@ -1245,7 +1245,7 @@ void SwTableColumnPage::ActivatePage( const SfxItemSet& ) bModifyTbl = FALSE; if(bPercentMode) { - aModifyTableCB .Check(FALSE); + aModifyTableCB .Check(FALSE); aProportionalCB .Check(FALSE); } else if( !bModifyTbl ) @@ -1258,7 +1258,7 @@ void SwTableColumnPage::ActivatePage( const SfxItemSet& ) aModifyTableCB.Enable( !bPercentMode && bModifyTbl ); aProportionalCB.Enable(!bPercentMode && bModifyTbl ); -/* if(pTblData->IsLineSelected() && pTblData->IsComplex()) +/* if(pTblData->IsLineSelected() && pTblData->IsComplex()) { }*/ @@ -1351,7 +1351,7 @@ SwTwips SwTableColumnPage::GetVisibleWidth(USHORT nPos) while(!pTblData->GetColumns()[i].bVisible && (i + 1) < nNoOfCols) nReturn += pTblData->GetColumns()[++i].nWidth; -// return (*ppTableColumns)[i].nWidth; +// return (*ppTableColumns)[i].nWidth; return nReturn; } @@ -1437,7 +1437,7 @@ SwTextFlowPage::SwTextFlowPage( Window* pParent, aPageNoNF (this, SW_RES(NF_PAGENUM )), aSplitCB (this, SW_RES(CB_SPLIT )), aSplitRowCB (this, SW_RES(CB_SPLIT_ROW )), - aKeepCB (this, SW_RES(CB_KEEP )), + aKeepCB (this, SW_RES(CB_KEEP )), aHeadLineCB (this, SW_RES(CB_HEADLINE )), aRepeatHeaderFT (this, SW_RES(FT_REPEAT_HEADER )), aRepeatHeaderBeforeFT (this), @@ -1560,9 +1560,9 @@ BOOL SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) } BOOL bIsChecked = aPgBrkCB.IsChecked(); if ( !bPageItemPut && - ( bState != aPageCollCB.GetSavedValue() || - bIsChecked != aPgBrkCB.GetSavedValue() || - aPgBrkBeforeRB.IsChecked() != aPgBrkBeforeRB.GetSavedValue() || + ( bState != aPageCollCB.GetSavedValue() || + bIsChecked != aPgBrkCB.GetSavedValue() || + aPgBrkBeforeRB.IsChecked() != aPgBrkBeforeRB.GetSavedValue() || aPgBrkRB.IsChecked() != aPgBrkRB.GetSavedValue() )) { SvxFmtBreakItem aBreak( @@ -1762,7 +1762,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) aColBrkRB.Enable(FALSE); aPgBrkBeforeRB.Enable(FALSE); aPgBrkAfterRB.Enable(FALSE); - aKeepCB .Enable(FALSE); + aKeepCB .Enable(FALSE); aSplitCB.Enable(FALSE); aPgBrkCB.Enable(FALSE); aPageCollCB.Enable(FALSE); @@ -1830,10 +1830,10 @@ IMPL_LINK( SwTextFlowPage, PageBreakHdl_Impl, CheckBox*, EMPTYARG ) { if( aPgBrkCB.IsChecked() ) { - aPgBrkRB. Enable(); - aColBrkRB. Enable(); - aPgBrkBeforeRB. Enable(); - aPgBrkAfterRB. Enable(); + aPgBrkRB. Enable(); + aColBrkRB. Enable(); + aPgBrkBeforeRB. Enable(); + aPgBrkAfterRB. Enable(); if ( aPgBrkRB.IsChecked() && aPgBrkBeforeRB.IsChecked() ) { @@ -1856,10 +1856,10 @@ IMPL_LINK( SwTextFlowPage, PageBreakHdl_Impl, CheckBox*, EMPTYARG ) aPageCollLB.Enable(FALSE); aPageNoFT.Enable(FALSE); aPageNoNF.Enable(FALSE); - aPgBrkRB. Enable(FALSE); - aColBrkRB. Enable(FALSE); - aPgBrkBeforeRB. Enable(FALSE); - aPgBrkAfterRB. Enable(FALSE); + aPgBrkRB. Enable(FALSE); + aColBrkRB. Enable(FALSE); + aPgBrkBeforeRB. Enable(FALSE); + aPgBrkAfterRB. Enable(FALSE); } return 0; } @@ -1910,11 +1910,11 @@ IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, RadioButton*, pBtn ) } else if ( pBtn == &aPgBrkAfterRB ) { - aPageCollCB .Check( FALSE ); - aPageCollCB .Enable(FALSE); - aPageCollLB .Enable(FALSE); - aPageNoFT .Enable(FALSE); - aPageNoNF .Enable(FALSE); + aPageCollCB .Check( FALSE ); + aPageCollCB .Enable(FALSE); + aPageCollLB .Enable(FALSE); + aPageNoFT .Enable(FALSE); + aPageNoNF .Enable(FALSE); } } return 0; @@ -1926,11 +1926,11 @@ IMPL_LINK( SwTextFlowPage, PageBreakTypeHdl_Impl, RadioButton*, pBtn ) { if ( pBtn == &aColBrkRB || aPgBrkAfterRB.IsChecked() ) { - aPageCollCB .Check(FALSE); - aPageCollCB .Enable(FALSE); - aPageCollLB .Enable(FALSE); - aPageNoFT .Enable(FALSE); - aPageNoNF .Enable(FALSE); + aPageCollCB .Check(FALSE); + aPageCollCB .Enable(FALSE); + aPageCollLB .Enable(FALSE); + aPageNoFT .Enable(FALSE); + aPageNoNF .Enable(FALSE); } else if ( aPgBrkBeforeRB.IsChecked() ) PageBreakPosHdl_Impl( &aPgBrkBeforeRB ); diff --git a/sw/source/ui/table/tabledlg.hrc b/sw/source/ui/table/tabledlg.hrc index 843bec591d9e..1640c623d957 100644 --- a/sw/source/ui/table/tabledlg.hrc +++ b/sw/source/ui/table/tabledlg.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 @@ -26,85 +26,85 @@ ************************************************************************/ #include "globals.hrc" -#define ED_WIDTH 1 +#define ED_WIDTH 1 #define FL_WIDTH 3 -#define CB_REL_WIDTH 4 -#define RB_LEFT 10 -#define RB_RIGHT 11 -#define RB_CENTER 12 -#define RB_FREE 13 -#define RB_FULL 14 +#define CB_REL_WIDTH 4 +#define RB_LEFT 10 +#define RB_RIGHT 11 +#define RB_CENTER 12 +#define RB_FREE 13 +#define RB_FULL 14 #define FL_POS 15 -#define ED_LEFT_DIST 51 -#define ED_RIGHT_DIST 52 -#define FT_RIGHT_DIST 53 -#define FT_LEFT_DIST 54 -#define FT_TOP_DIST 20 -#define ED_TOP_DIST 21 -#define FT_BOTTOM_DIST 22 -#define ED_BOTTOM_DIST 23 +#define ED_LEFT_DIST 51 +#define ED_RIGHT_DIST 52 +#define FT_RIGHT_DIST 53 +#define FT_LEFT_DIST 54 +#define FT_TOP_DIST 20 +#define ED_TOP_DIST 21 +#define FT_BOTTOM_DIST 22 +#define ED_BOTTOM_DIST 23 #define FL_DIST 24 -#define FT_WIDTH 25 -#define FT_SCOL 30 -#define DLB_SCOL 31 -#define FT_POS 32 -#define DLB_SPOS 33 -#define FT_SSZ 34 -#define ED_SSZ 36 +#define FT_WIDTH 25 +#define FT_SCOL 30 +#define DLB_SCOL 31 +#define FT_POS 32 +#define DLB_SPOS 33 +#define FT_SSZ 34 +#define ED_SSZ 36 #define FL_SHADE 37 -#define CB_HEADLINE 40 -#define FT_REPEAT_HEADER 40 -#define NF_REPEAT_HEADER 40 -#define WIN_REPEAT_HEADER 40 +#define CB_HEADLINE 40 +#define FT_REPEAT_HEADER 40 +#define NF_REPEAT_HEADER 40 +#define WIN_REPEAT_HEADER 40 #define FL_HEADLINE 41 #define FL_PROPERTIES 42 #define FT_TEXTDIRECTION 43 #define LB_TEXTDIRECTION 44 -#define BT_OK 100 -#define BT_CANCEL 101 -#define BT_MORE 102 -#define ED_NAME 103 -#define FT_NAME 104 +#define BT_OK 100 +#define BT_CANCEL 101 +#define BT_MORE 102 +#define ED_NAME 103 +#define FT_NAME 104 #define FL_OPTIONS 105 #define FL_NAME 106 -#define COL_FT_1 107 -#define COL_MF_1 108 -#define COL_FT_2 109 -#define COL_MF_2 110 -#define COL_FT_3 111 -#define COL_MF_3 112 -#define COL_FT_4 113 -#define COL_MF_4 114 -#define COL_FT_5 115 -#define COL_MF_5 116 -#define COL_FT_6 117 -#define COL_MF_6 118 +#define COL_FT_1 107 +#define COL_MF_1 108 +#define COL_FT_2 109 +#define COL_MF_2 110 +#define COL_FT_3 111 +#define COL_MF_3 112 +#define COL_FT_4 113 +#define COL_MF_4 114 +#define COL_FT_5 115 +#define COL_MF_5 116 +#define COL_FT_6 117 +#define COL_MF_6 118 #define COL_FL_LAYOUT 119 -#define COL_BTN_UP 120 -#define COL_BTN_DOWN 121 -#define CB_MOD_TBL 122 -#define CB_PROP 123 +#define COL_BTN_UP 120 +#define COL_BTN_DOWN 121 +#define CB_MOD_TBL 122 +#define CB_PROP 123 -#define FT_SPACE 125 -#define ED_SPACE 126 +#define FT_SPACE 125 +#define ED_SPACE 126 #define FL_FLOW 130 -#define CB_PAGEBREAK 131 -#define RB_BREAKPAGE 132 -#define RB_BREAKCOLUMN 133 -#define RB_PAGEBREAKBEFORE 134 -#define RB_PAGEBREAKAFTER 135 -#define CB_PAGECOLL 136 -#define LB_PAGECOLL 137 -#define FT_PAGENUM 138 -#define NF_PAGENUM 139 -#define CB_KEEP 144 -#define CB_SPLIT 145 +#define CB_PAGEBREAK 131 +#define RB_BREAKPAGE 132 +#define RB_BREAKCOLUMN 133 +#define RB_PAGEBREAKBEFORE 134 +#define RB_PAGEBREAKAFTER 135 +#define CB_PAGECOLL 136 +#define LB_PAGECOLL 137 +#define FT_PAGENUM 138 +#define NF_PAGENUM 139 +#define CB_KEEP 144 +#define CB_SPLIT 145 #define CB_SPLIT_ROW 146 #define FL_VERT_ORIENT 140 -#define RB_FROM_LEFT 144 +#define RB_FROM_LEFT 144 #define FT_VERTORIENT 150 #define LB_VERTORIENT 151 diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src index 4243ba1b6c68..0dd3607c2d0b 100644 --- a/sw/source/ui/table/tabledlg.src +++ b/sw/source/ui/table/tabledlg.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 @@ -551,7 +551,7 @@ TabPage TP_TABLE_COLUMN }; /**************************************************************************/ /* */ -/* Textfluss */ +/* Textfluss */ /* */ /**************************************************************************/ TabPage TP_TABLE_TEXTFLOW @@ -568,7 +568,7 @@ TabPage TP_TABLE_TEXTFLOW }; CheckBox CB_PAGEBREAK { - // Disable = TRUE; + // Disable = TRUE; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 90 , 8 ) ; Text [ en-US ] = "~Break" ; @@ -585,7 +585,7 @@ TabPage TP_TABLE_TEXTFLOW }; RadioButton RB_BREAKCOLUMN { - // Disable = TRUE; + // Disable = TRUE; Pos = MAP_APPFONT ( 178 , 14 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; // ### ACHTUNG: Neuer Text in Resource? S~palte : ~Spalte @@ -593,7 +593,7 @@ TabPage TP_TABLE_TEXTFLOW }; RadioButton RB_PAGEBREAKBEFORE { - // Disable = TRUE; + // Disable = TRUE; Pos = MAP_APPFONT ( 105 , 28 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "Be~fore" ; @@ -602,14 +602,14 @@ TabPage TP_TABLE_TEXTFLOW }; RadioButton RB_PAGEBREAKAFTER { - // Disable = TRUE; + // Disable = TRUE; Pos = MAP_APPFONT ( 178 , 28 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "~After" ; }; CheckBox CB_PAGECOLL { - // Disable = TRUE; + // Disable = TRUE; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "With Page St~yle" ; diff --git a/sw/source/ui/table/tablemgr.cxx b/sw/source/ui/table/tablemgr.cxx index c0f325862d82..16958e3fc1ca 100644 --- a/sw/source/ui/table/tablemgr.cxx +++ b/sw/source/ui/table/tablemgr.cxx @@ -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 @@ -58,7 +58,7 @@ using namespace ::com::sun::star; /*------------------------------------------------------------------------ - Beschreibung: Zeilenhoehe einstellen (Dialog) + Beschreibung: Zeilenhoehe einstellen (Dialog) ------------------------------------------------------------------------*/ @@ -119,7 +119,7 @@ SwTwips SwTableFUNC::GetMaxColWidth( USHORT nNum ) const { // Die max. Breite ergibt sich aus der eigenen Breite und // der Breite der Nachbarzellen um je MINLAY verringert - SwTwips nMax = nNum == 0 ? + SwTwips nMax = nNum == 0 ? GetColWidth(1) - MINLAY : nNum == GetColCount() ? GetColWidth( nNum-1 ) - MINLAY : @@ -214,7 +214,7 @@ void SwTableFUNC::UpdateChart() } } -uno::Reference< frame::XModel > SwTableFUNC::InsertChart( +uno::Reference< frame::XModel > SwTableFUNC::InsertChart( uno::Reference< chart2::data::XDataProvider > &rxDataProvider, sal_Bool bFillWithData, const rtl::OUString &rCellRange, @@ -248,7 +248,7 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart( ::svt::EmbeddedObjectRef aEmbObjRef( xObj, ::com::sun::star::embed::Aspects::MSOLE_CONTENT ); if ( xObj.is() ) { - + SwFlyFrmFmt* pTmp = 0; pSh->InsertOleObject( aEmbObjRef, &pTmp ); if (ppFlyFrmFmt) @@ -258,7 +258,7 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart( if( xCompSupp.is()) { xChartModel.set( xCompSupp->getComponent(), uno::UNO_QUERY ); - if( xChartModel.is() ) + if( xChartModel.is() ) xChartModel->lockControllers(); //#i79578# don't request a new replacement image for charts to often - block change notifications } @@ -308,7 +308,7 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart( bHasCategories = false; if (nRowLen == 1 && nColLen == 1) - bFirstCellAsLabel = false; + bFirstCellAsLabel = false; else if (nRowLen > 1) eDataRowSource = chart::ChartDataRowSource_ROWS; else if (nColLen > 1) @@ -336,12 +336,12 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart( pSh->EndUndo( UNDO_UI_INSERT_CHART ); - if( xChartModel.is() ) + if( xChartModel.is() ) xChartModel->unlockControllers(); //#i79578# don't request a new replacement image for charts to often return xChartModel; } -USHORT SwTableFUNC::GetCurColNum() const +USHORT SwTableFUNC::GetCurColNum() const { USHORT nPos = pSh->GetCurTabColNum(); USHORT nCount = 0; @@ -354,7 +354,7 @@ USHORT SwTableFUNC::GetCurColNum() const -USHORT SwTableFUNC::GetColCount() const +USHORT SwTableFUNC::GetColCount() const { USHORT nCount = 0; for(USHORT i = 0; i < aCols.Count(); i++ ) diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx index 51e39a65dce9..f4b00f50620a 100644 --- a/sw/source/ui/table/tablepg.hxx +++ b/sw/source/ui/table/tablepg.hxx @@ -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 @@ -47,50 +47,50 @@ class SwTableRep; struct TColumn { SwTwips nWidth; - BOOL bVisible; + BOOL bVisible; }; class SwFormatTablePage : public SfxTabPage { FixedLine aOptionsFL; - FixedText aNameFT; - TableNameEdit aNameED; - FixedText aWidthFT; - PercentField aWidthMF; - CheckBox aRelWidthCB; + FixedText aNameFT; + TableNameEdit aNameED; + FixedText aWidthFT; + PercentField aWidthMF; + CheckBox aRelWidthCB; FixedLine aPosFL; - RadioButton aFullBtn; - RadioButton aLeftBtn; - RadioButton aFromLeftBtn; - RadioButton aRightBtn; - RadioButton aCenterBtn; - RadioButton aFreeBtn; + RadioButton aFullBtn; + RadioButton aLeftBtn; + RadioButton aFromLeftBtn; + RadioButton aRightBtn; + RadioButton aCenterBtn; + RadioButton aFreeBtn; FixedLine aDistFL; - FixedText aLeftFT; - PercentField aLeftMF; - FixedText aRightFT; - PercentField aRightMF; - FixedText aTopFT; - MetricField aTopMF; - FixedText aBottomFT; - MetricField aBottomMF; + FixedText aLeftFT; + PercentField aLeftMF; + FixedText aRightFT; + PercentField aRightMF; + FixedText aTopFT; + MetricField aTopMF; + FixedText aBottomFT; + MetricField aBottomMF; FixedLine aPropertiesFL; FixedText aTextDirectionFT; ListBox aTextDirectionLB; SwTableRep* pTblData; - SwTwips nSaveWidth; - SwTwips nMinTableWidth; - USHORT nOldAlign; - BOOL bModified; - BOOL bFull:1; + SwTwips nSaveWidth; + SwTwips nMinTableWidth; + USHORT nOldAlign; + BOOL bModified; + BOOL bFull:1; BOOL bHtmlMode : 1; - void Init(); - void ModifyHdl( Edit* pEdit ); + void Init(); + void ModifyHdl( Edit* pEdit ); DECL_LINK( AutoClickHdl, CheckBox * ); DECL_LINK( RelWidthClickHdl, CheckBox * ); @@ -103,11 +103,11 @@ class SwFormatTablePage : public SfxTabPage public: SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& rSet ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); }; /*------------------------------------------------------- @@ -117,51 +117,51 @@ public: class SwTableColumnPage : public SfxTabPage { - CheckBox aModifyTableCB; - CheckBox aProportionalCB; - FixedText aSpaceFT; - MetricField aSpaceED; - - ImageButton aUpBtn; - FixedText aFT1; - PercentField aMF1; - FixedText aFT2; - PercentField aMF2; - FixedText aFT3; - PercentField aMF3; - FixedText aFT4; - PercentField aMF4; - FixedText aFT5; - PercentField aMF5; - FixedText aFT6; - PercentField aMF6; - ImageButton aDownBtn; + CheckBox aModifyTableCB; + CheckBox aProportionalCB; + FixedText aSpaceFT; + MetricField aSpaceED; + + ImageButton aUpBtn; + FixedText aFT1; + PercentField aMF1; + FixedText aFT2; + PercentField aMF2; + FixedText aFT3; + PercentField aMF3; + FixedText aFT4; + PercentField aMF4; + FixedText aFT5; + PercentField aMF5; + FixedText aFT6; + PercentField aMF6; + ImageButton aDownBtn; FixedLine aColFL; - SwTableRep* pTblData; - PercentField* pFieldArr[MET_FIELDS]; - FixedText* pTextArr[MET_FIELDS]; - SwTwips nTableWidth; - SwTwips nMinWidth; - USHORT nNoOfCols; - USHORT nNoOfVisibleCols; + SwTableRep* pTblData; + PercentField* pFieldArr[MET_FIELDS]; + FixedText* pTextArr[MET_FIELDS]; + SwTwips nTableWidth; + SwTwips nMinWidth; + USHORT nNoOfCols; + USHORT nNoOfVisibleCols; //Breite merken, wenn auf autom. Ausrichtung gestellt wird - USHORT aValueTbl[MET_FIELDS];//primaere Zuordnung der MetricFields - BOOL bModified:1; - BOOL bModifyTbl:1; - BOOL bPercentMode:1; + USHORT aValueTbl[MET_FIELDS];//primaere Zuordnung der MetricFields + BOOL bModified:1; + BOOL bModifyTbl:1; + BOOL bPercentMode:1; - void Init(BOOL bWeb); + void Init(BOOL bWeb); DECL_LINK( AutoClickHdl, CheckBox * ); - void ModifyHdl( PercentField* pEdit ); + void ModifyHdl( PercentField* pEdit ); DECL_LINK( UpHdl, PercentField * ); DECL_LINK( DownHdl, PercentField * ); DECL_LINK( LoseFocusHdl, PercentField * ); DECL_LINK( ModeHdl, CheckBox * ); - void UpdateCols( USHORT nAktPos ); - SwTwips GetVisibleWidth(USHORT nPos); - void SetVisibleWidth(USHORT nPos, SwTwips nNewWidth); - + void UpdateCols( USHORT nAktPos ); + SwTwips GetVisibleWidth(USHORT nPos); + void SetVisibleWidth(USHORT nPos, SwTwips nNewWidth); + using TabPage::ActivatePage; using TabPage::DeactivatePage; @@ -169,11 +169,11 @@ public: SwTableColumnPage( Window* pParent, const SfxItemSet& rSet ); ~SwTableColumnPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& rSet ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); }; @@ -183,24 +183,24 @@ public: class SwTextFlowPage : public SfxTabPage { FixedLine aFlowFL; - CheckBox aPgBrkCB; - RadioButton aPgBrkRB; - RadioButton aColBrkRB; - RadioButton aPgBrkBeforeRB; - RadioButton aPgBrkAfterRB; - CheckBox aPageCollCB; - ListBox aPageCollLB; - FixedText aPageNoFT; - NumericField aPageNoNF; - CheckBox aSplitCB; + CheckBox aPgBrkCB; + RadioButton aPgBrkRB; + RadioButton aColBrkRB; + RadioButton aPgBrkBeforeRB; + RadioButton aPgBrkAfterRB; + CheckBox aPageCollCB; + ListBox aPageCollLB; + FixedText aPageNoFT; + NumericField aPageNoNF; + CheckBox aSplitCB; TriStateBox aSplitRowCB; - CheckBox aKeepCB; - CheckBox aHeadLineCB; - FixedText aRepeatHeaderFT; // "dummy" to build before and after FT - FixedText aRepeatHeaderBeforeFT; - NumericField aRepeatHeaderNF; - FixedText aRepeatHeaderAfterFT; - TextControlCombo aRepeatHeaderCombo; + CheckBox aKeepCB; + CheckBox aHeadLineCB; + FixedText aRepeatHeaderFT; // "dummy" to build before and after FT + FixedText aRepeatHeaderBeforeFT; + NumericField aRepeatHeaderNF; + FixedText aRepeatHeaderAfterFT; + TextControlCombo aRepeatHeaderCombo; FixedText aTextDirectionFT; ListBox aTextDirectionLB; @@ -208,10 +208,10 @@ class SwTextFlowPage : public SfxTabPage FixedText aVertOrientFT; ListBox aVertOrientLB; - SwWrtShell* pShell; + SwWrtShell* pShell; - BOOL bPageBreak; - BOOL bHtmlMode; + BOOL bPageBreak; + BOOL bHtmlMode; DECL_LINK( PageBreakHdl_Impl, CheckBox* ); @@ -227,13 +227,13 @@ class SwTextFlowPage : public SfxTabPage ~SwTextFlowPage(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void SetShell(SwWrtShell* pSh); + void SetShell(SwWrtShell* pSh); - void DisablePageBreak(); + void DisablePageBreak(); }; #endif diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index d097d5afeba5..a0a2f1c41e0e 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -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 @@ -106,11 +106,11 @@ private: uno::Reference< i18n::XBreakIterator > m_xBreak; //------------------------------------------- - void Init (); - void DoPaint ( const Rectangle& rRect ); - void CalcCellArray ( BOOL bFitWidth ); - void CalcLineMap (); - void PaintCells (); + void Init (); + void DoPaint ( const Rectangle& rRect ); + void CalcCellArray ( BOOL bFitWidth ); + void CalcLineMap (); + void PaintCells (); BYTE GetFormatIndex( size_t nCol, size_t nRow ) const; const SvxBoxItem& GetBoxItem( size_t nCol, size_t nRow ) const; @@ -120,7 +120,7 @@ private: void DrawBackground(); void MakeFonts ( BYTE nIndex, Font& rFont, Font& rCJKFont, Font& rCTLFont ); - String MakeNumberString( String cellString, BOOL bAddDec ); + String MakeNumberString( String cellString, BOOL bAddDec ); }; //======================================================================== @@ -128,7 +128,7 @@ private: class SwStringInputDlg : public ModalDialog { public: - SwStringInputDlg( Window* pParent, + SwStringInputDlg( Window* pParent, const String& rTitle, const String& rEditTitle, const String& rDefault ); @@ -137,22 +137,22 @@ public: void GetInputString( String& rString ) const; private: - Edit aEdInput; // Edit erhaelt so den Focus - FixedText aFtEditTitle; - OKButton aBtnOk; - CancelButton aBtnCancel; + Edit aEdInput; // Edit erhaelt so den Focus + FixedText aFtEditTitle; + OKButton aBtnOk; + CancelButton aBtnCancel; }; -SwStringInputDlg::SwStringInputDlg( Window* pParent, - const String& rTitle, - const String& rEditTitle, - const String& rDefault ) : - ModalDialog ( pParent, SW_RES( DLG_SWDLG_STRINPUT ) ), +SwStringInputDlg::SwStringInputDlg( Window* pParent, + const String& rTitle, + const String& rEditTitle, + const String& rDefault ) : + ModalDialog ( pParent, SW_RES( DLG_SWDLG_STRINPUT ) ), // - aEdInput ( this, SW_RES( ED_INPUT ) ), + aEdInput ( this, SW_RES( ED_INPUT ) ), aFtEditTitle ( this, SW_RES( FT_LABEL ) ), - aBtnOk ( this, SW_RES( BTN_OK ) ), + aBtnOk ( this, SW_RES( BTN_OK ) ), aBtnCancel ( this, SW_RES( BTN_CANCEL ) ) { SetText( rTitle ); @@ -183,33 +183,33 @@ SwAutoFormatDlg::SwAutoFormatDlg( Window* pParent, SwWrtShell* pWrtShell, : SfxModalDialog( pParent, SW_RES( DLG_AUTOFMT_TABLE ) ), // aFlFormat ( this, SW_RES( FL_FORMAT ) ), - aLbFormat ( this, SW_RES( LB_FORMAT ) ), + aLbFormat ( this, SW_RES( LB_FORMAT ) ), - aBtnNumFormat ( this, SW_RES( BTN_NUMFORMAT ) ), - aBtnBorder ( this, SW_RES( BTN_BORDER ) ), - aBtnFont ( this, SW_RES( BTN_FONT ) ), - aBtnPattern ( this, SW_RES( BTN_PATTERN ) ), - aBtnAlignment ( this, SW_RES( BTN_ALIGNMENT ) ), + aBtnNumFormat ( this, SW_RES( BTN_NUMFORMAT ) ), + aBtnBorder ( this, SW_RES( BTN_BORDER ) ), + aBtnFont ( this, SW_RES( BTN_FONT ) ), + aBtnPattern ( this, SW_RES( BTN_PATTERN ) ), + aBtnAlignment ( this, SW_RES( BTN_ALIGNMENT ) ), aFlFormats ( this, SW_RES( FL_FORMATS ) ), - aBtnOk ( this, SW_RES( BTN_OK ) ), - aBtnCancel ( this, SW_RES( BTN_CANCEL ) ), - aBtnHelp ( this, SW_RES( BTN_HELP ) ), - aBtnAdd ( this, SW_RES( BTN_ADD ) ), - aBtnRemove ( this, SW_RES( BTN_REMOVE ) ), + aBtnOk ( this, SW_RES( BTN_OK ) ), + aBtnCancel ( this, SW_RES( BTN_CANCEL ) ), + aBtnHelp ( this, SW_RES( BTN_HELP ) ), + aBtnAdd ( this, SW_RES( BTN_ADD ) ), + aBtnRemove ( this, SW_RES( BTN_REMOVE ) ), aBtnRename ( this, SW_RES( BTN_RENAME ) ), aBtnMore ( this, SW_RES( BTN_MORE ) ), - aStrTitle ( SW_RES( STR_ADD_TITLE ) ), - aStrLabel ( SW_RES( STR_ADD_LABEL ) ), - aStrClose ( SW_RES( STR_BTN_CLOSE ) ), - aStrDelTitle ( SW_RES( STR_DEL_TITLE ) ), - aStrDelMsg ( SW_RES( STR_DEL_MSG ) ), - aStrRenameTitle ( SW_RES( STR_RENAME_TITLE ) ), - aStrInvalidFmt ( SW_RES( STR_INVALID_AFNAME )), + aStrTitle ( SW_RES( STR_ADD_TITLE ) ), + aStrLabel ( SW_RES( STR_ADD_LABEL ) ), + aStrClose ( SW_RES( STR_BTN_CLOSE ) ), + aStrDelTitle ( SW_RES( STR_DEL_TITLE ) ), + aStrDelMsg ( SW_RES( STR_DEL_MSG ) ), + aStrRenameTitle ( SW_RES( STR_RENAME_TITLE ) ), + aStrInvalidFmt ( SW_RES( STR_INVALID_AFNAME )), pWndPreview ( new AutoFmtPreview( this, SW_RES( WND_PREVIEW ), pWrtShell )), // pShell ( pWrtShell ), - nIndex ( 0 ), - nDfltStylePos ( 0 ), + nIndex ( 0 ), + nDfltStylePos ( 0 ), bCoreDataChanged( FALSE ), bSetAutoFmt ( bSetAutoFormat ) { @@ -337,8 +337,8 @@ IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn ) pData->SetBackground( bCheck ); else if ( pBtn == &aBtnAlignment ) pData->SetJustify( bCheck ); -// else if ( pBtn == &aBtnAdjust ) -// pData->SetIncludeWidthHeight( bCheck ); +// else if ( pBtn == &aBtnAdjust ) +// pData->SetIncludeWidthHeight( bCheck ); else bDataChgd = FALSE; @@ -363,7 +363,7 @@ IMPL_LINK( SwAutoFormatDlg, AddHdl, void *, EMPTYARG ) BOOL bOk = FALSE, bFmtInserted = FALSE; while( !bOk ) { - SwStringInputDlg* pDlg = new SwStringInputDlg( this, + SwStringInputDlg* pDlg = new SwStringInputDlg( this, aStrTitle, aStrLabel, aEmptyStr ); @@ -427,7 +427,7 @@ IMPL_LINK( SwAutoFormatDlg, AddHdl, void *, EMPTYARG ) IMPL_LINK( SwAutoFormatDlg, RemoveHdl, void *, EMPTYARG ) { - String aMessage = aStrDelMsg ; + String aMessage = aStrDelMsg ; aMessage.AppendAscii("\n\n"); aMessage += aLbFormat.GetSelectEntry() ; aMessage += '\n'; @@ -582,7 +582,7 @@ IMPL_LINK_INLINE_END( SwAutoFormatDlg, OkHdl, Button *, EMPTYARG ) //------------------------------------------------------------------------ AutoFmtPreview::AutoFmtPreview( Window* pParent, const ResId& rRes, SwWrtShell* pWrtShell ) : - Window ( pParent, rRes ), + Window ( pParent, rRes ), aCurData ( aEmptyStr ), aVD ( *this ), @@ -595,19 +595,19 @@ AutoFmtPreview::AutoFmtPreview( Window* pParent, const ResId& rRes, SwWrtShell* nDataColWidth2 ( (aPrvSize.Width() - 4 - 2 * nLabelColWidth) / 4 ), nRowHeight ( (aPrvSize.Height() - 4) / 5 ), aStrJan ( SW_RES( STR_JAN ) ), - aStrFeb ( SW_RES( STR_FEB ) ), - aStrMar ( SW_RES( STR_MAR ) ), - aStrNorth ( SW_RES( STR_NORTH ) ), - aStrMid ( SW_RES( STR_MID ) ), - aStrSouth ( SW_RES( STR_SOUTH ) ), - aStrSum ( SW_RES( STR_SUM ) ), + aStrFeb ( SW_RES( STR_FEB ) ), + aStrMar ( SW_RES( STR_MAR ) ), + aStrNorth ( SW_RES( STR_NORTH ) ), + aStrMid ( SW_RES( STR_MID ) ), + aStrSouth ( SW_RES( STR_SOUTH ) ), + aStrSum ( SW_RES( STR_SUM ) ), m_xMSF ( comphelper::getProcessServiceFactory() ) { if (!pWrtShell->IsCrsrInTbl()) // We haven't created the table yet mbRTL = Application::GetSettings().GetLayoutRTL(); else mbRTL = pWrtShell->IsTableRightToLeft(); - + DBG_ASSERT( m_xMSF.is(), "AutoFmtPreview: no MultiServiceFactory"); if ( m_xMSF.is() ) { @@ -616,7 +616,7 @@ AutoFmtPreview::AutoFmtPreview( Window* pParent, const ResId& rRes, SwWrtShell* rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ), uno::UNO_QUERY); } - pNumFmt = new SvNumberFormatter( m_xMSF, LANGUAGE_SYSTEM ); + pNumFmt = new SvNumberFormatter( m_xMSF, LANGUAGE_SYSTEM ); Init(); } @@ -705,14 +705,14 @@ void AutoFmtPreview::DrawString( size_t nCol, size_t nRow ) switch( nIndex ) { - case 1: cellString = aStrJan; break; - case 2: cellString = aStrFeb; break; - case 3: cellString = aStrMar; break; - case 5: cellString = aStrNorth; break; - case 10: cellString = aStrMid; break; - case 15: cellString = aStrSouth; break; + case 1: cellString = aStrJan; break; + case 2: cellString = aStrFeb; break; + case 3: cellString = aStrMar; break; + case 5: cellString = aStrNorth; break; + case 10: cellString = aStrMid; break; + case 15: cellString = aStrSouth; break; case 4: - case 20: cellString = aStrSum; break; + case 20: cellString = aStrSum; break; case 6: case 8: @@ -721,22 +721,22 @@ void AutoFmtPreview::DrawString( size_t nCol, size_t nRow ) nNum = 5; goto MAKENUMSTR; case 17: - case 7: nVal = nIndex; + case 7: nVal = nIndex; nNum = 6; goto MAKENUMSTR; case 11: case 12: - case 13: nVal = nIndex; + case 13: nVal = nIndex; nNum = 12 == nIndex ? 10 : 9; goto MAKENUMSTR; - case 9: nVal = 21; nNum = 7; goto MAKENUMSTR; - case 14: nVal = 36; nNum = 11; goto MAKENUMSTR; - case 19: nVal = 51; nNum = 7; goto MAKENUMSTR; - case 21: nVal = 33; nNum = 13; goto MAKENUMSTR; - case 22: nVal = 36; nNum = 14; goto MAKENUMSTR; - case 23: nVal = 39; nNum = 13; goto MAKENUMSTR; - case 24: nVal = 108; nNum = 15; goto MAKENUMSTR; + case 9: nVal = 21; nNum = 7; goto MAKENUMSTR; + case 14: nVal = 36; nNum = 11; goto MAKENUMSTR; + case 19: nVal = 51; nNum = 7; goto MAKENUMSTR; + case 21: nVal = 33; nNum = 13; goto MAKENUMSTR; + case 22: nVal = 36; nNum = 14; goto MAKENUMSTR; + case 23: nVal = 39; nNum = 13; goto MAKENUMSTR; + case 24: nVal = 108; nNum = 15; goto MAKENUMSTR; MAKENUMSTR: if( aCurData.IsValueFormat() ) { @@ -759,14 +759,14 @@ MAKENUMSTR: if( cellString.Len() ) { - Size aStrSize; + Size aStrSize; BYTE nFmtIndex = GetFormatIndex( nCol, nRow ); Rectangle cellRect = maArray.GetCellRect( nCol, nRow ); Point aPos = cellRect.TopLeft(); - USHORT nRightX = 0; -// BOOL bJustify = aCurData.IsJustify(); -// ScHorJustifyAttr aHorJustifyItem; -// CellHorJustify eJustification; + USHORT nRightX = 0; +// BOOL bJustify = aCurData.IsJustify(); +// ScHorJustifyAttr aHorJustifyItem; +// CellHorJustify eJustification; Size theMaxStrSize( cellRect.GetWidth() - FRAME_OFFSET, cellRect.GetHeight() - FRAME_OFFSET ); @@ -795,9 +795,9 @@ MAKENUMSTR: while( theMaxStrSize.Width() <= aStrSize.Width() && cellString.Len() > 1 ) { -// if( eJustification == SVX_HOR_JUSTIFY_RIGHT ) -// cellString.Erase( 0, 1 ); -// else +// if( eJustification == SVX_HOR_JUSTIFY_RIGHT ) +// cellString.Erase( 0, 1 ); +// else cellString.Erase( cellString.Len() - 1 ); aScriptedText.SetText( cellString, m_xBreak ); aStrSize = aScriptedText.GetTextSize(); @@ -827,7 +827,7 @@ MAKENUMSTR: //----------- // horizontal //----------- -/* if ( eJustification != SC_HOR_JUSTIFY_STANDARD )*/ +/* if ( eJustification != SC_HOR_JUSTIFY_STANDARD )*/ if( mbRTL ) aPos.X() += nRightX; else if (aCurData.IsJustify()) @@ -1004,22 +1004,22 @@ void AutoFmtPreview::DoPaint( const Rectangle& /*rRect*/ ) SW_MOD()->GetAccessibilityOptions().GetIsForBorders() ) aVD.SetDrawMode( DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ); - Bitmap thePreview; - Point aCenterPos; - Size theWndSize = GetSizePixel(); - Size thePrevSize; - Color oldColor; - Font aFont; + Bitmap thePreview; + Point aCenterPos; + Size theWndSize = GetSizePixel(); + Size thePrevSize; + Color oldColor; + Font aFont; aFont = aVD.GetFont(); aFont.SetTransparent( TRUE ); - aVD.SetFont ( aFont ); + aVD.SetFont ( aFont ); aVD.SetLineColor (); const Color& rWinColor = GetSettings().GetStyleSettings().GetWindowColor(); aVD.SetBackground ( Wallpaper(rWinColor) ); aVD.SetFillColor ( rWinColor ); - aVD.SetOutputSizePixel ( aPrvSize ); + aVD.SetOutputSizePixel ( aPrvSize ); //-------------------------------- // Zellen auf virtual Device malen @@ -1037,7 +1037,7 @@ void AutoFmtPreview::DoPaint( const Rectangle& /*rRect*/ ) aVD.SetLineColor(); aVD.DrawRect( Rectangle( Point(0,0), theWndSize ) ); SetLineColor( oldColor ); - aCenterPos = Point( (theWndSize.Width() - aPrvSize.Width() ) / 2, + aCenterPos = Point( (theWndSize.Width() - aPrvSize.Width() ) / 2, (theWndSize.Height() - aPrvSize.Height()) / 2 ); aVD.DrawBitmap( aCenterPos, thePreview ); diff --git a/sw/source/ui/table/tautofmt.hrc b/sw/source/ui/table/tautofmt.hrc index 5ffd2d3eb8d3..5f107ebbc385 100644 --- a/sw/source/ui/table/tautofmt.hrc +++ b/sw/source/ui/table/tautofmt.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 @@ -30,47 +30,47 @@ #include "table.hrc" // allgemein #define BTN_OK 100 -#define BTN_CANCEL 102 +#define BTN_CANCEL 102 #define BTN_HELP 103 -#define BTN_MORE 104 -#define BTN_ADD 105 -#define BTN_REMOVE 106 -#define BTN_RENAME 107 -#define FT_LABEL 110 +#define BTN_MORE 104 +#define BTN_ADD 105 +#define BTN_REMOVE 106 +#define BTN_RENAME 107 +#define FT_LABEL 110 #define FL_FRAME 111 -#define STR_BTN_CLOSE 200 +#define STR_BTN_CLOSE 200 // Autoformat -#define LB_FORMAT 1 +#define LB_FORMAT 1 #define FL_FORMAT 9 #define FL_FORMATS 29 -#define WND_PREVIEW 19 -#define BTN_NUMFORMAT 20 -#define BTN_BORDER 21 -#define BTN_FONT 23 -#define BTN_PATTERN 24 -#define BTN_ALIGNMENT 25 -//#define BTN_ADJUST 26 -#define STR_ADD_TITLE 100 -#define STR_ADD_LABEL 101 -#define STR_DEL_TITLE 102 -#define STR_DEL_MSG 103 +#define WND_PREVIEW 19 +#define BTN_NUMFORMAT 20 +#define BTN_BORDER 21 +#define BTN_FONT 23 +#define BTN_PATTERN 24 +#define BTN_ALIGNMENT 25 +//#define BTN_ADJUST 26 +#define STR_ADD_TITLE 100 +#define STR_ADD_LABEL 101 +#define STR_DEL_TITLE 102 +#define STR_DEL_MSG 103 #define STR_INVALID_AFNAME 104 -#define STR_RENAME_TITLE 105 +#define STR_RENAME_TITLE 105 // Autoformat-Preview: -#define STR_JAN 121 -#define STR_FEB 122 -#define STR_MAR 123 -#define STR_NORTH 124 -#define STR_MID 125 -#define STR_SOUTH 126 -#define STR_SUM 127 +#define STR_JAN 121 +#define STR_FEB 122 +#define STR_MAR 123 +#define STR_NORTH 124 +#define STR_MID 125 +#define STR_SOUTH 126 +#define STR_SUM 127 // Gruppierung setzen/aufheben: -#define BTN_GROUP_COLS 1 -#define BTN_GROUP_ROWS 3 -#define STR_GROUP 1 -#define STR_UNGROUP 2 +#define BTN_GROUP_COLS 1 +#define BTN_GROUP_ROWS 3 +#define STR_GROUP 1 +#define STR_UNGROUP 2 #define ED_INPUT 1 diff --git a/sw/source/ui/table/tautofmt.src b/sw/source/ui/table/tautofmt.src index 4bc6a62bb591..ab314e0932a3 100644 --- a/sw/source/ui/table/tautofmt.src +++ b/sw/source/ui/table/tautofmt.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/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx index 3c77dc41d4d6..64ae4a42e4a4 100644 --- a/sw/source/ui/uiview/formatclipboard.cxx +++ b/sw/source/ui/uiview/formatclipboard.cxx @@ -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 @@ -64,7 +64,7 @@ #include <paratr.hxx> #include <fmtpdsc.hxx> #include <fmtrowsplt.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <boost/shared_ptr.hpp> //#define FORMAT_PAINTBRUSH_ALSO_COPY_NUMBERFORMAT_FOR_TABLES 1 @@ -117,9 +117,9 @@ SfxItemSet* lcl_CreateEmptyItemSet( int nSelectionType, SfxItemPool& rPool else if( nSelectionType == nsSelectionType::SEL_TBL ) { pItemSet = new SfxItemSet(rPool, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW, //SID_ATTR_BORDER_OUTER is inbetween + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW, //SID_ATTR_BORDER_OUTER is inbetween RES_BACKGROUND, RES_SHADOW, //RES_BOX is inbetween - SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE, + SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE, RES_BREAK, RES_BREAK, RES_PAGEDESC, RES_PAGEDESC, RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT, diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index d499add5ad53..6f10283478a4 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -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 @@ -176,16 +176,16 @@ void lcl_InvalidateZoomSlots(SfxBindings& rBindings) class SwPreViewZoomDlg : public SvxStandardDialog { - FixedText aRowLbl; - NumericField aRowEdit; - FixedText aColLbl; - NumericField aColEdit; + FixedText aRowLbl; + NumericField aRowEdit; + FixedText aColLbl; + NumericField aColEdit; - OKButton aOkBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOkBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; - virtual void Apply(); + virtual void Apply(); public: SwPreViewZoomDlg( SwPagePreViewWin& rParent ); @@ -235,11 +235,11 @@ void SwPreViewZoomDlg::Apply() struct PrintSettingsStruct; class PrtPrvWindow : public Window { - const PrintSettingsStruct& rSettings; + const PrintSettingsStruct& rSettings; - virtual void Paint(const Rectangle&); + virtual void Paint(const Rectangle&); public : - PrtPrvWindow(Window* pParent, const ResId& rResId, const PrintSettingsStruct& rSett) : + PrtPrvWindow(Window* pParent, const ResId& rResId, const PrintSettingsStruct& rSett) : Window(pParent, rResId), rSettings(rSett){} }; /*-------------------------------------------------------------------- @@ -247,109 +247,109 @@ public : --------------------------------------------------------------------*/ struct PrintSettingsStruct { - Size aPageMaxSize; // groesste Seite - Size aPrtSize; // Papiergroesse - Size aPrvPrtSize; // Groesse innerhalb der LRTB-Raender - Size aGridSize; // Groesse fuer jede Seite, enthaelt je + Size aPageMaxSize; // groesste Seite + Size aPrtSize; // Papiergroesse + Size aPrvPrtSize; // Groesse innerhalb der LRTB-Raender + Size aGridSize; // Groesse fuer jede Seite, enthaelt je // die Haelfte von H- und V-Distance - long nLeft; - long nRight; - long nTop; - long nBottom; - long nHori; - long nVert; + long nLeft; + long nRight; + long nTop; + long nBottom; + long nHori; + long nVert; - USHORT nRows; - USHORT nCols; + USHORT nRows; + USHORT nCols; - BOOL bPrinterLandscape; // Ausrichtung + BOOL bPrinterLandscape; // Ausrichtung }; class SwPreviewPrintOptionsDialog : public SvxStandardDialog { FixedLine aRowColFL; - FixedText aRowsFT; - NumericField aRowsNF; - FixedText aColsFT; - NumericField aColsNF; + FixedText aRowsFT; + NumericField aRowsNF; + FixedText aColsFT; + NumericField aColsNF; FixedLine aMarginFL; - FixedText aLSpaceFT; - MetricField aLSpaceMF; - FixedText aRSpaceFT; - MetricField aRSpaceMF; - FixedText aTSpaceFT; - MetricField aTSpaceMF; - FixedText aBSpaceFT; - MetricField aBSpaceMF; + FixedText aLSpaceFT; + MetricField aLSpaceMF; + FixedText aRSpaceFT; + MetricField aRSpaceMF; + FixedText aTSpaceFT; + MetricField aTSpaceMF; + FixedText aBSpaceFT; + MetricField aBSpaceMF; FixedLine aDistanceFL; - FixedText aHSpaceFT; - MetricField aHSpaceMF; - FixedText aVSpaceFT; - MetricField aVSpaceMF; + FixedText aHSpaceFT; + MetricField aHSpaceMF; + FixedText aVSpaceFT; + MetricField aVSpaceMF; - RadioButton aLandscapeRB; - RadioButton aPortraitRB; + RadioButton aLandscapeRB; + RadioButton aPortraitRB; FixedLine aOrientationFL; - PrtPrvWindow aPreviewWin; + PrtPrvWindow aPreviewWin; - OKButton aOkBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOkBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; - PushButton aStandardPB; + PushButton aStandardPB; - SwPagePreView& rPreView; + SwPagePreView& rPreView; SwPagePreViewWin& rParentWin; PrintSettingsStruct aSettings; -/* Size aPageMaxSize; - Size aPrtSize; +/* Size aPageMaxSize; + Size aPrtSize; - BOOL bOrientation; + BOOL bOrientation; */ - BOOL bStandard; + BOOL bStandard; - virtual void Apply(); - void FillControls(SwPagePreViewPrtData& rData); + virtual void Apply(); + void FillControls(SwPagePreViewPrtData& rData); DECL_LINK( ModifyHdl, Edit* ); DECL_LINK( StandardHdl, PushButton* ); public: - SwPreviewPrintOptionsDialog(SwPagePreViewWin& rParent, SwPagePreView& rView); + SwPreviewPrintOptionsDialog(SwPagePreViewWin& rParent, SwPagePreView& rView); ~SwPreviewPrintOptionsDialog(); }; /* -----------------19.08.98 13:35------------------- * * --------------------------------------------------*/ -SwPreviewPrintOptionsDialog::SwPreviewPrintOptionsDialog( SwPagePreViewWin& rParent, SwPagePreView& rView ) : +SwPreviewPrintOptionsDialog::SwPreviewPrintOptionsDialog( SwPagePreViewWin& rParent, SwPagePreView& rView ) : SvxStandardDialog( &rParent, SW_RES(DLG_PAGEPREVIEW_PRINTOPTIONS) ), aRowColFL(this,SW_RES( FL_ROWCOL)), - aRowsFT(this,SW_RES( FT_ROWS)), - aRowsNF(this,SW_RES( NF_ROWS)), - aColsFT(this,SW_RES( FT_COLS)), - aColsNF(this,SW_RES( NF_COLS)), + aRowsFT(this,SW_RES( FT_ROWS)), + aRowsNF(this,SW_RES( NF_ROWS)), + aColsFT(this,SW_RES( FT_COLS)), + aColsNF(this,SW_RES( NF_COLS)), aMarginFL(this,SW_RES( FL_MARGINS)), - aLSpaceFT(this,SW_RES( FT_LMARGIN)), - aLSpaceMF(this,SW_RES( MF_LMARGIN)), - aRSpaceFT(this,SW_RES( FT_RMARGIN)), - aRSpaceMF(this,SW_RES( MF_RMARGIN)), - aTSpaceFT(this,SW_RES( FT_TMARGIN)), - aTSpaceMF(this,SW_RES( MF_TMARGIN)), - aBSpaceFT(this,SW_RES( FT_BMARGIN)), - aBSpaceMF(this,SW_RES( MF_BMARGIN)), + aLSpaceFT(this,SW_RES( FT_LMARGIN)), + aLSpaceMF(this,SW_RES( MF_LMARGIN)), + aRSpaceFT(this,SW_RES( FT_RMARGIN)), + aRSpaceMF(this,SW_RES( MF_RMARGIN)), + aTSpaceFT(this,SW_RES( FT_TMARGIN)), + aTSpaceMF(this,SW_RES( MF_TMARGIN)), + aBSpaceFT(this,SW_RES( FT_BMARGIN)), + aBSpaceMF(this,SW_RES( MF_BMARGIN)), aDistanceFL(this,SW_RES(FL_DISTANCE)), - aHSpaceFT(this,SW_RES( FT_HMARGIN)), - aHSpaceMF(this,SW_RES( MF_HMARGIN)), - aVSpaceFT(this,SW_RES( FT_VMARGIN)), - aVSpaceMF(this,SW_RES( MF_VMARGIN)), - aLandscapeRB(this,SW_RES( RB_LANDSCAPE)), - aPortraitRB(this,SW_RES( RB_PORTRAIT)), + aHSpaceFT(this,SW_RES( FT_HMARGIN)), + aHSpaceMF(this,SW_RES( MF_HMARGIN)), + aVSpaceFT(this,SW_RES( FT_VMARGIN)), + aVSpaceMF(this,SW_RES( MF_VMARGIN)), + aLandscapeRB(this,SW_RES( RB_LANDSCAPE)), + aPortraitRB(this,SW_RES( RB_PORTRAIT)), aOrientationFL(this,SW_RES( FL_ORIENTATION)), - aPreviewWin(this,SW_RES( WIN_PREVIEW), aSettings), + aPreviewWin(this,SW_RES( WIN_PREVIEW), aSettings), aOkBtn(this,SW_RES(BT_OK)), aCancelBtn(this,SW_RES(BT_CANCEL)), aHelpBtn(this,SW_RES(BT_HELP)), @@ -451,7 +451,7 @@ SwPreviewPrintOptionsDialog::~SwPreviewPrintOptionsDialog() /* -----------------12.11.98 11:32------------------- * * --------------------------------------------------*/ -void SwPreviewPrintOptionsDialog::FillControls(SwPagePreViewPrtData& rData) +void SwPreviewPrintOptionsDialog::FillControls(SwPagePreViewPrtData& rData) { aLSpaceMF.SetValue(aLSpaceMF.Normalize(rData.GetLeftSpace() ), FUNIT_TWIP); aRSpaceMF.SetValue(aRSpaceMF.Normalize(rData.GetRightSpace() ), FUNIT_TWIP); @@ -475,15 +475,15 @@ void SwPreviewPrintOptionsDialog::FillControls(SwPagePreViewPrtData& rData) aLandscapeRB.SaveValue(); aPortraitRB.SaveValue(); - aSettings.nLeft = rData.GetLeftSpace() ; + aSettings.nLeft = rData.GetLeftSpace() ; aSettings.nRight = rData.GetRightSpace() ; aSettings.nTop = rData.GetTopSpace() ; aSettings.nBottom = rData.GetBottomSpace(); aSettings.nHori = rData.GetHorzSpace() ; aSettings.nVert = rData.GetVertSpace() ; - aSettings.nRows = rData.GetRow() ; + aSettings.nRows = rData.GetRow() ; aSettings.nCols = rData.GetCol() ; - aSettings.aPrvPrtSize = aSettings.aPrtSize ; + aSettings.aPrvPrtSize = aSettings.aPrtSize ; } /* -----------------19.08.98 14:31------------------- @@ -495,7 +495,7 @@ void SwPreviewPrintOptionsDialog::Apply() SwDoc* pDoc = rPreView.GetDocShell()->GetDoc(); if(bStandard) pDoc->SetPreViewPrtData(0); - else if( aLSpaceMF.GetSavedValue() != aLSpaceMF.GetText() || + else if( aLSpaceMF.GetSavedValue() != aLSpaceMF.GetText() || aRSpaceMF.GetSavedValue() != aRSpaceMF.GetText() || aTSpaceMF.GetSavedValue() != aTSpaceMF.GetText() || aBSpaceMF.GetSavedValue() != aBSpaceMF.GetText() || @@ -563,7 +563,7 @@ IMPL_LINK( SwPreviewPrintOptionsDialog, ModifyHdl, Edit*, pEdit ) else if(pEdit == &aVSpaceMF) aSettings.nVert = static_cast< long >(aVSpaceMF.Denormalize(aVSpaceMF.GetValue(FUNIT_TWIP))); else if(pEdit == &aRowsNF) - aSettings.nRows = (USHORT)aRowsNF.GetValue(); + aSettings.nRows = (USHORT)aRowsNF.GetValue(); else if(pEdit == &aColsNF) aSettings.nCols = (USHORT)aColsNF.GetValue(); else if(pEdit == (Edit*)&aLandscapeRB) @@ -581,7 +581,7 @@ IMPL_LINK( SwPreviewPrintOptionsDialog, ModifyHdl, Edit*, pEdit ) aSettings.aPrvPrtSize = Size(aSettings.aPrtSize.Width() - aSettings.nRight - aSettings.nLeft, aSettings.aPrtSize.Height() - aSettings.nTop - aSettings.nBottom); aSettings.aGridSize = Size(aSettings.aPrvPrtSize.Width() / aSettings.nCols, - aSettings.aPrvPrtSize.Height() / aSettings.nRows ); + aSettings.aPrvPrtSize.Height() / aSettings.nRows ); // was fehlt noch: Orientation auswerten, minimalrand ausrechnen, Beispiel fuettern @@ -630,7 +630,7 @@ IMPL_LINK( SwPreviewPrintOptionsDialog, StandardHdl, PushButton*, EMPTYARG ) /* -----------------20.08.98 15:28------------------- * Preview anzeigen * --------------------------------------------------*/ -void PrtPrvWindow::Paint(const Rectangle&) +void PrtPrvWindow::Paint(const Rectangle&) { Size aWinSize(GetOutputSizePixel()); long nWidth = rSettings.aPrtSize.Width(); @@ -1034,7 +1034,7 @@ void SwPagePreViewWin::KeyInput( const KeyEvent &rKEvt ) } /****************************************************************************** - * Beschreibung: + * Beschreibung: ******************************************************************************/ void SwPagePreViewWin::Command( const CommandEvent& rCEvt ) @@ -1121,7 +1121,7 @@ void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt ) } /****************************************************************************** - * Beschreibung: Userprefs bzw Viewoptions setzen + * Beschreibung: Userprefs bzw Viewoptions setzen ******************************************************************************/ @@ -1480,7 +1480,7 @@ void SwPagePreView::Execute( SfxRequest &rReq ) case FN_START_OF_LINE: case FN_START_OF_DOCUMENT: aViewWin.SetSelectedPage( 1 ); - eMvMode = SwPagePreViewWin::MV_DOC_STT; bRetVal = TRUE; goto MOVEPAGE; + eMvMode = SwPagePreViewWin::MV_DOC_STT; bRetVal = TRUE; goto MOVEPAGE; case FN_END_OF_LINE: case FN_END_OF_DOCUMENT: aViewWin.SetSelectedPage( mnPageCount ); @@ -1524,9 +1524,9 @@ MOVEPAGE: return; case FN_CLOSE_PAGEPREVIEW: case SID_PRINTPREVIEW: - // print preview is now always in the same frame as the tab view - // -> always switch this frame back to normal view - // (ScTabViewShell ctor reads stored view data) + // print preview is now always in the same frame as the tab view + // -> always switch this frame back to normal view + // (ScTabViewShell ctor reads stored view data) GetViewFrame()->GetDispatcher()->Execute( SID_VIEWSHELL0, 0, 0, SFX_CALLMODE_ASYNCHRON ); break; case FN_INSERT_BREAK: @@ -1564,7 +1564,7 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) ASSERT(nWhich, leeres Set); SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout(); //#106746# zoom has to be disabled if Accessibility support is switched on - // MT 2010/01, see #110498# + // MT 2010/01, see #110498# BOOL bZoomEnabled = TRUE; // !Application::GetSettings().GetMiscSettings().GetEnableATToolSupport(); while(nWhich) @@ -1703,7 +1703,7 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) case SID_PRINTDOC: case SID_PRINTDOCDIRECT: - GetSlotState( nWhich, SfxViewShell::GetInterface(), &rSet ); + GetSlotState( nWhich, SfxViewShell::GetInterface(), &rSet ); break; } nWhich = aIter.NextWhich(); @@ -1748,7 +1748,7 @@ void SwPagePreView::Init(const SwViewOption * pPrefs) // die Felder aktualisieren // ACHTUNG: hochcasten auf die EditShell, um die SS zu nutzen. - // In den Methoden wird auf die akt. Shell abgefragt! + // In den Methoden wird auf die akt. Shell abgefragt! SwEditShell* pESh = (SwEditShell*)GetViewShell(); BOOL bIsModified = pESh->IsModified(); @@ -1936,9 +1936,9 @@ int SwPagePreView::_CreateScrollbar( BOOL bHori ) if( !bHori ) { - pPageUpBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEUP ) ); + pPageUpBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEUP ) ); pPageUpBtn->SetHelpId(FN_PAGEUP); - pPageDownBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEDOWN ) ); + pPageDownBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEDOWN ) ); pPageDownBtn->SetHelpId(FN_PAGEDOWN); Link aLk( LINK( this, SwPagePreView, BtnPage ) ); pPageUpBtn->SetClickHdl( aLk ); @@ -2031,7 +2031,7 @@ int SwPagePreView::ChgPage( int eMvMode, int bUpdateScrollbar ) void SwPagePreView::CalcAndSetBorderPixel( SvBorder &rToFill, BOOL /*bInner*/ ) { -// const long nAdd = bInner ? 0 : ScrollBar::GetWindowOverlapPixel(); +// const long nAdd = bInner ? 0 : ScrollBar::GetWindowOverlapPixel(); const StyleSettings &rSet = aViewWin.GetSettings().GetStyleSettings(); const long nTmp = rSet.GetScrollBarSize();// - nAdd; if ( pVScrollbar->IsVisible( FALSE )) @@ -2084,7 +2084,7 @@ void SwPagePreView::OuterResizePixel( const Point &rOfst, const Size &rSize ) //Aufruf der DocSzChgd-Methode der Scrollbars ist noetig, da vom maximalen //Scrollrange immer die halbe Hoehe der VisArea abgezogen wird. if ( pVScrollbar && - aTmpSize.Width() > 0 && aTmpSize.Height() > 0 ) + aTmpSize.Width() > 0 && aTmpSize.Height() > 0 ) { ScrollDocSzChg(); } @@ -2169,10 +2169,10 @@ IMPL_LINK( SwPagePreView, ScrollHdl, SwScrollbar *, pScrollbar ) aPos.Y() = pScrollbar->OutputToScreenPixel(pScrollbar->GetPointerPosPixel()).Y(); Size aSize = pScrollbar->GetSizePixel(); Rectangle aRect; - aRect.Left() = aPos.X() -8; - aRect.Right() = aRect.Left(); - aRect.Top() = aPos.Y(); - aRect.Bottom() = aRect.Top(); + aRect.Left() = aPos.X() -8; + aRect.Right() = aRect.Left(); + aRect.Top() = aPos.Y(); + aRect.Bottom() = aRect.Top(); Help::ShowQuickHelp(pScrollbar, aRect, sStateStr, QUICKHELP_RIGHT|QUICKHELP_VCENTER); @@ -2425,7 +2425,7 @@ USHORT SwPagePreView::SetPrinter( SfxPrinter *pNew, USHORT nDiffFlags, bool ) if ( pOld && pOld->IsPrinting() ) return SFX_PRINTERROR_BUSY; - SwEditShell &rESh = (SwEditShell&)rSh; //Buh... + SwEditShell &rESh = (SwEditShell&)rSh; //Buh... if( ( SFX_PRINTER_PRINTER | SFX_PRINTER_JOBSETUP ) & nDiffFlags ) { rSh.getIDocumentDeviceAccess()->setPrinter( pNew, true, true ); @@ -2646,7 +2646,7 @@ BOOL SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt ) uno::Reference< ::com::sun::star::accessibility::XAccessible > SwPagePreViewWin::CreateAccessible() { - vos::OGuard aGuard(Application::GetSolarMutex()); // this should have + vos::OGuard aGuard(Application::GetSolarMutex()); // this should have // happend already!!! DBG_ASSERT( GetViewShell() != NULL, "We need a view shell" ); diff --git a/sw/source/ui/uiview/pview.hrc b/sw/source/ui/uiview/pview.hrc index 3724789431ed..d30f90e396f4 100644 --- a/sw/source/ui/uiview/pview.hrc +++ b/sw/source/ui/uiview/pview.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 @@ -26,24 +26,24 @@ ************************************************************************/ #include "view.hrc" -#define FT_COL 1 -#define FT_ROW 2 -#define ED_COL 4 -#define ED_ROW 5 +#define FT_COL 1 +#define FT_ROW 2 +#define ED_COL 4 +#define ED_ROW 5 -#define BT_OK 20 -#define BT_CANCEL 21 -#define BT_HELP 22 +#define BT_OK 20 +#define BT_CANCEL 21 +#define BT_HELP 22 // Grenzwerte fuers Zooming (werden auch im piew.cxx benutzt!) -#define PVIEW_MIN_ROW 1 -#define PVIEW_MAX_ROW 10 -#define PVIEW_MIN_COL 1 -#define PVIEW_MAX_COL 20 +#define PVIEW_MIN_ROW 1 +#define PVIEW_MAX_ROW 10 +#define PVIEW_MIN_COL 1 +#define PVIEW_MAX_COL 20 //Dialog Druckoptionen #define FL_ROWCOL 1 -#define FT_ROWS 2 +#define FT_ROWS 2 #define NF_ROWS 3 #define FT_COLS 4 #define NF_COLS 5 @@ -68,5 +68,5 @@ #define MF_VMARGIN 23 #define PB_STANDARD 24 -#define RB_LANDSCAPE 24 +#define RB_LANDSCAPE 24 #define RB_PORTRAIT 25 diff --git a/sw/source/ui/uiview/pview.src b/sw/source/ui/uiview/pview.src index 53f672dbdb60..57fb35d27a79 100644 --- a/sw/source/ui/uiview/pview.src +++ b/sw/source/ui/uiview/pview.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/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx index c8ecc2d92607..f063a6973216 100644 --- a/sw/source/ui/uiview/scroll.cxx +++ b/sw/source/ui/uiview/scroll.cxx @@ -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 @@ -55,7 +55,7 @@ SwScrollbar::SwScrollbar( Window *pWin, BOOL bHoriz ) : SwScrollbar::~SwScrollbar() {} /*------------------------------------------------------------------------ - Beschreibung: wird nach einer Aenderung der Dokumentgroesse gerufen, um den + Beschreibung: wird nach einer Aenderung der Dokumentgroesse gerufen, um den Range des Scrollbars neu einzustellen. ------------------------------------------------------------------------*/ @@ -70,7 +70,7 @@ void SwScrollbar::DocSzChgd( const Size &rSize ) } /*------------------------------------------------------------------------ - Beschreibung: wird nach einer Veraenderung des sichtbaren Ausschnittes + Beschreibung: wird nach einer Veraenderung des sichtbaren Ausschnittes gerufen. ------------------------------------------------------------------------*/ @@ -133,7 +133,7 @@ void SwScrollbar::SetAuto(BOOL bSet) if(!bAuto && bVisible && !ScrollBar::IsVisible()) ExtendedShow(TRUE); else if(bAuto) - AutoShow(); // oder automatisch verstecken + AutoShow(); // oder automatisch verstecken } } /*-----------------14.04.98 11:43------------------- @@ -150,7 +150,7 @@ void SwScrollbar::AutoShow() ScrollBar::Show(FALSE); } else if ( !ScrollBar::IsVisible() && - (!bHori || nVis) ) //Optimierung fuer Browser. + (!bHori || nVis) ) //Optimierung fuer Browser. //Horizontaler Scrollbar per //default aus. { diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 801ecba22c73..d418216a39fc 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -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 @@ -117,11 +117,11 @@ using ::com::sun::star::util::SearchOptions; #define SRC_SEARCHOPTIONS (0xFFFF & ~(SEARCH_OPTIONS_FORMAT|SEARCH_OPTIONS_FAMILIES|SEARCH_OPTIONS_SEARCH_ALL)) // Druckraender -> wie Basic - Ide -#define LMARGPRN 1700 -#define RMARGPRN 900 -#define TMARGPRN 2000 -#define BMARGPRN 1000 -#define BORDERPRN 300 +#define LMARGPRN 1700 +#define RMARGPRN 900 +#define TMARGPRN 2000 +#define BMARGPRN 1000 +#define BORDERPRN 300 @@ -134,7 +134,7 @@ SFX_IMPL_VIEWFACTORY(SwSrcView, SW_RES(STR_NONAME)) SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) ) { SFX_POPUPMENU_REGISTRATION(SW_RES(MN_SRCVIEW_POPUPMENU)); - SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS| + SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS| SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, SW_RES(RID_WEBTOOLS_TOOLBOX) ); SFX_CHILDWINDOW_REGISTRATION(SvxSearchDialogWrapper::GetChildWindowId()); @@ -149,7 +149,7 @@ TYPEINIT1(SwSrcView, SfxViewShell) void lcl_PrintHeader( OutputDevice &rOutDev, USHORT nPages, USHORT nCurPage, const String& rTitle ) { - short nLeftMargin = LMARGPRN; + short nLeftMargin = LMARGPRN; Size aSz = rOutDev.GetOutputSize(); short nBorder = BORDERPRN; @@ -236,7 +236,7 @@ void lcl_ConvertTabsToSpaces( String& rLine ) rLine.Insert( aBlanker, nPos ); nMax = rLine.Len(); } - nPos++; // Nicht optimal, falls Tab, aber auch nicht verkehrt... + nPos++; // Nicht optimal, falls Tab, aber auch nicht verkehrt... } } } @@ -276,7 +276,7 @@ SwSrcView::~SwSrcView() sal_Int32 delay = xDocProps->getAutoloadSecs(); pDocShell->SetAutoLoad(INetURLObject(url), delay, (delay != 0) || !url.equalsAscii("")); -// EndListening(*GetViewFrame()); +// EndListening(*GetViewFrame()); EndListening(*pDocShell); delete pSearchItem; } @@ -311,7 +311,7 @@ void SwSrcView::Init() aEditWin.SetReadonly(TRUE); } -// StartListening(*GetViewFrame()); +// StartListening(*GetViewFrame()); StartListening(*pDocShell,TRUE); } @@ -319,7 +319,7 @@ void SwSrcView::Init() Beschreibung: --------------------------------------------------------------------*/ -SwDocShell* SwSrcView::GetDocShell() +SwDocShell* SwSrcView::GetDocShell() { SfxObjectShell* pObjShell = GetViewFrame()->GetObjectShell(); return PTR_CAST(SwDocShell, pObjShell); @@ -332,7 +332,7 @@ SwDocShell* SwSrcView::GetDocShell() void SwSrcView::SaveContent(const String& rTmpFile) { - SfxMedium aMedium( rTmpFile, STREAM_WRITE, TRUE); + SfxMedium aMedium( rTmpFile, STREAM_WRITE, TRUE); SvStream* pOutStream = aMedium.GetOutStream(); pOutStream->SetStreamCharSet( lcl_GetStreamCharSet(eLoadEncoding) ); aEditWin.Write(*pOutStream);//, EE_FORMAT_TEXT); @@ -358,7 +358,7 @@ void SwSrcView::Execute(SfxRequest& rReq) TemplateDescription::FILESAVE_AUTOEXTENSION, TemplateDescription::FILESAVE_SIMPLE ); uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker(); -// pFileDlg->SetHelpId(HID_FILEDLG_SRCVIEW); +// pFileDlg->SetHelpId(HID_FILEDLG_SRCVIEW); uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY); // search for an html filter for export @@ -749,7 +749,7 @@ USHORT SwSrcView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags, bool ) } return 0; } - + /*-------------------------------------------------------------------- Beschreibung: --------------------------------------------------------------------*/ @@ -764,7 +764,7 @@ SfxPrinter* SwSrcView::GetPrinter( BOOL bCreate ) --------------------------------------------------------------------*/ sal_Int32 SwSrcView::PrintSource( OutputDevice *pOutDev, - sal_Int32 nPage, + sal_Int32 nPage, bool bCalcNumPagesOnly ) { if (!pOutDev || nPage <= 0) @@ -829,7 +829,7 @@ sal_Int32 SwSrcView::PrintSource( } aPos.Y() += nParaSpace; } - + pOutDev->Pop(); DBG_ASSERT( bCalcNumPagesOnly || nPage <= nCurPage, "page number out of range" ); diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/ui/uiview/swcli.cxx index 6da603c893b3..996ab9b23516 100644 --- a/sw/source/ui/uiview/swcli.cxx +++ b/sw/source/ui/uiview/swcli.cxx @@ -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 @@ -66,7 +66,7 @@ void SwOleClient::RequestNewObjectArea( Rectangle& aLogRect ) // the aLogRect will get the preliminary size now aLogRect.SetSize( rSh.RequestObjectResize( SwRect( aLogRect ), GetObject() ) ); - + // the EndAllAction() call will trigger CalcAndSetScale() call, // so the embedded object must get the correct size before if ( aLogRect.GetSize() != GetScaledObjArea().GetSize() ) @@ -138,11 +138,11 @@ void SwOleClient::ViewChanged() // this is an error OSL_ENSURE( sal_False, "Something goes wrong on requesting object size!\n" ); } - + Size aVisSize( aSz.Width, aSz.Height ); // Bug 24833: solange keine vernuenftige Size vom Object kommt, - // kann nichts skaliert werden + // kann nichts skaliert werden if( !aVisSize.Width() || !aVisSize.Height() ) return; @@ -157,7 +157,7 @@ void SwOleClient::ViewChanged() aVisSize.Height()= Fraction( aVisSize.Height() ) * GetScaleHeight(); SwRect aRect( Point( LONG_MIN, LONG_MIN ), aVisSize ); - rSh.LockView( TRUE ); //Scrollen im EndAction verhindern + rSh.LockView( TRUE ); //Scrollen im EndAction verhindern rSh.StartAllAction(); rSh.RequestObjectResize( aRect, GetObject() ); rSh.EndAllAction(); diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx index 20dc6035dc36..d58e80a542b9 100644 --- a/sw/source/ui/uiview/uivwimp.cxx +++ b/sw/source/ui/uiview/uivwimp.cxx @@ -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,14 +124,14 @@ void SwView_Impl::SetShellMode(ShellModes eSet) /*-----------------13.12.97 09:59------------------- --------------------------------------------------*/ -view::XSelectionSupplier* SwView_Impl::GetUNOObject() +view::XSelectionSupplier* SwView_Impl::GetUNOObject() { return pxXTextView->get(); } /* -----------------02.06.98 15:29------------------- * * --------------------------------------------------*/ -SwXTextView* SwView_Impl::GetUNOObject_Impl() +SwXTextView* SwView_Impl::GetUNOObject_Impl() { view::XSelectionSupplier* pTextView = pxXTextView->get(); return ((SwXTextView*)pTextView); diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 4396ff03807c..496e6837bec0 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -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 @@ -116,6 +116,8 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +#include <svl/cjkoptions.hxx> + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -125,31 +127,31 @@ using ::rtl::OUString; using ::rtl::OUStringBuffer; -extern sal_Bool bNoInterrupt; // in mainwn.cxx +extern sal_Bool bNoInterrupt; // in mainwn.cxx -#define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT| \ +#define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT| \ SFX_VIEW_HAS_PRINTOPTIONS) /*-------------------------------------------------------------------- - Beschreibung: Statics + Beschreibung: Statics --------------------------------------------------------------------*/ int bDocSzUpdated = 1; -SvxSearchItem* SwView::pSrchItem = 0; +SvxSearchItem* SwView::pSrchItem = 0; -sal_uInt16 SwView::nInsertCtrlState = FN_INSERT_TABLE; -sal_uInt16 SwView::nWebInsertCtrlState = FN_INSERT_TABLE; -sal_uInt16 SwView::nInsertObjectCtrlState = SID_INSERT_DIAGRAM; +sal_uInt16 SwView::nInsertCtrlState = FN_INSERT_TABLE; +sal_uInt16 SwView::nWebInsertCtrlState = FN_INSERT_TABLE; +sal_uInt16 SwView::nInsertObjectCtrlState = SID_INSERT_DIAGRAM; -sal_Bool SwView::bExtra = sal_False; -sal_Bool SwView::bFound = sal_False; -sal_Bool SwView::bJustOpened = sal_False; +sal_Bool SwView::bExtra = sal_False; +sal_Bool SwView::bFound = sal_False; +sal_Bool SwView::bJustOpened = sal_False; -SvxSearchDialog* SwView::pSrchDlg = 0; -SearchAttrItemList* SwView::pSrchList = 0; -SearchAttrItemList* SwView::pReplList = 0; +SvxSearchDialog* SwView::pSrchDlg = 0; +SearchAttrItemList* SwView::pSrchList = 0; +SearchAttrItemList* SwView::pReplList = 0; DBG_NAME(viewhdl) @@ -249,7 +251,7 @@ void SwView::SelectShell() { //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // -// Achtung: SelectShell fuer die WebView mitpflegen +// Achtung: SelectShell fuer die WebView mitpflegen // //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -285,10 +287,10 @@ void SwView::SelectShell() SfxDispatcher &rDispatcher = GetDispatcher(); SwToolbarConfigItem *pBarCfg = SW_MOD()->GetToolbarConfig(); - // DELETEZ(pxSelectionObj); //Selektionsobjekt loeschen + // DELETEZ(pxSelectionObj); //Selektionsobjekt loeschen if ( pShell ) { - rDispatcher.Flush(); // alle gecachten Shells wirklich loeschen + rDispatcher.Flush(); // alle gecachten Shells wirklich loeschen //Zur alten Selektion merken welche Toolbar sichtbar war USHORT nId = static_cast< USHORT >( rDispatcher.GetObjectBarId( SFX_OBJECTBAR_OBJECT )); @@ -515,7 +517,7 @@ IMPL_LINK( SwView, AttrChangedNotify, SwWrtShell *, EMPTYARG ) if( !bAttrChgNotified ) { if ( pWrtShell->BasicActionPend() || bNoInterrupt || - GetDispatcher().IsLocked() || //do not confuse the SFX + GetDispatcher().IsLocked() || //do not confuse the SFX GetViewFrame()->GetBindings().IsInUpdate() )//do not confuse the SFX { bAttrChgNotified = sal_True; @@ -602,7 +604,7 @@ void SwView::_CheckReadonlyState() SfxItemState eStateRO, eStateProtAll; const SfxPoolItem *pItem; // JP 29.04.97: von einem nur uns bekannten Slot den Status abfragen. - // Ansonsten kennen andere den Slot; wie z.B. die BasidIde + // Ansonsten kennen andere den Slot; wie z.B. die BasidIde eStateRO = rDis.QueryState( FN_INSERT_BOOKMARK, pItem ); eStateProtAll = rDis.QueryState( FN_EDIT_REGION, pItem ); sal_Bool bChgd = sal_False; @@ -611,37 +613,37 @@ void SwView::_CheckReadonlyState() { static sal_uInt16 aROIds[] = { - SID_DELETE, FN_BACKSPACE, FN_SHIFT_BACKSPACE, + SID_DELETE, FN_BACKSPACE, FN_SHIFT_BACKSPACE, SID_UNDO, - SID_REDO, SID_REPEAT, SID_PASTE, + SID_REDO, SID_REPEAT, SID_PASTE, SID_PASTE_UNFORMATTED, SID_PASTE_SPECIAL, SID_SBA_BRW_INSERT, SID_BACKGROUND_COLOR, FN_INSERT_BOOKMARK, - SID_CHARMAP, FN_INSERT_SOFT_HYPHEN, - FN_INSERT_HARDHYPHEN, FN_INSERT_HARD_SPACE, FN_INSERT_BREAK, - FN_INSERT_LINEBREAK, FN_INSERT_COLUMN_BREAK, FN_INSERT_BREAK_DLG, - FN_DELETE_SENT, FN_DELETE_BACK_SENT, FN_DELETE_WORD, - FN_DELETE_BACK_WORD, FN_DELETE_LINE, FN_DELETE_BACK_LINE, - FN_DELETE_PARA, FN_DELETE_BACK_PARA, FN_DELETE_WHOLE_LINE, - FN_CALCULATE, FN_FORMAT_RESET, - FN_POSTIT, FN_JAVAEDIT, SID_ATTR_PARA_ADJUST_LEFT, - SID_ATTR_PARA_ADJUST_RIGHT, SID_ATTR_PARA_ADJUST_CENTER,SID_ATTR_PARA_ADJUST_BLOCK, - SID_ATTR_PARA_LINESPACE_10, SID_ATTR_PARA_LINESPACE_15, SID_ATTR_PARA_LINESPACE_20, - SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONTHEIGHT, SID_ATTR_CHAR_COLOR_BACKGROUND, - SID_ATTR_CHAR_COLOR_BACKGROUND_EXT, SID_ATTR_CHAR_COLOR_EXT, - SID_ATTR_CHAR_COLOR, SID_ATTR_CHAR_WEIGHT, SID_ATTR_CHAR_POSTURE, + SID_CHARMAP, FN_INSERT_SOFT_HYPHEN, + FN_INSERT_HARDHYPHEN, FN_INSERT_HARD_SPACE, FN_INSERT_BREAK, + FN_INSERT_LINEBREAK, FN_INSERT_COLUMN_BREAK, FN_INSERT_BREAK_DLG, + FN_DELETE_SENT, FN_DELETE_BACK_SENT, FN_DELETE_WORD, + FN_DELETE_BACK_WORD, FN_DELETE_LINE, FN_DELETE_BACK_LINE, + FN_DELETE_PARA, FN_DELETE_BACK_PARA, FN_DELETE_WHOLE_LINE, + FN_CALCULATE, FN_FORMAT_RESET, + FN_POSTIT, FN_JAVAEDIT, SID_ATTR_PARA_ADJUST_LEFT, + SID_ATTR_PARA_ADJUST_RIGHT, SID_ATTR_PARA_ADJUST_CENTER,SID_ATTR_PARA_ADJUST_BLOCK, + SID_ATTR_PARA_LINESPACE_10, SID_ATTR_PARA_LINESPACE_15, SID_ATTR_PARA_LINESPACE_20, + SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONTHEIGHT, SID_ATTR_CHAR_COLOR_BACKGROUND, + SID_ATTR_CHAR_COLOR_BACKGROUND_EXT, SID_ATTR_CHAR_COLOR_EXT, + SID_ATTR_CHAR_COLOR, SID_ATTR_CHAR_WEIGHT, SID_ATTR_CHAR_POSTURE, SID_ATTR_CHAR_OVERLINE, - SID_ATTR_CHAR_UNDERLINE, SID_ATTR_FLASH, SID_ATTR_CHAR_STRIKEOUT, - FN_UNDERLINE_DOUBLE, SID_ATTR_CHAR_CONTOUR, SID_ATTR_CHAR_SHADOWED, - SID_ATTR_CHAR_AUTOKERN, SID_ATTR_CHAR_ESCAPEMENT, FN_SET_SUPER_SCRIPT, - FN_SET_SUB_SCRIPT, SID_ATTR_CHAR_CASEMAP, SID_ATTR_CHAR_LANGUAGE, - SID_ATTR_CHAR_KERNING, SID_CHAR_DLG, SID_ATTR_CHAR_WORDLINEMODE, - FN_GROW_FONT_SIZE, FN_SHRINK_FONT_SIZE, FN_TXTATR_INET, - FN_FORMAT_DROPCAPS, SID_ATTR_PARA_ADJUST, SID_ATTR_PARA_LINESPACE, - SID_ATTR_PARA_SPLIT, SID_ATTR_PARA_KEEP, SID_ATTR_PARA_WIDOWS, + SID_ATTR_CHAR_UNDERLINE, SID_ATTR_FLASH, SID_ATTR_CHAR_STRIKEOUT, + FN_UNDERLINE_DOUBLE, SID_ATTR_CHAR_CONTOUR, SID_ATTR_CHAR_SHADOWED, + SID_ATTR_CHAR_AUTOKERN, SID_ATTR_CHAR_ESCAPEMENT, FN_SET_SUPER_SCRIPT, + FN_SET_SUB_SCRIPT, SID_ATTR_CHAR_CASEMAP, SID_ATTR_CHAR_LANGUAGE, + SID_ATTR_CHAR_KERNING, SID_CHAR_DLG, SID_ATTR_CHAR_WORDLINEMODE, + FN_GROW_FONT_SIZE, FN_SHRINK_FONT_SIZE, FN_TXTATR_INET, + FN_FORMAT_DROPCAPS, SID_ATTR_PARA_ADJUST, SID_ATTR_PARA_LINESPACE, + SID_ATTR_PARA_SPLIT, SID_ATTR_PARA_KEEP, SID_ATTR_PARA_WIDOWS, SID_ATTR_PARA_ORPHANS, - SID_ATTR_PARA_MODEL, SID_PARA_DLG, - FN_SELECT_PARA, SID_DEC_INDENT, + SID_ATTR_PARA_MODEL, SID_PARA_DLG, + FN_SELECT_PARA, SID_DEC_INDENT, SID_INC_INDENT }; static sal_Bool bFirst = sal_True; @@ -708,11 +710,11 @@ void SwView::_CheckReadonlySelection() case SHELL_MODE_TABLE_LIST_TEXT: { //JP 22.01.99: temporaere Loesung!!! Sollte bei jeder Cursorbewegung -// den Font von der akt. Einfuegeposition setzen, also ausserhalb -// dieses if's. Aber TH wertet den Font zur Zeit nicht aus und -// das besorgen erscheint mir hier zu teuer zu sein. -// Ausserdem haben wir keinen Font, sondern nur Attribute aus denen -// die Textformatierung dann den richtigen Font zusammen baut. +// den Font von der akt. Einfuegeposition setzen, also ausserhalb +// dieses if's. Aber TH wertet den Font zur Zeit nicht aus und +// das besorgen erscheint mir hier zu teuer zu sein. +// Ausserdem haben wir keinen Font, sondern nur Attribute aus denen +// die Textformatierung dann den richtigen Font zusammen baut. InputContext aCntxt( GetEditWin().GetInputContext() ); aCntxt.SetOptions( SW_DISABLE_ON_PROTECTED_CURSOR & nDisableFlags @@ -862,7 +864,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) pWrtShell = new SwWrtShell( *((SwView*)pExistingSh)->pWrtShell, pEditWin, *this); //MA: Das kann doch nur zu einem GPF fuehren! -// nSelectionType = ((SwView*)pOldSh)->nSelectionType; +// nSelectionType = ((SwView*)pOldSh)->nSelectionType; } else { @@ -915,7 +917,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) // <-- // JP 05.02.99: Bug 61495 - damit unter anderem das HLineal im - // ReadonlyFall nicht angezeigt wird + // ReadonlyFall nicht angezeigt wird aUsrPref.SetReadonly( pWrtShell->GetViewOptions()->IsReadonly() ); //Kein Margin fuer OLE! @@ -950,10 +952,47 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) pVRuler->SetZoom( aZoomFract ); pHRuler->SetDoubleClickHdl(LINK( this, SwView, ExecRulerClick )); FieldUnit eMetric = pUsrPref->GetHScrollMetric(); + + BOOL bApplyCharUnit = pUsrPref->IsApplyCharUnit(); + SvtCJKOptions aCJKOptions; + if ( aCJKOptions.IsAsianTypographyEnabled() ) + { + if ( bApplyCharUnit ) + eMetric = FUNIT_CHAR; + else + { + if ( eMetric == FUNIT_CHAR ) + eMetric = FUNIT_CM; + } + } + else + { + if ( eMetric == FUNIT_CHAR ) + eMetric = FUNIT_INCH; + } pHRuler->SetUnit( eMetric ); + eMetric = pUsrPref->GetVScrollMetric(); + if ( aCJKOptions.IsAsianTypographyEnabled() ) + { + if ( bApplyCharUnit ) + eMetric = FUNIT_LINE; + else + { + if ( eMetric == FUNIT_LINE ) + eMetric = FUNIT_CM; + } + } + else + { + if ( eMetric == FUNIT_LINE ) + eMetric = FUNIT_INCH; + } pVRuler->SetUnit( eMetric ); + pHRuler->SetCharWidth( 371 ); // default character width + pVRuler->SetLineHeight( 551 ); // default line height + // DocShell setzen pDocSh->SetView( this ); SW_MOD()->SetView( this ); @@ -1009,7 +1048,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) { SfxRequest aSfxRequest( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() ); Execute( aSfxRequest ); - pWrtShell->GetDoc()->SetUpdateTOX( sal_False ); // wieder zurueck setzen + pWrtShell->GetDoc()->SetUpdateTOX( sal_False ); // wieder zurueck setzen pWrtShell->SttEndDoc(TRUE); } @@ -1019,7 +1058,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) // zur Zeit(360) wird die View erst nach dem Ctor eingetragen // der folgende Ausdruck funktioniert auch, wenn sich das aendert //JP 27.07.98: wenn per Undo nicht mehr die Modifizierung aufhebar ist, - // so setze das Modified NICHT zurueck. + // so setze das Modified NICHT zurueck. // --> OD 2005-02-11 #i38810# - no reset of modified state, if document // was already modified. if ( !pWrtShell->GetDoc()->IsUndoNoResetModified() && @@ -1107,7 +1146,7 @@ SwView::~SwView() EndListening(*GetDocShell()); delete pScrollFill; delete pWrtShell; - pWrtShell = 0; // Auf 0 setzen, damit folgende DToren nicht drauf zugreifen + pWrtShell = 0; // Auf 0 setzen, damit folgende DToren nicht drauf zugreifen pShell = 0; delete pHScrollbar; delete pVScrollbar; @@ -1124,7 +1163,7 @@ SwView::~SwView() } /*-------------------------------------------------------------------- - Beschreibung: DocShell rausgrabbeln ueber das FrameWindow + Beschreibung: DocShell rausgrabbeln ueber das FrameWindow --------------------------------------------------------------------*/ @@ -1135,7 +1174,7 @@ SwDocShell* SwView::GetDocShell() } /*-------------------------------------------------------------------- - Beschreibung: CursorPos merken + Beschreibung: CursorPos merken --------------------------------------------------------------------*/ @@ -1209,8 +1248,8 @@ void SwView::ReadUserData( const String &rUserData, sal_Bool bBrowse ) sal_uInt16 nZoomFactor = static_cast< sal_uInt16 >( rUserData.GetToken(0, ';', nPos ).ToInt32() ); - long nLeft = rUserData.GetToken(0, ';', nPos ).ToInt32(), - nTop = rUserData.GetToken(0, ';', nPos ).ToInt32(), + long nLeft = rUserData.GetToken(0, ';', nPos ).ToInt32(), + nTop = rUserData.GetToken(0, ';', nPos ).ToInt32(), nRight = rUserData.GetToken(0, ';', nPos ).ToInt32(), nBottom= rUserData.GetToken(0, ';', nPos ).ToInt32(); @@ -1587,7 +1626,7 @@ void SwView::ShowCursor( FASTBOOL bOn ) { //JP 10.10.2001: Bug 90461 - don't scroll the cursor into the visible area BOOL bUnlockView = !pWrtShell->IsViewLocked(); - pWrtShell->LockView( TRUE ); //lock visible section + pWrtShell->LockView( TRUE ); //lock visible section if( !bOn ) pWrtShell->HideCrsr(); @@ -1633,7 +1672,7 @@ String SwView::GetSelectionText( sal_Bool bCompleteWrds ) /*-----------------09/16/97 09:50am----------------- --------------------------------------------------*/ -String SwView::GetSelectionTextParam( sal_Bool bCompleteWrds, +String SwView::GetSelectionTextParam( sal_Bool bCompleteWrds, sal_Bool bEraseTrail ) { String sReturn; @@ -1766,8 +1805,8 @@ void SwView::ScannerEventHdl( const EventObject& /*rEventObject*/ ) uno::Reference< XScannerManager > xScanMgr = SW_MOD()->GetScannerManager(); if( xScanMgr.is() ) { - const ScannerContext aContext( xScanMgr->getAvailableScanners().getConstArray()[ 0 ] ); - const ScanError eError = xScanMgr->getError( aContext ); + const ScannerContext aContext( xScanMgr->getAvailableScanners().getConstArray()[ 0 ] ); + const ScanError eError = xScanMgr->getError( aContext ); if( ScanError_ScanErrorNone == eError ) { @@ -1796,7 +1835,7 @@ void SwView::ScannerEventHdl( const EventObject& /*rEventObject*/ ) --------------------------------------------------*/ -void SwView::StopShellTimer() +void SwView::StopShellTimer() { if(aTimer.IsActive()) { diff --git a/sw/source/ui/uiview/view.hrc b/sw/source/ui/uiview/view.hrc index 8697a7e4ed63..a2b828bb2c87 100644 --- a/sw/source/ui/uiview/view.hrc +++ b/sw/source/ui/uiview/view.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 @@ -36,14 +36,14 @@ // STR ------------------------------------------------------------------- -#define STR_NUM_LEVEL (RC_VIEW_BEGIN + 3) -#define STR_NUM_OUTLINE (RC_VIEW_BEGIN + 4) +#define STR_NUM_LEVEL (RC_VIEW_BEGIN + 3) +#define STR_NUM_OUTLINE (RC_VIEW_BEGIN + 4) -#define STR_ERROR_NOLANG (RC_VIEW_BEGIN + 6) +#define STR_ERROR_NOLANG (RC_VIEW_BEGIN + 6) -#define STR_EDIT_FOOTNOTE (RC_VIEW_BEGIN + 14) +#define STR_EDIT_FOOTNOTE (RC_VIEW_BEGIN + 14) -//#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 15) +//#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 15) #define MSG_NOT_FOUND (RC_VIEW_BEGIN + 16) #define MSG_SEARCH_START (RC_VIEW_BEGIN + 17) #define MSG_SEARCH_END (RC_VIEW_BEGIN + 18) @@ -51,33 +51,33 @@ #define STR_NB_REPLACED (RC_VIEW_BEGIN + 20) #define MSG_SCAN_NOSOURCE (RC_VIEW_BEGIN + 21) -#define STR_SRCVIEW_ROW (RC_VIEW_BEGIN + 22) -#define STR_SRCVIEW_COL (RC_VIEW_BEGIN + 23) +#define STR_SRCVIEW_ROW (RC_VIEW_BEGIN + 22) +#define STR_SRCVIEW_COL (RC_VIEW_BEGIN + 23) #define STR_SAVEAS_SRC (RC_VIEW_BEGIN + 24) #define MSG_NO_MERGE_ENTRY (RC_VIEW_BEGIN + 25) -#define STR_PRINT_TITLE (RC_VIEW_BEGIN + 26) -#define STR_PRINT_MSG (RC_VIEW_BEGIN + 27) -#define STR_PRINT_ALL (RC_VIEW_BEGIN + 28) -#define STR_PRINT_SELECTION (RC_VIEW_BEGIN + 29) -#define STR_READONLY_SEL (RC_VIEW_BEGIN + 30) +#define STR_PRINT_TITLE (RC_VIEW_BEGIN + 26) +#define STR_PRINT_MSG (RC_VIEW_BEGIN + 27) +#define STR_PRINT_ALL (RC_VIEW_BEGIN + 28) +#define STR_PRINT_SELECTION (RC_VIEW_BEGIN + 29) +#define STR_READONLY_SEL (RC_VIEW_BEGIN + 30) -#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 31) +#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 31) #define STR_WEBOPTIONS (RC_VIEW_BEGIN + 32) #define STR_TEXTOPTIONS (RC_VIEW_BEGIN + 33) // MSG ------------------------------------------------------------------- #define MSG_ERR_INSERT_GLOS (RC_VIEW_BEGIN) -#define MSG_ERR_NO_FAX (RC_VIEW_BEGIN + 5) -#define MSG_ERR_SRCSTREAM (RC_VIEW_BEGIN + 6) +#define MSG_ERR_NO_FAX (RC_VIEW_BEGIN + 5) +#define MSG_ERR_SRCSTREAM (RC_VIEW_BEGIN + 6) // DLG ------------------------------------------------------------------- -#define DLG_SPECIAL_FORCED (RC_VIEW_BEGIN) -#define DLG_PAGEPREVIEW_ZOOM (RC_VIEW_BEGIN + 1) -#define DLG_PAGEPREVIEW_PRINTOPTIONS (RC_VIEW_BEGIN + 2) +#define DLG_SPECIAL_FORCED (RC_VIEW_BEGIN) +#define DLG_PAGEPREVIEW_ZOOM (RC_VIEW_BEGIN + 1) +#define DLG_PAGEPREVIEW_PRINTOPTIONS (RC_VIEW_BEGIN + 2) // Ueberlaufpruefung ----------------------------------------------------- diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src index 9cf4f910f183..233664b50971 100644 --- a/sw/source/ui/uiview/view.src +++ b/sw/source/ui/uiview/view.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/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index 9d905a4c3443..f3e1253572b9 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -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 @@ -59,7 +59,7 @@ #include "basesh.hxx" #include "docsh.hxx" #include "globals.hrc" -#include "cmdid.h" // FN_ ... +#include "cmdid.h" // FN_ ... #include "globdoc.hxx" #include "wview.hxx" #include "shells.hrc" @@ -139,7 +139,7 @@ TYPEINIT1(SwView,SfxViewShell) /*-----------------13.12.97 11:06------------------- --------------------------------------------------*/ -ShellModes SwView::GetShellMode() +ShellModes SwView::GetShellMode() { return pViewImpl->GetShellMode(); } diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx index 208a9c27ebdc..94ec7895b81b 100644 --- a/sw/source/ui/uiview/view1.cxx +++ b/sw/source/ui/uiview/view1.cxx @@ -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 @@ -96,7 +96,7 @@ void SwView::Activate(BOOL bMDIActivate) if ( bMDIActivate ) { - pWrtShell->ShGetFcs(FALSE); // Selektionen sichtbar + pWrtShell->ShGetFcs(FALSE); // Selektionen sichtbar if( sSwViewData.Len() ) { @@ -153,7 +153,7 @@ void SwView::Deactivate(BOOL bMDIActivate) if( bMDIActivate ) { - pWrtShell->ShLooseFcs(); // Selektionen unsichtbar + pWrtShell->ShLooseFcs(); // Selektionen unsichtbar pHRuler->SetActive( FALSE ); pVRuler->SetActive( FALSE ); diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 51c6bc514c99..dbabf2b45ba3 100755 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -185,7 +185,7 @@ static void lcl_SetAllTextToDefaultLanguage( SwWrtShell &rWrtSh, USHORT nWhichId } /*--------------------------------------------------------------------------- - Beschreibung: String fuer die Seitenanzeige in der Statusbar basteln. + Beschreibung: String fuer die Seitenanzeige in der Statusbar basteln. ----------------------------------------------------------------------------*/ String SwView::GetPageStr( USHORT nPg, USHORT nLogPg, @@ -546,7 +546,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq) if( aPasswd.getLength() ) { DBG_ASSERT( !((const SfxBoolItem*)pItem)->GetValue(), "SwView::Execute(): password set an redlining off doesn't match!" ); - // xmlsec05: new password dialog + // xmlsec05: new password dialog Window* pParent; const SfxPoolItem* pParentItem; if( SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_XWINDOW, FALSE, &pParentItem ) ) @@ -563,7 +563,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq) if(SvPasswordHelper::CompareHashPassword(aPasswd, sNewPasswd)) pIDRA->SetRedlinePassword(Sequence <sal_Int8> ()); else - { // xmlsec05: message box for wrong password + { // xmlsec05: message box for wrong password break; } } @@ -582,8 +582,8 @@ void __EXPORT SwView::Execute(SfxRequest &rReq) && ((SfxBoolItem*)pItem)->GetValue() == ( aPasswd.getLength() != 0 ) ) break; - // xmlsec05: new password dialog - // message box for wrong password + // xmlsec05: new password dialog + // message box for wrong password Window* pParent; const SfxPoolItem* pParentItem; if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_XWINDOW, FALSE, &pParentItem ) ) @@ -941,7 +941,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq) } } break; - case SID_ATTR_LANGUAGE : + case SID_ATTR_LANGUAGE : if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_LANGUAGE, FALSE, &pItem)) { SvxLanguageItem aLang(((SvxLanguageItem*)pItem)->GetLanguage(), RES_CHRATR_LANGUAGE); @@ -1167,7 +1167,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq) } /*-------------------------------------------------------------------- - Beschreibung: SeitenNr-Feld invalidieren + Beschreibung: SeitenNr-Feld invalidieren --------------------------------------------------------------------*/ void SwView::UpdatePageNums(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr) @@ -1180,7 +1180,7 @@ void SwView::UpdatePageNums(USHORT nPhyNum, USHORT nVirtNum, const String& rPgSt } /*-------------------------------------------------------------------- - Beschreibung: Status der Stauszeile + Beschreibung: Status der Stauszeile --------------------------------------------------------------------*/ @@ -1200,7 +1200,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) /* //JP 07.01.00: is a nice feature - show the selektion of DrawObjects if( rShell.IsObjSelected() -//??? || rShell.IsFrmSelected() +//??? || rShell.IsFrmSelected() ) { String sDisplay( rShell.GetDrawView()->GetMarkedObjectList(). @@ -1208,7 +1208,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) rSet.Put( SfxStringItem( FN_STAT_PAGE, sDisplay )); } else -*/ { +*/ { // Anzahl der Seiten, log. SeitenNr. SeitenNr ermitteln USHORT nPage, nLogPage; String sDisplay; @@ -1217,7 +1217,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) GetPageStr( nPage, nLogPage, sDisplay) )); USHORT nCnt = GetWrtShell().GetPageCnt(); - if (nPageCnt != nCnt) // Basic benachrichtigen + if (nPageCnt != nCnt) // Basic benachrichtigen { nPageCnt = nCnt; SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_PAGE_COUNT, SwDocShell::GetEventName(STR_SW_EVENT_PAGE_COUNT), GetViewFrame()->GetObjectShell()), FALSE); @@ -1394,40 +1394,40 @@ void SwView::StateStatusLine(SfxItemSet &rSet) //#outline level, removed by zhaojianwei //const SwNumRule* pNumRule = rShell.GetCurNumRule(); - //if (pNumRule) // Cursor in Numerierung + //if (pNumRule) // Cursor in Numerierung //{ - // BYTE nNumLevel = rShell.GetNumLevel(); - // if( IsShowNum(nNumLevel) && MAXLEVEL > - // ( nNumLevel = GetRealLevel( nNumLevel )) ) - // { - // if( sStr.Len() ) - // sStr.AppendAscii(sStatusDelim); - // sStr += SW_RESSTR(STR_NUM_LEVEL); - // sStr += String::CreateFromInt32( nNumLevel + 1 ); - // if(!pNumRule->IsAutoRule()) - // { - // SfxItemSet aSet(GetPool(), - // RES_PARATR_NUMRULE, RES_PARATR_NUMRULE); - // rShell.GetCurAttr(aSet); - // /* const SfxPoolItem* pItem; */ - // if(SFX_ITEM_AVAILABLE <= - // aSet.GetItemState(RES_PARATR_NUMRULE, TRUE - // /*, &pItem */ )) - // { - // const String& rNumStyle = - // ((const SfxStringItem &) - // aSet.Get(RES_PARATR_NUMRULE)).GetValue(); - // /* #i5116# GetItemState does not necessarily - // change pItem */ - // // ((const SfxStringItem*)pItem)->GetValue(); - // if(rNumStyle.Len()) - // { - // sStr.AppendAscii(sStatusDelim); - // sStr += rNumStyle; - // } - // } - // } - // } + // BYTE nNumLevel = rShell.GetNumLevel(); + // if( IsShowNum(nNumLevel) && MAXLEVEL > + // ( nNumLevel = GetRealLevel( nNumLevel )) ) + // { + // if( sStr.Len() ) + // sStr.AppendAscii(sStatusDelim); + // sStr += SW_RESSTR(STR_NUM_LEVEL); + // sStr += String::CreateFromInt32( nNumLevel + 1 ); + // if(!pNumRule->IsAutoRule()) + // { + // SfxItemSet aSet(GetPool(), + // RES_PARATR_NUMRULE, RES_PARATR_NUMRULE); + // rShell.GetCurAttr(aSet); + // /* const SfxPoolItem* pItem; */ + // if(SFX_ITEM_AVAILABLE <= + // aSet.GetItemState(RES_PARATR_NUMRULE, TRUE + // /*, &pItem */ )) + // { + // const String& rNumStyle = + // ((const SfxStringItem &) + // aSet.Get(RES_PARATR_NUMRULE)).GetValue(); + // /* #i5116# GetItemState does not necessarily + // change pItem */ + // // ((const SfxStringItem*)pItem)->GetValue(); + // if(rNumStyle.Len()) + // { + // sStr.AppendAscii(sStatusDelim); + // sStr += rNumStyle; + // } + // } + // } + // } //}//<-removed end ,zhaojianwei //-->#outline level,added by zhaojianwei @@ -1435,7 +1435,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) const bool bOutlineNum = pNumRule ? pNumRule->IsOutlineRule() : 0; //((SwTxtFmtColl*)rShell.GetCrsr()->GetNode()->GetTxtNode()->GetFmtColl())->IsAssignedToListLevelOfOutlineStyle(); - if (pNumRule && !bOutlineNum ) // Cursor in Numerierung + if (pNumRule && !bOutlineNum ) // Cursor in Numerierung { BYTE nNumLevel = rShell.GetNumLevel(); // --> OD 2008-04-02 #refactorlists# @@ -1528,7 +1528,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: Execute fuer die Stauszeile + Beschreibung: Execute fuer die Stauszeile --------------------------------------------------------------------*/ @@ -1698,7 +1698,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq) else { const SwNumRule* pNumRule = rSh.GetCurNumRule(); - if( pNumRule ) // Cursor in Numerierung + if( pNumRule ) // Cursor in Numerierung { if( pNumRule->IsAutoRule() ) nId = FN_NUMBER_BULLETS; @@ -1815,7 +1815,7 @@ void SwView::InsFrmMode(USHORT nCols) } /*-------------------------------------------------------------------- - Beschreibung: Links bearbeiten + Beschreibung: Links bearbeiten --------------------------------------------------------------------*/ void SwView::EditLinkDlg() @@ -1911,7 +1911,7 @@ BOOL SwView::JumpToSwMark( const String& rMark ) BOOL bSearchInNotes = FALSE; if( pWrtShell->SearchPattern( aSearchOpt, bSearchInNotes, DOCPOS_START, DOCPOS_END )) { - pWrtShell->EnterStdMode(); // Selektion wieder aufheben + pWrtShell->EnterStdMode(); // Selektion wieder aufheben bRet = TRUE; } } @@ -1979,7 +1979,7 @@ sal_uInt16 lcl_PageDescWithHeader( const SwDoc& rDoc ) } /*-------------------------------------------------------------------- - Beschreibung: Links bearbeiten + Beschreibung: Links bearbeiten --------------------------------------------------------------------*/ void SwView::ExecuteInsertDoc( SfxRequest& rRequest, const SfxPoolItem* pItem ) @@ -2090,7 +2090,7 @@ long SwView::InsertMedium( USHORT nSlotId, SfxMedium* pMedium, INT16 nVersion ) } pDocSh->RegisterTransfer( *pMedium ); pMedium->DownLoad(); // ggfs. den DownLoad anstossen - if( aRef.Is() && 1 < aRef->GetRefCount() ) // noch gueltige Ref? + if( aRef.Is() && 1 < aRef->GetRefCount() ) // noch gueltige Ref? { SwReader* pRdr; Reader *pRead = pDocSh->StartConvertFrom( *pMedium, &pRdr, pWrtShell ); @@ -2102,15 +2102,15 @@ long SwView::InsertMedium( USHORT nSlotId, SfxMedium* pMedium, INT16 nVersion ) if( pRead && pDocSh->GetDoc() ) nUndoCheck = lcl_PageDescWithHeader( *pDoc ); ULONG nErrno; - { //Scope for SwWait-Object, to be able to execute slots + { //Scope for SwWait-Object, to be able to execute slots //outside this scope. SwWait aWait( *GetDocShell(), TRUE ); pWrtShell->StartAllAction(); if ( pWrtShell->HasSelection() ) - pWrtShell->DelRight(); // Selektionen loeschen + pWrtShell->DelRight(); // Selektionen loeschen if( pRead ) { - nErrno = pRdr->Read( *pRead ); // und Dokument einfuegen + nErrno = pRdr->Read( *pRead ); // und Dokument einfuegen delete pRdr; } else @@ -2128,7 +2128,7 @@ long SwView::InsertMedium( USHORT nSlotId, SfxMedium* pMedium, INT16 nVersion ) { SfxRequest aReq( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() ); Execute( aReq ); - pWrtShell->SetUpdateTOX( FALSE ); // wieder zurueck setzen + pWrtShell->SetUpdateTOX( FALSE ); // wieder zurueck setzen } if( pDoc ) @@ -2166,7 +2166,7 @@ extern int lcl_FindDocShell( SfxObjectShellRef& xDocSh, SwWait aWait( *GetDocShell(), TRUE ); pWrtShell->StartAllAction(); - pWrtShell->EnterStdMode(); // Selektionen loeschen + pWrtShell->EnterStdMode(); // Selektionen loeschen if( bCompare ) nFound = pWrtShell->CompareDoc( *((SwDocShell*)&xDocSh)->GetDoc() ); @@ -2206,9 +2206,9 @@ namespace { Sequence < OUString > aNames = _rDatasourceContext->getElementNames(); - return ( !aNames.getLength() - || ( ( 1 == aNames.getLength() ) - && aNames.getConstArray()[0] == SW_MOD()->GetDBConfig()->GetBibliographySource().sDataSource + return ( !aNames.getLength() + || ( ( 1 == aNames.getLength() ) + && aNames.getConstArray()[0] == SW_MOD()->GetDBConfig()->GetBibliographySource().sDataSource ) ); } diff --git a/sw/source/ui/uiview/viewcoll.cxx b/sw/source/ui/uiview/viewcoll.cxx index e5f9350277ee..355d199aef3a 100644 --- a/sw/source/ui/uiview/viewcoll.cxx +++ b/sw/source/ui/uiview/viewcoll.cxx @@ -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/uiview/viewdlg.cxx b/sw/source/ui/uiview/viewdlg.cxx index 8c19c454b6ac..25b30387de49 100644 --- a/sw/source/ui/uiview/viewdlg.cxx +++ b/sw/source/ui/uiview/viewdlg.cxx @@ -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/uiview/viewdlg2.cxx b/sw/source/ui/uiview/viewdlg2.cxx index bbff2271e9fa..27f017c51769 100644 --- a/sw/source/ui/uiview/viewdlg2.cxx +++ b/sw/source/ui/uiview/viewdlg2.cxx @@ -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 @@ -177,7 +177,7 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt) } USHORT nID = USHRT_MAX; - SwFieldType* pType = 0; + SwFieldType* pType = 0; const USHORT nCount = aMgr.GetFldTypeCount(); if( rName.Len() ) { diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx index abae753c1b56..49889a3daf03 100644 --- a/sw/source/ui/uiview/viewdraw.cxx +++ b/sw/source/ui/uiview/viewdraw.cxx @@ -83,7 +83,7 @@ using namespace ::com::sun::star; /*-------------------------------------------------------------------- - Beschreibung: Drawing-Ids ausfuehren + Beschreibung: Drawing-Ids ausfuehren --------------------------------------------------------------------*/ void SwView::ExecDraw(SfxRequest& rReq) @@ -135,7 +135,7 @@ void SwView::ExecDraw(SfxRequest& rReq) if (nNewId == nFormSfxId) { bDeselect = sal_True; - GetViewFrame()->GetDispatcher()->Execute(SID_FM_LEAVE_CREATE); // Button soll rauspoppen + GetViewFrame()->GetDispatcher()->Execute(SID_FM_LEAVE_CREATE); // Button soll rauspoppen } } } @@ -178,7 +178,7 @@ void SwView::ExecDraw(SfxRequest& rReq) } else if ( nSlotId == SID_FONTWORK_GALLERY_FLOATER ) { - Window* pWin = &( pWrtShell->GetView().GetViewFrame()->GetWindow() ); + Window* pWin = &( pWrtShell->GetView().GetViewFrame()->GetWindow() ); if ( pWin ) pWin->EnterWait(); @@ -195,11 +195,11 @@ void SwView::ExecDraw(SfxRequest& rReq) aDlg.Execute(); if ( pObj ) { - Size aDocSize( pWrtShell->GetDocSize() ); - const SwRect& rVisArea = pWrtShell->VisArea(); - Point aPos( rVisArea.Center() ); - Size aSize; - Size aPrefSize( pObj->GetSnapRect().GetSize() ); + Size aDocSize( pWrtShell->GetDocSize() ); + const SwRect& rVisArea = pWrtShell->VisArea(); + Point aPos( rVisArea.Center() ); + Size aSize; + Size aPrefSize( pObj->GetSnapRect().GetSize() ); if( rVisArea.Width() > aDocSize.Width()) aPos.X() = aDocSize.Width() / 2 + rVisArea.Left(); @@ -266,7 +266,7 @@ void SwView::ExecDraw(SfxRequest& rReq) LeaveDrawCreate(); if (pWrtShell->IsFrmSelected()) - pWrtShell->EnterStdMode(); // wegen Bug #45639 + pWrtShell->EnterStdMode(); // wegen Bug #45639 SwDrawBase* pFuncPtr = NULL; @@ -408,7 +408,7 @@ void SwView::ExecDraw(SfxRequest& rReq) } /*-------------------------------------------------------------------- - Beschreibung: Drawing beenden + Beschreibung: Drawing beenden --------------------------------------------------------------------*/ @@ -462,7 +462,7 @@ void SwView::ExitDraw() } /*-------------------------------------------------------------------- - Beschreibung: Rotate-Mode abschalten + Beschreibung: Rotate-Mode abschalten --------------------------------------------------------------------*/ @@ -480,7 +480,7 @@ void SwView::NoRotate() } /****************************************************************************** - * Beschreibung: DrawTextEditMode einschalten + * Beschreibung: DrawTextEditMode einschalten ******************************************************************************/ sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos) @@ -518,9 +518,9 @@ sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos) } /****************************************************************************** - * Beschreibung: DrawTextEditMode einschalten + * Beschreibung: DrawTextEditMode einschalten ******************************************************************************/ -sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin, +sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin, bool bIsNewObj, bool bSetSelectionToStart) { SwWrtShell *pSh = &GetWrtShell(); @@ -619,7 +619,7 @@ sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin, } /****************************************************************************** - * Beschreibung: Ist ein DrawTextObjekt selektiert? + * Beschreibung: Ist ein DrawTextObjekt selektiert? ******************************************************************************/ @@ -743,7 +743,7 @@ sal_Bool SwView::HasDrwObj(SdrObject *pSdrObj) const if (pSdrObj->IsGroupObject()) { - SdrObjList* pList = pSdrObj->GetSubList(); + SdrObjList* pList = pSdrObj->GetSubList(); sal_uInt32 nCnt = pList->GetObjCount(); for (sal_uInt32 i = 0; i < nCnt; i++) @@ -766,7 +766,7 @@ sal_Bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const if (pSdrObj->IsGroupObject()) { - SdrObjList* pList = pSdrObj->GetSubList(); + SdrObjList* pList = pSdrObj->GetSubList(); sal_uInt32 nCnt = pList->GetObjCount(); for (sal_uInt32 i = 0; i < nCnt; i++) diff --git a/sw/source/ui/uiview/viewfunc.hxx b/sw/source/ui/uiview/viewfunc.hxx index f04db152ec2f..09502fa6dd35 100644 --- a/sw/source/ui/uiview/viewfunc.hxx +++ b/sw/source/ui/uiview/viewfunc.hxx @@ -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/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index b3f73f7c38e4..25daf5609a24 100755 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -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 @@ -56,24 +56,24 @@ #include <editeng/SpellPortions.hxx> #include <swmodule.hxx> #include <swwait.hxx> -#include <initui.hxx> // fuer SpellPointer +#include <initui.hxx> // fuer SpellPointer #include <uitool.hxx> #include <view.hxx> #include <wrtsh.hxx> #include <basesh.hxx> -#include <docsh.hxx> // CheckSpellChanges -#include <viewopt.hxx> // Viewoptions +#include <docsh.hxx> // CheckSpellChanges +#include <viewopt.hxx> // Viewoptions #include <swundo.hxx> // fuer Undo-Ids #include <hyp.hxx> // Trennung -#include <olmenu.hxx> // PopupMenu fuer OnlineSpelling -#include <pam.hxx> // Spelling: Multiselektion +#include <olmenu.hxx> // PopupMenu fuer OnlineSpelling +#include <pam.hxx> // Spelling: Multiselektion #include <edtwin.hxx> #include <crsskip.hxx> #include <ndtxt.hxx> #include <vcl/lstbox.hxx> #include <cmdid.h> #include <globals.hrc> -#include <comcore.hrc> // STR_MULT_INTERACT_SPELL_WARN +#include <comcore.hrc> // STR_MULT_INTERACT_SPELL_WARN #include <view.hrc> #include <hhcwrp.hxx> #include <com/sun/star/frame/XStorable.hpp> @@ -112,7 +112,7 @@ using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::smarttags; /*-------------------------------------------------------------------- - Beschreibung: Lingu-Dispatcher + Beschreibung: Lingu-Dispatcher --------------------------------------------------------------------*/ @@ -145,7 +145,7 @@ void SwView::ExecLingu(SfxRequest &rReq) Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY ); if( xInit.is() ) { - // initialize dialog + // initialize dialog Reference< awt::XWindow > xDialogParentWindow(0); Sequence<Any> aSeq(1); Any* pArray = aSeq.getArray(); @@ -254,7 +254,7 @@ void SwView::StartTextConversion( { return; } - + SpellKontext(sal_True); const SwViewOption* pVOpt = pWrtShell->GetViewOptions(); @@ -485,7 +485,7 @@ void SwView::HyphenateDocument() Reference< beans::XPropertySet > xProp( ::GetLinguPropertySet() ); - pWrtShell->StartUndo(UNDO_INSATTR); // spaeter gueltig + pWrtShell->StartUndo(UNDO_INSATTR); // spaeter gueltig sal_Bool bHyphSpecial = xProp.is() ? *(sal_Bool*)xProp->getPropertyValue( C2U(UPN_IS_HYPH_SPECIAL) ).getValue() : sal_False; @@ -530,11 +530,11 @@ bool SwView::IsValidSelectionForThesaurus() const { // must not be a multi-selection, and if it is a selection it needs // to be within a single paragraph - + const bool bMultiSel = pWrtShell->GetCrsr() != pWrtShell->GetCrsr()->GetNext(); const sal_Bool bSelection = ((SwCrsrShell*)pWrtShell)->HasSelection(); return !bMultiSel && (!bSelection || pWrtShell->IsSelOnePara() ); -} +} String SwView::GetThesaurusLookUpText( bool bSelection ) const @@ -584,11 +584,11 @@ void SwView::InsertThesaurusSynonym( const String &rSynonmText, const String &rL pWrtShell->EndAllAction(); pWrtShell->SetInsMode( bOldIns ); -} +} /*-------------------------------------------------------------------- - Beschreibung: Thesaurus starten + Beschreibung: Thesaurus starten --------------------------------------------------------------------*/ @@ -629,9 +629,9 @@ void SwView::StartThesaurus() else { // create dialog - { //Scope for SwWait-Object + { //Scope for SwWait-Object SwWait aWait( *GetDocShell(), sal_True ); - // load library with dialog only on demand ... + // load library with dialog only on demand ... SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); pDlg = pFact->CreateThesaurusDialog( &GetEditWin(), xThes, aTmp, eLang ); } @@ -646,7 +646,7 @@ void SwView::StartThesaurus() } /*-------------------------------------------------------------------- - Beschreibung: Online-Vorschlaege anbieten + Beschreibung: Online-Vorschlaege anbieten *--------------------------------------------------------------------*/ //!! Start of extra code for context menu modifying extensions @@ -660,7 +660,7 @@ struct ExecuteInfo class AsyncExecute { public: - DECL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo* ); + DECL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo* ); }; IMPL_STATIC_LINK_NOINSTANCE( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) @@ -717,7 +717,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) aMessageText = aGrammarCheckRes.aErrors[ nErrorInResult ].aShortComment; // we like to use the grammar checking context menu if we either get // some suggestions or at least a comment about the error found... - bUseGrammarContext = bCorrectionRes && + bUseGrammarContext = bCorrectionRes && (aSuggestions.getLength() > 0 || aMessageText.getLength() > 0); } @@ -728,11 +728,11 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) // get paragraph text String aParaText; SwPosition aPoint( *pWrtShell->GetCrsr()->GetPoint() ); - const SwTxtNode *pNode = dynamic_cast< const SwTxtNode * >( + const SwTxtNode *pNode = dynamic_cast< const SwTxtNode * >( &aPoint.nNode.GetNode() ); if (pNode) - aParaText = pNode->GetTxt(); // this may include hidden text but that should be Ok - else + aParaText = pNode->GetTxt(); // this may include hidden text but that should be Ok + else { DBG_ERROR( "text node expected but not found" ); } @@ -756,11 +756,11 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) aEvent.ExecutePosition.Y = aPixPos.Y(); Menu* pMenu = 0; - ::rtl::OUString sMenuName = ::rtl::OUString::createFromAscii( + ::rtl::OUString sMenuName = ::rtl::OUString::createFromAscii( bUseGrammarContext ? "private:resource/GrammarContextMenu" : "private:resource/SpellContextMenu"); if(TryContextMenuInterception( *pPopup, sMenuName, pMenu, aEvent )) { - + //! happy hacking for context menu modifying extensions of this //! 'custom made' menu... *sigh* (code copied from sfx2 and framework) if ( pMenu ) @@ -789,7 +789,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) uno::Reference< util::XURLTransformer > xURLTransformer; if (xMgr.is()) { - xURLTransformer = uno::Reference< util::XURLTransformer >( xMgr->createInstance( + xURLTransformer = uno::Reference< util::XURLTransformer >( xMgr->createInstance( C2U("com.sun.star.util.URLTransformer")), UNO_QUERY); } @@ -798,7 +798,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) uno::Sequence< beans::PropertyValue > aArgs; xDispatch = xDispatchProvider->queryDispatch( aURL, rtl::OUString(), 0 ); - + if (xDispatch.is()) { // Execute dispatch asynchronously @@ -808,12 +808,12 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) pExecuteInfo->aArgs = aArgs; Application::PostUserEvent( STATIC_LINK(0, AsyncExecute , ExecuteHdl_Impl), pExecuteInfo ); } - } + } catch (Exception &) { - } + } } - } + } else { pPopup->Execute( aToFill.SVRect(), pEditWin ); @@ -846,9 +846,9 @@ sal_Bool SwView::ExecSmartTagPopup( const Point& rPt ) // This data structure maps a smart tag type string to the property bag SwRect aToFill; Sequence< rtl::OUString > aSmartTagTypes; - Sequence< Reference< container::XStringKeyMap > > aStringKeyMaps; + Sequence< Reference< container::XStringKeyMap > > aStringKeyMaps; Reference<text::XTextRange> xRange; - + pWrtShell->GetSmartTagTerm( rPt, aToFill, aSmartTagTypes, aStringKeyMaps, xRange); if ( xRange.is() && aSmartTagTypes.getLength() ) { @@ -882,17 +882,17 @@ public: void *GetImplWin() { return NULL; //FIXME!!! -// return mpImplWin; +// return mpImplWin; } protected: virtual void LoseFocus() { -// printf("ListBox: lose focus!!\n"); +// printf("ListBox: lose focus!!\n"); ListBox::LoseFocus(); - } + } virtual void Select() { -// printf("SELECT!!! IsTravelSelect=%i\n", IsTravelSelect()); +// printf("SELECT!!! IsTravelSelect=%i\n", IsTravelSelect()); ListBox::Select(); } }; @@ -934,10 +934,10 @@ public: aText.SetText(rtl::OUString::createFromAscii("Cancel")); Size tSize=aText.GetOptimalSize(WINDOWSIZE_PREFERRED); aText.SetSizePixel(Size(lbSize.Width(), tSize.Height())); - aText.SetPosPixel(Point(0, lbSize.Height())); + aText.SetPosPixel(Point(0, lbSize.Height())); aText.Show(); - SetSizePixel(Size(lbSize.Width(), lbSize.Height()+tSize.Height())); -// SetSizePixel(Size(200, 200)); + SetSizePixel(Size(lbSize.Width(), lbSize.Height()+tSize.Height())); +// SetSizePixel(Size(200, 200)); } int getSelection() { @@ -956,10 +956,10 @@ protected: virtual long PreNotify( NotifyEvent& rNEvt ) { if (rNEvt.GetType() == EVENT_LOSEFOCUS && aListBox.GetImplWin()==rNEvt.GetWindow()) { EndDialog(8); - return 1; + return 1; } if (rNEvt.GetType() == EVENT_KEYINPUT) { -// printf("PreNotify::KEYINPUT\n"); +// printf("PreNotify::KEYINPUT\n"); } return Dialog::PreNotify(rNEvt); } diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index 9dfa8e79ecfa..f8212d87249d 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -83,7 +83,7 @@ #include <IDocumentSettingAccess.hxx> #include <PostItMgr.hxx> -USHORT SwView::nMoveType = NID_PGE; +USHORT SwView::nMoveType = NID_PGE; sal_Int32 SwView::nActMark = 0; @@ -134,7 +134,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, const MapMode aTmpMap( MAP_TWIP ); const Size aWindowSize( GetEditWin().PixelToLogic( rEditSize, aTmpMap ) ); - if( nsUseOnPage::PD_MIRROR == rDesc.GetUseOn() ) // gespiegelte Seiten + if( nsUseOnPage::PD_MIRROR == rDesc.GetUseOn() ) // gespiegelte Seiten { const SvxLRSpaceItem &rLeftLRSpace = rDesc.GetLeft().GetLRSpace(); aPageSize.Width() += Abs( long(rLeftLRSpace.GetLeft()) - long(rLRSpace.GetLeft()) ); @@ -182,10 +182,10 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, //MasterUsrPrefs updaten UND DANACH die ViewOptions der aktuellen //View updaten. if ( !bViewOnly && - (USHORT(nFac) != pUsrPref->GetZoom() || + (USHORT(nFac) != pUsrPref->GetZoom() || BYTE (eZoomType) != pUsrPref->GetZoomType()) ) { - pUsrPref->SetZoom ( USHORT(nFac) ); + pUsrPref->SetZoom ( USHORT(nFac) ); pUsrPref->SetZoomType( eZoomType ); SW_MOD()->ApplyUsrPref( *pUsrPref, bViewOnly ? this: 0, @@ -194,7 +194,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, } if ( pOpt->GetZoom() != (USHORT) nFac ) { - aOpt.SetZoom ( USHORT(nFac) ); + aOpt.SetZoom ( USHORT(nFac) ); aOpt.SetReadonly(pOpt->IsReadonly()); pWrtShell->ApplyViewOptions( aOpt ); } @@ -221,11 +221,11 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, // OS: Notloesung - in CalcVisArea wird u.U. wieder SetZoom gerufen und // dann werden falsche Werte eingestellt ((SwViewOption*)pWrtShell->GetViewOptions())->SetZoomType( eZoomType ); - CalcVisArea( rEditSize ); //fuer das Neuberechnen des sichtbaren Bereiches + CalcVisArea( rEditSize ); //fuer das Neuberechnen des sichtbaren Bereiches } else if ( USHORT(nFac) != pOpt->GetZoom() ) { - aOpt.SetZoom ( USHORT(nFac) ); + aOpt.SetZoom ( USHORT(nFac) ); pWrtShell->ApplyViewOptions( aOpt ); } @@ -247,7 +247,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, // mpPostItMgr->LayoutPostIts(); // } -// eZoom = eZoomType; +// eZoom = eZoomType; } void SwView::SetViewLayout( USHORT nColumns, bool bBookMode, BOOL bViewOnly ) @@ -342,9 +342,9 @@ int SwView::_CreateScrollbar( BOOL bHori ) void SwView::CreatePageButtons(BOOL bShow) { Window *pMDI = &GetViewFrame()->GetWindow(); - pPageUpBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEUP ), TRUE ); + pPageUpBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEUP ), TRUE ); pPageUpBtn->SetHelpId(HID_SCRL_PAGEUP); - pPageDownBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEDOWN ), FALSE ); + pPageDownBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEDOWN ), FALSE ); pPageDownBtn->SetHelpId(HID_SCRL_PAGEDOWN); Reference< XFrame > xFrame = GetViewFrame()->GetFrame().GetFrameInterface(); pNaviBtn = new SwNaviImageButton(pMDI, xFrame ); @@ -530,11 +530,11 @@ IMPL_STATIC_LINK( SwView, MoveNavigationHdl, bool *, pbNext ) /************************************************************************* |* -|* SwView::CreateTab() +|* SwView::CreateTab() |* -|* Beschreibung -|* Ersterstellung VB 29.05.91 -|* Letzte Aenderung OS 09.05.96 +|* Beschreibung +|* Ersterstellung VB 29.05.91 +|* Letzte Aenderung OS 09.05.96 |* *************************************************************************/ @@ -549,11 +549,11 @@ int SwView::CreateTab() /************************************************************************* |* -|* SwView::KillTab() +|* SwView::KillTab() |* -|* Beschreibung -|* Ersterstellung VB 29.05.91 -|* Letzte Aenderung OS 09.05.96 +|* Beschreibung +|* Ersterstellung VB 29.05.91 +|* Letzte Aenderung OS 09.05.96 |* *************************************************************************/ @@ -597,10 +597,10 @@ void SwView::GetHLinealMetric(FieldUnit& eToFill) const } /************************************************************************* |* -|* SwView::CreateVLineal() +|* SwView::CreateVLineal() |* -|* Beschreibung -|* Ersterstellung VB 29.05.91 +|* Beschreibung +|* Ersterstellung VB 29.05.91 |* *************************************************************************/ @@ -616,10 +616,10 @@ int SwView::CreateVLineal() /************************************************************************* |* -|* SwView::KillVLineal() +|* SwView::KillVLineal() |* -|* Beschreibung -|* Ersterstellung VB 29.05.91 +|* Beschreibung +|* Ersterstellung VB 29.05.91 |* *************************************************************************/ @@ -632,11 +632,11 @@ int SwView::KillVLineal() } /************************************************************************* |* -|* SwView::ExecRulerClick() +|* SwView::ExecRulerClick() |* -|* Beschreibung -|* Ersterstellung OS 15.06.95 -|* Letzte Aenderung +|* Beschreibung +|* Ersterstellung OS 15.06.95 +|* Letzte Aenderung |* *************************************************************************/ diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index b343619f2ea8..d47436aae3b0 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -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 @@ -108,7 +108,7 @@ void lcl_GetPos(SwView* pView, long lDelta = lPos - rSh.VisArea().Pos().*pPt; const long lSize = aDocSz.*pSz + lBorder; // Bug 11693: sollte rechts oder unten zuviel Wiese sein, dann muss - // diese von der VisArea herausgerechnet werden! + // diese von der VisArea herausgerechnet werden! long nTmp = pView->GetVisArea().Right()+lDelta; if ( bHori && nTmp > lSize ) lDelta -= nTmp - lSize; @@ -122,7 +122,7 @@ void lcl_GetPos(SwView* pView, } /*-------------------------------------------------------------------- - Beschreibung: Nullpunkt Lineal setzen + Beschreibung: Nullpunkt Lineal setzen --------------------------------------------------------------------*/ void SwView::InvalidateRulerPos() @@ -146,7 +146,7 @@ void SwView::InvalidateRulerPos() } /*-------------------------------------------------------------------- - Beschreibung: begrenzt das Scrollen soweit, dass jeweils nur einen + Beschreibung: begrenzt das Scrollen soweit, dass jeweils nur einen viertel Bildschirm bis vor das Ende des Dokumentes gescrollt werden kann. --------------------------------------------------------------------*/ @@ -166,7 +166,7 @@ long SwView::SetVScrollMax( long lMax ) { const long lBorder = IsDocumentBorder() ? DOCUMENTBORDER : DOCUMENTBORDER * 2; long lSize = GetDocSz().Height() + lBorder - aVisArea.GetHeight(); - return Max( Min( lMax, lSize), 0L ); // siehe horz. + return Max( Min( lMax, lSize), 0L ); // siehe horz. } @@ -176,7 +176,7 @@ Point SwView::AlignToPixel(const Point &rPt) const } /*-------------------------------------------------------------------- - Beschreibung: Dokumentgroesse hat sich geaendert + Beschreibung: Dokumentgroesse hat sich geaendert --------------------------------------------------------------------*/ void SwView::DocSzChgd(const Size &rSz) @@ -187,7 +187,7 @@ extern int bDocSzUpdated; aDocSz = rSz; - if( !pWrtShell || aVisArea.IsEmpty() ) // keine Shell -> keine Aenderung + if( !pWrtShell || aVisArea.IsEmpty() ) // keine Shell -> keine Aenderung { bDocSzUpdated = FALSE; return; @@ -227,14 +227,14 @@ aDocSz = rSz; } /*-------------------------------------------------------------------- - Beschreibung: Visarea neu setzen + Beschreibung: Visarea neu setzen --------------------------------------------------------------------*/ void SwView::SetVisArea( const Rectangle &rRect, BOOL bUpdateScrollbar ) { const Size aOldSz( aVisArea.GetSize() ); - const Point aTopLeft( AlignToPixel( rRect.TopLeft() )); + const Point aTopLeft( AlignToPixel( rRect.TopLeft() )); const Point aBottomRight( AlignToPixel( rRect.BottomRight() )); Rectangle aLR( aTopLeft, aBottomRight ); @@ -321,7 +321,7 @@ void SwView::SetVisArea( const Rectangle &rRect, BOOL bUpdateScrollbar ) } /*-------------------------------------------------------------------- - Beschreibung: Pos VisArea setzen + Beschreibung: Pos VisArea setzen --------------------------------------------------------------------*/ void SwView::SetVisArea( const Point &rPt, BOOL bUpdateScrollbar ) @@ -334,7 +334,7 @@ void SwView::SetVisArea( const Point &rPt, BOOL bUpdateScrollbar ) //mal sehen wie weit wir mit der halben BrushSize kommen. //TODO: why BRUSH_SIZE? Point aPt( rPt ); -// const long nTmp = GetWrtShell().IsFrameView() ? BRUSH_SIZE/2 : BRUSH_SIZE; +// const long nTmp = GetWrtShell().IsFrameView() ? BRUSH_SIZE/2 : BRUSH_SIZE; const long nTmp = GetWrtShell().IsFrameView() ? 4 : 8; aPt = GetEditWin().LogicToPixel( aPt ); aPt.X() -= aPt.X() % nTmp; @@ -345,7 +345,7 @@ void SwView::SetVisArea( const Point &rPt, BOOL bUpdateScrollbar ) return; const long lXDiff = aVisArea.Left() - aPt.X(); - const long lYDiff = aVisArea.Top() - aPt.Y(); + const long lYDiff = aVisArea.Top() - aPt.Y(); SetVisArea( Rectangle( aPt, Point( aVisArea.Right() - lXDiff, aVisArea.Bottom() - lYDiff ) ), bUpdateScrollbar); @@ -370,13 +370,13 @@ void SwView::CheckVisArea() } /*-------------------------------------------------------------------- - Beschreibung: Sichtbaren Bereich berechnen + Beschreibung: Sichtbaren Bereich berechnen - OUT Point *pPt: neue Position des sichtbaren + OUT Point *pPt: neue Position des sichtbaren Bereiches - IN Rectangle &rRect: Rechteck, das sich innerhalb des neuen + IN Rectangle &rRect: Rechteck, das sich innerhalb des neuen sichtbaren Bereiches befinden soll - USHORT nRange optional exakte Angabe des Bereiches, + USHORT nRange optional exakte Angabe des Bereiches, um den ggfs. gescrollt werden soll --------------------------------------------------------------------*/ @@ -395,12 +395,12 @@ void SwView::CalcPt( Point *pPt, const Rectangle &rRect, pPt->Y() = rRect.Top(); pPt->Y() = Max( lMin, pPt->Y() ); } - else if ( rRect.Top() < aVisArea.Top() ) //Verschiebung nach oben + else if ( rRect.Top() < aVisArea.Top() ) //Verschiebung nach oben { pPt->Y() = rRect.Top() - (nRangeY != USHRT_MAX ? nRangeY : nYScroll); pPt->Y() = Max( lMin, pPt->Y() ); } - else if( rRect.Bottom() > aVisArea.Bottom() ) //Verschiebung nach unten + else if( rRect.Bottom() > aVisArea.Bottom() ) //Verschiebung nach unten { pPt->Y() = rRect.Bottom() - (aVisArea.GetHeight()) + ( nRangeY != USHRT_MAX ? @@ -408,14 +408,14 @@ void SwView::CalcPt( Point *pPt, const Rectangle &rRect, pPt->Y() = SetVScrollMax( pPt->Y() ); } long nXScroll = GetXScroll(); - if ( rRect.Right() > aVisArea.Right() ) //Verschiebung nach rechts + if ( rRect.Right() > aVisArea.Right() ) //Verschiebung nach rechts { pPt->X() = rRect.Right() - (aVisArea.GetWidth()) + (nRangeX != USHRT_MAX ? nRangeX : nXScroll); pPt->X() = SetHScrollMax( pPt->X() ); } - else if ( rRect.Left() < aVisArea.Left() ) //Verschiebung nach links + else if ( rRect.Left() < aVisArea.Left() ) //Verschiebung nach links { pPt->X() = rRect.Left() - (nRangeX != USHRT_MAX ? nRangeX : nXScroll); pPt->X() = Max( ::GetLeftMargin( *this ) + nLeftOfst, pPt->X() ); @@ -425,7 +425,7 @@ void SwView::CalcPt( Point *pPt, const Rectangle &rRect, } /*-------------------------------------------------------------------- - Beschreibung: Scrolling + Beschreibung: Scrolling --------------------------------------------------------------------*/ BOOL SwView::IsScroll( const Rectangle &rRect ) const @@ -466,7 +466,7 @@ void SwView::Scroll( const Rectangle &rRect, USHORT nRangeX, USHORT nRangeY ) if ( nTopDiff < nBottomDiff ) { if ( nBottomDiff > 0 ) // Ist unterhalb ueberhaupt Platz? - { // dann verschieben wir die Oberkante und merken uns dies + { // dann verschieben wir die Oberkante und merken uns dies nDiffY = aDlgRect.Bottom() - aVisArea.Top(); aVisArea.Top() += nDiffY; } @@ -538,7 +538,7 @@ void SwView::Scroll( const Rectangle &rRect, USHORT nRangeX, USHORT nRangeY ) aPnt.Y() += ( rRect.Top() + rRect.Bottom() - aVisArea.Top() - aVisArea.Bottom() ) / 2 - nDiffY; // ... in X-Richtung nur, wenn das Rechteck rechts oder links aus der - // VisArea hinausragt. + // VisArea hinausragt. if ( rRect.Right() > aVisArea.Right() || rRect.Left() < aVisArea.Left() ) { aPnt.X() += ( rRect.Left() + rRect.Right() @@ -557,7 +557,7 @@ void SwView::Scroll( const Rectangle &rRect, USHORT nRangeX, USHORT nRangeY ) } /*-------------------------------------------------------------------- - Beschreibung: Seitenweises Scrollen + Beschreibung: Seitenweises Scrollen Liefern den Wert, um den bei PageUp / -Down gescrollt werden soll --------------------------------------------------------------------*/ @@ -702,7 +702,7 @@ long SwView::PageDownCrsr(BOOL bSelect) } /*------------------------------------------------------------------------ - Beschreibung: Handler der Scrollbars + Beschreibung: Handler der Scrollbars ------------------------------------------------------------------------*/ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar ) @@ -718,7 +718,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar ) { //Hier wieder auskommentieren wenn das mitscrollen nicht gewuenscht ist. // JP 21.07.00: the end scrollhandler invalidate the FN_STAT_PAGE, - // so we dont must do it agin. + // so we dont must do it agin. EndScrollHdl(pScrollbar); Point aPos( aVisArea.TopLeft() ); @@ -731,9 +731,9 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar ) if(pWrtShell->GetPageNumber( aPos.Y(), FALSE, nPhNum, nVirtNum, sDisplay )) { // JP 21.07.00: the end scrollhandler invalidate the FN_STAT_PAGE, - // so we dont must do it agin. + // so we dont must do it agin. // if(!GetViewFrame()->GetFrame().IsInPlace()) -// S F X_BINDINGS().Update(FN_STAT_PAGE); +// S F X_BINDINGS().Update(FN_STAT_PAGE); //QuickHelp: if( pWrtShell->GetPageCnt() > 1 && Help::IsQuickHelpEnabled() ) @@ -745,8 +745,8 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar ) pScrollbar->GetPosPixel() ).X() -8; aRect.Top() = pScrollbar->OutputToScreenPixel( pScrollbar->GetPointerPosPixel() ).Y(); - aRect.Right() = aRect.Left(); - aRect.Bottom() = aRect.Top(); + aRect.Right() = aRect.Left(); + aRect.Bottom() = aRect.Top(); String sPageStr( GetPageStr( nPhNum, nVirtNum, sDisplay )); SwContentAtPos aCnt( SwContentAtPos::SW_OUTLINE ); @@ -776,7 +776,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar ) return 0; } /*------------------------------------------------------------------------ - Beschreibung: Handler der Scrollbars + Beschreibung: Handler der Scrollbars ------------------------------------------------------------------------*/ IMPL_LINK( SwView, EndScrollHdl, SwScrollbar *, pScrollbar ) @@ -839,8 +839,8 @@ void SwView::CalcVisArea( const Size &rOutPixel ) const long lHeight = GetWrtShell().GetDocSize().Height() + lBorder; if ( aRect.Bottom() > lHeight ) { - long lDelta = aRect.Bottom() - lHeight; - aRect.Top() -= lDelta; + long lDelta = aRect.Bottom() - lHeight; + aRect.Top() -= lDelta; aRect.Bottom() -= lDelta; } } @@ -850,7 +850,7 @@ void SwView::CalcVisArea( const Size &rOutPixel ) } /*-------------------------------------------------------------------- - Beschreibung: Bedienelemente neu anordnen + Beschreibung: Bedienelemente neu anordnen --------------------------------------------------------------------*/ @@ -946,7 +946,7 @@ void ViewResizePixel( const Window &rRef, if(!aSize.Height()) aSize.Height() = pHLineal->GetSizePixel().Height(); pHLineal->SetPosSizePixel( rOfst, aSize ); -// #46802 VCL ruft an unsichtbaren Fenstern kein Resize +// #46802 VCL ruft an unsichtbaren Fenstern kein Resize // fuer das Lineal ist das aber keine gute Idee if(!pHLineal->IsVisible()) pHLineal->Resize(); @@ -993,7 +993,7 @@ void ViewResizePixel( const Window &rRef, if(!bHidePageButtons) aSize.Height() -= nSubSize; else - aImgSz.Width() = 0; // kein Hide, weil das im Update Scrollbar missverstanden wird + aImgSz.Width() = 0; // kein Hide, weil das im Update Scrollbar missverstanden wird if ( nHBSzHeight ) aSize.Height() -= nHBSzHeight; @@ -1016,7 +1016,7 @@ void ViewResizePixel( const Window &rRef, aScrollFillPos.X() = aPos.X(); rScrollBarBox.SetPosSizePixel( aScrollFillPos, - Size( nHBSzHeight, nVBSzWidth) ); + Size( nHBSzHeight, nVBSzWidth) ); } } } @@ -1089,7 +1089,7 @@ void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize ) const Fraction aFrac( nZoom, 100 ); pVRuler->SetZoom( aFrac ); pHRuler->SetZoom( aFrac ); - InvalidateRulerPos(); //Inhalt invalidieren. + InvalidateRulerPos(); //Inhalt invalidieren. } //CursorStack zuruecksetzen, da die Cursorpositionen fuer PageUp/-Down //nicht mehr zum aktuell sichtbaren Bereich passen @@ -1118,7 +1118,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize ) // FME 22.08.2003 #i16909# - return, if no size (caused by minimize window). if ( bInOuterResizePixel || ( !rSize.Width() && !rSize.Height() ) ) return; - bInOuterResizePixel = TRUE; + bInOuterResizePixel = TRUE; // feststellen, ob Scrollbars angezeigt werden duerfen BOOL bBrowse = pWrtShell->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); @@ -1188,7 +1188,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize ) ShowAtResize(); if( pHRuler->IsVisible() || pVRuler->IsVisible() ) - InvalidateRulerPos(); //Inhalt invalidieren. + InvalidateRulerPos(); //Inhalt invalidieren. //CursorStack zuruecksetzen, da die Cursorpositionen fuer PageUp/-Down //nicht mehr zum aktuell sichtbaren Bereich passen @@ -1224,7 +1224,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize ) //Nicht endlosschleifen. Moeglichst dann stoppen wenn die //(Auto-)Scrollbars sichtbar sind. - if ( bRepeat && + if ( bRepeat && ( nCnt > 10 || ( nCnt > 3 && bHAuto && bAuto ) ) ) { @@ -1345,7 +1345,7 @@ BOOL SwView::UpdateScrollbars() void SwView::Move() { if ( GetWrtShell().IsInSelect() ) - GetWrtShell().EndSelect(); //#32427# + GetWrtShell().EndSelect(); //#32427# SfxViewShell::Move(); } @@ -1365,7 +1365,7 @@ BOOL SwView::HandleWheelCommands( const CommandEvent& rCEvt ) bOk = TRUE; } else - { + { if (pWData && (COMMAND_WHEEL_SCROLL==pWData->GetMode()) && (((ULONG)0xFFFFFFFF) == pWData->GetScrollLines())) { if (pWData->GetDelta()<0) diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index 8721f425eb8d..88ad18947b04 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -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 @@ -95,7 +95,7 @@ using namespace ::com::sun::star; /*-------------------------------------------------------------------- - Beschreibung: Drucker an Sfx uebergeben + Beschreibung: Drucker an Sfx uebergeben --------------------------------------------------------------------*/ @@ -113,7 +113,7 @@ SfxPrinter* __EXPORT SwView::GetPrinter( BOOL bCreate ) } /*-------------------------------------------------------------------- - Beschreibung: Druckerwechsel weitermelden + Beschreibung: Druckerwechsel weitermelden --------------------------------------------------------------------*/ void SetPrinter( IDocumentDeviceAccess* pIDDA, SfxPrinter* pNew, BOOL bWeb ) @@ -174,7 +174,7 @@ USHORT __EXPORT SwView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags, bool ) } /*-------------------------------------------------------------------- - Beschreibung: TabPage fuer applikationsspezifische Druckoptionen + Beschreibung: TabPage fuer applikationsspezifische Druckoptionen --------------------------------------------------------------------*/ SfxTabPage* __EXPORT SwView::CreatePrintOptionsPage(Window* pParent, @@ -184,18 +184,18 @@ SfxTabPage* __EXPORT SwView::CreatePrintOptionsPage(Window* pParent, } /*-------------------------------------------------------------------- - Beschreibung: Druckerdialog + Beschreibung: Druckerdialog --------------------------------------------------------------------*/ PrintDialog* CreatePrintDialog( Window* pParent, USHORT nPg, SwWrtShell* pSh ) { PrintDialog *pDlg = new PrintDialog( pParent, false ); -// pDlg->ChangeFirstPage( 1 ); +// pDlg->ChangeFirstPage( 1 ); if ( !nPg ) nPg = 1; -// pDlg->ChangeLastPage( nPg ); -// pDlg->ChangeMaxPage( 9999 ); +// pDlg->ChangeLastPage( nPg ); +// pDlg->ChangeMaxPage( 9999 ); pDlg->EnableRange( PRINTDIALOG_FROMTO ); if (pSh && (pSh->IsSelection() || pSh->IsFrmSelected() || pSh->IsObjSelected())) @@ -214,13 +214,13 @@ PrintDialog* CreatePrintDialog( Window* pParent, USHORT nPg, SwWrtShell* pSh ) PrintDialog* __EXPORT SwView::CreatePrintDialog( Window* pParent ) { // AMA: Hier sollte vielleicht die virtuelle Seitennummer angezeigt werden, - // aber nur, wenn das Drucken virtuelle Seitennummern und nicht wie - // bisher (auch beim SWG 2.0) physikalische beachtet werden. + // aber nur, wenn das Drucken virtuelle Seitennummern und nicht wie + // bisher (auch beim SWG 2.0) physikalische beachtet werden. return ::CreatePrintDialog( pParent, GetWrtShell().GetPhyPageNum(), &GetWrtShell() ); } /*-------------------------------------------------------------------- - Beschreibung: Print-Dispatcher + Beschreibung: Print-Dispatcher --------------------------------------------------------------------*/ void __EXPORT SwView::ExecutePrint(SfxRequest& rReq) @@ -290,7 +290,7 @@ void __EXPORT SwView::ExecutePrint(SfxRequest& rReq) short nBtn = SvxPrtQryBox(&GetEditWin()).Execute(); if( RET_CANCEL == nBtn ) return;; - + if( RET_OK == nBtn ) bPrintSelection = true; } @@ -314,7 +314,7 @@ void __EXPORT SwView::ExecutePrint(SfxRequest& rReq) } /*-------------------------------------------------------------------- - Beschreibung: Page Drucker/Zusaetze erzeugen fuer SwView und + Beschreibung: Page Drucker/Zusaetze erzeugen fuer SwView und SwPagePreview --------------------------------------------------------------------*/ @@ -351,10 +351,10 @@ void SetAppPrintOptions( ViewShell* pSh, BOOL bWeb ) // Applikationseigene Druckoptionen in SfxPrinter schiessen SwAddPrinterItem aAddPrinterItem (FN_PARAM_ADDPRINTER, aPrtData); SfxItemSet aSet( pSh->GetAttrPool(), - FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER, - SID_HTML_MODE, SID_HTML_MODE, - SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, - SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, + FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER, + SID_HTML_MODE, SID_HTML_MODE, + SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, + SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, 0 ); utl::MiscCfg aMisc; diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index 57c7bd20623c..238202e0b91d 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -56,7 +56,7 @@ #include <view.hxx> #endif #include <wrtsh.hxx> -#include <swundo.hxx> // fuer Undo-Ids +#include <swundo.hxx> // fuer Undo-Ids #include <uitool.hxx> #ifndef _CMDID_H #include <cmdid.h> @@ -82,12 +82,12 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::i18n; -#define SRCH_ATTR_OFF 0 +#define SRCH_ATTR_OFF 0 #define SRCH_ATTR_ON 1 #define SRCH_ATTR_SET 2 /*-------------------------------------------------------------------- - Beschreibung: Search Parameter + Beschreibung: Search Parameter --------------------------------------------------------------------*/ struct SwSearchOptions @@ -253,7 +253,7 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage) // 1) Selektion ersetzen (nicht. wenn nur Attribute ersetzt // werden sollen) //JP 27.04.95: warum ? -// was ist, wenn man das gefundene nur attributieren will?? +// was ist, wenn man das gefundene nur attributieren will?? USHORT nCmd = SVX_SEARCHCMD_FIND; if( pSrchItem->GetReplaceString().Len() || @@ -317,7 +317,7 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage) bExtra = FALSE; ULONG nFound; - { //Scope for SwWait-Object + { //Scope for SwWait-Object SwWait aWait( *GetDocShell(), TRUE ); pWrtShell->StartAllAction(); nFound = FUNC_Search( aOpts ); @@ -362,44 +362,44 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage) { static const USHORT aNormalAttr[] = { -/* 0 */ RES_CHRATR_CASEMAP, RES_CHRATR_CASEMAP, -/* 2 */ RES_CHRATR_COLOR, RES_CHRATR_POSTURE, -/* 4 */ RES_CHRATR_SHADOWED, RES_CHRATR_WORDLINEMODE, -/* 6 */ RES_CHRATR_BLINK, RES_CHRATR_BLINK, -/* 8 */ RES_CHRATR_BACKGROUND, RES_CHRATR_BACKGROUND, -/*10 */ RES_CHRATR_ROTATE, RES_CHRATR_ROTATE, -/*12 */ RES_CHRATR_SCALEW, RES_CHRATR_RELIEF, +/* 0 */ RES_CHRATR_CASEMAP, RES_CHRATR_CASEMAP, +/* 2 */ RES_CHRATR_COLOR, RES_CHRATR_POSTURE, +/* 4 */ RES_CHRATR_SHADOWED, RES_CHRATR_WORDLINEMODE, +/* 6 */ RES_CHRATR_BLINK, RES_CHRATR_BLINK, +/* 8 */ RES_CHRATR_BACKGROUND, RES_CHRATR_BACKGROUND, +/*10 */ RES_CHRATR_ROTATE, RES_CHRATR_ROTATE, +/*12 */ RES_CHRATR_SCALEW, RES_CHRATR_RELIEF, // insert position for CJK/CTL attributes! -/*14 */ RES_PARATR_LINESPACING, RES_PARATR_HYPHENZONE, -/*16 */ RES_PARATR_REGISTER, RES_PARATR_REGISTER, -/*18 */ RES_PARATR_VERTALIGN, RES_PARATR_VERTALIGN, -/*20 */ RES_LR_SPACE, RES_UL_SPACE, -/*22 */ SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP, -/*24 */ 0 +/*14 */ RES_PARATR_LINESPACING, RES_PARATR_HYPHENZONE, +/*16 */ RES_PARATR_REGISTER, RES_PARATR_REGISTER, +/*18 */ RES_PARATR_VERTALIGN, RES_PARATR_VERTALIGN, +/*20 */ RES_LR_SPACE, RES_UL_SPACE, +/*22 */ SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP, +/*24 */ 0 }; static const USHORT aCJKAttr[] = { - RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_WEIGHT, + RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_WEIGHT, RES_CHRATR_EMPHASIS_MARK, RES_CHRATR_TWO_LINES, RES_PARATR_SCRIPTSPACE, RES_PARATR_FORBIDDEN_RULES }; static const USHORT aCTLAttr[] = { - RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_WEIGHT + RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_WEIGHT }; SvUShorts aArr( 0, 16 ); - aArr.Insert( aNormalAttr, + aArr.Insert( aNormalAttr, sizeof( aNormalAttr ) / sizeof( aNormalAttr[0] ), 0 ); if( SW_MOD()->GetCTLOptions().IsCTLFontEnabled() ) - aArr.Insert( aCTLAttr, + aArr.Insert( aCTLAttr, sizeof( aCTLAttr ) / sizeof( aCTLAttr[0] ), 14 ); SvtCJKOptions aCJKOpt; if( aCJKOpt.IsAnyEnabled() ) - aArr.Insert( aCJKAttr, + aArr.Insert( aCJKAttr, sizeof( aCJKAttr ) / sizeof( aCJKAttr[0] ), 14 ); @@ -678,8 +678,8 @@ ULONG SwView::FUNC_Search( const SwSearchOptions& rOptions ) /* -- Seitenumbruch mit Seitenvorlage */ ::SfxToSwPageDescAttr( *pWrtShell, *pReplSet ); - if( !pReplSet->Count() ) // schade, die Attribute - DELETEZ( pReplSet ); // kennen wir nicht + if( !pReplSet->Count() ) // schade, die Attribute + DELETEZ( pReplSet ); // kennen wir nicht } // @@ -781,16 +781,16 @@ void SwView::StateSearch(SfxItemSet &rSet) } break; -/* case SID_SEARCH_REPLACESET: +/* case SID_SEARCH_REPLACESET: case SID_SEARCH_SEARCHSET: { static USHORT __READONLY_DATA aSearchAttrRange[] = { - RES_CHRATR_CASEMAP, RES_CHRATR_POSTURE, - RES_CHRATR_SHADOWED, RES_CHRATR_WORDLINEMODE, + RES_CHRATR_CASEMAP, RES_CHRATR_POSTURE, + RES_CHRATR_SHADOWED, RES_CHRATR_WORDLINEMODE, RES_PARATR_LINESPACING, RES_PARATR_HYPHENZONE, - RES_LR_SPACE, RES_UL_SPACE, - SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP, + RES_LR_SPACE, RES_UL_SPACE, + SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP, 0 }; diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx index b0d5f71744c9..20821d5d612d 100755 --- a/sw/source/ui/uiview/viewstat.cxx +++ b/sw/source/ui/uiview/viewstat.cxx @@ -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 @@ -93,7 +93,7 @@ void SwView::GetState(SfxItemSet &rSet) switch(nWhich) { case FN_EDIT_LINK_DLG: - if( !pWrtShell->GetLinkManager().GetLinks().Count() ) + if( !pWrtShell->GetLinkManager().GetLinks().Count() ) rSet.DisableItem(nWhich); else if( pWrtShell->IsSelFrmMode() && pWrtShell->IsSelObjProtected(FLYPROTECT_CONTENT)) @@ -137,7 +137,7 @@ void SwView::GetState(SfxItemSet &rSet) break; case SID_PRINTDOC: case SID_PRINTDOCDIRECT: - GetSlotState( nWhich, SfxViewShell::GetInterface(), &rSet ); + GetSlotState( nWhich, SfxViewShell::GetInterface(), &rSet ); break; case SID_ATTR_PAGE: case SID_ATTR_PAGE_SIZE: @@ -169,7 +169,7 @@ void SwView::GetState(SfxItemSet &rSet) case SID_UNDO: { //JP 21.07.98: Bug 53429 - die muss noch nicht vorhanden sein - // also lasse sie mal anlegen: + // also lasse sie mal anlegen: if( !pShell ) SelectShell(); @@ -304,7 +304,7 @@ void SwView::GetState(SfxItemSet &rSet) case SID_THESAURUS: { SwWrtShell &rSh = GetWrtShell(); - if (2 <= rSh.GetCrsrCnt()) // multi selection? + if (2 <= rSh.GetCrsrCnt()) // multi selection? rSet.DisableItem(nWhich); else { @@ -342,7 +342,7 @@ void SwView::GetState(SfxItemSet &rSet) case SID_DOCUMENT_COMPARE: case SID_DOCUMENT_MERGE: if( GetDocShell()->IsA( SwGlobalDocShell::StaticType() ) || -// pWrtShell->IsAnySectionInDoc( sal_True, sal_True, sal_True )|| +// pWrtShell->IsAnySectionInDoc( sal_True, sal_True, sal_True )|| (SID_DOCUMENT_MERGE == nWhich && pWrtShell->getIDocumentRedlineAccess()->GetRedlinePassword().getLength())) rSet.DisableItem(nWhich); break; diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index 44e314a7475b..d80233ef3e6d 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -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 @@ -59,8 +59,8 @@ #include "cmdid.h" #include "viewopt.hxx" #include "tabcol.hxx" -#include "frmfmt.hxx" // FrameFormat -#include "pagedesc.hxx" // Aktuelles Seitenformat +#include "frmfmt.hxx" // FrameFormat +#include "pagedesc.hxx" // Aktuelles Seitenformat #include "wview.hxx" #include "fmtcol.hxx" #include "section.hxx" @@ -76,12 +76,12 @@ using namespace ::com::sun::star; /*-------------------------------------------------------------------- - Beschreibung: Debug-Methode + Beschreibung: Debug-Methode --------------------------------------------------------------------*/ /*-------------------------------------------------------------------- - Beschreibung: Columns eintueten + Beschreibung: Columns eintueten --------------------------------------------------------------------*/ @@ -124,7 +124,7 @@ void lcl_FillSvxColumn(const SwFmtCol& rCol, } /*-------------------------------------------------------------------- - Beschreibung: ColumnItem in ColumnInfo ueberfuehren + Beschreibung: ColumnItem in ColumnInfo ueberfuehren --------------------------------------------------------------------*/ @@ -138,7 +138,7 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem, if(rCols.GetNumCols() != rColItem.Count()) return; - USHORT nLeft = 0; + USHORT nLeft = 0; SwTwips nSumAll= 0; // Summiere alle Spalten und Raender auf SwColumns& rArr = rCols.GetColumns(); @@ -151,7 +151,7 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem, USHORT nEnd = static_cast< USHORT >(rColItem[i].nEnd); if(nStart < nEnd) nStart = nEnd; - const USHORT nDiff = nStart - nEnd; + const USHORT nDiff = nStart - nEnd; const USHORT nRight = nDiff / 2; USHORT nWidth = static_cast< USHORT >(rColItem[i].nEnd - rColItem[i].nStart); @@ -176,7 +176,7 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem, } /*-------------------------------------------------------------------- - Beschreibung: Tabs loeschen + Beschreibung: Tabs loeschen --------------------------------------------------------------------*/ @@ -197,7 +197,7 @@ void lcl_EraseDefTabs(SvxTabStopItem& rTabStops) } /*-------------------------------------------------------------------- - Beschreibung: Seitenrand umdrehen + Beschreibung: Seitenrand umdrehen --------------------------------------------------------------------*/ @@ -215,7 +215,7 @@ void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace) } /*-------------------------------------------------------------------- - Beschreibung: Wenn der Rahmenrand verschoben wird, sollen die + Beschreibung: Wenn der Rahmenrand verschoben wird, sollen die Spaltentrenner an der gleichen absoluten Position bleiben --------------------------------------------------------------------*/ @@ -265,23 +265,23 @@ void ResizeFrameCols(SwFmtCol& rCol, rCol.SetOrtho(FALSE, 0, 0 ); } /*-------------------------------------------------------------------- - Beschreibung: Hier werden alle Aenderungen der Tableiste + Beschreibung: Hier werden alle Aenderungen der Tableiste wieder in das Modell geschossen --------------------------------------------------------------------*/ void SwView::ExecTabWin( SfxRequest& rReq ) { - SwWrtShell &rSh = GetWrtShell(); - const USHORT nFrmType = rSh.IsObjSelected() ? + SwWrtShell &rSh = GetWrtShell(); + const USHORT nFrmType = rSh.IsObjSelected() ? FRMTYPE_DRAWOBJ : rSh.GetFrmType(0,TRUE); - const BOOL bFrmSelection = rSh.IsFrmSelected(); + const BOOL bFrmSelection = rSh.IsFrmSelected(); const BOOL bBrowse = rSh.getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); - const USHORT nSlot = rReq.GetSlot(); - const USHORT nDescId = rSh.GetCurPageDesc(); + const USHORT nSlot = rReq.GetSlot(); + const USHORT nDescId = rSh.GetCurPageDesc(); const SwPageDesc& rDesc = rSh.GetPageDesc( nDescId ); const BOOL bVerticalWriting = rSh.IsInVerticalText(); @@ -301,7 +301,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) rSh.StartAllAction(); BOOL bSect = 0 != (nFrmType & FRMTYPE_COLSECT); - switch ( nSlot ) + switch ( nSlot ) { case SID_ATTR_LONG_LRSPACE: { @@ -426,7 +426,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) rSh.UpdateSection(rSh.GetSectionFmtPos(*pSectFmt), aData, &aSet); } else - { // Seitenraender einstellen + { // Seitenraender einstellen aLR.SetLeft((USHORT)aLongLR.GetLeft()); aLR.SetRight((USHORT)aLongLR.GetRight()); SwapPageMargin( rDesc, aLR ); @@ -516,7 +516,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) rSh.UpdateSection(rSh.GetSectionFmtPos(*pSectFmt), aData, &aSet); } else - { SwPageDesc aDesc( rDesc ); + { SwPageDesc aDesc( rDesc ); if ( nFrmType & ( FRMTYPE_HEADER | FRMTYPE_FOOTER )) { @@ -580,7 +580,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) ::MakeDefTabs( nDef, aTabStops ); SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl(); - if( pColl && pColl->IsAutoUpdateFmt() ) + if( pColl && pColl->IsAutoUpdateFmt() ) { SfxItemSet aTmp(GetPool(), RES_PARATR_TABSTOP, RES_PARATR_TABSTOP); aTmp.Put(aTabStops); @@ -676,7 +676,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) USHORT nDef = ::GetTabDist(rDefTabs); ::MakeDefTabs( nDef, aTabStops ); - if( pColl && pColl->IsAutoUpdateFmt()) + if( pColl && pColl->IsAutoUpdateFmt()) { SfxItemSet aSetTmp(GetPool(), RES_PARATR_TABSTOP, RES_PARATR_TABSTOP); aSetTmp.Put(aTabStops); @@ -898,7 +898,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) } /*-------------------------------------------------------------------- - Beschreibung: Hier wird der Status der Tableiste ermittelt + Beschreibung: Hier wird der Status der Tableiste ermittelt sprich alle relevanten Attribute an der CursorPos werden der Tableiste uebermittelt --------------------------------------------------------------------*/ @@ -906,14 +906,14 @@ void SwView::ExecTabWin( SfxRequest& rReq ) void SwView::StateTabWin(SfxItemSet& rSet) { - SwWrtShell &rSh = GetWrtShell(); + SwWrtShell &rSh = GetWrtShell(); const Point* pPt = IsTabColFromDoc() || IsTabRowFromDoc() ? &aTabColFromDocPos : 0; - const USHORT nFrmType = rSh.IsObjSelected() + const USHORT nFrmType = rSh.IsObjSelected() ? FRMTYPE_DRAWOBJ : rSh.GetFrmType( pPt, TRUE ); - const BOOL bFrmSelection = rSh.IsFrmSelected(); + const BOOL bFrmSelection = rSh.IsFrmSelected(); const BOOL bBrowse = rSh.getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); // PageOffset/Begrenzer @@ -944,7 +944,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) SwapPageMargin( rDesc, aPageLRSpace ); SfxItemSet aCoreSet( GetPool(), RES_PARATR_TABSTOP, RES_PARATR_TABSTOP, - RES_LR_SPACE, RES_UL_SPACE, 0 ); + RES_LR_SPACE, RES_UL_SPACE, 0 ); // --> OD 2008-01-17 #newlistlevelattrs# // get also the list level indent values merged as LR-SPACE item, if needed. rSh.GetCurAttr( aCoreSet, true ); @@ -1292,7 +1292,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) else if ( bHasTable ) { SwTabCols aTabCols; - USHORT nNum; + USHORT nNum; if ( 0 != ( bSetTabColFromDoc = IsTabColFromDoc() ) ) { rSh.GetMouseTabCols( aTabCols, aTabColFromDocPos ); @@ -1460,7 +1460,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) rSet.DisableItem(nWhich); } else - { // Spalten auf der Seite + { // Spalten auf der Seite const SwFrmFmt& rMaster = rDesc.GetMaster(); SwFmtCol aCol(rMaster.GetCol()); if(rFrameDir.GetValue() == FRMDIR_HORI_RIGHT_TOP) @@ -1581,7 +1581,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) { // PAGES01 SvxPagePosSizeItem aPagePosSize( - Point( rPageRect.Left(), rPageRect.Top()) , nPageWidth, nPageHeight); + Point( rPageRect.Left(), rPageRect.Top()) , nPageWidth, nPageHeight); rSet.Put(aPagePosSize); break; @@ -1713,10 +1713,10 @@ void SwView::StateTabWin(SfxItemSet& rSet) } } else - { //hier nur fuer Tabelle in mehrspaltigen Seiten und Rahmen + { //hier nur fuer Tabelle in mehrspaltigen Seiten und Rahmen BOOL bSectOutTbl = (nFrmType & FRMTYPE_TABLE) ? TRUE : FALSE; BOOL bFrame = (nFrmType & FRMTYPE_FLY_ANY) ? TRUE : FALSE; - BOOL bColSct = (nFrmType & ( bSectOutTbl + BOOL bColSct = (nFrmType & ( bSectOutTbl ? FRMTYPE_COLSECTOUTTAB : FRMTYPE_COLSECT ) ) ? TRUE : FALSE; @@ -1778,7 +1778,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) if( bFrame | bColSct ) { aRectangle.Left() = aRect.Left() - rPageRect.Left() + nStart; - aRectangle.Right() = nPageWidth - aRectangle.Left() - nEnd + nStart; + aRectangle.Right() = nPageWidth - aRectangle.Left() - nEnd + nStart; } else if(!bBrowse) { @@ -1817,9 +1817,9 @@ void SwView::StateTabWin(SfxItemSet& rSet) BYTE nProtect = pWrtShell->IsSelObjProtected( FLYPROTECT_SIZE|FLYPROTECT_POS|FLYPROTECT_CONTENT ); SvxProtectItem aProt(SID_RULER_PROTECT); - aProt.SetCntntProtect((nProtect & FLYPROTECT_CONTENT) != 0); - aProt.SetSizeProtect ((nProtect & FLYPROTECT_SIZE) != 0); - aProt.SetPosProtect ((nProtect & FLYPROTECT_POS) != 0); + aProt.SetCntntProtect((nProtect & FLYPROTECT_CONTENT) != 0); + aProt.SetSizeProtect ((nProtect & FLYPROTECT_SIZE) != 0); + aProt.SetPosProtect ((nProtect & FLYPROTECT_POS) != 0); rSet.Put(aProt); } else diff --git a/sw/source/ui/uno/RefreshListenerContainer.cxx b/sw/source/ui/uno/RefreshListenerContainer.cxx index 39d28a6347c1..a57353254df7 100644 --- a/sw/source/ui/uno/RefreshListenerContainer.cxx +++ b/sw/source/ui/uno/RefreshListenerContainer.cxx @@ -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/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index b0ad816df4a1..48d6a30d5940 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -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,7 +124,9 @@ enum SwDocumentSettingsPropertyHandles // --> OD 2008-06-05 #i89181# HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, // <-- - HANDLE_MODIFYPASSWORDINFO + HANDLE_MODIFYPASSWORDINFO, + HANDLE_INVERT_BORDER_SPACING, + HANDLE_COLLAPSE_EMPTY_CELL_PARA }; MasterPropertySetInfo * lcl_createSettingsInfo() @@ -132,25 +134,25 @@ MasterPropertySetInfo * lcl_createSettingsInfo() static PropertyInfo aWriterSettingsInfoMap[] = { { RTL_CONSTASCII_STRINGPARAM("ForbiddenCharacters"), HANDLE_FORBIDDEN_CHARS, CPPUTYPE_REFFORBCHARS, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("LinkUpdateMode"), HANDLE_LINK_UPDATE_MODE, CPPUTYPE_INT16, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("FieldAutoUpdate"), HANDLE_FIELD_AUTO_UPDATE, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ChartAutoUpdate"), HANDLE_CHART_AUTO_UPDATE, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("AddParaTableSpacing"), HANDLE_ADD_PARA_TABLE_SPACING, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("AddParaTableSpacingAtStart"), HANDLE_ADD_PARA_TABLE_SPACING_AT_START, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("AlignTabStopPosition"), HANDLE_ALIGN_TAB_STOP_POSITION, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("PrinterName"), HANDLE_PRINTER_NAME, CPPUTYPE_OUSTRING, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("PrinterSetup"), HANDLE_PRINTER_SETUP, CPPUTYPE_SEQINT8, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("IsKernAsianPunctuation"), HANDLE_IS_KERN_ASIAN_PUNCTUATION, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("CharacterCompressionType"), HANDLE_CHARACTER_COMPRESSION_TYPE, CPPUTYPE_INT16, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ApplyUserData"), HANDLE_APPLY_USER_DATA, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("SaveGlobalDocumentLinks"), HANDLE_SAVE_GLOBAL_DOCUMENT_LINKS, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseDataSource"), HANDLE_CURRENT_DATABASE_DATA_SOURCE, CPPUTYPE_OUSTRING, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseCommand"), HANDLE_CURRENT_DATABASE_COMMAND, CPPUTYPE_OUSTRING, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("LinkUpdateMode"), HANDLE_LINK_UPDATE_MODE, CPPUTYPE_INT16, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("FieldAutoUpdate"), HANDLE_FIELD_AUTO_UPDATE, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ChartAutoUpdate"), HANDLE_CHART_AUTO_UPDATE, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("AddParaTableSpacing"), HANDLE_ADD_PARA_TABLE_SPACING, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("AddParaTableSpacingAtStart"), HANDLE_ADD_PARA_TABLE_SPACING_AT_START, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("AlignTabStopPosition"), HANDLE_ALIGN_TAB_STOP_POSITION, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("PrinterName"), HANDLE_PRINTER_NAME, CPPUTYPE_OUSTRING, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("PrinterSetup"), HANDLE_PRINTER_SETUP, CPPUTYPE_SEQINT8, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("IsKernAsianPunctuation"), HANDLE_IS_KERN_ASIAN_PUNCTUATION, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("CharacterCompressionType"), HANDLE_CHARACTER_COMPRESSION_TYPE, CPPUTYPE_INT16, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ApplyUserData"), HANDLE_APPLY_USER_DATA, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("SaveGlobalDocumentLinks"), HANDLE_SAVE_GLOBAL_DOCUMENT_LINKS, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseDataSource"), HANDLE_CURRENT_DATABASE_DATA_SOURCE, CPPUTYPE_OUSTRING, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseCommand"), HANDLE_CURRENT_DATABASE_COMMAND, CPPUTYPE_OUSTRING, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseCommandType"), HANDLE_CURRENT_DATABASE_COMMAND_TYPE, CPPUTYPE_INT32, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("SaveVersionOnClose"), HANDLE_SAVE_VERSION_ON_CLOSE, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("SaveVersionOnClose"), HANDLE_SAVE_VERSION_ON_CLOSE, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("UpdateFromTemplate"), HANDLE_UPDATE_FROM_TEMPLATE, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("PrinterIndependentLayout"), HANDLE_PRINTER_INDEPENDENT_LAYOUT, CPPUTYPE_INT16, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("PrinterIndependentLayout"), HANDLE_PRINTER_INDEPENDENT_LAYOUT, CPPUTYPE_INT16, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("IsLabelDocument"), HANDLE_IS_LABEL_DOC, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("AddFrameOffsets"), HANDLE_IS_ADD_FLY_OFFSET, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("AddExternalLeading"), HANDLE_IS_ADD_EXTERNAL_LEADING, CPPUTYPE_BOOLEAN, 0, 0}, @@ -162,7 +164,7 @@ MasterPropertySetInfo * lcl_createSettingsInfo() { RTL_CONSTASCII_STRINGPARAM("AddParaSpacingToTableCells"), HANDLE_ADD_PARA_SPACING_TO_TABLE_CELLS, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("UseFormerObjectPositioning"), HANDLE_USE_FORMER_OBJECT_POSITIONING, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("UseFormerTextWrapping"), HANDLE_USE_FORMER_TEXT_WRAPPING, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("RedlineProtectionKey"), HANDLE_CHANGES_PASSWORD, CPPUTYPE_SEQINT8, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("RedlineProtectionKey"), HANDLE_CHANGES_PASSWORD, CPPUTYPE_SEQINT8, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("ConsiderTextWrapOnObjPos"), HANDLE_CONSIDER_WRAP_ON_OBJPOS, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("IgnoreFirstLineIndentInNumbering"), HANDLE_IGNORE_FIRST_LINE_INDENT_IN_NUMBERING, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("DoNotJustifyLinesWithManualBreak"), HANDLE_DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, CPPUTYPE_BOOLEAN, 0, 0}, @@ -179,32 +181,33 @@ MasterPropertySetInfo * lcl_createSettingsInfo() // --> OD 2008-06-05 #i89181# { RTL_CONSTASCII_STRINGPARAM("TabAtLeftIndentForParagraphsInList"), HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("ModifyPasswordInfo"), HANDLE_MODIFYPASSWORDINFO, CPPUTYPE_PROPERTYVALUE, 0, 0}, - + { RTL_CONSTASCII_STRINGPARAM("InvertBorderSpacing"), HANDLE_INVERT_BORDER_SPACING, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("CollapseEmptyCellPara"), HANDLE_COLLAPSE_EMPTY_CELL_PARA, CPPUTYPE_BOOLEAN, 0, 0}, /* * As OS said, we don't have a view when we need to set this, so I have to * find another solution before adding them to this property set - MTG - { RTL_CONSTASCII_STRINGPARAM("IsGridVisible"), HANDLE_IS_GRID_VISIBLE, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("IsSnapToGrid"), HANDLE_IS_SNAP_TO_GRID, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("IsSynchroniseAxes"), HANDLE_IS_SYNCHRONISE_AXES, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("HorizontalGridResolution"), HANDLE_HORIZONTAL_GRID_RESOLUTION, CPPUTYPE_INT32, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("HorizontalGridSubdivision"), HANDLE_HORIZONTAL_GRID_SUBDIVISION, CPPUTYPE_INT16, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("VerticalGridResolution"), HANDLE_VERTICAL_GRID_RESOLUTION, CPPUTYPE_INT32, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("VerticalGridSubdivision"), HANDLE_VERTICAL_GRID_SUBDIVISION, CPPUTYPE_INT16, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("IsGridVisible"), HANDLE_IS_GRID_VISIBLE, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("IsSnapToGrid"), HANDLE_IS_SNAP_TO_GRID, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("IsSynchroniseAxes"), HANDLE_IS_SYNCHRONISE_AXES, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("HorizontalGridResolution"), HANDLE_HORIZONTAL_GRID_RESOLUTION, CPPUTYPE_INT32, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("HorizontalGridSubdivision"), HANDLE_HORIZONTAL_GRID_SUBDIVISION, CPPUTYPE_INT16, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("VerticalGridResolution"), HANDLE_VERTICAL_GRID_RESOLUTION, CPPUTYPE_INT32, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("VerticalGridSubdivision"), HANDLE_VERTICAL_GRID_SUBDIVISION, CPPUTYPE_INT16, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowParagraphEnd"), HANDLE_SHOW_PARAGRAPH_END, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowOptionalHyphens"), HANDLE_SHOW_OPTIONAL_HYPHENS, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowSpaces"), HANDLE_SHOW_SPACES, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowTabs"), HANDLE_SHOW_TABS, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowBreaks"), HANDLE_SHOW_BREAKS, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowHiddenText"), HANDLE_SHOW_HIDDEN_TEXT, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowHiddenParagraphs"), HANDLE_SHOW_HIDDEN_PARAGRAPHS, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ShowParagraphEnd"), HANDLE_SHOW_PARAGRAPH_END, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ShowOptionalHyphens"), HANDLE_SHOW_OPTIONAL_HYPHENS, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ShowSpaces"), HANDLE_SHOW_SPACES, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ShowTabs"), HANDLE_SHOW_TABS, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ShowBreaks"), HANDLE_SHOW_BREAKS, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ShowHiddenText"), HANDLE_SHOW_HIDDEN_TEXT, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ShowHiddenParagraphs"), HANDLE_SHOW_HIDDEN_PARAGRAPHS, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowTextLimitGuide"), HANDLE_SHOW_TEXT_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowTableLimitGuide"), HANDLE_SHOW_TABLE_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowSectionLimitGuide"), HANDLE_SHOW_SECTION_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowGuidesWhileMoving"), HANDLE_SHOW_GUIDES_WHILE_MOVING, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowSimpleHandles"), HANDLE_SHOW_SIMPLE_HANDLES, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowLargeHandles"), HANDLE_SHOW_LARGE_HANDLES, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ShowTextLimitGuide"), HANDLE_SHOW_TEXT_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ShowTableLimitGuide"), HANDLE_SHOW_TABLE_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ShowSectionLimitGuide"), HANDLE_SHOW_SECTION_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ShowGuidesWhileMoving"), HANDLE_SHOW_GUIDES_WHILE_MOVING, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ShowSimpleHandles"), HANDLE_SHOW_SIMPLE_HANDLES, CPPUTYPE_BOOLEAN, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("ShowLargeHandles"), HANDLE_SHOW_LARGE_HANDLES, CPPUTYPE_BOOLEAN, 0, 0}, */ { NULL, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 } }; @@ -409,7 +412,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf static sal_uInt16 __READONLY_DATA nRange[] = { FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER, - SID_HTML_MODE, SID_HTML_MODE, + SID_HTML_MODE, SID_HTML_MODE, SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, 0 @@ -677,7 +680,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf { uno::Sequence< beans::PropertyValue > aInfo; if ( !( rValue >>= aInfo ) ) - throw lang::IllegalArgumentException( + throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value of type Sequence<PropertyValue> expected!" ) ), uno::Reference< uno::XInterface >(), 2 ); @@ -688,6 +691,18 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf uno::Reference< uno::XInterface >() ); } break; + case HANDLE_INVERT_BORDER_SPACING: + { + sal_Bool bTmp = *(sal_Bool*)rValue.getValue(); + mpDoc->set(IDocumentSettingAccess::INVERT_BORDER_SPACING, bTmp); + } + break; + case HANDLE_COLLAPSE_EMPTY_CELL_PARA: + { + sal_Bool bTmp = *(sal_Bool*)rValue.getValue(); + mpDoc->set(IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA, bTmp); + } + break; default: throw UnknownPropertyException(); } @@ -1020,7 +1035,18 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf rValue <<= mpDocSh->GetModifyPasswordInfo(); } break; - + case HANDLE_INVERT_BORDER_SPACING: + { + sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::INVERT_BORDER_SPACING); + rValue.setValue( &bTmp, ::getBooleanCppuType() ); + } + break; + case HANDLE_COLLAPSE_EMPTY_CELL_PARA: + { + sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA ); + rValue.setValue( &bTmp, ::getBooleanCppuType() ); + } + break; default: throw UnknownPropertyException(); } diff --git a/sw/source/ui/uno/SwXDocumentSettings.hxx b/sw/source/ui/uno/SwXDocumentSettings.hxx index 6ea168716e40..b9eb99632647 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.hxx +++ b/sw/source/ui/uno/SwXDocumentSettings.hxx @@ -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 @@ -56,10 +56,10 @@ class SwXDocumentSettings : public cppu::OWeakObject { protected: - com::sun::star::uno::Reference< com::sun::star::text::XTextDocument > mxModel; - SwXTextDocument* mpModel; - SwDocShell* mpDocSh; - SwDoc* mpDoc; + com::sun::star::uno::Reference< com::sun::star::text::XTextDocument > mxModel; + SwXTextDocument* mpModel; + SwDocShell* mpDocSh; + SwDoc* mpDoc; /** the printer should be set only once; since there are several * printer-related properties, remember the last printer and set it in diff --git a/sw/source/ui/uno/SwXFilterOptions.cxx b/sw/source/ui/uno/SwXFilterOptions.cxx index 015a75de2ab0..128c278e28d0 100644 --- a/sw/source/ui/uno/SwXFilterOptions.cxx +++ b/sw/source/ui/uno/SwXFilterOptions.cxx @@ -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/uno/SwXPrintPreviewSettings.cxx b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx index a812c39754c9..ba39ed59a23e 100644 --- a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx +++ b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx @@ -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 @@ -63,15 +63,15 @@ static ChainablePropertySetInfo * lcl_createPrintPreviewSettingsInfo() { static PropertyInfo aPrintPreviewSettingsMap_Impl[] = { - { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintLeftMargin" ), HANDLE_PRINTSET_PREVIEW_LEFT_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 }, - { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintRightMargin" ), HANDLE_PRINTSET_PREVIEW_RIGHT_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 }, - { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintTopMargin" ), HANDLE_PRINTSET_PREVIEW_TOP_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 }, - { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintBottomMargin" ),HANDLE_PRINTSET_PREVIEW_BOTTOM_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 }, - { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintHorizontalSpacing" ),HANDLE_PRINTSET_PREVIEW_HORIZONTAL_SPACING, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 }, - { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintVerticalSpacing" ), HANDLE_PRINTSET_PREVIEW_VERTICAL_SPACING, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 }, - { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintNumRows" ), HANDLE_PRINTSET_PREVIEW_NUM_ROWS, CPPUTYPE_INT8, PropertyAttribute::MAYBEVOID, 0 }, - { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintNumColumns" ), HANDLE_PRINTSET_PREVIEW_NUM_COLUMNS, CPPUTYPE_INT8, PropertyAttribute::MAYBEVOID, 0 }, - { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintLandscape" ), HANDLE_PRINTSET_PREVIEW_LANDSCAPE, CPPUTYPE_BOOLEAN, PropertyAttribute::MAYBEVOID, 0 }, + { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintLeftMargin" ), HANDLE_PRINTSET_PREVIEW_LEFT_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 }, + { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintRightMargin" ), HANDLE_PRINTSET_PREVIEW_RIGHT_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 }, + { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintTopMargin" ), HANDLE_PRINTSET_PREVIEW_TOP_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 }, + { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintBottomMargin" ),HANDLE_PRINTSET_PREVIEW_BOTTOM_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 }, + { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintHorizontalSpacing" ),HANDLE_PRINTSET_PREVIEW_HORIZONTAL_SPACING, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 }, + { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintVerticalSpacing" ), HANDLE_PRINTSET_PREVIEW_VERTICAL_SPACING, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 }, + { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintNumRows" ), HANDLE_PRINTSET_PREVIEW_NUM_ROWS, CPPUTYPE_INT8, PropertyAttribute::MAYBEVOID, 0 }, + { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintNumColumns" ), HANDLE_PRINTSET_PREVIEW_NUM_COLUMNS, CPPUTYPE_INT8, PropertyAttribute::MAYBEVOID, 0 }, + { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintLandscape" ), HANDLE_PRINTSET_PREVIEW_LANDSCAPE, CPPUTYPE_BOOLEAN, PropertyAttribute::MAYBEVOID, 0 }, { 0, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 } }; return new ChainablePropertySetInfo ( aPrintPreviewSettingsMap_Impl ); @@ -93,7 +93,7 @@ SwXPrintPreviewSettings::~SwXPrintPreviewSettings() Any SAL_CALL SwXPrintPreviewSettings::queryInterface( const Type& rType ) throw(RuntimeException) { - return ::cppu::queryInterface ( rType , + return ::cppu::queryInterface ( rType , // OWeakObject interfaces dynamic_cast< XInterface* >( dynamic_cast< OWeakObject* >(this) ) , dynamic_cast< XWeak* >( this ) , @@ -122,15 +122,15 @@ void SwXPrintPreviewSettings::_preSetValues () mpPreViewData = new SwPagePreViewPrtData; if ( pConstPrtData ) { - mpPreViewData->SetLeftSpace ( pConstPrtData->GetLeftSpace() ); - mpPreViewData->SetRightSpace ( pConstPrtData->GetRightSpace() ); - mpPreViewData->SetTopSpace ( pConstPrtData->GetTopSpace() ); - mpPreViewData->SetBottomSpace ( pConstPrtData->GetBottomSpace() ); - mpPreViewData->SetHorzSpace ( pConstPrtData->GetHorzSpace() ); - mpPreViewData->SetVertSpace ( pConstPrtData->GetVertSpace() ); - mpPreViewData->SetRow ( pConstPrtData->GetRow() ); - mpPreViewData->SetCol ( pConstPrtData->GetCol() ); - mpPreViewData->SetLandscape ( pConstPrtData->GetLandscape() ); + mpPreViewData->SetLeftSpace ( pConstPrtData->GetLeftSpace() ); + mpPreViewData->SetRightSpace ( pConstPrtData->GetRightSpace() ); + mpPreViewData->SetTopSpace ( pConstPrtData->GetTopSpace() ); + mpPreViewData->SetBottomSpace ( pConstPrtData->GetBottomSpace() ); + mpPreViewData->SetHorzSpace ( pConstPrtData->GetHorzSpace() ); + mpPreViewData->SetVertSpace ( pConstPrtData->GetVertSpace() ); + mpPreViewData->SetRow ( pConstPrtData->GetRow() ); + mpPreViewData->SetCol ( pConstPrtData->GetCol() ); + mpPreViewData->SetLandscape ( pConstPrtData->GetLandscape() ); } } } diff --git a/sw/source/ui/uno/SwXPrintPreviewSettings.hxx b/sw/source/ui/uno/SwXPrintPreviewSettings.hxx index 2b908c453043..8cbc3e0567a3 100644 --- a/sw/source/ui/uno/SwXPrintPreviewSettings.hxx +++ b/sw/source/ui/uno/SwXPrintPreviewSettings.hxx @@ -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 @@ -46,8 +46,8 @@ class SwXPrintPreviewSettings :public comphelper::ChainablePropertySet, { friend class SwXDocumentSettings; protected: - sal_Bool mbPreviewDataChanged; - SwDoc* mpDoc; + sal_Bool mbPreviewDataChanged; + SwDoc* mpDoc; SwPagePreViewPrtData *mpPreViewData; const SwPagePreViewPrtData *mpConstPreViewData; diff --git a/sw/source/ui/uno/detreg.cxx b/sw/source/ui/uno/detreg.cxx index 8c5e5f0634f8..3a7741e2a581 100644 --- a/sw/source/ui/uno/detreg.cxx +++ b/sw/source/ui/uno/detreg.cxx @@ -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 @@ -44,8 +44,8 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( } SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey ) + void* /*pServiceManager*/, + void* pRegistryKey ) { Reference< ::registry::XRegistryKey > xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ; @@ -75,9 +75,9 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( // Set default return value for this operation - if it failed. void* pReturn = NULL ; - if ( - ( pImplementationName != NULL ) && - ( pServiceManager != NULL ) + if ( + ( pImplementationName != NULL ) && + ( pServiceManager != NULL ) ) { // Define variables which are used in following macros. diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx index c163feda46b5..c09a35bf5d81 100644 --- a/sw/source/ui/uno/dlelstnr.cxx +++ b/sw/source/ui/uno/dlelstnr.cxx @@ -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 @@ -59,7 +59,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::linguistic2::LinguServiceEventFlags; -#define A2OU(x) OUString::createFromAscii(x) +#define A2OU(x) OUString::createFromAscii(x) /* -----------------------------17.03.00 09:07-------------------------------- @@ -117,17 +117,17 @@ void SwLinguServiceEventListener::processDictionaryListEvent( sal_Int16 nEvt = rDicListEvent.nCondensedEvent; sal_Int16 nSpellWrongFlags = - DictionaryListEventFlags::ADD_POS_ENTRY | - DictionaryListEventFlags::DEL_NEG_ENTRY | - DictionaryListEventFlags::ACTIVATE_POS_DIC | + DictionaryListEventFlags::ADD_POS_ENTRY | + DictionaryListEventFlags::DEL_NEG_ENTRY | + DictionaryListEventFlags::ACTIVATE_POS_DIC | DictionaryListEventFlags::DEACTIVATE_NEG_DIC; - sal_Bool bIsSpellWrong = 0 != (nEvt & nSpellWrongFlags); + sal_Bool bIsSpellWrong = 0 != (nEvt & nSpellWrongFlags); sal_Int16 nSpellAllFlags = - DictionaryListEventFlags::ADD_NEG_ENTRY | - DictionaryListEventFlags::DEL_POS_ENTRY | - DictionaryListEventFlags::ACTIVATE_NEG_DIC | + DictionaryListEventFlags::ADD_NEG_ENTRY | + DictionaryListEventFlags::DEL_POS_ENTRY | + DictionaryListEventFlags::ACTIVATE_NEG_DIC | DictionaryListEventFlags::DEACTIVATE_POS_DIC; - sal_Bool bIsSpellAll = 0 != (nEvt & nSpellAllFlags); + sal_Bool bIsSpellAll = 0 != (nEvt & nSpellAllFlags); if (bIsSpellWrong || bIsSpellAll) SW_MOD()->CheckSpellChanges( sal_False, bIsSpellWrong, bIsSpellAll, sal_False ); diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx index cf27027148a7..d021c7fc82ac 100644 --- a/sw/source/ui/uno/swdet2.cxx +++ b/sw/source/ui/uno/swdet2.cxx @@ -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/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index cbde03479433..5bbf2bdf073e 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -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/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx index d3c65df67ce5..3677bd7f892e 100644 --- a/sw/source/ui/uno/swdetect.hxx +++ b/sw/source/ui/uno/swdetect.hxx @@ -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 @@ -78,8 +78,8 @@ class SfxFilter; class SwFilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo > { - static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter ); - static ULONG GlobDetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter ); + static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter ); + static ULONG GlobDetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter ); public: SwFilterDetect( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); virtual ~SwFilterDetect(); diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index 4578ef27c2ea..08451f6a246d 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -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 @@ -164,7 +164,7 @@ uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName) ::vos::OGuard aGuard(Application::GetSolarMutex()); uno::Reference< text::XAutoTextGroup > xGroup; - if ( pGlossaries && hasByName( GroupName ) ) // group name already known? + if ( pGlossaries && hasByName( GroupName ) ) // group name already known? // TRUE = create group if not already available xGroup = pGlossaries->GetAutoTextGroup( GroupName, TRUE ); @@ -224,7 +224,7 @@ uno::Reference< text::XAutoTextGroup > SwXAutoTextContainer::insertNewByName( for(sal_Int32 nPos = 0; nPos < aGroupName.getLength(); nPos++) { sal_Unicode cChar = aGroupName[nPos]; - if( ((cChar >= 'A') && (cChar <= 'Z')) || + if( ((cChar >= 'A') && (cChar <= 'Z')) || ((cChar >= 'a') && (cChar <= 'z')) || ((cChar >= '0') && (cChar <= '9')) || (cChar == '_') || @@ -321,7 +321,7 @@ sal_Int64 SAL_CALL SwXAutoTextGroup::getSomething( const uno::Sequence< sal_Int8 -----------------------------------------------------------------------*/ SwXAutoTextGroup::SwXAutoTextGroup(const OUString& rName, - SwGlossaries* pGlos) : + SwGlossaries* pGlos) : pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_AUTO_TEXT_GROUP)), pGlossaries(pGlos), sName(rName), @@ -932,7 +932,7 @@ void SwXAutoTextEntry::implFlushDocument( bool _bCloseDoc ) void SwXAutoTextEntry::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint ) { if ( &_rBC == &xDocSh ) - { // it's our document + { // it's our document if ( _rHint.ISA( SfxSimpleHint ) ) { if ( SFX_HINT_DEINITIALIZING == static_cast< const SfxSimpleHint& >( _rHint ).GetId() ) @@ -1186,8 +1186,8 @@ uno::Reference< container::XNameReplace > SwXAutoTextEntry::getEvents() ---------------------------------------------------------------------------*/ const struct SvEventDescription aAutotextEvents[] = { - { SW_EVENT_START_INS_GLOSSARY, "OnInsertStart" }, - { SW_EVENT_END_INS_GLOSSARY, "OnInsertDone" }, + { SW_EVENT_START_INS_GLOSSARY, "OnInsertStart" }, + { SW_EVENT_END_INS_GLOSSARY, "OnInsertDone" }, { 0, NULL } }; diff --git a/sw/source/ui/uno/unodefaults.cxx b/sw/source/ui/uno/unodefaults.cxx index 87104a4fd4cb..bc22cbe144a8 100644 --- a/sw/source/ui/uno/unodefaults.cxx +++ b/sw/source/ui/uno/unodefaults.cxx @@ -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/uno/unodefaults.hxx b/sw/source/ui/uno/unodefaults.hxx index eda851f1c8b5..a96785a28344 100644 --- a/sw/source/ui/uno/unodefaults.hxx +++ b/sw/source/ui/uno/unodefaults.hxx @@ -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/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx index 7f0347ac8bf7..24e386259ef0 100644 --- a/sw/source/ui/uno/unodispatch.cxx +++ b/sw/source/ui/uno/unodispatch.cxx @@ -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 @@ -45,10 +45,10 @@ using namespace ::com::sun::star; using namespace rtl; using namespace vos; -const char* cURLStart = ".uno:DataSourceBrowser/"; -const char* cURLFormLetter = ".uno:DataSourceBrowser/FormLetter"; -const char* cURLInsertContent = ".uno:DataSourceBrowser/InsertContent";//data into fields -const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns";//data into text +const char* cURLStart = ".uno:DataSourceBrowser/"; +const char* cURLFormLetter = ".uno:DataSourceBrowser/FormLetter"; +const char* cURLInsertContent = ".uno:DataSourceBrowser/InsertContent";//data into fields +const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns";//data into text const char* cURLDocumentDataSource = ".uno:DataSourceBrowser/DocumentDataSource";//current data source of the document const sal_Char* cInternalDBChangeNotification = ".uno::Writer/DataSourceChanged"; /*-- 07.11.00 13:25:51--------------------------------------------------- diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/ui/uno/unodoc.cxx index 3558b5391a06..fc0c440ff265 100644 --- a/sw/source/ui/uno/unodoc.cxx +++ b/sw/source/ui/uno/unodoc.cxx @@ -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/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx index a322b0e677f9..8be7174c77e3 100644 --- a/sw/source/ui/uno/unofreg.cxx +++ b/sw/source/ui/uno/unofreg.cxx @@ -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 @@ -61,55 +61,55 @@ extern uno::Reference< uno::XInterface > SAL_CALL SwGlobalDocument_createInstanc // xml import extern uno::Sequence< OUString > SAL_CALL SwXMLImport_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLImport_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImport_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImport_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); extern uno::Sequence< OUString > SAL_CALL SwXMLImportStyles_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLImportStyles_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportStyles_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportStyles_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); extern uno::Sequence< OUString > SAL_CALL SwXMLImportContent_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLImportContent_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportContent_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportContent_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); extern uno::Sequence< OUString > SAL_CALL SwXMLImportMeta_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLImportMeta_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportMeta_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportMeta_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); extern uno::Sequence< OUString > SAL_CALL SwXMLImportSettings_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLImportSettings_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportSettings_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportSettings_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); // xml export (OOo) extern uno::Sequence< OUString > SAL_CALL SwXMLExportOOO_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLExportOOO_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); extern uno::Sequence< OUString > SAL_CALL SwXMLExportContentOOO_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLExportContentOOO_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportContentOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportContentOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); extern uno::Sequence< OUString > SAL_CALL SwXMLExportStylesOOO_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLExportStylesOOO_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportStylesOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportStylesOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); extern uno::Sequence< OUString > SAL_CALL SwXMLExportMetaOOO_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLExportMetaOOO_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportMetaOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportMetaOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); extern uno::Sequence< OUString > SAL_CALL SwXMLExportSettingsOOO_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLExportSettingsOOO_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportSettingsOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportSettingsOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); // xml export (OASIS) extern uno::Sequence< OUString > SAL_CALL SwXMLExport_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLExport_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExport_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExport_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); extern uno::Sequence< OUString > SAL_CALL SwXMLExportContent_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLExportContent_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportContent_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportContent_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); extern uno::Sequence< OUString > SAL_CALL SwXMLExportStyles_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLExportStyles_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportStyles_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportStyles_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); extern uno::Sequence< OUString > SAL_CALL SwXMLExportMeta_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLExportMeta_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportMeta_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportMeta_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); extern uno::Sequence< OUString > SAL_CALL SwXMLExportSettings_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMLExportSettings_getImplementationName() throw(); -extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportSettings_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportSettings_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); //API objects extern uno::Sequence< OUString > SAL_CALL SwXAutoTextContainer_getSupportedServiceNames() throw(); diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 06b9e62b4a94..08c720d0b387 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -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 @@ -114,9 +114,9 @@ osl::Mutex & GetMailMergeMutex() enum CloseResult { - eSuccess, // successfully closed - eVetoed, // vetoed, ownership transfered to the vetoing instance - eFailed // failed for some unknown reason + eSuccess, // successfully closed + eVetoed, // vetoed, ownership transfered to the vetoing instance + eFailed // failed for some unknown reason }; static CloseResult CloseModelAndDocSh( Reference< frame::XModel > &rxModel, @@ -214,11 +214,11 @@ namespace class DelayedFileDeletion : public ::cppu::WeakImplHelper1< util::XCloseListener > { protected: - ::osl::Mutex m_aMutex; - Reference< util::XCloseable > m_xDocument; - Timer m_aDeleteTimer; - String m_sTemporaryFile; - sal_Int32 m_nPendingDeleteAttempts; + ::osl::Mutex m_aMutex; + Reference< util::XCloseable > m_xDocument; + Timer m_aDeleteTimer; + String m_sTemporaryFile; + sal_Int32 m_nPendingDeleteAttempts; public: DelayedFileDeletion( const Reference< XModel >& _rxModel, @@ -239,8 +239,8 @@ namespace DECL_LINK( OnTryDeleteFile, void* ); private: - DelayedFileDeletion( const DelayedFileDeletion& ); // never implemented - DelayedFileDeletion& operator=( const DelayedFileDeletion& ); // never implemented + DelayedFileDeletion( const DelayedFileDeletion& ); // never implemented + DelayedFileDeletion& operator=( const DelayedFileDeletion& ); // never implemented }; DBG_NAME( DelayedFileDeletion ) @@ -297,7 +297,7 @@ namespace m_aDeleteTimer.Start(); } else - bSuccess = sal_True; // can't do anything here ... + bSuccess = sal_True; // can't do anything here ... } catch( const Exception& ) { @@ -310,7 +310,7 @@ namespace { SWUnoHelper::UCB_DeleteFile( m_sTemporaryFile ); aGuard.clear(); - release(); // this should be our last reference, we should be dead after this + release(); // this should be our last reference, we should be dead after this } return 0L; } @@ -328,9 +328,9 @@ namespace DBG_ERROR( "DelayedFileDeletion::implTakeOwnership: could not revoke the listener!" ); } - m_aDeleteTimer.SetTimeout( 3000 ); // 3 seconds + m_aDeleteTimer.SetTimeout( 3000 ); // 3 seconds m_aDeleteTimer.SetTimeoutHdl( LINK( this, DelayedFileDeletion, OnTryDeleteFile ) ); - m_nPendingDeleteAttempts = 3; // try 3 times at most + m_nPendingDeleteAttempts = 3; // try 3 times at most m_aDeleteTimer.Start( ); } @@ -404,7 +404,7 @@ static BOOL DeleteTmpFile_Impl( } } else - bRes = TRUE; // file will be deleted delayed + bRes = TRUE; // file will be deleted delayed } return bRes; } @@ -445,7 +445,7 @@ SwXMailMerge::~SwXMailMerge() { if (aTmpFileName.Len()) DeleteTmpFile_Impl( xModel, xDocSh, aTmpFileName ); - else // there was no temporary file in use + else // there was no temporary file in use { //! we still need to close the model and doc shell manually //! because there is no automatism that will do that later. @@ -743,7 +743,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( aCurOutputURL = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); } } - else // default empty document without URL + else // default empty document without URL { if (!aCurOutputURL.getLength()) throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "OutputURL is not set and can not be obtained." ) ), static_cast < cppu::OWeakObject * > ( this ) ); @@ -835,7 +835,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( pMgr->SetMailMergeEvtSrc( pOldSrc ); if ( xCurModel.get() != xModel.get() ) - { // in case it was a temporary model -> close it, and delete the file + { // in case it was a temporary model -> close it, and delete the file DeleteTmpFile_Impl( xCurModel, xCurDocSh, aTmpFileName ); aTmpFileName.Erase(); } diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index bb0fde6b1fb4..50c19caaac98 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -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 @@ -143,36 +143,36 @@ static ChainablePropertySetInfo * lcl_createViewSettingsInfo() { RTL_CONSTASCII_STRINGPARAM ( "RasterSubdivisionX"), HANDLE_VIEWSET_RASTER_SUBDIVISION_X, CPPUTYPE_INT32, PROPERTY_NONE, 0}, { RTL_CONSTASCII_STRINGPARAM ( "RasterSubdivisionY"), HANDLE_VIEWSET_RASTER_SUBDIVISION_Y, CPPUTYPE_INT32, PROPERTY_NONE, 0}, { RTL_CONSTASCII_STRINGPARAM ( "ShowAnnotations" ), HANDLE_VIEWSET_ANNOTATIONS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowBreaks"), HANDLE_VIEWSET_BREAKS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowDrawings"), HANDLE_VIEWSET_DRAWINGS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowFieldCommands"), HANDLE_VIEWSET_FIELD_COMMANDS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowFootnoteBackground"),HANDLE_VIEWSET_FOOTNOTE_BACKGROUND , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowGraphics"), HANDLE_VIEWSET_GRAPHICS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowHiddenCharacters"), HANDLE_VIEWSET_HIDDEN_CHARACTERS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowHiddenParagraphs"), HANDLE_VIEWSET_HIDDEN_PARAGRAPHS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowHiddenText"), HANDLE_VIEWSET_HIDDEN_TEXT , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowHoriRuler"), HANDLE_VIEWSET_HRULER , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowHoriScrollBar"), HANDLE_VIEWSET_HSCROLL , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowIndexMarkBackground"),HANDLE_VIEWSET_INDEX_MARK_BACKGROUND, CPPUTYPE_BOOLEAN,PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowNonprintingCharacters"),HANDLE_VIEWSET_NONPRINTING_CHARACTERS, CPPUTYPE_BOOLEAN,PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowOnlineLayout"), HANDLE_VIEWSET_ONLINE_LAYOUT , CPPUTYPE_BOOLEAN, PropertyAttribute::MAYBEVOID, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowParaBreaks"), HANDLE_VIEWSET_PARA_BREAKS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowProtectedSpaces"), HANDLE_VIEWSET_PROTECTED_SPACES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowBreaks"), HANDLE_VIEWSET_BREAKS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowDrawings"), HANDLE_VIEWSET_DRAWINGS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowFieldCommands"), HANDLE_VIEWSET_FIELD_COMMANDS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowFootnoteBackground"),HANDLE_VIEWSET_FOOTNOTE_BACKGROUND , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowGraphics"), HANDLE_VIEWSET_GRAPHICS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowHiddenCharacters"), HANDLE_VIEWSET_HIDDEN_CHARACTERS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowHiddenParagraphs"), HANDLE_VIEWSET_HIDDEN_PARAGRAPHS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowHiddenText"), HANDLE_VIEWSET_HIDDEN_TEXT , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowHoriRuler"), HANDLE_VIEWSET_HRULER , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowHoriScrollBar"), HANDLE_VIEWSET_HSCROLL , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowIndexMarkBackground"),HANDLE_VIEWSET_INDEX_MARK_BACKGROUND, CPPUTYPE_BOOLEAN,PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowNonprintingCharacters"),HANDLE_VIEWSET_NONPRINTING_CHARACTERS, CPPUTYPE_BOOLEAN,PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowOnlineLayout"), HANDLE_VIEWSET_ONLINE_LAYOUT , CPPUTYPE_BOOLEAN, PropertyAttribute::MAYBEVOID, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowParaBreaks"), HANDLE_VIEWSET_PARA_BREAKS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowProtectedSpaces"), HANDLE_VIEWSET_PROTECTED_SPACES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, { RTL_CONSTASCII_STRINGPARAM ( "ShowRulers"), HANDLE_VIEWSET_SHOW_RULER , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowSoftHyphens"), HANDLE_VIEWSET_SOFT_HYPHENS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowSpaces"), HANDLE_VIEWSET_SPACES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowTableBoundaries"), HANDLE_VIEWSET_TABLE_BOUNDARIES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowTables"), HANDLE_VIEWSET_TABLES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowTabstops"), HANDLE_VIEWSET_TABSTOPS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowTextBoundaries"), HANDLE_VIEWSET_TEXT_BOUNDARIES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowTextFieldBackground"),HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND, CPPUTYPE_BOOLEAN,PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ShowVertRuler"), HANDLE_VIEWSET_VRULER , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowSoftHyphens"), HANDLE_VIEWSET_SOFT_HYPHENS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowSpaces"), HANDLE_VIEWSET_SPACES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowTableBoundaries"), HANDLE_VIEWSET_TABLE_BOUNDARIES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowTables"), HANDLE_VIEWSET_TABLES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowTabstops"), HANDLE_VIEWSET_TABSTOPS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowTextBoundaries"), HANDLE_VIEWSET_TEXT_BOUNDARIES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowTextFieldBackground"),HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND, CPPUTYPE_BOOLEAN,PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ShowVertRuler"), HANDLE_VIEWSET_VRULER , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, { RTL_CONSTASCII_STRINGPARAM ( "ShowVertScrollBar"), HANDLE_VIEWSET_VSCROLL , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "SmoothScrolling"), HANDLE_VIEWSET_SMOOTH_SCROLLING , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "SolidMarkHandles"), HANDLE_VIEWSET_SOLID_MARK_HANDLES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "SmoothScrolling"), HANDLE_VIEWSET_SMOOTH_SCROLLING , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "SolidMarkHandles"), HANDLE_VIEWSET_SOLID_MARK_HANDLES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, { RTL_CONSTASCII_STRINGPARAM ( "VerticalRulerMetric"), HANDLE_VIEWSET_VERT_RULER_METRIC , CPPUTYPE_INT32, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ZoomType"), HANDLE_VIEWSET_ZOOM_TYPE , CPPUTYPE_INT16, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "ZoomValue"), HANDLE_VIEWSET_ZOOM , CPPUTYPE_INT16, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ZoomType"), HANDLE_VIEWSET_ZOOM_TYPE , CPPUTYPE_INT16, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "ZoomValue"), HANDLE_VIEWSET_ZOOM , CPPUTYPE_INT16, PROPERTY_NONE, 0}, { 0, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 } }; return new ChainablePropertySetInfo ( aViewSettingsMap_Impl ); @@ -181,23 +181,23 @@ static ChainablePropertySetInfo * lcl_createPrintSettingsInfo() { static PropertyInfo aPrintSettingsMap_Impl[] = { - { RTL_CONSTASCII_STRINGPARAM ( "PrintAnnotationMode" ), HANDLE_PRINTSET_ANNOTATION_MODE , CPPUTYPE_INT16, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "PrintBlackFonts" ), HANDLE_PRINTSET_BLACK_FONTS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "PrintControls" ), HANDLE_PRINTSET_CONTROLS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "PrintDrawings" ), HANDLE_PRINTSET_DRAWINGS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "PrintGraphics" ), HANDLE_PRINTSET_GRAPHICS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "PrintAnnotationMode" ), HANDLE_PRINTSET_ANNOTATION_MODE , CPPUTYPE_INT16, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "PrintBlackFonts" ), HANDLE_PRINTSET_BLACK_FONTS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "PrintControls" ), HANDLE_PRINTSET_CONTROLS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "PrintDrawings" ), HANDLE_PRINTSET_DRAWINGS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "PrintGraphics" ), HANDLE_PRINTSET_GRAPHICS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, { RTL_CONSTASCII_STRINGPARAM ( "PrintHiddenText"), HANDLE_PRINTSET_HIDDEN_TEXT , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "PrintLeftPages" ), HANDLE_PRINTSET_LEFT_PAGES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "PrintPageBackground" ), HANDLE_PRINTSET_PAGE_BACKGROUND , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "PrintProspect" ), HANDLE_PRINTSET_PROSPECT , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "PrintLeftPages" ), HANDLE_PRINTSET_LEFT_PAGES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "PrintPageBackground" ), HANDLE_PRINTSET_PAGE_BACKGROUND , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "PrintProspect" ), HANDLE_PRINTSET_PROSPECT , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, { RTL_CONSTASCII_STRINGPARAM ( "PrintProspectRTL" ), HANDLE_PRINTSET_PROSPECT_RTL , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "PrintReversed" ), HANDLE_PRINTSET_REVERSED , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "PrintRightPages" ), HANDLE_PRINTSET_RIGHT_PAGES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "PrintFaxName" ), HANDLE_PRINTSET_FAX_NAME , CPPUTYPE_OUSTRING, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "PrintPaperFromSetup" ), HANDLE_PRINTSET_PAPER_FROM_SETUP , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "PrintTables" ), HANDLE_PRINTSET_TABLES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "PrintReversed" ), HANDLE_PRINTSET_REVERSED , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "PrintRightPages" ), HANDLE_PRINTSET_RIGHT_PAGES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "PrintFaxName" ), HANDLE_PRINTSET_FAX_NAME , CPPUTYPE_OUSTRING, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "PrintPaperFromSetup" ), HANDLE_PRINTSET_PAPER_FROM_SETUP , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "PrintTables" ), HANDLE_PRINTSET_TABLES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, { RTL_CONSTASCII_STRINGPARAM ( "PrintTextPlaceholder"), HANDLE_PRINTSET_PLACEHOLDER , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM ( "PrintSingleJobs" ), HANDLE_PRINTSET_SINGLE_JOBS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM ( "PrintSingleJobs" ), HANDLE_PRINTSET_SINGLE_JOBS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, { RTL_CONSTASCII_STRINGPARAM ( "PrintEmptyPages" ), HANDLE_PRINTSET_EMPTY_PAGES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0}, { 0, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 } }; @@ -623,7 +623,7 @@ Sequence< OUString > SwXPrintSettings::getSupportedServiceNames(void) throw( Run /*-- 18.12.98 11:01:10--------------------------------------------------- -----------------------------------------------------------------------*/ -SwXViewSettings::SwXViewSettings(sal_Bool bWebView, SwView* pVw) +SwXViewSettings::SwXViewSettings(sal_Bool bWebView, SwView* pVw) : ChainableHelperNoState( lcl_createViewSettingsInfo (), &Application::GetSolarMutex() ) , pView(pVw) , mpViewOption ( NULL ) @@ -678,30 +678,30 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c case HANDLE_VIEWSET_HRULER : mpViewOption->SetViewHRuler(bVal); break; case HANDLE_VIEWSET_VRULER : mpViewOption->SetViewVRuler(bVal);break; case HANDLE_VIEWSET_VRULER_RIGHT : mpViewOption->SetVRulerRight(bVal);break; - case HANDLE_VIEWSET_HSCROLL : mpViewOption->SetViewHScrollBar(bVal);break; - case HANDLE_VIEWSET_VSCROLL : mpViewOption->SetViewVScrollBar(bVal);break; + case HANDLE_VIEWSET_HSCROLL : mpViewOption->SetViewHScrollBar(bVal);break; + case HANDLE_VIEWSET_VSCROLL : mpViewOption->SetViewVScrollBar(bVal);break; case HANDLE_VIEWSET_GRAPHICS : mpViewOption->SetGraphic(bVal);break; - case HANDLE_VIEWSET_TABLES : mpViewOption->SetTable(bVal); break; - case HANDLE_VIEWSET_DRAWINGS : mpViewOption->SetDraw(bVal); break; - case HANDLE_VIEWSET_FIELD_COMMANDS : mpViewOption->SetFldName(bVal); break; - case HANDLE_VIEWSET_ANNOTATIONS : mpViewOption->SetPostIts(bVal); break; + case HANDLE_VIEWSET_TABLES : mpViewOption->SetTable(bVal); break; + case HANDLE_VIEWSET_DRAWINGS : mpViewOption->SetDraw(bVal); break; + case HANDLE_VIEWSET_FIELD_COMMANDS : mpViewOption->SetFldName(bVal); break; + case HANDLE_VIEWSET_ANNOTATIONS : mpViewOption->SetPostIts(bVal); break; case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, TRUE); break; case HANDLE_VIEWSET_NONPRINTING_CHARACTERS: mpViewOption->SetViewMetaChars( bVal ); break; case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, TRUE); break; case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, TRUE); break; - case HANDLE_VIEWSET_PARA_BREAKS : mpViewOption->SetParagraph(bVal); break; - case HANDLE_VIEWSET_SOFT_HYPHENS : mpViewOption->SetSoftHyph(bVal); break; - case HANDLE_VIEWSET_SPACES : mpViewOption->SetBlank(bVal); break; - case HANDLE_VIEWSET_PROTECTED_SPACES : mpViewOption->SetHardBlank(bVal); break; - case HANDLE_VIEWSET_TABSTOPS : mpViewOption->SetTab(bVal); break; + case HANDLE_VIEWSET_PARA_BREAKS : mpViewOption->SetParagraph(bVal); break; + case HANDLE_VIEWSET_SOFT_HYPHENS : mpViewOption->SetSoftHyph(bVal); break; + case HANDLE_VIEWSET_SPACES : mpViewOption->SetBlank(bVal); break; + case HANDLE_VIEWSET_PROTECTED_SPACES : mpViewOption->SetHardBlank(bVal); break; + case HANDLE_VIEWSET_TABSTOPS : mpViewOption->SetTab(bVal); break; case HANDLE_VIEWSET_BREAKS : mpViewOption->SetLineBreak(bVal); break; case HANDLE_VIEWSET_HIDDEN_TEXT : mpViewOption->SetShowHiddenField(bVal); break; case HANDLE_VIEWSET_HIDDEN_CHARACTERS : mpViewOption->SetShowHiddenChar(bVal); break; - case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : mpViewOption->SetShowHiddenPara(bVal); break; + case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : mpViewOption->SetShowHiddenPara(bVal); break; case HANDLE_VIEWSET_TABLE_BOUNDARIES : mpViewOption->SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, TRUE); break; case HANDLE_VIEWSET_TEXT_BOUNDARIES : mpViewOption->SetDocBoundaries(bVal); break; - case HANDLE_VIEWSET_SMOOTH_SCROLLING : mpViewOption->SetSmoothScroll(bVal); break; - case HANDLE_VIEWSET_SOLID_MARK_HANDLES : mpViewOption->SetSolidMarkHdl(bVal); break; + case HANDLE_VIEWSET_SMOOTH_SCROLLING : mpViewOption->SetSmoothScroll(bVal); break; + case HANDLE_VIEWSET_SOLID_MARK_HANDLES : mpViewOption->SetSolidMarkHdl(bVal); break; case HANDLE_VIEWSET_PREVENT_TIPS : mpViewOption->SetPreventTips(bVal); break; case HANDLE_VIEWSET_IS_RASTER_VISIBLE : mpViewOption->SetGridVisible(bVal); break; case HANDLE_VIEWSET_IS_SNAP_TO_RASTER : mpViewOption->SetSnap(bVal); break; @@ -901,29 +901,29 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u case HANDLE_VIEWSET_VRULER : bBoolVal = mpConstViewOption->IsViewVRuler(TRUE);break; case HANDLE_VIEWSET_VRULER_RIGHT : bBoolVal = mpConstViewOption->IsVRulerRight();break; case HANDLE_VIEWSET_HSCROLL: bBoolVal = mpConstViewOption->IsViewHScrollBar();break; - case HANDLE_VIEWSET_VSCROLL: bBoolVal = mpConstViewOption->IsViewVScrollBar();break; - case HANDLE_VIEWSET_GRAPHICS : bBoolVal = mpConstViewOption->IsGraphic();break; - case HANDLE_VIEWSET_TABLES : bBoolVal = mpConstViewOption->IsTable(); break; - case HANDLE_VIEWSET_DRAWINGS : bBoolVal = mpConstViewOption->IsDraw(); break; - case HANDLE_VIEWSET_FIELD_COMMANDS : bBoolVal = mpConstViewOption->IsFldName(); break; - case HANDLE_VIEWSET_ANNOTATIONS : bBoolVal = mpConstViewOption->IsPostIts(); break; + case HANDLE_VIEWSET_VSCROLL: bBoolVal = mpConstViewOption->IsViewVScrollBar();break; + case HANDLE_VIEWSET_GRAPHICS : bBoolVal = mpConstViewOption->IsGraphic();break; + case HANDLE_VIEWSET_TABLES : bBoolVal = mpConstViewOption->IsTable(); break; + case HANDLE_VIEWSET_DRAWINGS : bBoolVal = mpConstViewOption->IsDraw(); break; + case HANDLE_VIEWSET_FIELD_COMMANDS : bBoolVal = mpConstViewOption->IsFldName(); break; + case HANDLE_VIEWSET_ANNOTATIONS : bBoolVal = mpConstViewOption->IsPostIts(); break; case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : bBoolVal = SwViewOption::IsFieldShadings(); break; case HANDLE_VIEWSET_NONPRINTING_CHARACTERS: bBoolVal = mpConstViewOption->IsViewMetaChars(); break; case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : bBoolVal = SwViewOption::IsFieldShadings(); break; case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : bBoolVal = SwViewOption::IsFieldShadings(); break; - case HANDLE_VIEWSET_PARA_BREAKS : bBoolVal = mpConstViewOption->IsParagraph(sal_True); break; - case HANDLE_VIEWSET_SOFT_HYPHENS : bBoolVal = mpConstViewOption->IsSoftHyph(); break; - case HANDLE_VIEWSET_SPACES : bBoolVal = mpConstViewOption->IsBlank(sal_True); break; - case HANDLE_VIEWSET_PROTECTED_SPACES : bBoolVal = mpConstViewOption->IsHardBlank(); break; - case HANDLE_VIEWSET_TABSTOPS : bBoolVal = mpConstViewOption->IsTab(sal_True); break; + case HANDLE_VIEWSET_PARA_BREAKS : bBoolVal = mpConstViewOption->IsParagraph(sal_True); break; + case HANDLE_VIEWSET_SOFT_HYPHENS : bBoolVal = mpConstViewOption->IsSoftHyph(); break; + case HANDLE_VIEWSET_SPACES : bBoolVal = mpConstViewOption->IsBlank(sal_True); break; + case HANDLE_VIEWSET_PROTECTED_SPACES : bBoolVal = mpConstViewOption->IsHardBlank(); break; + case HANDLE_VIEWSET_TABSTOPS : bBoolVal = mpConstViewOption->IsTab(sal_True); break; case HANDLE_VIEWSET_BREAKS : bBoolVal = mpConstViewOption->IsLineBreak(sal_True); break; case HANDLE_VIEWSET_HIDDEN_TEXT : bBoolVal = mpConstViewOption->IsShowHiddenField(); break; case HANDLE_VIEWSET_HIDDEN_CHARACTERS : bBoolVal = mpConstViewOption->IsShowHiddenChar(); break; - case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : bBoolVal = mpConstViewOption->IsShowHiddenPara(); break; + case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : bBoolVal = mpConstViewOption->IsShowHiddenPara(); break; case HANDLE_VIEWSET_TABLE_BOUNDARIES : bBoolVal = SwViewOption::IsTableBoundaries(); break; case HANDLE_VIEWSET_TEXT_BOUNDARIES : bBoolVal = SwViewOption::IsDocBoundaries(); break; - case HANDLE_VIEWSET_SMOOTH_SCROLLING : bBoolVal = mpConstViewOption->IsSmoothScroll(); break; - case HANDLE_VIEWSET_SOLID_MARK_HANDLES : bBoolVal = mpConstViewOption->IsSolidMarkHdl(); break; + case HANDLE_VIEWSET_SMOOTH_SCROLLING : bBoolVal = mpConstViewOption->IsSmoothScroll(); break; + case HANDLE_VIEWSET_SOLID_MARK_HANDLES : bBoolVal = mpConstViewOption->IsSolidMarkHdl(); break; case HANDLE_VIEWSET_PREVENT_TIPS : bBoolVal = mpConstViewOption->IsPreventTips(); break; case HANDLE_VIEWSET_IS_RASTER_VISIBLE : bBoolVal = mpConstViewOption->IsGridVisible(); break; case HANDLE_VIEWSET_IS_SNAP_TO_RASTER : bBoolVal = mpConstViewOption->IsSnap(); break; diff --git a/sw/source/ui/uno/unomodule.cxx b/sw/source/ui/uno/unomodule.cxx index 85ef0f10c1d7..fe0041d04e8f 100644 --- a/sw/source/ui/uno/unomodule.cxx +++ b/sw/source/ui/uno/unomodule.cxx @@ -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/uno/unomodule.hxx b/sw/source/ui/uno/unomodule.hxx index 0fc02fc21562..4292c47a68da 100644 --- a/sw/source/ui/uno/unomodule.hxx +++ b/sw/source/ui/uno/unomodule.hxx @@ -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 @@ -56,16 +56,16 @@ namespace com } } -#define REFERENCE ::com::sun::star::uno::Reference -#define SEQUENCE ::com::sun::star::uno::Sequence -#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException -#define REFERENCE ::com::sun::star::uno::Reference -#define SEQUENCE ::com::sun::star::uno::Sequence -#define XDISPATCH ::com::sun::star::frame::XDispatch +#define REFERENCE ::com::sun::star::uno::Reference +#define SEQUENCE ::com::sun::star::uno::Sequence +#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException +#define REFERENCE ::com::sun::star::uno::Reference +#define SEQUENCE ::com::sun::star::uno::Sequence +#define XDISPATCH ::com::sun::star::frame::XDispatch #define XNOTIFYINGDISPATCH ::com::sun::star::frame::XNotifyingDispatch -#define OUSTRING ::rtl::OUString -#define UNOURL ::com::sun::star::util::URL -#define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor +#define OUSTRING ::rtl::OUString +#define UNOURL ::com::sun::star::util::URL +#define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor class SwUnoModule : public ::cppu::WeakImplHelper3< ::com::sun::star::frame::XDispatchProvider, ::com::sun::star::frame::XNotifyingDispatch, ::com::sun::star::lang::XServiceInfo > { @@ -86,9 +86,9 @@ public: // XDispatchProvider virtual SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ; - virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL , - const OUSTRING & sTargetFrameName, - sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION ) ; + virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL , + const OUSTRING & sTargetFrameName, + sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION ) ; // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 0579d180a04c..e3f1322bed24 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -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 @@ -197,11 +197,11 @@ SwPrintUIOptions * lcl_GetPrintUIOptions( const SwView * pSwView = dynamic_cast< const SwView * >(pView); const bool bHasSelection = pSwView ? pSwView->HasSelection( sal_False ) : false; // check for any selection, not just text selection const bool bHasPostIts = lcl_GetPostIts( pDocShell->GetDoc(), 0 ); - + // get default values to use in dialog from documents SwPrintData const SwPrintData *pPrintData = pDocShell->GetDoc()->getPrintData(); DBG_ASSERT( pPrintData, "failed to get SwPrintData from document" ); - + return new SwPrintUIOptions( bWebDoc, bSwSrcView, bHasSelection, bHasPostIts, *pPrintData ); } @@ -287,7 +287,7 @@ Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) throw(Run aRet <<= xTmp; } - if ( !aRet.hasValue() + if ( !aRet.hasValue() && rType != ::getCppuType((Reference< com::sun::star::document::XDocumentEventBroadcaster>*)0) && rType != ::getCppuType((Reference< com::sun::star::frame::XController>*)0) && rType != ::getCppuType((Reference< com::sun::star::frame::XFrame>*)0) @@ -762,7 +762,7 @@ Reference< util::XReplaceDescriptor > SwXTextDocument::createReplaceDescriptor( /* -----------------26.02.99 15:52------------------- * * --------------------------------------------------*/ -SwUnoCrsr* SwXTextDocument::CreateCursorForSearch(Reference< XTextCursor > & xCrsr) +SwUnoCrsr* SwXTextDocument::CreateCursorForSearch(Reference< XTextCursor > & xCrsr) { getText(); XText *const pText = xBodyText.get(); @@ -787,7 +787,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > throw RuntimeException(); Reference< XTextCursor > xCrsr; - SwUnoCrsr* pUnoCrsr = CreateCursorForSearch(xCrsr); + SwUnoCrsr* pUnoCrsr = CreateCursorForSearch(xCrsr); const SwXTextSearch* pSearch = reinterpret_cast<const SwXTextSearch*>( xDescTunnel->getSomething(SwXTextSearch::getUnoTunnelId())); @@ -864,7 +864,7 @@ Reference< util::XSearchDescriptor > SwXTextDocument::createSearchDescriptor(vo /* -----------------26.02.99 16:08------------------- * wird fuer findAll/First/Next verwendet * --------------------------------------------------*/ -SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > & xDesc, +SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > & xDesc, Reference< XTextCursor > & xCrsr, sal_Bool bAll, sal_Int32& nResult, Reference< XInterface > xLastResult) @@ -873,7 +873,7 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > if(!IsValid() || !xDescTunnel.is() || !xDescTunnel->getSomething(SwXTextSearch::getUnoTunnelId())) return 0; - SwUnoCrsr* pUnoCrsr = CreateCursorForSearch(xCrsr); + SwUnoCrsr* pUnoCrsr = CreateCursorForSearch(xCrsr); const SwXTextSearch* pSearch = reinterpret_cast<const SwXTextSearch*>( xDescTunnel->getSomething(SwXTextSearch::getUnoTunnelId())); @@ -923,11 +923,11 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > /* * folgende Kombinationen sind erlaubt: - * - suche einen im Body: -> FND_IN_BODY - * - suche alle im Body: -> FND_IN_BODYONLY | FND_IN_SELALL + * - suche einen im Body: -> FND_IN_BODY + * - suche alle im Body: -> FND_IN_BODYONLY | FND_IN_SELALL * - suche in Selectionen: einen / alle -> FND_IN_SEL [ | FND_IN_SELALL ] * - suche im nicht Body: einen / alle -> FND_IN_OTHER [ | FND_IN_SELALL ] - * - suche ueberall alle: -> FND_IN_SELALL + * - suche ueberall alle: -> FND_IN_SELALL */ int eRanges(FND_IN_BODY); if(bParentInExtra) @@ -948,7 +948,7 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > RES_CHRATR_BEGIN, RES_CHRATR_END-1, RES_PARATR_BEGIN, RES_PARATR_END-1, RES_FRMATR_BEGIN, RES_FRMATR_END-1, - RES_TXTATR_INETFMT, RES_TXTATR_INETFMT, + RES_TXTATR_INETFMT, RES_TXTATR_INETFMT, 0); pSearch->FillSearchItemSet(aSearch); BOOL bCancel; @@ -969,7 +969,7 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > (FindRanges)eRanges, pReplaceColl ); } else - { + { //todo/mba: assuming that notes should be omitted BOOL bSearchInNotes = FALSE; BOOL bCancel; @@ -1542,7 +1542,7 @@ void SwXTextDocument::Reactivate(SwDocShell* pNewDocShell) /*-- 18.12.98 11:55:26--------------------------------------------------- -----------------------------------------------------------------------*/ -void SwXTextDocument::InitNewDoc() +void SwXTextDocument::InitNewDoc() { // zunaechst alle Collections invalidieren, dann Referenzen loeschen und Null setzen if(pxXTextTables) @@ -1828,7 +1828,7 @@ Reference< XInterface > SwXTextDocument::createInstance(const OUString& rServic //! For inserting OLE objects the proper way is to use //! "com.sun.star.text.TextEmbeddedObject"! if (rServiceName.lastIndexOf( C2U(".OLE2Shape") ) == rServiceName.getLength() - 10) - throw ServiceNotRegisteredException(); // declare service to be not registered with this factory + throw ServiceNotRegisteredException(); // declare service to be not registered with this factory // --> OD 2006-02-22 #b6382898# // the XML import is allowed to create instances of com.sun.star.drawing.OLE2Shape. @@ -2485,7 +2485,7 @@ Any SAL_CALL SwXTextDocument::getPropertyDefault( const OUString& rPropertyName static OutputDevice * lcl_GetOutputDevice( const SwPrintUIOptions &rPrintUIOptions ) { OutputDevice *pOut = 0; - + uno::Any aAny( rPrintUIOptions.getValue( C2U( "RenderDevice" ) )); uno::Reference< awt::XDevice > xRenderDevice; aAny >>= xRenderDevice; @@ -2496,10 +2496,10 @@ static OutputDevice * lcl_GetOutputDevice( const SwPrintUIOptions &rPrintUIOptio } return pOut; -} +} -static bool lcl_SeqHasProperty( +static bool lcl_SeqHasProperty( const uno::Sequence< beans::PropertyValue >& rOptions, const sal_Char *pPropName ) { @@ -2510,14 +2510,14 @@ static bool lcl_SeqHasProperty( { if (pProps[i].Name.equalsAscii( pPropName )) bRes = true; - } + } return bRes; -} +} -SfxViewShell * SwXTextDocument::GetRenderView( - bool &rbIsSwSrcView, - const uno::Sequence< beans::PropertyValue >& rOptions, +SfxViewShell * SwXTextDocument::GetRenderView( + bool &rbIsSwSrcView, + const uno::Sequence< beans::PropertyValue >& rOptions, bool bIsPDFExport ) { // get view shell to use @@ -2532,11 +2532,11 @@ SfxViewShell * SwXTextDocument::GetRenderView( for (sal_Int32 i = 0; i < nLen; ++i) { if (pProps[i].Name.equalsAscii( "View" )) - { + { aTmp = pProps[i].Value; break; } - } + } uno::Reference< frame::XController > xController; if (aTmp >>= xController) @@ -2546,7 +2546,7 @@ SfxViewShell * SwXTextDocument::GetRenderView( } } return pView; -} +} /* @@ -2558,9 +2558,9 @@ SfxViewShell * SwXTextDocument::GetRenderView( * SfxViewShell. */ -SwDoc * SwXTextDocument::GetRenderDoc( - SfxViewShell *&rpView, - const uno::Any& rSelection, +SwDoc * SwXTextDocument::GetRenderDoc( + SfxViewShell *&rpView, + const uno::Any& rSelection, bool bIsPDFExport ) { SwDoc *pDoc = 0; @@ -2614,8 +2614,8 @@ SwDoc * SwXTextDocument::GetRenderDoc( ---------------------------------------------------------------------------*/ -static void lcl_SavePrintUIOptionsToDocumentPrintData( - SwDoc &rDoc, +static void lcl_SavePrintUIOptionsToDocumentPrintData( + SwDoc &rDoc, const SwPrintUIOptions &rPrintUIOptions, bool bIsPDFEXport ) { @@ -2625,9 +2625,9 @@ static void lcl_SavePrintUIOptionsToDocumentPrintData( rDoc.setPrintData ( *pTmpData ); delete pTmpData; // setPrintData does make its own copy! } - + SwPrintData *pDocPrintData = rDoc.getPrintData(); - + pDocPrintData->SetPrintGraphic( rPrintUIOptions.IsPrintGraphics() ); pDocPrintData->SetPrintTable( rPrintUIOptions.IsPrintTables() ); pDocPrintData->SetPrintDraw( rPrintUIOptions.IsPrintDrawings() ); @@ -2647,7 +2647,7 @@ static void lcl_SavePrintUIOptionsToDocumentPrintData( pDocPrintData->SetPrintHiddenText( rPrintUIOptions.IsPrintHiddenText() ); pDocPrintData->SetPrintTextPlaceholder( rPrintUIOptions.IsPrintTextPlaceholders() ); } - + sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( const uno::Any& rSelection, @@ -2661,14 +2661,14 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( const bool bIsPDFExport = !lcl_SeqHasProperty( rxOptions, "IsPrinter" ); bool bIsSwSrcView = false; SfxViewShell *pView = GetRenderView( bIsSwSrcView, rxOptions, bIsPDFExport ); - + if (!bIsSwSrcView && !m_pRenderData) m_pRenderData = new SwRenderData; if (!m_pPrintUIOptions) m_pPrintUIOptions = lcl_GetPrintUIOptions( pDocShell, pView ); bool bFormat = m_pPrintUIOptions->processPropertiesAndCheckFormat( rxOptions ); // const bool bIsSkipEmptyPages = !m_pPrintUIOptions->IsPrintEmptyPages( bIsPDFExport ); - + SwDoc *pDoc = GetRenderDoc( pView, rSelection, bIsPDFExport ); DBG_ASSERT( pDoc && pView, "doc or view shell missing!" ); if (!pDoc || !pView) @@ -2706,7 +2706,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( // reformating the document for printing will show the changes in the view // which is likely to produce many unwanted and not nice to view actions. - // We don't want that! Thus we disable updating of the view. + // We don't want that! Thus we disable updating of the view. pWrtShell->StartAction(); const TypeId aSwViewTypeId = TYPE(SwView); @@ -2721,7 +2721,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( m_pRenderData->SetSwPrtOptions( new SwPrtOptions( C2U( bIsPDFExport ? "PDF export" : "Printing" ) ) ); m_pRenderData->MakeSwPrtOptions( m_pRenderData->GetSwPrtOptionsRef(), pRenderDocShell, m_pPrintUIOptions, m_pRenderData, bIsPDFExport ); - + if (pView->IsA(aSwViewTypeId)) { // PDF export should not make use of the SwPrtOptions @@ -2742,10 +2742,10 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( //TODO: check what exatly needs to be done and make just one function for that pWrtShell->CalcLayout(); pWrtShell->CalcPagesForPrint( pDoc->GetPageCount() ); - + pWrtShell->SetPDFExportOption( sal_False ); - + // enable view again pWrtShell->EndAction(); } @@ -2784,7 +2784,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( } } DBG_ASSERT( nRet >= 0, "negative number of pages???" ); - + return nRet; } /* -----------------------------23.08.02 16:00-------------------------------- @@ -2803,7 +2803,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( const bool bIsPDFExport = !lcl_SeqHasProperty( rxOptions, "IsPrinter" ); bool bIsSwSrcView = false; SfxViewShell *pView = GetRenderView( bIsSwSrcView, rxOptions, bIsPDFExport ); - + // m_pRenderData should NOT be created here! // That should only be done in getRendererCount. If this function is called before // getRendererCount was called then the caller will probably just retrieve the extra UI options @@ -2845,8 +2845,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( if (m_pRenderData) { const USHORT nPage = nRenderer + 1; - - // get paper tray to use ... + + // get paper tray to use ... sal_Int32 nPrinterPaperTray = -1; if (! bPrintPaperFromSetup) { @@ -2863,7 +2863,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( if (bIsSwSrcView || bPrintProspect) { // for printing of HTML source code and prospect printing we should use - // the printers paper size since + // the printers paper size since // a) HTML source view has no page size // b) prospect printing has a different page size from the documents page // since two document pages will get rendered on one printer page @@ -2918,11 +2918,11 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( aRenderer.realloc( nLen ); aRenderer[ nLen - 1 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PrinterPaperTray" ) ); aRenderer[ nLen - 1 ].Value <<= nPrinterPaperTray; - } + } } m_pPrintUIOptions->appendPrintUIOptions( aRenderer ); - + return aRenderer; } /* -----------------------------28.10.02 16:00-------------------------------- @@ -2965,7 +2965,7 @@ SfxViewShell * SwXTextDocument::GuessViewShell( if (pView) rbIsSwSrcView = pSwSrcView != 0; return pView; -// return pSwView ? dynamic_cast< SfxViewShell * >(pSwView) : +// return pSwView ? dynamic_cast< SfxViewShell * >(pSwView) : // (pSwSrcView ? dynamic_cast< SfxViewShell * >(pSwSrcView) : // dynamic_cast< SfxViewShell * >(pSwPagePreView) ); } @@ -2990,7 +2990,7 @@ void SAL_CALL SwXTextDocument::render( const bool bIsPDFExport = !lcl_SeqHasProperty( rxOptions, "IsPrinter" ); bool bIsSwSrcView = false; SfxViewShell *pView = GetRenderView( bIsSwSrcView, rxOptions, bIsPDFExport ); - + DBG_ASSERT( m_pRenderData, "data should have been created already in getRendererCount..." ); DBG_ASSERT( m_pPrintUIOptions, "data should have been created already in getRendererCount..." ); if (!bIsSwSrcView && !m_pRenderData) @@ -3037,24 +3037,24 @@ void SAL_CALL SwXTextDocument::render( ((SwView*)pView)->GetWrtShellPtr() : ((SwPagePreView*)pView)->GetViewShell(); } - + // get output device to use OutputDevice * pOut = lcl_GetOutputDevice( *m_pPrintUIOptions ); - + if(pVwSh && pOut && m_pRenderData->HasSwPrtOptions()) { const rtl::OUString aPageRange = m_pPrintUIOptions->getStringValue( "PageRange", OUString() ); const bool bFirstPage = m_pPrintUIOptions->getBoolValue( "IsFirstPage", sal_False ); bool bIsSkipEmptyPages = !m_pPrintUIOptions->IsPrintEmptyPages( bIsPDFExport ); - + DBG_ASSERT(( pView->IsA(aSwViewTypeId) && m_pRenderData->IsViewOptionAdjust()) - || (!pView->IsA(aSwViewTypeId) && !m_pRenderData->IsViewOptionAdjust()), + || (!pView->IsA(aSwViewTypeId) && !m_pRenderData->IsViewOptionAdjust()), "SwView / SwViewOptionAdjust_Impl availability mismatch" ); - + // since printing now also use the API for PDF export this option // should be set for printing as well ... pVwSh->SetPDFExportOption( sal_True ); - + // --> FME 2004-06-08 #i12836# enhanced pdf export // // First, we have to export hyperlinks, notes, and outline to pdf. @@ -3064,19 +3064,19 @@ void SAL_CALL SwXTextDocument::render( SwWrtShell* pWrtShell = pView->IsA(aSwViewTypeId) ? ((SwView*)pView)->GetWrtShellPtr() : 0; - + if (bIsPDFExport && bFirstPage && pWrtShell) { SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, aPageRange, bIsSkipEmptyPages, sal_False ); } // <-- - + const SwPrtOptions &rSwPrtOptions = *m_pRenderData->GetSwPrtOptions(); if (bPrintProspect) pVwSh->PrintProspect( pOut, rSwPrtOptions, nRenderer ); else // normal printing and PDF export pVwSh->PrintOrPDFExport( pOut, rSwPrtOptions, nRenderer ); - + // --> FME 2004-10-08 #i35176# // // After printing the last page, we take care for the links coming @@ -3088,18 +3088,18 @@ void SAL_CALL SwXTextDocument::render( SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, aPageRange, bIsSkipEmptyPages, sal_True ); } // <-- - + pVwSh->SetPDFExportOption( sal_False ); - + // last page to be rendered? (not necessarily the last page of the document) // -> do clean-up of data - if (bLastPage) + if (bLastPage) { // #i96167# haggai: delete ViewOptionsAdjust here because it makes use // of the shell, which might get destroyed in lcl_DisposeView! if (m_pRenderData && m_pRenderData->IsViewOptionAdjust()) m_pRenderData->ViewOptionAdjustStop(); - + if (m_pRenderData && m_pRenderData->HasPostItData()) m_pRenderData->DeletePostItData(); if (m_pHiddenViewFrame) @@ -3301,7 +3301,7 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( //get languages from "drawobject" SwWrtShell *pWrtSh = pDocShell->GetWrtShell(); - SdrView *pSdrView = pWrtSh->GetDrawView(); + SdrView *pSdrView = pWrtSh->GetDrawView(); if( pSdrView ) { @@ -3381,12 +3381,12 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( SwXLinkTargetSupplier::SwXLinkTargetSupplier(SwXTextDocument& rxDoc) : pxDoc(&rxDoc) { - sTables = String(SW_RES(STR_CONTENT_TYPE_TABLE)); + sTables = String(SW_RES(STR_CONTENT_TYPE_TABLE)); sFrames = String(SW_RES(STR_CONTENT_TYPE_FRAME)); - sGraphics = String(SW_RES(STR_CONTENT_TYPE_GRAPHIC)); - sOLEs = String(SW_RES(STR_CONTENT_TYPE_OLE)); - sSections = String(SW_RES(STR_CONTENT_TYPE_REGION)); - sOutlines = String(SW_RES(STR_CONTENT_TYPE_OUTLINE)); + sGraphics = String(SW_RES(STR_CONTENT_TYPE_GRAPHIC)); + sOLEs = String(SW_RES(STR_CONTENT_TYPE_OLE)); + sSections = String(SW_RES(STR_CONTENT_TYPE_REGION)); + sOutlines = String(SW_RES(STR_CONTENT_TYPE_OUTLINE)); sBookmarks = String(SW_RES(STR_CONTENT_TYPE_BOOKMARK)); } /* -----------------25.10.99 11:11------------------- @@ -3432,7 +3432,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) Reference< XPropertySet > xRet(xTbls, UNO_QUERY); aRet.setValue(&xRet, ::getCppuType((Reference< XPropertySet>*)0)); } -/* else if(sToCompare == ) +/* else if(sToCompare == ) { sSuffix += UniString::CreateFromAscii(pMarkToText); Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( @@ -3487,7 +3487,7 @@ Sequence< OUString > SwXLinkTargetSupplier::getElementNames(void) pNames[0] = sTables; pNames[1] = sFrames ; pNames[2] = sGraphics; - pNames[3] = sOLEs ; + pNames[3] = sOLEs ; pNames[4] = sSections; pNames[5] = sOutlines; pNames[6] = sBookmarks; @@ -3500,13 +3500,13 @@ sal_Bool SwXLinkTargetSupplier::hasByName(const OUString& rName) throw( RuntimeException ) { String sToCompare(rName); - if( sToCompare == sTables || + if( sToCompare == sTables || sToCompare == sFrames || sToCompare == sGraphics|| - sToCompare == sOLEs || + sToCompare == sOLEs || sToCompare == sSections || sToCompare == sOutlines || - sToCompare == sBookmarks ) + sToCompare == sBookmarks ) return sal_True; return sal_False; } @@ -3782,8 +3782,8 @@ Any lcl_GetDisplayBitmap(String sLinkSuffix) nImgId = CONTENT_TYPE_FRAME; else if(COMPARE_EQUAL == sLinkSuffix.CompareToAscii(pMarkToGraphic)) nImgId = CONTENT_TYPE_GRAPHIC; -// else if(== sLinkSuffix) -// nImgId = CONTENT_TYPE_BOOKMARK; +// else if(== sLinkSuffix) +// nImgId = CONTENT_TYPE_BOOKMARK; else if(COMPARE_EQUAL == sLinkSuffix.CompareToAscii(pMarkToRegion)) nImgId = CONTENT_TYPE_REGION; else if(COMPARE_EQUAL == sLinkSuffix.CompareToAscii(pMarkToOLE)) @@ -4094,7 +4094,7 @@ SwViewOptionAdjust_Impl::~SwViewOptionAdjust_Impl() } -void SwViewOptionAdjust_Impl::AdjustViewOptions( +void SwViewOptionAdjust_Impl::AdjustViewOptions( const SwPrtOptions *pPrtOptions ) { // to avoid unnecessary reformatting the view options related to the content @@ -4111,7 +4111,7 @@ void SwViewOptionAdjust_Impl::AdjustViewOptions( SwViewOption aRenderViewOptions( m_aOldViewOptions ); // disable anything in the view that should not be printed (or exported to PDF) by default - // (see also dialog "Tools/Options - StarOffice Writer - Formatting Aids" + // (see also dialog "Tools/Options - StarOffice Writer - Formatting Aids" // in section "Display of ...") aRenderViewOptions.SetParagraph( FALSE ); // paragraph end aRenderViewOptions.SetSoftHyph( FALSE ); // aka custom hyphens @@ -4128,17 +4128,17 @@ void SwViewOptionAdjust_Impl::AdjustViewOptions( aRenderViewOptions.SetShowHiddenField( bVal ); if (bContainsHiddenParagraphs) aRenderViewOptions.SetShowHiddenPara( bVal ); - + if (bContainsPlaceHolders) { // should always be printed in PDF export! bVal = pPrtOptions ? pPrtOptions->bPrintTextPlaceholder : TRUE; aRenderViewOptions.SetShowPlaceHolderFields( bVal ); } - + if (bContainsFields) aRenderViewOptions.SetFldName( FALSE ); - + // we need to set this flag in order to get to see the visible effect of // some of the above settings (needed for correct rendering) aRenderViewOptions.SetViewMetaChars( TRUE ); diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index 1f1fc9149e34..8ba286f92630 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -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 @@ -179,7 +179,7 @@ void SwXTextView::Invalidate() ---------------------------------------------------------------------------*/ Sequence< uno::Type > SAL_CALL SwXTextView::getTypes( ) throw(uno::RuntimeException) { -// uno::Sequence< uno::Type > aViewTypes = SwXTextViewBaseClass::getTypes(); +// uno::Sequence< uno::Type > aViewTypes = SwXTextViewBaseClass::getTypes(); uno::Sequence< uno::Type > aBaseTypes = SfxBaseController::getTypes(); long nIndex = aBaseTypes.getLength(); @@ -187,12 +187,12 @@ Sequence< uno::Type > SAL_CALL SwXTextView::getTypes( ) throw(uno::RuntimeExcep aBaseTypes.getLength() + 8 ); uno::Type* pBaseTypes = aBaseTypes.getArray(); - pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XSelectionSupplier >*)0); - pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XServiceInfo >*)0); + pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XSelectionSupplier >*)0); + pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XServiceInfo >*)0); pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XFormLayerAccess >*)0); pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XTextViewCursorSupplier>*)0); - pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XViewSettingsSupplier >*)0); - pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XRubySelection >*)0); + pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XViewSettingsSupplier >*)0); + pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XRubySelection >*)0); pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XPropertySet >*)0); pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<datatransfer::XTransferableSupplier >*)0); return aBaseTypes; @@ -233,17 +233,17 @@ uno::Any SAL_CALL SwXTextView::queryInterface( const uno::Type& aType ) throw (RuntimeException) { uno::Any aRet; - if(aType == ::getCppuType((uno::Reference<view::XSelectionSupplier >*)0)) + if(aType == ::getCppuType((uno::Reference<view::XSelectionSupplier >*)0)) { uno::Reference<view::XSelectionSupplier> xRet = this; aRet.setValue(&xRet, aType); } - else if(aType == ::getCppuType((uno::Reference<lang::XServiceInfo >*)0)) + else if(aType == ::getCppuType((uno::Reference<lang::XServiceInfo >*)0)) { uno::Reference<lang::XServiceInfo> xRet = this; aRet.setValue(&xRet, aType); } - else if(aType == ::getCppuType((uno::Reference<view::XControlAccess >*)0)) + else if(aType == ::getCppuType((uno::Reference<view::XControlAccess >*)0)) { uno::Reference<view::XControlAccess> xRet = this; aRet.setValue(&xRet, aType); @@ -258,7 +258,7 @@ uno::Any SAL_CALL SwXTextView::queryInterface( const uno::Type& aType ) uno::Reference<text::XTextViewCursorSupplier> xRet = this; aRet.setValue(&xRet, aType); } - else if(aType == ::getCppuType((uno::Reference<view::XViewSettingsSupplier >*)0)) + else if(aType == ::getCppuType((uno::Reference<view::XViewSettingsSupplier >*)0)) { uno::Reference<view::XViewSettingsSupplier> xRet = this; aRet.setValue(&xRet, aType); @@ -295,8 +295,8 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg SwDoc* pDoc = GetView()->GetDocShell()->GetDoc(); uno::Reference< lang::XUnoTunnel > xIfcTunnel(xInterface, uno::UNO_QUERY); uno::Reference< text::XTextCursor > xCrsr(xInterface, uno::UNO_QUERY); - uno::Reference< container::XIndexAccess > xPosN(xInterface, uno::UNO_QUERY); - uno::Reference< text::XTextRange > xPos(xInterface, uno::UNO_QUERY); + uno::Reference< container::XIndexAccess > xPosN(xInterface, uno::UNO_QUERY); + uno::Reference< text::XTextRange > xPos(xInterface, uno::UNO_QUERY); SwXFrame* pFrame = xIfcTunnel.is() ? reinterpret_cast<SwXFrame*>( xIfcTunnel->getSomething(SwXFrame::getUnoTunnelId())) : 0; @@ -456,14 +456,14 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg SvxShape* pSvxShape = 0; if(pSwXShape) { - uno::Reference< uno::XAggregation > xAgg = pSwXShape->GetAggregationInterface(); + uno::Reference< uno::XAggregation > xAgg = pSwXShape->GetAggregationInterface(); if(xAgg.is()) { pSvxShape = reinterpret_cast<SvxShape*>(xIfcTunnel->getSomething(SvxShape::getUnoTunnelId())); } } - if ( pSvxShape || xShapeColl.is() ) // Drawing drawing::Layer + if ( pSvxShape || xShapeColl.is() ) // Drawing drawing::Layer { SdrView* pDrawView = rSh.GetDrawView(); if (pDrawView) @@ -471,7 +471,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg pDrawView->SdrEndTextEdit(); pDrawView->UnmarkAll(); - if (pSvxShape) // einzelnes Shape + if (pSvxShape) // einzelnes Shape { SdrObject *pObj = pSvxShape->GetSdrObject(); if (pObj) @@ -485,7 +485,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg } } } - else // Shape Collection + else // Shape Collection { sal_Bool bSelected = sal_False; SdrPageView* pPV = NULL; @@ -507,7 +507,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg SdrObject *pObj = pShape->GetSdrObject(); if (pObj) { - if (!pPV) // erstes Objekt + if (!pPV) // erstes Objekt { // lcl_ShowObject( *m_pViewSh, *pDrawView, pObj ); pPV = pDrawView->GetSdrPageView(); @@ -578,7 +578,7 @@ uno::Any SwXTextView::getSelection(void) throw( uno::RuntimeException ) SwXFrame* pxFrame = (SwXFrame*)SwClientIter((SwFrmFmt&)*pFmt). First(TYPE(SwXFrame)); - if(pxFrame) //das einzige gemeinsame interface fuer alle Frames + if(pxFrame) //das einzige gemeinsame interface fuer alle Frames { aRef = uno::Reference< uno::XInterface >((cppu::OWeakObject*)pxFrame, uno::UNO_QUERY); } @@ -615,7 +615,7 @@ uno::Any SwXTextView::getSelection(void) throw( uno::RuntimeException ) SwXTextDocument* pTextDoc = reinterpret_cast<SwXTextDocument*>(xModelTunnel-> getSomething(SwXTextDocument::getUnoTunnelId())); - SwFmDrawPage* pSvxDrawPage = pTextDoc->GetDrawPage()->GetSvxPage(); + SwFmDrawPage* pSvxDrawPage = pTextDoc->GetDrawPage()->GetSvxPage(); uno::Reference< drawing::XShapes > xShCol = new SvxShapeCollection(); const SdrMarkList& rMarkList = rSh.GetDrawView()->GetMarkedObjectList(); @@ -2128,25 +2128,25 @@ sal_Int64 SAL_CALL SwXTextViewCursor::getSomething( // ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2(SwXTextViewCursor,SwXTextViewCursor_Base,OTextCursorHelper) -const SwDoc* SwXTextViewCursor::GetDoc() const +const SwDoc* SwXTextViewCursor::GetDoc() const { SwWrtShell& rSh = m_pView->GetWrtShell(); - return rSh.GetCrsr() ? rSh.GetCrsr()->GetDoc() : 0; + return rSh.GetCrsr() ? rSh.GetCrsr()->GetDoc() : 0; } // ----------------------------------------------------------------------------- -SwDoc* SwXTextViewCursor::GetDoc() +SwDoc* SwXTextViewCursor::GetDoc() { SwWrtShell& rSh = m_pView->GetWrtShell(); - return rSh.GetCrsr() ? rSh.GetCrsr()->GetDoc() : 0; + return rSh.GetCrsr() ? rSh.GetCrsr()->GetDoc() : 0; } // ----------------------------------------------------------------------------- -const SwPaM* SwXTextViewCursor::GetPaM() const +const SwPaM* SwXTextViewCursor::GetPaM() const { SwWrtShell& rSh = m_pView->GetWrtShell(); return rSh.GetCrsr(); } // ----------------------------------------------------------------------------- -SwPaM* SwXTextViewCursor::GetPaM() +SwPaM* SwXTextViewCursor::GetPaM() { SwWrtShell& rSh = m_pView->GetWrtShell(); return rSh.GetCrsr(); diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 418ea4a4559b..98e0a4e07b61 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -109,11 +109,11 @@ static sal_Char __READONLY_DATA sKomma[] = ", "; SfxItemPresentation SwFmtCharFmt::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, - String& rText, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -150,9 +150,9 @@ SfxItemPresentation SwFmtAutoFmt::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -178,9 +178,9 @@ SfxItemPresentation SwFmtINetFmt::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -219,7 +219,7 @@ SfxItemPresentation SwFmtRuby::GetPresentation( SfxItemPresentation ePres, } /************************************************************************* -|* class SwFmtDrop +|* class SwFmtDrop *************************************************************************/ @@ -228,9 +228,9 @@ SfxItemPresentation SwFmtDrop::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { rText.Erase(); switch ( ePres ) @@ -263,7 +263,7 @@ SfxItemPresentation SwFmtDrop::GetPresentation } /************************************************************************* -|* class SwRegisterItem +|* class SwRegisterItem *************************************************************************/ @@ -272,9 +272,9 @@ SfxItemPresentation SwRegisterItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, + XubString& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -294,7 +294,7 @@ SfxItemPresentation SwRegisterItem::GetPresentation } /************************************************************************* -|* class SwNumRuleItem +|* class SwNumRuleItem *************************************************************************/ @@ -303,9 +303,9 @@ SfxItemPresentation SwNumRuleItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, + XubString& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -359,18 +359,18 @@ SfxItemPresentation SwParaConnectBorderItem::GetPresentation /****************************************************************************** - * Frame-Attribute: + * Frame-Attribute: ******************************************************************************/ SfxItemPresentation SwFmtFrmSize::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, - String& rText, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, + String& rText, const IntlWrapper* pIntl -) const +) const { switch ( ePres ) { @@ -429,9 +429,9 @@ SfxItemPresentation SwFmtHeader::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -459,9 +459,9 @@ SfxItemPresentation SwFmtFooter::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -486,9 +486,9 @@ SfxItemPresentation SwFmtSurround::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -538,17 +538,17 @@ SfxItemPresentation SwFmtSurround::GetPresentation //VertOrientation, wie und woran orientiert -- -// sich der FlyFrm in der Vertikalen ----------- +// sich der FlyFrm in der Vertikalen ----------- SfxItemPresentation SwFmtVertOrient::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, - String& rText, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, + String& rText, const IntlWrapper* pIntl -) const +) const { switch ( ePres ) { @@ -599,17 +599,17 @@ SfxItemPresentation SwFmtVertOrient::GetPresentation } //HoriOrientation, wie und woran orientiert -- -// sich der FlyFrm in der Hoizontalen ---------- +// sich der FlyFrm in der Hoizontalen ---------- SfxItemPresentation SwFmtHoriOrient::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, - String& rText, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, + String& rText, const IntlWrapper* pIntl -) const +) const { switch ( ePres ) { @@ -667,9 +667,9 @@ SfxItemPresentation SwFmtAnchor::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -708,9 +708,9 @@ SfxItemPresentation SwFmtPageDesc::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -738,11 +738,11 @@ SfxItemPresentation SwFmtPageDesc::GetPresentation SfxItemPresentation SwFmtCol::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, + SfxMapUnit eCoreUnit, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* pIntl -) const +) const { switch ( ePres ) { @@ -785,9 +785,9 @@ SfxItemPresentation SwFmtURL::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { rText.Erase(); switch ( ePres ) @@ -829,9 +829,9 @@ SfxItemPresentation SwFmtEditInReadonly::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { rText.Erase(); switch ( ePres ) @@ -857,9 +857,9 @@ SfxItemPresentation SwFmtLayoutSplit::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -896,9 +896,9 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -912,7 +912,7 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation switch( GetValue() ) { case FTNEND_ATPGORDOCEND: -// rText = SW_RESSTR( STR_LAYOUT_FTN ); +// rText = SW_RESSTR( STR_LAYOUT_FTN ); break; case FTNEND_ATTXTEND: @@ -920,11 +920,11 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation case FTNEND_ATTXTEND_OWNNUMSEQ: { -// String sPrefix; -// String sSuffix; -// SvxNumberType aFmt; -// USHORT nOffset; -// rText += +// String sPrefix; +// String sSuffix; +// SvxNumberType aFmt; +// USHORT nOffset; +// rText += } break; } @@ -943,9 +943,9 @@ SfxItemPresentation SwFmtChain::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -980,9 +980,9 @@ SfxItemPresentation SwFmtLineNumber::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -1014,9 +1014,9 @@ SfxItemPresentation SwTextGridItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -1061,7 +1061,7 @@ SfxItemPresentation SwHeaderAndFooterEatSpacingItem::GetPresentation SfxMapUnit /*ePresUnit*/, String& /*rText*/, const IntlWrapper* /*pIntl*/ -) const +) const { // rText.Erase(); // switch ( ePres ) @@ -1099,7 +1099,7 @@ SfxItemPresentation SwMirrorGrf::GetPresentation( case RES_MIRROR_GRAPH_VERT: nId = STR_VERT_MIRROR; break; case RES_MIRROR_GRAPH_HOR: nId = STR_HORI_MIRROR; break; case RES_MIRROR_GRAPH_BOTH: nId = STR_BOTH_MIRROR; break; - default: nId = 0; break; + default: nId = 0; break; } if ( nId ) { @@ -1200,10 +1200,10 @@ SfxItemPresentation SwChannelGrf::GetPresentation( USHORT nId; switch ( Which() ) { - case RES_GRFATR_CHANNELR: nId = STR_CHANNELR; break; - case RES_GRFATR_CHANNELG: nId = STR_CHANNELG; break; - case RES_GRFATR_CHANNELB: nId = STR_CHANNELB; break; - default: nId = 0; break; + case RES_GRFATR_CHANNELR: nId = STR_CHANNELR; break; + case RES_GRFATR_CHANNELG: nId = STR_CHANNELG; break; + case RES_GRFATR_CHANNELB: nId = STR_CHANNELB; break; + default: nId = 0; break; } if( nId ) rText = SW_RESSTR( nId ); @@ -1307,10 +1307,10 @@ SfxItemPresentation SwDrawModeGrf::GetPresentation( switch ( GetValue() ) { - case GRAPHICDRAWMODE_GREYS: nId = STR_DRAWMODE_GREY; break; + case GRAPHICDRAWMODE_GREYS: nId = STR_DRAWMODE_GREY; break; case GRAPHICDRAWMODE_MONO: nId = STR_DRAWMODE_BLACKWHITE; break; - case GRAPHICDRAWMODE_WATERMARK: nId = STR_DRAWMODE_WATERMARK; break; - default: nId = STR_DRAWMODE_STD; break; + case GRAPHICDRAWMODE_WATERMARK: nId = STR_DRAWMODE_WATERMARK; break; + default: nId = STR_DRAWMODE_STD; break; } (rText = SW_RESSTR( STR_DRAWMODE ) ) += SW_RESSTR( nId ); } diff --git a/sw/source/ui/utlui/attrdesc.hrc b/sw/source/ui/utlui/attrdesc.hrc index 1f2c5d34fa37..972f13c278d7 100644 --- a/sw/source/ui/utlui/attrdesc.hrc +++ b/sw/source/ui/utlui/attrdesc.hrc @@ -30,81 +30,81 @@ #include "rcid.hrc" -#define STR_DROP_OVER (RC_ATTR_BEGIN + 1) -#define STR_DROP_LINES (RC_ATTR_BEGIN + 2) -#define STR_NO_DROP_LINES (RC_ATTR_BEGIN + 3) -#define STR_NO_PAGEDESC (RC_ATTR_BEGIN + 4) -#define STR_NO_MIRROR (RC_ATTR_BEGIN + 5) -#define STR_VERT_MIRROR (RC_ATTR_BEGIN + 6) -#define STR_HORI_MIRROR (RC_ATTR_BEGIN + 7) -#define STR_BOTH_MIRROR (RC_ATTR_BEGIN + 8) -#define STR_CHARFMT (RC_ATTR_BEGIN + 9) -#define STR_NO_CHARFMT (RC_ATTR_BEGIN + 10) -#define STR_FOOTER (RC_ATTR_BEGIN + 11) -#define STR_NO_FOOTER (RC_ATTR_BEGIN + 12) -#define STR_HEADER (RC_ATTR_BEGIN + 13) -#define STR_NO_HEADER (RC_ATTR_BEGIN + 14) -#define STR_SURROUND_NONE (RC_ATTR_BEGIN + 15) -#define STR_SURROUND_THROUGHT (RC_ATTR_BEGIN + 16) -#define STR_SURROUND_PARALLEL (RC_ATTR_BEGIN + 17) -#define STR_SURROUND_COLUMN (RC_ATTR_BEGIN + 18) -#define STR_SURROUND_LEFT (RC_ATTR_BEGIN + 19) -#define STR_SURROUND_RIGHT (RC_ATTR_BEGIN + 20) -#define STR_SURROUND_INSIDE (RC_ATTR_BEGIN + 21) -#define STR_SURROUND_OUTSIDE (RC_ATTR_BEGIN + 22) -#define STR_FRM_WIDTH (RC_ATTR_BEGIN + 23) -#define STR_FRM_FIXEDHEIGHT (RC_ATTR_BEGIN + 24) -#define STR_FRM_MINHEIGHT (RC_ATTR_BEGIN + 25) +#define STR_DROP_OVER (RC_ATTR_BEGIN + 1) +#define STR_DROP_LINES (RC_ATTR_BEGIN + 2) +#define STR_NO_DROP_LINES (RC_ATTR_BEGIN + 3) +#define STR_NO_PAGEDESC (RC_ATTR_BEGIN + 4) +#define STR_NO_MIRROR (RC_ATTR_BEGIN + 5) +#define STR_VERT_MIRROR (RC_ATTR_BEGIN + 6) +#define STR_HORI_MIRROR (RC_ATTR_BEGIN + 7) +#define STR_BOTH_MIRROR (RC_ATTR_BEGIN + 8) +#define STR_CHARFMT (RC_ATTR_BEGIN + 9) +#define STR_NO_CHARFMT (RC_ATTR_BEGIN + 10) +#define STR_FOOTER (RC_ATTR_BEGIN + 11) +#define STR_NO_FOOTER (RC_ATTR_BEGIN + 12) +#define STR_HEADER (RC_ATTR_BEGIN + 13) +#define STR_NO_HEADER (RC_ATTR_BEGIN + 14) +#define STR_SURROUND_NONE (RC_ATTR_BEGIN + 15) +#define STR_SURROUND_THROUGHT (RC_ATTR_BEGIN + 16) +#define STR_SURROUND_PARALLEL (RC_ATTR_BEGIN + 17) +#define STR_SURROUND_COLUMN (RC_ATTR_BEGIN + 18) +#define STR_SURROUND_LEFT (RC_ATTR_BEGIN + 19) +#define STR_SURROUND_RIGHT (RC_ATTR_BEGIN + 20) +#define STR_SURROUND_INSIDE (RC_ATTR_BEGIN + 21) +#define STR_SURROUND_OUTSIDE (RC_ATTR_BEGIN + 22) +#define STR_FRM_WIDTH (RC_ATTR_BEGIN + 23) +#define STR_FRM_FIXEDHEIGHT (RC_ATTR_BEGIN + 24) +#define STR_FRM_MINHEIGHT (RC_ATTR_BEGIN + 25) #define STR_FLY_AT_PARA (RC_ATTR_BEGIN + 26) #define STR_FLY_AS_CHAR (RC_ATTR_BEGIN + 27) #define STR_FLY_AT_PAGE (RC_ATTR_BEGIN + 28) -#define STR_POS_X (RC_ATTR_BEGIN + 29) -#define STR_POS_Y (RC_ATTR_BEGIN + 30) -#define STR_VERT_TOP (RC_ATTR_BEGIN + 31) -#define STR_VERT_CENTER (RC_ATTR_BEGIN + 32) -#define STR_VERT_BOTTOM (RC_ATTR_BEGIN + 33) -#define STR_HORI_RIGHT (RC_ATTR_BEGIN + 34) -#define STR_HORI_CENTER (RC_ATTR_BEGIN + 35) -#define STR_HORI_LEFT (RC_ATTR_BEGIN + 36) -#define STR_HORI_INSIDE (RC_ATTR_BEGIN + 37) -#define STR_HORI_OUTSIDE (RC_ATTR_BEGIN + 38) -#define STR_HORI_FULL (RC_ATTR_BEGIN + 39) -#define STR_COLUMNS (RC_ATTR_BEGIN + 40) -#define STR_LINE_WIDTH (RC_ATTR_BEGIN + 41) -#define STR_MAX_FTN_HEIGHT (RC_ATTR_BEGIN + 42) -#define STR_SURROUND_IDEAL (RC_ATTR_BEGIN + 43) -#define STR_LINE_TOP (RC_ATTR_BEGIN + 44) -#define STR_LINE_CENTER (RC_ATTR_BEGIN + 45) -#define STR_LINE_BOTTOM (RC_ATTR_BEGIN + 46) -#define STR_REGISTER_ON (RC_ATTR_BEGIN + 47) -#define STR_REGISTER_OFF (RC_ATTR_BEGIN + 48) -#define STR_SURROUND_ANCHORONLY (RC_ATTR_BEGIN + 49) -#define STR_EDIT_IN_READONLY (RC_ATTR_BEGIN + 50) -#define STR_LAYOUT_SPLIT (RC_ATTR_BEGIN + 51) -#define STR_NUMRULE_ON (RC_ATTR_BEGIN + 52) -#define STR_NUMRULE_OFF (RC_ATTR_BEGIN + 53) -#define STR_CONNECT1 (RC_ATTR_BEGIN + 54) -#define STR_CONNECT2 (RC_ATTR_BEGIN + 55) -#define STR_MIRROR_TOGGLE (RC_ATTR_BEGIN + 56) -#define STR_LINECOUNT (RC_ATTR_BEGIN + 57) -#define STR_DONTLINECOUNT (RC_ATTR_BEGIN + 58) -#define STR_LINCOUNT_START (RC_ATTR_BEGIN + 59) +#define STR_POS_X (RC_ATTR_BEGIN + 29) +#define STR_POS_Y (RC_ATTR_BEGIN + 30) +#define STR_VERT_TOP (RC_ATTR_BEGIN + 31) +#define STR_VERT_CENTER (RC_ATTR_BEGIN + 32) +#define STR_VERT_BOTTOM (RC_ATTR_BEGIN + 33) +#define STR_HORI_RIGHT (RC_ATTR_BEGIN + 34) +#define STR_HORI_CENTER (RC_ATTR_BEGIN + 35) +#define STR_HORI_LEFT (RC_ATTR_BEGIN + 36) +#define STR_HORI_INSIDE (RC_ATTR_BEGIN + 37) +#define STR_HORI_OUTSIDE (RC_ATTR_BEGIN + 38) +#define STR_HORI_FULL (RC_ATTR_BEGIN + 39) +#define STR_COLUMNS (RC_ATTR_BEGIN + 40) +#define STR_LINE_WIDTH (RC_ATTR_BEGIN + 41) +#define STR_MAX_FTN_HEIGHT (RC_ATTR_BEGIN + 42) +#define STR_SURROUND_IDEAL (RC_ATTR_BEGIN + 43) +#define STR_LINE_TOP (RC_ATTR_BEGIN + 44) +#define STR_LINE_CENTER (RC_ATTR_BEGIN + 45) +#define STR_LINE_BOTTOM (RC_ATTR_BEGIN + 46) +#define STR_REGISTER_ON (RC_ATTR_BEGIN + 47) +#define STR_REGISTER_OFF (RC_ATTR_BEGIN + 48) +#define STR_SURROUND_ANCHORONLY (RC_ATTR_BEGIN + 49) +#define STR_EDIT_IN_READONLY (RC_ATTR_BEGIN + 50) +#define STR_LAYOUT_SPLIT (RC_ATTR_BEGIN + 51) +#define STR_NUMRULE_ON (RC_ATTR_BEGIN + 52) +#define STR_NUMRULE_OFF (RC_ATTR_BEGIN + 53) +#define STR_CONNECT1 (RC_ATTR_BEGIN + 54) +#define STR_CONNECT2 (RC_ATTR_BEGIN + 55) +#define STR_MIRROR_TOGGLE (RC_ATTR_BEGIN + 56) +#define STR_LINECOUNT (RC_ATTR_BEGIN + 57) +#define STR_DONTLINECOUNT (RC_ATTR_BEGIN + 58) +#define STR_LINCOUNT_START (RC_ATTR_BEGIN + 59) -#define STR_LUMINANCE (RC_ATTR_BEGIN + 60) -#define STR_CHANNELR (RC_ATTR_BEGIN + 61) -#define STR_CHANNELG (RC_ATTR_BEGIN + 62) -#define STR_CHANNELB (RC_ATTR_BEGIN + 63) -#define STR_CONTRAST (RC_ATTR_BEGIN + 64) -#define STR_GAMMA (RC_ATTR_BEGIN + 65) -#define STR_TRANSPARENCY (RC_ATTR_BEGIN + 66) -#define STR_INVERT (RC_ATTR_BEGIN + 67) -#define STR_INVERT_NOT (RC_ATTR_BEGIN + 68) -#define STR_DRAWMODE (RC_ATTR_BEGIN + 69) -#define STR_DRAWMODE_STD (RC_ATTR_BEGIN + 70) -#define STR_DRAWMODE_GREY (RC_ATTR_BEGIN + 71) +#define STR_LUMINANCE (RC_ATTR_BEGIN + 60) +#define STR_CHANNELR (RC_ATTR_BEGIN + 61) +#define STR_CHANNELG (RC_ATTR_BEGIN + 62) +#define STR_CHANNELB (RC_ATTR_BEGIN + 63) +#define STR_CONTRAST (RC_ATTR_BEGIN + 64) +#define STR_GAMMA (RC_ATTR_BEGIN + 65) +#define STR_TRANSPARENCY (RC_ATTR_BEGIN + 66) +#define STR_INVERT (RC_ATTR_BEGIN + 67) +#define STR_INVERT_NOT (RC_ATTR_BEGIN + 68) +#define STR_DRAWMODE (RC_ATTR_BEGIN + 69) +#define STR_DRAWMODE_STD (RC_ATTR_BEGIN + 70) +#define STR_DRAWMODE_GREY (RC_ATTR_BEGIN + 71) #define STR_DRAWMODE_BLACKWHITE (RC_ATTR_BEGIN + 72) #define STR_DRAWMODE_WATERMARK (RC_ATTR_BEGIN + 73) -#define STR_ROTATION (RC_ATTR_BEGIN + 74) +#define STR_ROTATION (RC_ATTR_BEGIN + 74) #define STR_GRID_NONE (RC_ATTR_BEGIN + 75) #define STR_GRID_LINES_ONLY (RC_ATTR_BEGIN + 76) #define STR_GRID_LINES_CHARS (RC_ATTR_BEGIN + 77) diff --git a/sw/source/ui/utlui/bookctrl.cxx b/sw/source/ui/utlui/bookctrl.cxx index 3b2567673020..4bab9e8ca107 100644 --- a/sw/source/ui/utlui/bookctrl.cxx +++ b/sw/source/ui/utlui/bookctrl.cxx @@ -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 @@ -63,10 +63,10 @@ class BookmarkPopup_Impl : public PopupMenu public: BookmarkPopup_Impl(); - USHORT GetCurId() const { return nCurId; } + USHORT GetCurId() const { return nCurId; } private: - USHORT nCurId; + USHORT nCurId; virtual void Select(); }; diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/ui/utlui/condedit.cxx index b534b538ca54..8929abb0069c 100644 --- a/sw/source/ui/utlui/condedit.cxx +++ b/sw/source/ui/utlui/condedit.cxx @@ -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/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 0b0bca564f48..a59244a23777 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -115,8 +115,8 @@ #include <unomid.h> -#define CTYPE_CNT 0 -#define CTYPE_CTT 1 +#define CTYPE_CNT 0 +#define CTYPE_CTT 1 using namespace ::std; using namespace ::com::sun::star; @@ -125,7 +125,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; -#define NAVI_BOOKMARK_DELIM (sal_Unicode)1 +#define NAVI_BOOKMARK_DELIM (sal_Unicode)1 /*************************************************************************** @@ -189,7 +189,7 @@ SwContent::SwContent(const SwContentType* pCnt, const String& rName, long nYPos) } -sal_uInt8 SwTypeNumber::GetTypeId() +sal_uInt8 SwTypeNumber::GetTypeId() { return nTypeId; } @@ -224,7 +224,7 @@ SwTOXBaseContent::~SwTOXBaseContent() } /*************************************************************************** - Beschreibung: Inhaltstyp, kennt seine Inhalte und die WrtShell + Beschreibung: Inhaltstyp, kennt seine Inhalte und die WrtShell ***************************************************************************/ @@ -246,7 +246,7 @@ SwContentType::SwContentType(SwWrtShell* pShell, sal_uInt16 nType, sal_uInt8 nLe } /*************************************************************************** - Beschreibung: Initialisierung + Beschreibung: Initialisierung ***************************************************************************/ @@ -257,7 +257,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) nMemberCount = 0; switch(nContentType) { - case CONTENT_TYPE_OUTLINE : + case CONTENT_TYPE_OUTLINE : { sTypeToken = C2S(pMarkToOutline); sal_uInt16 nOutlineCount = nMemberCount = @@ -274,7 +274,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) } break; - case CONTENT_TYPE_TABLE : + case CONTENT_TYPE_TABLE : sTypeToken = C2S(pMarkToTable); nMemberCount = pWrtShell->GetTblFrmFmtCount(sal_True); bEdit = sal_True; @@ -313,7 +313,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) break; case CONTENT_TYPE_REGION : { - SwContentArr* pOldMember = 0; + SwContentArr* pOldMember = 0; sal_uInt16 nOldRegionCount = 0; sal_Bool bInvalidate = sal_False; if(!pMember) @@ -350,7 +350,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, 0 ); if( !pFmt->GetInfo( aAskItem ) && - !aAskItem.pObject ) // not visible + !aAskItem.pObject ) // not visible pCnt->SetInvisible(); pMember->Insert(pCnt);//, pMember->Count()); @@ -448,8 +448,8 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) } } /* - // this code can be used once we want redline comments in the margin - else // redcomment + // this code can be used once we want redline comments in the margin + else // redcomment { SwRedline* pRedline = static_cast<SwRedline*>((*i)->GetBroadCaster()); if ( pRedline->GetComment() != String(::rtl::OUString::createFromAscii("")) ) @@ -499,7 +499,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) // ... dann koennen die Daten auch nicht mehr gueltig sein // abgesehen von denen, die schon korrigiert wurden, dann ist // nOldMemberCount doch nicht so old - if( nOldMemberCount != nMemberCount ) + if( nOldMemberCount != nMemberCount ) bDataValid = sal_False; } @@ -514,7 +514,7 @@ SwContentType::~SwContentType() } /*************************************************************************** - Beschreibung: Inhalt liefern, dazu gfs. die Liste fuellen + Beschreibung: Inhalt liefern, dazu gfs. die Liste fuellen ***************************************************************************/ @@ -537,7 +537,7 @@ const SwContent* SwContentType::GetMember(sal_uInt16 nIndex) ***************************************************************************/ -void SwContentType::Invalidate() +void SwContentType::Invalidate() { bDataValid = sal_False; } @@ -547,9 +547,9 @@ void SwContentType::Invalidate() ***************************************************************************/ -void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) +void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) { - SwContentArr* pOldMember = 0; + SwContentArr* pOldMember = 0; int nOldMemberCount = -1; SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, 0 ); if(pMember && pbLevelOrVisibiblityChanged) @@ -565,7 +565,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) pMember->DeleteAndDestroy(0, pMember->Count()); switch(nContentType) { - case CONTENT_TYPE_OUTLINE : + case CONTENT_TYPE_OUTLINE : { sal_uInt16 nOutlineCount = nMemberCount = static_cast<sal_uInt16>(pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount()); @@ -598,13 +598,13 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) } break; - case CONTENT_TYPE_TABLE : + case CONTENT_TYPE_TABLE : { DBG_ASSERT(nMemberCount == pWrtShell->GetTblFrmFmtCount(sal_True), "MemberCount differiert"); Point aNullPt; - nMemberCount = pWrtShell->GetTblFrmFmtCount(sal_True); + nMemberCount = pWrtShell->GetTblFrmFmtCount(sal_True); for(sal_uInt16 i = 0; i < nMemberCount; i++) { const SwFrmFmt& rTblFmt = pWrtShell->GetTblFrmFmt(i, sal_True); @@ -613,7 +613,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) SwContent* pCnt = new SwContent(this, sTblName, rTblFmt.FindLayoutRect(sal_False, &aNullPt).Top() ); if( !rTblFmt.GetInfo( aAskItem ) && - !aAskItem.pObject ) // not visible + !aAskItem.pObject ) // not visible pCnt->SetInvisible(); pMember->Insert(pCnt);//, i); @@ -633,7 +633,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) eType = FLYCNTTYPE_OLE; else if(nContentType == CONTENT_TYPE_GRAPHIC) eType = FLYCNTTYPE_GRF; - DBG_ASSERT(nMemberCount == pWrtShell->GetFlyCount(eType), + DBG_ASSERT(nMemberCount == pWrtShell->GetFlyCount(eType), "MemberCount differiert"); Point aNullPt; nMemberCount = pWrtShell->GetFlyCount(eType); @@ -659,7 +659,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) pFrmFmt->FindLayoutRect(sal_False, &aNullPt).Top() ); } if( !pFrmFmt->GetInfo( aAskItem ) && - !aAskItem.pObject ) // not visible + !aAskItem.pObject ) // not visible pCnt->SetInvisible(); pMember->Insert(pCnt);//, i); if(nOldMemberCount > (int)i && @@ -711,7 +711,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) nLevel, pFmt->FindLayoutRect( sal_False, &aNullPt ).Top()); if( !pFmt->GetInfo( aAskItem ) && - !aAskItem.pObject ) // not visible + !aAskItem.pObject ) // not visible pCnt->SetInvisible(); pMember->Insert(pCnt);//, pMember->Count()); @@ -773,7 +773,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) this, sTOXNm, nTox, *pBase); if( !pBase->GetInfo( aAskItem ) && - !aAskItem.pObject ) // not visible + !aAskItem.pObject ) // not visible pCnt->SetInvisible(); pMember->Insert( pCnt );//, nTox ); @@ -814,8 +814,8 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) nMemberCount++; } } - /* this code can be used once we want redline comments in the margin - else // redcomment + /* this code can be used once we want redline comments in the margin + else // redcomment { SwRedline* pRedline = static_cast<SwRedline*>((*i)->GetBroadCaster()); if ( pRedline->GetComment() != String(::rtl::OUString::createFromAscii("")) ) @@ -940,8 +940,8 @@ SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) : SetDragDropMode(SV_DRAGDROP_APP_COPY); for( i = 0; i < CONTENT_TYPE_MAX; i++) { - aActiveContentArr[i] = 0; - aHiddenContentArr[i] = 0; + aActiveContentArr[i] = 0; + aHiddenContentArr[i] = 0; } for( i = 0; i < CONTEXT_COUNT; i++ ) { @@ -968,7 +968,6 @@ SwContentTree::~SwContentTree() /*************************************************************************** Drag&Drop methods ***************************************************************************/ - void SwContentTree::StartDrag( sal_Int8 nAction, const Point& rPosPixel ) { if( !bIsRoot || nRootType != CONTENT_TYPE_OUTLINE ) @@ -1016,10 +1015,47 @@ sal_Int8 SwContentTree::AcceptDrop( const AcceptDropEvent& rEvt ) } /*************************************************************************** - Beschreibung: Drop wird im Navigator ausgefuehrt + Beschreibung: Drop wird im Navigator ausgefuehrt ***************************************************************************/ +void* lcl_GetOutlineKey( SwContentTree* pTree, SwOutlineContent* pContent) +{ + void* key = 0; + if( pTree && pContent ) + { + SwWrtShell* pShell = pTree->GetWrtShell(); + sal_Int32 nPos = pContent->GetYPos(); + if( nPos ) + { + key = (void*)pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos ); + } + } + return key; +} + sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) { + SvLBoxEntry* pEntry = pTargetEntry; + if( pEntry && ( nRootType == CONTENT_TYPE_OUTLINE ) && lcl_IsContent( pEntry ) ) + { + SwOutlineContent* pOutlineContent = ( SwOutlineContent* )( pEntry->GetUserData() ); + if( pOutlineContent ) + { + void* key = lcl_GetOutlineKey(this, pOutlineContent); + if( !mOutLineNodeMap[key] ) + { + while( pEntry->HasChilds() ) + { + SvLBoxEntry* pChildEntry = FirstChild( pEntry ); + while( pChildEntry ) + { + pEntry = pChildEntry; + pChildEntry = NextSibling( pChildEntry ); + } + } + pTargetEntry = pEntry; + } + } + } if( bIsRoot ) return SvTreeListBox::ExecuteDrop( rEvt ); return bIsInDrag ? DND_ACTION_NONE : GetParentWindow()->ExecuteDrop(rEvt); @@ -1027,7 +1063,7 @@ sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) /*************************************************************************** - Beschreibung: Handler fuer Dragging und ContextMenu + Beschreibung: Handler fuer Dragging und ContextMenu ***************************************************************************/ PopupMenu* SwContentTree::CreateContextMenu( void ) { @@ -1200,19 +1236,19 @@ PopupMenu* SwContentTree::CreateContextMenu( void ) } /*************************************************************************** - Beschreibung: Einrueckung fuer outlines (und sections) + Beschreibung: Einrueckung fuer outlines (und sections) ***************************************************************************/ -long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) +long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) { sal_uInt16 nLevel = 0; if(lcl_IsContent(pEntry)) { nLevel++; SwContent* pCnt = (SwContent *) pEntry->GetUserData(); - const SwContentType* pParent; - if(pCnt && 0 != (pParent = pCnt->GetParent())) + const SwContentType* pParent; + if(pCnt && 0 != (pParent = pCnt->GetParent())) { if(pParent->GetType() == CONTENT_TYPE_OUTLINE) nLevel = nLevel + ((SwOutlineContent*)pCnt)->GetOutlineLevel(); @@ -1225,7 +1261,7 @@ long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) } /*************************************************************************** - Beschreibung: Inhalte werden erst auf Anforderung in die Box eingefuegt + Beschreibung: Inhalte werden erst auf Anforderung in die Box eingefuegt ***************************************************************************/ @@ -1240,30 +1276,76 @@ void SwContentTree::RequestingChilds( SvLBoxEntry* pParent ) SwContentType* pCntType = (SwContentType*)pParent->GetUserData(); sal_uInt16 nCount = pCntType->GetMemberCount(); - for(sal_uInt16 i = 0; i < nCount; i++) - { - const SwContent* pCnt = pCntType->GetMember(i); - if(pCnt) - { - String sEntry = pCnt->GetName(); - if(!sEntry.Len()) - sEntry = sSpace; - InsertEntry(sEntry, pParent, - sal_False, LIST_APPEND, (void*)pCnt); - } - + /************************************************************** + Add for outline plus/minus + ***************************************************************/ + if(pCntType->GetType() == CONTENT_TYPE_OUTLINE) + { + SvLBoxEntry* pChild = 0; + for(sal_uInt16 i = 0; i < nCount; i++) + { + const SwContent* pCnt = pCntType->GetMember(i); + if(pCnt) + { + sal_uInt16 nLevel = ((SwOutlineContent*)pCnt)->GetOutlineLevel(); + String sEntry = pCnt->GetName(); + if(!sEntry.Len()) + sEntry = sSpace; + if(!pChild || (nLevel == 0)) + pChild = InsertEntry(sEntry, pParent, + sal_False, LIST_APPEND,(void*)pCnt); + else + { + //back search parent. + if(((SwOutlineContent*)pCntType->GetMember(i-1))->GetOutlineLevel() < nLevel) + pChild = InsertEntry(sEntry, pChild, + sal_False, LIST_APPEND, (void*)pCnt); + else + { + pChild = Prev(pChild); + while(pChild && + lcl_IsContent(pChild) && + !(((SwOutlineContent*)pChild->GetUserData())->GetOutlineLevel() < nLevel) + ) + { + pChild = Prev(pChild); + } + if(pChild) + pChild = InsertEntry(sEntry, pChild, + sal_False, LIST_APPEND, (void*)pCnt); + } + } + } + } + } + else + { + for(sal_uInt16 i = 0; i < nCount; i++) + { + const SwContent* pCnt = pCntType->GetMember(i); + if(pCnt) + { + String sEntry = pCnt->GetName(); + if(!sEntry.Len()) + sEntry = sSpace; + InsertEntry(sEntry, pParent, + sal_False, LIST_APPEND, (void*)pCnt); + } + + } } } } } /*************************************************************************** - Beschreibung: Expand - Zustand fuer Inhaltstypen merken + Beschreibung: Expand - Zustand fuer Inhaltstypen merken ***************************************************************************/ sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent ) { - if(!bIsRoot) + if(!bIsRoot || (((SwContentType*)pParent->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE) || + (nRootType == CONTENT_TYPE_OUTLINE)) { if(lcl_IsContentType(pParent)) { @@ -1276,22 +1358,59 @@ sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent ) } else nHiddenBlock |= nOr; + if((pCntType->GetType() == CONTENT_TYPE_OUTLINE)) + { + std::map< void*, sal_Bool > mCurrOutLineNodeMap; + + SwWrtShell* pShell = GetWrtShell(); + sal_Bool bBool = SvTreeListBox::Expand(pParent); + SvLBoxEntry* pChild = Next(pParent); + while(pChild && lcl_IsContent(pChild) && pParent->HasChilds()) + { + if(pChild->HasChilds()) + { + sal_Int32 nPos = ((SwContent*)pChild->GetUserData())->GetYPos(); + void* key = (void*)pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos ); + mCurrOutLineNodeMap.insert(std::map<void*, sal_Bool>::value_type( key, sal_False ) ); + std::map<void*,sal_Bool>::iterator iter = mOutLineNodeMap.find( key ); + if( iter != mOutLineNodeMap.end() && mOutLineNodeMap[key]) + { + mCurrOutLineNodeMap[key] = sal_True; + SvTreeListBox::Expand(pChild); + } + } + pChild = Next(pChild); + } + mOutLineNodeMap = mCurrOutLineNodeMap; + return bBool; + } + + } + else if( lcl_IsContent(pParent) ) + { + SwWrtShell* pShell = GetWrtShell(); + sal_Int32 nPos = ((SwContent*)pParent->GetUserData())->GetYPos(); + void* key = (void*)pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos ); + mOutLineNodeMap[key] = sal_True; } } return SvTreeListBox::Expand(pParent); } /*************************************************************************** - Beschreibung: Collapse - Zustand fuer Inhaltstypen merken + Beschreibung: Collapse - Zustand fuer Inhaltstypen merken ***************************************************************************/ sal_Bool SwContentTree::Collapse( SvLBoxEntry* pParent ) { sal_Bool bRet; - if(!bIsRoot) + if(!bIsRoot || (((SwContentType*)pParent->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE) || + (nRootType == CONTENT_TYPE_OUTLINE)) { if(lcl_IsContentType(pParent)) { + if(bIsRoot) + return bRet = sal_False; SwContentType* pCntType = (SwContentType*)pParent->GetUserData(); sal_uInt16 nAnd = 1 << pCntType->GetType(); nAnd = ~nAnd; @@ -1303,16 +1422,24 @@ sal_Bool SwContentTree::Collapse( SvLBoxEntry* pParent ) else nHiddenBlock &= nAnd; } + else if( lcl_IsContent(pParent) ) + { + SwWrtShell* pShell = GetWrtShell(); + sal_Int32 nPos = ((SwContent*)pParent->GetUserData())->GetYPos(); + void* key = (void*)pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos ); + mOutLineNodeMap[key] = sal_False; + } bRet = SvTreeListBox::Collapse(pParent); } else - bRet = sal_False; +// bRet = sal_False; + bRet = SvTreeListBox::Collapse(pParent); return bRet; } /*************************************************************************** - Beschreibung: Auch auf Doppelclick wird zunaechst nur aufgeklappt + Beschreibung: Auch auf Doppelclick wird zunaechst nur aufgeklappt ***************************************************************************/ @@ -1323,9 +1450,9 @@ IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG ) DBG_ASSERT(pEntry, "kein aktueller Eintrag!"); if(pEntry) { - if(lcl_IsContentType(pEntry)) + if(lcl_IsContentType(pEntry) && !pEntry->HasChilds()) RequestingChilds(pEntry); - else if(bIsActive || bIsConstant) + else if(!lcl_IsContentType(pEntry) && (bIsActive || bIsConstant)) { if(bIsConstant) { @@ -1335,7 +1462,7 @@ IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG ) SwContent* pCnt = (SwContent*)pEntry->GetUserData(); DBG_ASSERT( pCnt, "keine UserData"); GotoContent(pCnt); - if(pCnt->GetParent()->GetType() == CONTENT_TYPE_FRAME) + if(pCnt->GetParent()->GetType() == CONTENT_TYPE_FRAME) pActiveShell->EnterStdMode(); } } @@ -1343,7 +1470,7 @@ IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG ) } /*************************************************************************** - Beschreibung: Anzeigen der Datei + Beschreibung: Anzeigen der Datei ***************************************************************************/ @@ -1358,7 +1485,7 @@ void SwContentTree::Display( sal_Bool bActive ) // erst den selektierten Eintrag auslesen, um ihn spaeter evtl. wieder // zu selektieren -> die UserDaten sind hier nicht mehr gueltig! SvLBoxEntry* pOldSelEntry = FirstSelected(); - String sEntryName; // Name des Eintrags + String sEntryName; // Name des Eintrags sal_uInt16 nEntryRelPos = 0; // rel. Pos zu seinem Parent sal_uInt32 nOldEntryCount = GetEntryCount(); sal_Int32 nOldScrollPos = 0; @@ -1369,9 +1496,14 @@ void SwContentTree::Display( sal_Bool bActive ) nOldScrollPos = pVScroll->GetThumbPos(); sEntryName = GetEntryText(pOldSelEntry); + SvLBoxEntry* pParantEntry = pOldSelEntry; + while( GetParent(pParantEntry)) + { + pParantEntry = GetParent(pParantEntry); + } if(GetParent(pOldSelEntry)) { - nEntryRelPos = (sal_uInt16)(GetModel()->GetAbsPos(pOldSelEntry) - GetModel()->GetAbsPos(GetParent(pOldSelEntry))); + nEntryRelPos = (sal_uInt16)(GetModel()->GetAbsPos(pOldSelEntry) - GetModel()->GetAbsPos(pParantEntry)); } } Clear(); @@ -1465,18 +1597,24 @@ void SwContentTree::Display( sal_Bool bActive ) (*ppRootContentT)->GetName(), rImage, rImage, 0, sal_False, LIST_APPEND, *ppRootContentT); - for(sal_uInt16 i = 0; i < (*ppRootContentT)->GetMemberCount(); i++ ) + if(nRootType != CONTENT_TYPE_OUTLINE) { - const SwContent* pCnt = (*ppRootContentT)->GetMember(i); - if(pCnt) + SvLBoxEntry* pEntry; + for(sal_uInt16 i = 0; i < (*ppRootContentT)->GetMemberCount(); i++ ) { - String sEntry = pCnt->GetName(); - if(!sEntry.Len()) - sEntry = sSpace; - InsertEntry( sEntry, pParent, - sal_False, LIST_APPEND, (void*)pCnt); + const SwContent* pCnt = (*ppRootContentT)->GetMember(i); + if(pCnt) + { + String sEntry = pCnt->GetName(); + if(!sEntry.Len()) + sEntry = sSpace; + InsertEntry( sEntry, pParent, + sal_False, LIST_APPEND, (void*)pCnt); + } } - } + } + else + RequestingChilds(pParent); Expand(pParent); if( nRootType == CONTENT_TYPE_OUTLINE && bIsActive ) { @@ -1535,7 +1673,7 @@ void SwContentTree::Display( sal_Bool bActive ) } /*************************************************************************** - Beschreibung: Im Clear muessen auch die ContentTypes geloescht werden + Beschreibung: Im Clear muessen auch die ContentTypes geloescht werden ***************************************************************************/ @@ -1632,7 +1770,7 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, // nur, wenn primaer ein Link eingefuegt werden soll bRet = sal_True; } - else if( nActType == CONTENT_TYPE_REGION || + else if( nActType == CONTENT_TYPE_REGION || nActType == CONTENT_TYPE_BOOKMARK ) { // fuer Bereich und Textmarken ist ein Link auch ohne @@ -1690,7 +1828,7 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, return bRet; } /*************************************************************************** - Beschreibung: Umschalten der Anzeige auf Root + Beschreibung: Umschalten der Anzeige auf Root ***************************************************************************/ @@ -1724,7 +1862,7 @@ sal_Bool SwContentTree::ToggleToRoot() } /*************************************************************************** - Beschreibung: Angezeigten Inhalt auf Gueltigkeit pruefen + Beschreibung: Angezeigten Inhalt auf Gueltigkeit pruefen ***************************************************************************/ @@ -1851,9 +1989,9 @@ sal_Bool SwContentTree::HasContentChanged() // or if the visibility of objects (frames, sections, tables) has changed // i.e. in header/footer pArrType->FillMemberList(&bLevelOrVisibiblityChanged); - if(bLevelOrVisibiblityChanged) - bInvalidate = sal_True; sal_uInt16 nChildCount = (sal_uInt16)GetChildCount(pEntry); + if((nType == CONTENT_TYPE_OUTLINE) && bLevelOrVisibiblityChanged) + bRepaint = sal_True; if(bLevelOrVisibiblityChanged) bInvalidate = sal_True; @@ -1943,9 +2081,9 @@ sal_Bool SwContentTree::HasContentChanged() } /*************************************************************************** - Beschreibung: Bevor alle Daten geloescht werden, soll noch der letzte - * aktive Eintrag festgestellt werden. Dann werden die - * UserData geloescht + Beschreibung: Bevor alle Daten geloescht werden, soll noch der letzte + * aktive Eintrag festgestellt werden. Dann werden die + * UserData geloescht ***************************************************************************/ void SwContentTree::FindActiveTypeAndRemoveUserData() { @@ -1960,8 +2098,8 @@ void SwContentTree::FindActiveTypeAndRemoveUserData() if(pEntry->GetUserData() && lcl_IsContentType(pEntry)) nLastSelType = ((SwContentType*)pEntry->GetUserData())->GetType(); } -// else -// nLastSelType = USHRT_MAX; +// else +// nLastSelType = USHRT_MAX; pEntry = First(); while(pEntry) { @@ -1971,7 +2109,7 @@ void SwContentTree::FindActiveTypeAndRemoveUserData() } /*************************************************************************** - Beschreibung: Nachdem ein File auf den Navigator gedroppt wurde, + Beschreibung: Nachdem ein File auf den Navigator gedroppt wurde, wird die neue Shell gesetzt ***************************************************************************/ @@ -1991,7 +2129,7 @@ void SwContentTree::SetHiddenShell(SwWrtShell* pSh) GetParentWindow()->UpdateListBox(); } /*************************************************************************** - Beschreibung: Dokumentwechsel - neue Shell setzen + Beschreibung: Dokumentwechsel - neue Shell setzen ***************************************************************************/ @@ -2030,15 +2168,15 @@ void SwContentTree::SetActiveShell(SwWrtShell* pSh) } /*************************************************************************** - Beschreibung: Eine offene View als aktiv festlegen + Beschreibung: Eine offene View als aktiv festlegen ***************************************************************************/ void SwContentTree::SetConstantShell(SwWrtShell* pSh) { pActiveShell = pSh; - bIsActive = sal_False; - bIsConstant = sal_True; + bIsActive = sal_False; + bIsConstant = sal_True; FindActiveTypeAndRemoveUserData(); for(sal_uInt16 i=0; i < CONTENT_TYPE_MAX; i++) { @@ -2047,7 +2185,7 @@ void SwContentTree::SetConstantShell(SwWrtShell* pSh) Display(sal_True); } /*************************************************************************** - Beschreibung: Kommandos des Navigators ausfuehren + Beschreibung: Kommandos des Navigators ausfuehren ***************************************************************************/ @@ -2072,7 +2210,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) { if(bIsRoot && nRootType == CONTENT_TYPE_OUTLINE || ((SwContent*)pFirstEntry->GetUserData())->GetParent()->GetType() - == CONTENT_TYPE_OUTLINE) + == CONTENT_TYPE_OUTLINE) { nActPos = ((SwOutlineContent*)pFirstEntry->GetUserData())->GetPos(); } @@ -2212,25 +2350,25 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) ***************************************************************************/ -void SwContentTree::ShowTree() +void SwContentTree::ShowTree() { aUpdTimer.Start(); SvTreeListBox::Show(); } /*************************************************************************** - Beschreibung: zusammengefaltet wird nicht geidlet + Beschreibung: zusammengefaltet wird nicht geidlet ***************************************************************************/ -void SwContentTree::HideTree() +void SwContentTree::HideTree() { aUpdTimer.Stop(); SvTreeListBox::Hide(); } /*************************************************************************** - Beschreibung: Kein Idle mit Focus oder waehrend des Dragging + Beschreibung: Kein Idle mit Focus oder waehrend des Dragging ***************************************************************************/ @@ -2297,7 +2435,7 @@ DragDropMode SwContentTree::NotifyStartDrag( /*************************************************************************** - Beschreibung : Nach dem Drag wird der aktuelle Absatz m i t + Beschreibung : Nach dem Drag wird der aktuelle Absatz m i t Childs verschoben ***************************************************************************/ @@ -2313,7 +2451,7 @@ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget, nTargetPos = USHRT_MAX; else nTargetPos = (( SwOutlineContent* )pTarget->GetUserData())->GetPos(); - if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt + if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt nTargetPos != USHRT_MAX) { SvLBoxEntry* pNext = Next(pTarget); @@ -2337,7 +2475,7 @@ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget, return sal_False; } /*************************************************************************** - Beschreibung : Nach dem Drag wird der aktuelle Absatz o h n e + Beschreibung : Nach dem Drag wird der aktuelle Absatz o h n e Childs verschoben ***************************************************************************/ @@ -2354,7 +2492,7 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, else nTargetPos = (( SwOutlineContent* )pTarget->GetUserData())->GetPos(); - if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt + if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt nTargetPos != USHRT_MAX) { SvLBoxEntry* pNext = Next(pTarget); @@ -2368,7 +2506,7 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, DBG_ASSERT( pEntry && lcl_IsContent(pEntry),"Source == 0 oder Source hat keinen Content" ); - GetParentWindow()->MoveOutline( nSourcePos, nTargetPos, sal_False); + GetParentWindow()->MoveOutline( nSourcePos, nTargetPos, sal_False); //TreeListBox wird aus dem Dokument neu geladen aActiveContentArr[CONTENT_TYPE_OUTLINE]->Invalidate(); @@ -2378,7 +2516,7 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, } /*************************************************************************** - Beschreibung: Kein Drop vor den ersten Eintrag - es ist ein SwContentType + Beschreibung: Kein Drop vor den ersten Eintrag - es ist ein SwContentType ***************************************************************************/ sal_Bool SwContentTree::NotifyAcceptDrop( SvLBoxEntry* pEntry) @@ -2388,8 +2526,8 @@ sal_Bool SwContentTree::NotifyAcceptDrop( SvLBoxEntry* pEntry) /*************************************************************************** - Beschreibung: Wird ein Ctrl+DoubleClick in einen freien Bereich ausgefuehrt, - * dann soll die Basisfunktion des Controls gerufen werden + Beschreibung: Wird ein Ctrl+DoubleClick in einen freien Bereich ausgefuehrt, + * dann soll die Basisfunktion des Controls gerufen werden ***************************************************************************/ void SwContentTree::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -2402,7 +2540,7 @@ void SwContentTree::MouseButtonDown( const MouseEvent& rMEvt ) } /*************************************************************************** - Beschreibung: sofort aktualisieren + Beschreibung: sofort aktualisieren ***************************************************************************/ @@ -2722,7 +2860,7 @@ void SwContentTree::SetOutlineLevel(sal_uInt8 nSet) } /*************************************************************************** - Beschreibung: Moduswechsel: gedropptes Doc anzeigen + Beschreibung: Moduswechsel: gedropptes Doc anzeigen ***************************************************************************/ @@ -2737,7 +2875,7 @@ void SwContentTree::ShowHiddenShell() } /*************************************************************************** - Beschreibung: Moduswechsel: aktive Sicht anzeigen + Beschreibung: Moduswechsel: aktive Sicht anzeigen ***************************************************************************/ @@ -2760,6 +2898,10 @@ sal_Bool SwContentTree::Select( SvLBoxEntry* pEntry, sal_Bool bSelect ) return sal_False; sal_Bool bEnable = sal_False; SvLBoxEntry* pParentEntry = GetParent(pEntry); + while(pParentEntry && (!lcl_IsContentType(pParentEntry))) + { + pParentEntry = GetParent(pParentEntry); + } if(!bIsLastReadOnly && (!IsVisible() || (bIsRoot && nRootType == CONTENT_TYPE_OUTLINE && pParentEntry || lcl_IsContent(pEntry) && ((SwContentType*)pParentEntry->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE))) @@ -2812,7 +2954,7 @@ void SwContentTree::EditEntry(SvLBoxEntry* pEntry, sal_uInt8 nMode) uno::Reference< container::XNameAccess > xNameAccess, xSecond, xThird; switch(nType) { - case CONTENT_TYPE_TABLE : + case CONTENT_TYPE_TABLE : if(nMode == EDIT_UNPROTECT_TABLE) { pActiveShell->GetView().GetDocShell()-> @@ -2936,7 +3078,7 @@ void SwContentTree::EditEntry(SvLBoxEntry* pEntry, sal_uInt8 nMode) pActiveShell->DelRight(); } /* - // this code can be used once we want redline comments in the margin + // this code can be used once we want redline comments in the margin else { SwMarginWin* pComment = pActiveShell->GetView().GetPostItMgr()->GetPostIt(((SwPostItContent*)pCnt)->GetRedline()); @@ -3045,12 +3187,12 @@ void SwContentTree::GotoContent(SwContent* pCnt) sal_uInt16 nJumpType = pCnt->GetParent()->GetType(); switch(nJumpType) { - case CONTENT_TYPE_OUTLINE : + case CONTENT_TYPE_OUTLINE : { pActiveShell->GotoOutline(((SwOutlineContent*)pCnt)->GetPos()); } break; - case CONTENT_TYPE_TABLE : + case CONTENT_TYPE_TABLE : { pActiveShell->GotoTable(pCnt->GetName()); } @@ -3190,10 +3332,10 @@ sal_Bool NaviContentBookmark::Paste( TransferableDataHelper& rData ) if( bRet ) { xub_StrLen nPos = 0; - aUrl = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ); - aDescr = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ); + aUrl = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ); + aDescr = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ); nDefDrag= (USHORT)sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ).ToInt32(); - nDocSh = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ).ToInt32(); + nDocSh = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ).ToInt32(); } return bRet; } @@ -3206,7 +3348,7 @@ class SwContentLBoxString : public SvLBoxString { public: SwContentLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, - const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) {} + const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) {} virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index e9b8fdf6feef..31789382ec2f 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -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 @@ -90,12 +90,12 @@ using ::rtl::OUString; #define CTX_INSERT_NEW_FILE 12 #define CTX_INSERT_TEXT 13 -#define CTX_UPDATE_SEL 20 +#define CTX_UPDATE_SEL 20 #define CTX_UPDATE_INDEX 21 #define CTX_UPDATE_LINK 22 #define CTX_UPDATE_ALL 23 -#define CTX_UPDATE 1 +#define CTX_UPDATE 1 #define CTX_INSERT 2 #define CTX_EDIT 3 #define CTX_DELETE 4 @@ -104,12 +104,12 @@ using ::rtl::OUString; #define GLOBAL_UPDATE_TIMEOUT 2000 // Flags fuer PopupMenu-enable/disable -#define ENABLE_INSERT_IDX 0x0001 +#define ENABLE_INSERT_IDX 0x0001 #define ENABLE_INSERT_FILE 0x0002 #define ENABLE_INSERT_TEXT 0x0004 #define ENABLE_EDIT 0x0008 #define ENABLE_DELETE 0x0010 -#define ENABLE_UPDATE 0x0020 +#define ENABLE_UPDATE 0x0020 #define ENABLE_UPDATE_SEL 0x0040 #define ENABLE_EDIT_LINK 0x0080 @@ -119,34 +119,34 @@ using ::rtl::OUString; const SfxObjectShell* SwGlobalTree::pShowShell = 0; static const USHORT __FAR_DATA aHelpForMenu[] = { - 0, // - HID_GLBLTREE_UPDATE, //CTX_UPDATE - HID_GLBLTREE_INSERT, //CTX_INSERT - HID_GLBLTREE_EDIT, //CTX_EDIT - HID_GLBLTREE_DEL, //CTX_DELETE + 0, // + HID_GLBLTREE_UPDATE, //CTX_UPDATE + HID_GLBLTREE_INSERT, //CTX_INSERT + HID_GLBLTREE_EDIT, //CTX_EDIT + HID_GLBLTREE_DEL, //CTX_DELETE HID_GLBLTREE_EDIT_LINK, //CTX_EDIT_LINK - 0, // - 0, // - 0, // - 0, // - HID_GLBLTREE_INS_IDX, //CTX_INSERT_ANY_INDEX - HID_GLBLTREE_INS_FILE, //CTX_INSERT_FILE - HID_GLBLTREE_INS_NEW_FILE, //CTX_INSERT_NEW_FILE - HID_GLBLTREE_INS_TEXT, //CTX_INSERT_TEXT - 0, // - 0, // - 0, // - 0, // - 0, // - 0, // - HID_GLBLTREE_UPD_SEL, //CTX_UPDATE_SEL - HID_GLBLTREE_UPD_IDX, //CTX_UPDATE_INDEX - HID_GLBLTREE_UPD_LINK, //CTX_UPDATE_LINK - HID_GLBLTREEUPD_ALL //CTX_UPDATE_ALL + 0, // + 0, // + 0, // + 0, // + HID_GLBLTREE_INS_IDX, //CTX_INSERT_ANY_INDEX + HID_GLBLTREE_INS_FILE, //CTX_INSERT_FILE + HID_GLBLTREE_INS_NEW_FILE, //CTX_INSERT_NEW_FILE + HID_GLBLTREE_INS_TEXT, //CTX_INSERT_TEXT + 0, // + 0, // + 0, // + 0, // + 0, // + 0, // + HID_GLBLTREE_UPD_SEL, //CTX_UPDATE_SEL + HID_GLBLTREE_UPD_IDX, //CTX_UPDATE_INDEX + HID_GLBLTREE_UPD_LINK, //CTX_UPDATE_LINK + HID_GLBLTREEUPD_ALL //CTX_UPDATE_ALL }; /************************************************************************/ -/* */ +/* */ /************************************************************************/ /* -----------------------------24.08.00 12:04-------------------------------- @@ -161,9 +161,9 @@ public: StartListening(rFrame); } - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - BOOL IsValid() const {return bValid;} + BOOL IsValid() const {return bValid;} }; /* -----------------------------24.08.00 12:05-------------------------------- @@ -292,7 +292,7 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) { INetURLObject aTemp(sFileName); GraphicDescriptor aDesc(aTemp); - if( !aDesc.Detect() ) // keine Grafiken annehmen + if( !aDesc.Detect() ) // keine Grafiken annehmen { nRet = rEvt.mnAction; InsertRegion(pCnt, &sFileName); @@ -448,7 +448,7 @@ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox) pMenu->EnableItem(CTX_INSERT_FILE, 0 != (nEnableFlags & ENABLE_INSERT_FILE)); pMenu->EnableItem(CTX_INSERT_NEW_FILE, 0 != (nEnableFlags & ENABLE_INSERT_FILE)); pMenu->SetSelectHdl(LINK(this, SwGlobalTree, PopupHdl)); - pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft()); + pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft()); delete pMenu; pBox->EndSelection(); pBox->Invalidate(); @@ -463,7 +463,7 @@ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox) } pMenu->EnableItem(CTX_UPDATE_SEL, 0 != (nEnableFlags & ENABLE_UPDATE_SEL)); pMenu->SetSelectHdl(LINK(this, SwGlobalTree, PopupHdl)); - pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft()); + pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft()); delete pMenu; pBox->EndSelection(); pBox->Invalidate(); @@ -472,7 +472,7 @@ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox) /*-----------------16.06.97 11:02------------------- --------------------------------------------------*/ -USHORT SwGlobalTree::GetEnableFlags() const +USHORT SwGlobalTree::GetEnableFlags() const { SvLBoxEntry* pEntry = FirstSelected(); USHORT nSelCount = (USHORT)GetSelectionCount(); @@ -485,7 +485,7 @@ USHORT SwGlobalTree::GetEnableFlags() const if(nSelCount == 1) { nRet |= ENABLE_EDIT; - if( ((SwGlblDocContent*)pEntry->GetUserData())->GetType() != GLBLDOC_UNKNOWN && + if( ((SwGlblDocContent*)pEntry->GetUserData())->GetType() != GLBLDOC_UNKNOWN && (!pPrevEntry || ((SwGlblDocContent*)pPrevEntry->GetUserData())->GetType() != GLBLDOC_UNKNOWN)) nRet |= ENABLE_INSERT_TEXT; if( GLBLDOC_SECTION == ((SwGlblDocContent*)pEntry->GetUserData())->GetType() ) @@ -505,7 +505,7 @@ USHORT SwGlobalTree::GetEnableFlags() const /*-----------------12.06.97 09:38------------------- --------------------------------------------------*/ -void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) +void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) { BOOL bParent = TRUE; Update(TRUE); @@ -555,7 +555,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) /*-----------------16.06.97 16:15------------------- --------------------------------------------------*/ -void SwGlobalTree::SelectHdl() +void SwGlobalTree::SelectHdl() { USHORT nSelCount = (USHORT)GetSelectionCount(); @@ -576,7 +576,7 @@ void SwGlobalTree::SelectHdl() /*-----------------16.06.97 16:15------------------- --------------------------------------------------*/ -void SwGlobalTree::DeselectHdl() +void SwGlobalTree::DeselectHdl() { SelectHdl(); } @@ -613,7 +613,7 @@ BOOL SwGlobalTree::NotifyMoving( SvLBoxEntry* pTarget, USHORT nSource = (USHORT) _pModel->GetAbsPos(pSource); USHORT nDest = pTarget ? (USHORT) _pModel->GetAbsPos(pTarget) : pSwGlblDocContents->Count(); - if( pActiveShell->MoveGlobalDocContent( + if( pActiveShell->MoveGlobalDocContent( *pSwGlblDocContents, nSource, nSource + 1, nDest ) && Update( FALSE )) Display(); @@ -655,8 +655,8 @@ void SwGlobalTree::DragFinished( sal_Int8 nAction ) } /*************************************************************************** - Beschreibung: Wird ein Ctrl+DoubleClick in einen freien Bereich ausgefuehrt, - * dann soll die Basisfunktion des Controls gerufen werden + Beschreibung: Wird ein Ctrl+DoubleClick in einen freien Bereich ausgefuehrt, + * dann soll die Basisfunktion des Controls gerufen werden ***************************************************************************/ void SwGlobalTree::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -709,7 +709,7 @@ void SwGlobalTree::Clear() /*-----------------12.06.97 12:38------------------- --------------------------------------------------*/ -void SwGlobalTree::Display(BOOL bOnlyUpdateUserData) +void SwGlobalTree::Display(BOOL bOnlyUpdateUserData) { if(!bIsImageListInitialized) { @@ -732,7 +732,7 @@ void SwGlobalTree::Display(BOOL bOnlyUpdateUserData) { SetUpdateMode( FALSE ); SvLBoxEntry* pOldSelEntry = FirstSelected(); - String sEntryName; // Name des Eintrags + String sEntryName; // Name des Eintrags USHORT nSelPos = USHRT_MAX; if(pOldSelEntry) { @@ -823,7 +823,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* pCont, const String* pF /*-----------------18.06.97 12:42------------------- --------------------------------------------------*/ -void SwGlobalTree::EditContent(const SwGlblDocContent* pCont ) +void SwGlobalTree::EditContent(const SwGlblDocContent* pCont ) { USHORT nSlot = 0; switch( pCont->GetType() ) @@ -966,8 +966,8 @@ void SwGlobalTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ) } break; case CTX_INSERT_ANY_INDEX: -// case CTX_INSERT_CNTIDX: -// case CTX_INSERT_USRIDX: +// case CTX_INSERT_CNTIDX: +// case CTX_INSERT_USRIDX: { if(pContCopy) { @@ -1141,7 +1141,7 @@ void SwGlobalTree::GotoContent(const SwGlblDocContent* pCont) /*-----------------16.06.97 07:42------------------- --------------------------------------------------*/ -void SwGlobalTree::ShowTree() +void SwGlobalTree::ShowTree() { aUpdateTimer.Start(); SvTreeListBox::Show(); @@ -1149,7 +1149,7 @@ void SwGlobalTree::ShowTree() /*-----------------16.06.97 07:42------------------- --------------------------------------------------*/ -void SwGlobalTree::HideTree() +void SwGlobalTree::HideTree() { aUpdateTimer.Stop(); SvTreeListBox::Hide(); @@ -1157,7 +1157,7 @@ void SwGlobalTree::HideTree() /*-----------------18.06.97 10:02------------------- --------------------------------------------------*/ -void SwGlobalTree::ExecCommand(USHORT nCmd) +void SwGlobalTree::ExecCommand(USHORT nCmd) { SvLBoxEntry* pEntry = FirstSelected(); DBG_ASSERT(pEntry, "gleich knallt's"); @@ -1191,7 +1191,7 @@ void SwGlobalTree::ExecCommand(USHORT nCmd) } break; } - if( bMove && pActiveShell->MoveGlobalDocContent( + if( bMove && pActiveShell->MoveGlobalDocContent( *pSwGlblDocContents, nSource, nSource + 1, nDest ) && Update( FALSE )) Display(); @@ -1202,7 +1202,7 @@ void SwGlobalTree::ExecCommand(USHORT nCmd) /*-----------------16.06.97 07:43------------------- --------------------------------------------------*/ -BOOL SwGlobalTree::Update(BOOL bHard) +BOOL SwGlobalTree::Update(BOOL bHard) { SwView* pActView = GetParentWindow()->GetCreateView(); BOOL bRet = FALSE; @@ -1314,7 +1314,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) /*-----------------25.06.97 16:08------------------- --------------------------------------------------*/ -IMPL_LINK( SwGlobalTree, DoubleClickHdl, SwGlobalTree *, EMPTYARG ) +IMPL_LINK( SwGlobalTree, DoubleClickHdl, SwGlobalTree *, EMPTYARG ) { SvLBoxEntry* pEntry = GetCurEntry(); SwGlblDocContent* pCont = (SwGlblDocContent*)pEntry->GetUserData(); @@ -1361,7 +1361,7 @@ void SwLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SwGlblDocContent* pCont = (SwGlblDocContent*)pEntry->GetUserData(); const SwSection* pSect; if(pCont->GetType() == GLBLDOC_SECTION && - !(pSect = pCont->GetSection())->IsConnectFlag() ) + !(pSect = pCont->GetSection())->IsConnectFlag() ) { Font aOldFont( rDev.GetFont()); Font aFont(aOldFont); diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx index 5c3350346201..a34b874a3b2e 100644 --- a/sw/source/ui/utlui/gloslst.cxx +++ b/sw/source/ui/utlui/gloslst.cxx @@ -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 @@ -83,10 +83,10 @@ SV_IMPL_PTRARR( TripleStrings, TripleStringPtr ) class SwGlossDecideDlg : public ModalDialog { - OKButton aOk; - CancelButton aCancel; - HelpButton aHelp; - ListBox aListLB; + OKButton aOk; + CancelButton aCancel; + HelpButton aHelp; + ListBox aListLB; FixedLine aFL; DECL_LINK(DoubleClickHdl, ListBox*); @@ -94,7 +94,7 @@ class SwGlossDecideDlg : public ModalDialog public: SwGlossDecideDlg(Window* pParent); - ListBox& GetListBox() {return aListLB;} + ListBox& GetListBox() {return aListLB;} }; /*-----------------21.01.97 13.25------------------- @@ -103,10 +103,10 @@ class SwGlossDecideDlg : public ModalDialog SwGlossDecideDlg::SwGlossDecideDlg(Window* pParent) : ModalDialog(pParent, SW_RES(DLG_GLOSSARY_DECIDE_DLG)), - aOk(this, SW_RES(PB_OK)), - aCancel(this, SW_RES(PB_CANCEL)), - aHelp(this, SW_RES(PB_HELP)), - aListLB(this, SW_RES(LB_LIST)), + aOk(this, SW_RES(PB_OK)), + aCancel(this, SW_RES(PB_CANCEL)), + aHelp(this, SW_RES(PB_HELP)), + aListLB(this, SW_RES(LB_LIST)), aFL(this, SW_RES(FL_GLOSS)) { FreeResource(); @@ -232,7 +232,7 @@ BOOL SwGlossaryList::GetShortName(const String& rLongName, ********************************************************************/ -USHORT SwGlossaryList::GetGroupCount() +USHORT SwGlossaryList::GetGroupCount() { if(!bFilled) Update(); @@ -266,7 +266,7 @@ String SwGlossaryList::GetGroupName(USHORT nPos, BOOL bNoPath, String* pTitle) ********************************************************************/ -USHORT SwGlossaryList::GetBlockCount(USHORT nGroup) +USHORT SwGlossaryList::GetBlockCount(USHORT nGroup) { DBG_ASSERT(aGroupArr.Count() > nGroup, "Gruppe nicht vorhanden"); if(nGroup < aGroupArr.Count()) @@ -282,7 +282,7 @@ USHORT SwGlossaryList::GetBlockCount(USHORT nGroup) ********************************************************************/ -String SwGlossaryList::GetBlockName(USHORT nGroup, USHORT nBlock, String& rShortName) +String SwGlossaryList::GetBlockName(USHORT nGroup, USHORT nBlock, String& rShortName) { DBG_ASSERT(aGroupArr.Count() > nGroup, "Gruppe nicht vorhanden"); if(nGroup < aGroupArr.Count()) @@ -430,7 +430,7 @@ void SwGlossaryList::Timeout() ********************************************************************/ -AutoTextGroup* SwGlossaryList::FindGroup(const String& rGroupName) +AutoTextGroup* SwGlossaryList::FindGroup(const String& rGroupName) { for(USHORT i = 0; i < aGroupArr.Count(); i++) { @@ -448,7 +448,7 @@ AutoTextGroup* SwGlossaryList::FindGroup(const String& rGroupName) void SwGlossaryList::FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGlossaries) { - SwTextBlocks* pBlock = pGlossaries->GetGroupDoc(pGroup->sName); + SwTextBlocks* pBlock = pGlossaries->GetGroupDoc(pGroup->sName); pGroup->nCount = pBlock ? pBlock->GetCount() : 0; pGroup->sLongNames = pGroup->sShortNames = aEmptyStr; if(pBlock) @@ -501,7 +501,7 @@ BOOL SwGlossaryList::HasLongName(const String& rBegin, SvStringsISortDtor* pLong /******************************************************************** ********************************************************************/ -void SwGlossaryList::ClearGroups() +void SwGlossaryList::ClearGroups() { USHORT nCount = aGroupArr.Count(); for( USHORT i = 0; i < nCount; ++i ) diff --git a/sw/source/ui/utlui/gloslst.hrc b/sw/source/ui/utlui/gloslst.hrc index 6c89f1c5ac9c..0d3fe2b0f586 100644 --- a/sw/source/ui/utlui/gloslst.hrc +++ b/sw/source/ui/utlui/gloslst.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 diff --git a/sw/source/ui/utlui/gloslst.src b/sw/source/ui/utlui/gloslst.src index 78f96e85e741..1ccf855ffe0b 100644 --- a/sw/source/ui/utlui/gloslst.src +++ b/sw/source/ui/utlui/gloslst.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/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index d40283e39146..65731de981d5 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -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 @@ -56,13 +56,13 @@ #include <unomid.h> /*-------------------------------------------------------------------- - Beschreibung: globale Pointer + Beschreibung: globale Pointer --------------------------------------------------------------------*/ -SwGlossaries* pGlossaries = 0; +SwGlossaries* pGlossaries = 0; // Liefert alle benoetigten Pfade. Wird durch UI initialisiert -SwGlossaryList* pGlossaryList = 0; +SwGlossaryList* pGlossaryList = 0; String* pOldGrfCat = 0; String* pOldTabCat = 0; @@ -97,11 +97,11 @@ void SetCurrGlosGroup(String* pStr) SvStringsDtor* pDBNameList = 0; -SvStringsDtor* pAuthFieldNameList = 0; -SvStringsDtor* pAuthFieldTypeList = 0; +SvStringsDtor* pAuthFieldNameList = 0; +SvStringsDtor* pAuthFieldTypeList = 0; /*-------------------------------------------------------------------- - Beschreibung: UI beenden + Beschreibung: UI beenden --------------------------------------------------------------------*/ void _FinitUI() @@ -129,7 +129,7 @@ void _FinitUI() } /*-------------------------------------------------------------------- - Beschreibung: Initialisierung + Beschreibung: Initialisierung --------------------------------------------------------------------*/ @@ -169,20 +169,20 @@ ShellResource::ShellResource() sDurationFormat( SW_RES( STR_DURATION_FORMAT )), aTOXIndexName( SW_RES(STR_TOI)), - aTOXUserName( SW_RES(STR_TOU)), - aTOXContentName( SW_RES(STR_TOC)), - aTOXIllustrationsName( SW_RES(STR_TOX_ILL)), - aTOXObjectsName( SW_RES(STR_TOX_OBJ)), - aTOXTablesName( SW_RES(STR_TOX_TBL)), - aTOXAuthoritiesName( SW_RES(STR_TOX_AUTH)), + aTOXUserName( SW_RES(STR_TOU)), + aTOXContentName( SW_RES(STR_TOC)), + aTOXIllustrationsName( SW_RES(STR_TOX_ILL)), + aTOXObjectsName( SW_RES(STR_TOX_OBJ)), + aTOXTablesName( SW_RES(STR_TOX_TBL)), + aTOXAuthoritiesName( SW_RES(STR_TOX_AUTH)), aHyperlinkClick( SW_RES( STR_HYPERLINK_CLICK)), pAutoFmtNameLst(0), - sPageDescFirstName( SW_RES(STR_PAGEDESC_FIRSTNAME)), - sPageDescFollowName( SW_RES(STR_PAGEDESC_FOLLOWNAME)), + sPageDescFirstName( SW_RES(STR_PAGEDESC_FIRSTNAME)), + sPageDescFollowName( SW_RES(STR_PAGEDESC_FOLLOWNAME)), sPageDescName( SW_RES(STR_PAGEDESC_NAME)) { const USHORT nCount = FLD_DOCINFO_END - FLD_DOCINFO_BEGIN; - + KeyCode aCode( KEY_SPACE ); KeyCode aModifiedCode( KEY_SPACE, KEY_MOD1 ); String aModStr( aModifiedCode.GetName() ); @@ -273,7 +273,7 @@ ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( SvStringsDtor& rLst ) /* -----------------16.09.99 12:28------------------- --------------------------------------------------*/ -const String& SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType) +const String& SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType) { if(!pAuthFieldNameList) { @@ -289,7 +289,7 @@ const String& SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType) /* -----------------16.09.99 12:29------------------- --------------------------------------------------*/ -const String& SwAuthorityFieldType::GetAuthTypeName(ToxAuthorityType eType) +const String& SwAuthorityFieldType::GetAuthTypeName(ToxAuthorityType eType) { if(!pAuthFieldTypeList) { diff --git a/sw/source/ui/utlui/initui.hrc b/sw/source/ui/utlui/initui.hrc index 367091fbd443..34d7e788c7b2 100644 --- a/sw/source/ui/utlui/initui.hrc +++ b/sw/source/ui/utlui/initui.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 @@ -28,37 +28,37 @@ #ifndef _INITUI_HRC #define _INITUI_HRC -#define BMP_FRAME_ANCHOR 1 -#define BMP_FRAME_DRAG_ANCHOR 2 +#define BMP_FRAME_ANCHOR 1 +#define BMP_FRAME_DRAG_ANCHOR 2 // lokale Resourcen fuer die Shells: -#define STR_POSTIT_PAGE 1 -#define STR_POSTIT_AUTHOR 2 -#define STR_CALC_SYNTAX 3 -#define STR_CALC_ZERODIV 4 -#define STR_CALC_BRACK 5 -#define STR_CALC_POW 6 -#define STR_CALC_VARNFND 7 -#define STR_CALC_OVERFLOW 8 -#define STR_CALC_WRONGTIME 9 -#define STR_CALC_DEFAULT 10 -#define STR_CALC_ERROR 11 -#define STR_GETREFFLD_UP 12 -#define STR_GETREFFLD_DOWN 13 -#define STR_ALLPAGE_HEADFOOT 14 -#define STR_TEMPLATE_NONE 15 -#define STR_POSTIT_LINE 16 -#define STR_FIELD_FIXED 17 -#define STR_TOI 18 +#define STR_POSTIT_PAGE 1 +#define STR_POSTIT_AUTHOR 2 +#define STR_CALC_SYNTAX 3 +#define STR_CALC_ZERODIV 4 +#define STR_CALC_BRACK 5 +#define STR_CALC_POW 6 +#define STR_CALC_VARNFND 7 +#define STR_CALC_OVERFLOW 8 +#define STR_CALC_WRONGTIME 9 +#define STR_CALC_DEFAULT 10 +#define STR_CALC_ERROR 11 +#define STR_GETREFFLD_UP 12 +#define STR_GETREFFLD_DOWN 13 +#define STR_ALLPAGE_HEADFOOT 14 +#define STR_TEMPLATE_NONE 15 +#define STR_POSTIT_LINE 16 +#define STR_FIELD_FIXED 17 +#define STR_TOI 18 #define STR_TOU 19 #define STR_TOC 20 #define STR_TOX_ILL 21 #define STR_TOX_OBJ 22 #define STR_TOX_TBL 23 #define STR_TOX_AUTH 24 -#define STR_PAGEDESC_NAME 25 -#define STR_PAGEDESC_FIRSTNAME 26 -#define STR_PAGEDESC_FOLLOWNAME 27 +#define STR_PAGEDESC_NAME 25 +#define STR_PAGEDESC_FIRSTNAME 26 +#define STR_PAGEDESC_FOLLOWNAME 27 #define STR_HYPERLINK_CLICK 28 #define STR_GETREFFLD_REFITEMNOTFOUND 29 #define STR_DURATION_FORMAT 30 diff --git a/sw/source/ui/utlui/initui.src b/sw/source/ui/utlui/initui.src index 3b08e771a309..619b208f3793 100644 --- a/sw/source/ui/utlui/initui.src +++ b/sw/source/ui/utlui/initui.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/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx index 435f5583cd30..d822ee37617f 100644 --- a/sw/source/ui/utlui/navicfg.cxx +++ b/sw/source/ui/utlui/navicfg.cxx @@ -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 @@ -29,7 +29,7 @@ #include "precompiled_sw.hxx" -#include <swtypes.hxx> // fuer Pathfinder +#include <swtypes.hxx> // fuer Pathfinder #include <navicfg.hxx> #include <swcont.hxx> #include <tools/debug.hxx> @@ -49,7 +49,7 @@ Sequence<OUString> SwNavigationConfig::GetPropertyNames() { static const char* aPropNames[] = { - "RootType", //0 + "RootType", //0 "SelectedPosition", //1 "OutlineLevel", //2 "InsertMode", //3 @@ -82,7 +82,7 @@ SwNavigationConfig::SwNavigationConfig() : { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); -// EnableNotification(aNames); +// EnableNotification(aNames); const Any* pValues = aValues.getConstArray(); DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) @@ -93,12 +93,12 @@ SwNavigationConfig::SwNavigationConfig() : { switch(nProp) { - case 0: pValues[nProp] >>= nRootType; break; + case 0: pValues[nProp] >>= nRootType; break; case 1: pValues[nProp] >>= nSelectedPos; break; case 2: pValues[nProp] >>= nOutlineLevel; break; case 3: pValues[nProp] >>= nRegionMode; break; - case 4: pValues[nProp] >>= nActiveBlock; break; - case 5: bIsSmall = *(sal_Bool*)pValues[nProp].getValue(); break; + case 4: pValues[nProp] >>= nActiveBlock; break; + case 5: bIsSmall = *(sal_Bool*)pValues[nProp].getValue(); break; case 6: bIsGlobalActive = *(sal_Bool*)pValues[nProp].getValue(); break; } } @@ -124,13 +124,13 @@ void SwNavigationConfig::Commit() { switch(nProp) { - case 0: pValues[nProp] <<= nRootType; break; + case 0: pValues[nProp] <<= nRootType; break; case 1: pValues[nProp] <<= nSelectedPos; break; case 2: pValues[nProp] <<= nOutlineLevel; break; case 3: pValues[nProp] <<= nRegionMode; break; - case 4: pValues[nProp] <<= nActiveBlock; break; - case 5: pValues[nProp].setValue(&bIsSmall, rType); break; - case 6: pValues[nProp].setValue(&bIsGlobalActive, rType); break; + case 4: pValues[nProp] <<= nActiveBlock; break; + case 5: pValues[nProp].setValue(&bIsSmall, rType); break; + case 6: pValues[nProp].setValue(&bIsGlobalActive, rType); break; } } PutProperties(aNames, aValues); diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index ea43533f70d8..55276b7e33ef 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -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 @@ -45,7 +45,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/dockwin.hxx> #include <vcl/toolbox.hxx> -#include <swtypes.hxx> // fuer Pathfinder +#include <swtypes.hxx> // fuer Pathfinder #include <errhdl.hxx> #include <swmodule.hxx> #ifndef _VIEW_HXX @@ -93,7 +93,7 @@ // Version fuer Konfiguration -#define NAVI_VERSION0 0 +#define NAVI_VERSION0 0 #define NAVI_VERSION1 1 #define NAVI_VERSION2 2 // bIsGlobalActive @@ -117,7 +117,7 @@ void SwNavigationPI::CleanEntry( String& rEntry ) *pStr = 0x20; } /*------------------------------------------------------------------------ - Beschreibung: Ausfuehrung der Drag-Operation + Beschreibung: Ausfuehrung der Drag-Operation mit und ohne Childs ------------------------------------------------------------------------*/ @@ -155,7 +155,7 @@ void SwNavigationPI::MoveOutline(USHORT nSource, USHORT nTarget, /*------------------------------------------------------------------------ - Beschreibung: Nach Goto einen Status Rahmenselektion aufheben + Beschreibung: Nach Goto einen Status Rahmenselektion aufheben ------------------------------------------------------------------------*/ @@ -169,7 +169,7 @@ void lcl_UnSelectFrm(SwWrtShell *pSh) } /*------------------------------------------------------------------------ - Beschreibung: Select der Documentanzeige + Beschreibung: Select der Documentanzeige ------------------------------------------------------------------------*/ @@ -198,7 +198,7 @@ IMPL_LINK( SwNavigationPI, DocListBoxSelectHdl, ListBox *, pBox ) } /*------------------------------------------------------------------------ - Beschreibung: Fuellen der ListBox fuer Outline Sicht oder Dokumente + Beschreibung: Fuellen der ListBox fuer Outline Sicht oder Dokumente Der PI wird auf volle Groesse gesetzt ------------------------------------------------------------------------*/ @@ -250,7 +250,7 @@ void SwNavigationPI::UsePage(SwWrtShell *pSh) } /*------------------------------------------------------------------------ - Beschreibung: SelectHandler der Toolboxen + Beschreibung: SelectHandler der Toolboxen ------------------------------------------------------------------------*/ @@ -393,7 +393,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox ) return TRUE; } /*------------------------------------------------------------------------ - Beschreibung: ClickHandler der Toolboxen + Beschreibung: ClickHandler der Toolboxen ------------------------------------------------------------------------*/ @@ -461,7 +461,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox ) pMenu->CheckItem( aContentTree.GetOutlineLevel() + 100 ); pMenu->SetSelectHdl(LINK(this, SwNavigationPI, MenuSelectHdl)); pBox->SetItemDown( nCurrItemId, TRUE ); - pMenu->Execute( pBox, + pMenu->Execute( pBox, pBox->GetItemRect(FN_OUTLINE_LEVEL), POPUPMENU_EXECUTE_DOWN ); pBox->SetItemDown( nCurrItemId, FALSE ); @@ -533,7 +533,7 @@ void SwNavHelpToolBox::RequestHelp( const HelpEvent& rHEvt ) } /*------------------------------------------------------------------------ - Beschreibung: Action-Handler Edit; wechselt auf die Seite, wenn + Beschreibung: Action-Handler Edit; wechselt auf die Seite, wenn nicht Gliederungssicht angeschaltet ist. ------------------------------------------------------------------------*/ @@ -553,7 +553,7 @@ IMPL_LINK( SwNavigationPI, EditAction, NumEditAction *, pEdit ) } /*------------------------------------------------------------------------ - Beschreibung: Falls die Seite eingestellt werden kann, wird hier + Beschreibung: Falls die Seite eingestellt werden kann, wird hier das Maximum gesetzt. ------------------------------------------------------------------------*/ @@ -584,7 +584,7 @@ BOOL SwNavigationPI::Close() } /*------------------------------------------------------------------------ - Beschreibung: Setzen einer automatischen Marke + Beschreibung: Setzen einer automatischen Marke ------------------------------------------------------------------------*/ @@ -609,7 +609,7 @@ void SwNavigationPI::MakeMark() // this assumes that IDocumentMarkAccess generates Names in ascending order if(vNavMarkNames.size() == MAX_MARKS) pMarkAccess->deleteMark(pMarkAccess->findMark(vNavMarkNames[nAutoMarkIdx])); - + rSh.SetBookmark(KeyCode(), ::rtl::OUString(), ::rtl::OUString(), IDocumentMarkAccess::NAVIGATOR_REMINDER); SwView::SetActMark( nAutoMarkIdx ); @@ -808,8 +808,8 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, bPageCtrlsVisible = TRUE; -// Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SHOW_ROOT); -// USHORT nWidth = 2 * (USHORT)aFirstRect.Left(); +// Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SHOW_ROOT); +// USHORT nWidth = 2 * (USHORT)aFirstRect.Left(); //doppelte Separatoren sind nicht erlaubt, also muss //die passende Groesse anders ermittelt werden Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SELECT_FOOTNOTE); @@ -856,7 +856,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, if( ( aTmpParentSize.Width() < aMinSize.Width() || - aTmpParentSize.Height() < aMinSize.Height() + aTmpParentSize.Height() < aMinSize.Height() ) && ((SfxDockingWindow*)pParent)->GetFloatingWindow() && @@ -869,14 +869,14 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); aContentTree.SetSpaceBetweenEntries(3); aContentTree.SetSelectionMode( SINGLE_SELECTION ); - aContentTree.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | + aContentTree.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY | SV_DRAGDROP_ENABLE_TOP ); aContentTree.EnableAsyncDrag(TRUE); aContentTree.ShowTree(); aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, TRUE); -// TreeListBox fuer Globaldokument +// TreeListBox fuer Globaldokument aGlobalTree.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y ); aGlobalTree.SetSelectionMode( MULTIPLE_SELECTION ); aGlobalTree.SetWindowBits( WB_HASBUTTONS|WB_HASBUTTONSATROOT| @@ -884,7 +884,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, Size aGlblSize(aGlobalToolBox.CalcWindowSizePixel()); aGlobalToolBox.SetSizePixel(aGlblSize); -// Handler +// Handler Link aLk = LINK(this, SwNavigationPI, ToolBoxSelectHdl); aContentToolBox.SetSelectHdl( aLk ); @@ -1102,7 +1102,7 @@ SfxChildAlignment eRetAlign; } /*-------------------------------------------------------------------- - Beschreibung: Benachrichtigung bei geaenderter DocInfo + Beschreibung: Benachrichtigung bei geaenderter DocInfo --------------------------------------------------------------------*/ void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint ) @@ -1329,7 +1329,7 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt ) { INetURLObject aTemp( sFileName ); GraphicDescriptor aDesc( aTemp ); - if( !aDesc.Detect() ) // keine Grafiken annehmen + if( !aDesc.Detect() ) // keine Grafiken annehmen { if( STRING_NOTFOUND == sFileName.Search('#') && (!sContentFileName.Len() || sContentFileName != sFileName )) @@ -1384,7 +1384,7 @@ void SwNavigationPI::SetRegionDropMode(USHORT nNewMode) --------------------------------------------------*/ -BOOL SwNavigationPI::ToggleTree() +BOOL SwNavigationPI::ToggleTree() { BOOL bRet = TRUE; BOOL bGlobalDoc = IsGlobalDoc(); @@ -1420,7 +1420,7 @@ BOOL SwNavigationPI::ToggleTree() /*-----------------13.06.97 09:42------------------- --------------------------------------------------*/ -BOOL SwNavigationPI::IsGlobalDoc() const +BOOL SwNavigationPI::IsGlobalDoc() const { BOOL bRet = FALSE; SwView *pView = GetCreateView(); diff --git a/sw/source/ui/utlui/navipi.hrc b/sw/source/ui/utlui/navipi.hrc index 8254e2dc92a9..e8a6dc2e39a6 100644 --- a/sw/source/ui/utlui/navipi.hrc +++ b/sw/source/ui/utlui/navipi.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,38 +24,38 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TB_1 1 -#define TB_2 2 -#define TB_3 3 -#define TB_4 4 -#define BT_UP 5 -#define BT_DOWN 6 +#define TB_1 1 +#define TB_2 2 +#define TB_3 3 +#define TB_4 4 +#define BT_UP 5 +#define BT_DOWN 6 #define IL_CONTENT 7 #define ILH_CONTENT 8 -#define FT_PAGE 10 -#define ED_PAGE 11 -#define LB_SELECT 22 -#define TL_SELECT 23 -#define TB_PAGE_TEXT 41 +#define FT_PAGE 10 +#define ED_PAGE 11 +#define LB_SELECT 22 +#define TL_SELECT 23 +#define TB_PAGE_TEXT 41 #define TB_PAGE_COUNT 42 -#define TB_CONTENT 50 -#define TL_CONTENT 51 -#define LB_DOCS 53 -#define NF_PAGE 54 +#define TB_CONTENT 50 +#define TL_CONTENT 51 +#define LB_DOCS 53 +#define NF_PAGE 54 #define TL_GLOBAL 55 #define TB_GLOBAL 56 //------------------------------------------------------------------- // Strings fuer Kontextmenue des ContentTree -#define ST_CONTEXT_FIRST 60 -#define ST_OUTLINE_LEVEL ST_CONTEXT_FIRST +#define ST_CONTEXT_FIRST 60 +#define ST_OUTLINE_LEVEL ST_CONTEXT_FIRST #define ST_DRAGMODE (ST_CONTEXT_FIRST + 1) #define ST_HYPERLINK (ST_CONTEXT_FIRST + 2) #define ST_LINK_REGION (ST_CONTEXT_FIRST + 3) #define ST_COPY_REGION (ST_CONTEXT_FIRST + 4) #define ST_DISPLAY (ST_CONTEXT_FIRST + 5) #define ST_ACTIVE_VIEW (ST_CONTEXT_FIRST + 6) -#define ST_STATUS_FIRST 67 +#define ST_STATUS_FIRST 67 #define ST_HIDDEN (ST_STATUS_FIRST ) #define ST_ACTIVE (ST_STATUS_FIRST + 1) #define ST_INACTIVE (ST_STATUS_FIRST + 2) @@ -63,8 +63,8 @@ #define ST_EDIT_ENTRY ST_MISC #define ST_DELETE_ENTRY (ST_MISC + 1) -#define ST_GLOBAL_CONTEXT_FIRST (ST_DELETE_ENTRY + 1) -#define ST_UPDATE (ST_GLOBAL_CONTEXT_FIRST ) +#define ST_GLOBAL_CONTEXT_FIRST (ST_DELETE_ENTRY + 1) +#define ST_UPDATE (ST_GLOBAL_CONTEXT_FIRST ) #define ST_EDIT_CONTENT (ST_GLOBAL_CONTEXT_FIRST + 1) #define ST_INSERT (ST_GLOBAL_CONTEXT_FIRST + 2) #define ST_INDEX (ST_GLOBAL_CONTEXT_FIRST + 3) @@ -76,7 +76,7 @@ #define ST_UPDATE_INDEX (ST_GLOBAL_CONTEXT_FIRST + 9) #define ST_UPDATE_LINK (ST_GLOBAL_CONTEXT_FIRST +10) #define ST_UPDATE_ALL (ST_GLOBAL_CONTEXT_FIRST +11) -#define ST_BROKEN_LINK (ST_GLOBAL_CONTEXT_FIRST +12) +#define ST_BROKEN_LINK (ST_GLOBAL_CONTEXT_FIRST +12) #define ST_EDIT_LINK (ST_GLOBAL_CONTEXT_FIRST +13) #define ST_REMOVE_INDEX (ST_GLOBAL_CONTEXT_FIRST +30) @@ -85,7 +85,7 @@ #define ST_READONLY_IDX (ST_GLOBAL_CONTEXT_FIRST +33) #define ST_INVISIBLE (ST_GLOBAL_CONTEXT_FIRST +34) -#define ST_POSTIT_SHOW (ST_GLOBAL_CONTEXT_FIRST +35) -#define ST_POSTIT_HIDE (ST_GLOBAL_CONTEXT_FIRST +36) -#define ST_POSTIT_DELETE (ST_GLOBAL_CONTEXT_FIRST +37) +#define ST_POSTIT_SHOW (ST_GLOBAL_CONTEXT_FIRST +35) +#define ST_POSTIT_HIDE (ST_GLOBAL_CONTEXT_FIRST +36) +#define ST_POSTIT_DELETE (ST_GLOBAL_CONTEXT_FIRST +37) diff --git a/sw/source/ui/utlui/navipi.src b/sw/source/ui/utlui/navipi.src index 0c45e3203df0..fd83ec90675f 100644 --- a/sw/source/ui/utlui/navipi.src +++ b/sw/source/ui/utlui/navipi.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 @@ -36,13 +36,13 @@ Window DLG_NAVIGATION_PI OutputSize = TRUE ; DialogControl = TRUE ; SVLook = TRUE ; - // Size = MAP_PIXEL( 235, 195 ); - // ZoomInOutputSize = MAP_PIXEL(235, 56); + // Size = MAP_PIXEL( 235, 195 ); + // ZoomInOutputSize = MAP_PIXEL(235, 56); Size = MAP_PIXEL ( 282 , 59 ) ; // Closeable = TRUE ; // Zoomable = TRUE ; // Moveable = TRUE ; - // ZoomIn = FALSE; + // ZoomIn = FALSE; Hide = TRUE ; // HideWhenDeactivate = TRUE ; // Sizeable = TRUE ; @@ -120,7 +120,7 @@ Window DLG_NAVIGATION_PI ToolBoxItem { Identifier = FN_UP ; - // ItemBitmap = Bitmap { File = "navup.bmp"; }; + // ItemBitmap = Bitmap { File = "navup.bmp"; }; HelpID = HID_NAVI_TBX2 ; /* ### ACHTUNG: Neuer Text in Resource? Rückwärts : R³ckwõrts */ Text [ en-US ] = "Back" ; @@ -128,7 +128,7 @@ Window DLG_NAVIGATION_PI ToolBoxItem { Identifier = FN_DOWN ; - // ItemBitmap = Bitmap { File = "navdn.bmp"; }; + // ItemBitmap = Bitmap { File = "navdn.bmp"; }; HelpID = HID_NAVI_TBX3 ; /* ### ACHTUNG: Neuer Text in Resource? Vorwärts : Vorwõrts */ Text [ en-US ] = "Forward" ; @@ -148,7 +148,7 @@ Window DLG_NAVIGATION_PI ToolBoxItem { Identifier = FN_ITEM_UP ; - // ItemBitmap = Bitmap { File = "navchup.bmp"; }; + // ItemBitmap = Bitmap { File = "navchup.bmp"; }; HelpID = HID_NAVI_TBX5 ; Text [ en-US ] = "Promote Chapter" ; //HelpText[english_us-wrong] = "Move chapter down";//"Move chapter up" @@ -156,7 +156,7 @@ Window DLG_NAVIGATION_PI ToolBoxItem { Identifier = FN_ITEM_DOWN ; - // ItemBitmap = Bitmap { File = "navchdn.bmp"; }; + // ItemBitmap = Bitmap { File = "navchdn.bmp"; }; HelpID = HID_NAVI_TBX6 ; Text [ en-US ] = "Demote Chapter" ; }; @@ -184,7 +184,7 @@ Window DLG_NAVIGATION_PI { Identifier = FN_SELECT_SET_AUTO_BOOKMARK ; HelpID = HID_NAVI_TBX9 ; - // ItemBitmap = Bitmap { File = "navstmp.bmp"; }; + // ItemBitmap = Bitmap { File = "navstmp.bmp"; }; Text [ en-US ] = "Set Reminder" ; }; ToolBoxItem @@ -194,14 +194,14 @@ Window DLG_NAVIGATION_PI ToolBoxItem { Identifier = FN_SELECT_HEADER ; - // ItemBitmap = Bitmap { File = "navhead.bmp"; }; + // ItemBitmap = Bitmap { File = "navhead.bmp"; }; HelpID = HID_NAVI_TBX10 ; Text [ en-US ] = "Header" ; }; ToolBoxItem { Identifier = FN_SELECT_FOOTER ; - // ItemBitmap = Bitmap { File = "navfoot.bmp"; }; + // ItemBitmap = Bitmap { File = "navfoot.bmp"; }; HelpID = HID_NAVI_TBX11 ; /* ### ACHTUNG: Neuer Text in Resource? Fußzeile : Fu˜zeile */ Text [ en-US ] = "Footer" ; @@ -210,7 +210,7 @@ Window DLG_NAVIGATION_PI ToolBoxItem { Identifier = FN_SELECT_FOOTNOTE ; - // ItemBitmap = Bitmap { File = "navnote.bmp"; }; + // ItemBitmap = Bitmap { File = "navnote.bmp"; }; HelpID = HID_NAVI_TBX12 ; Text [ en-US ] = "Anchor<->Text" ; /* ### ACHTUNG: Neuer Text in Resource? Springen zwischen Fußnotenankern und dem Fußnotentext : Springen zwischen Fu˜notenankern und dem Fu˜notentext */ @@ -235,13 +235,13 @@ Window DLG_NAVIGATION_PI { Identifier = FN_ITEM_LEFT ; HelpID = HID_NAVI_TBX14 ; - // ItemBitmap = Bitmap { File = "navchlf.bmp"; }; + // ItemBitmap = Bitmap { File = "navchlf.bmp"; }; Text [ en-US ] = "Promote Level" ; }; ToolBoxItem { Identifier = FN_ITEM_RIGHT ; - // ItemBitmap = Bitmap { File = "navchrg.bmp"; }; + // ItemBitmap = Bitmap { File = "navchrg.bmp"; }; HelpID = HID_NAVI_TBX15 ; Text [ en-US ] = "Demote Level" ; }; diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx index baf059c51c32..4bf6997cabf9 100644 --- a/sw/source/ui/utlui/numfmtlb.cxx +++ b/sw/source/ui/utlui/numfmtlb.cxx @@ -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 @@ -73,12 +73,12 @@ using namespace ::com::sun::star::lang; NumFormatListBox::NumFormatListBox( Window* pWin, const ResId& rResId, short nFormatType, ULONG nDefFmt, BOOL bUsrFmts ) : - ListBox ( pWin, rResId ), - nCurrFormatType (-1), - nStdEntry (0), - bOneArea (FALSE), - nDefFormat (nDefFmt), - pVw (0), + ListBox ( pWin, rResId ), + nCurrFormatType (-1), + nStdEntry (0), + bOneArea (FALSE), + nDefFormat (nDefFmt), + pVw (0), pOwnFormatter (0), bShowLanguageControl(FALSE), bUseAutomaticLanguage(TRUE) @@ -93,12 +93,12 @@ NumFormatListBox::NumFormatListBox( Window* pWin, const ResId& rResId, NumFormatListBox::NumFormatListBox( Window* pWin, SwView* pView, const ResId& rResId, short nFormatType, ULONG nDefFmt, BOOL bUsrFmts ) : - ListBox ( pWin, rResId ), - nCurrFormatType (-1), - nStdEntry (0), - bOneArea (FALSE), - nDefFormat (nDefFmt), - pVw (pView), + ListBox ( pWin, rResId ), + nCurrFormatType (-1), + nStdEntry (0), + bOneArea (FALSE), + nDefFormat (nDefFmt), + pVw (pView), pOwnFormatter (0), bShowLanguageControl(FALSE), bUseAutomaticLanguage(TRUE) @@ -158,7 +158,7 @@ SwView* NumFormatListBox::GetView() void NumFormatListBox::SetFormatType(const short nFormatType) { if (nCurrFormatType == -1 || - (nCurrFormatType & nFormatType) == 0) // Es gibt Mischformate, wie z.B. DateTime + (nCurrFormatType & nFormatType) == 0) // Es gibt Mischformate, wie z.B. DateTime { SvNumberFormatter* pFormatter; @@ -174,7 +174,7 @@ void NumFormatListBox::SetFormatType(const short nFormatType) pFormatter = rSh.GetNumberFormatter(); } - Clear(); // Alle Eintraege in der Listbox entfernen + Clear(); // Alle Eintraege in der Listbox entfernen NfIndexTableOffset eOffsetStart = NF_NUMBER_START; NfIndexTableOffset eOffsetEnd = NF_NUMBER_START; @@ -272,8 +272,8 @@ void NumFormatListBox::SetFormatType(const short nFormatType) pFormatter->GetOutputString( sTxt, nFormat, sValue, &pCol); } - if (nFormat != nSysNumFmt && - nFormat != nSysShortDateFmt && + if (nFormat != nSysNumFmt && + nFormat != nSysShortDateFmt && nFormat != nSysLongDateFmt) { nPos = InsertEntry( sValue ); @@ -434,7 +434,7 @@ IMPL_LINK( NumFormatListBox, SelectHdl, ListBox *, pBox ) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!"); - SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aCoreSet, + SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aCoreSet, GetView()->GetViewFrame()->GetFrame().GetFrameInterface(), RC_DLG_SWNUMFMTDLG ); DBG_ASSERT(pDlg, "Dialogdiet fail!"); @@ -496,7 +496,7 @@ double NumFormatListBox::GetDefValue(const short nFormatType) const case NUMBERFORMAT_TIME: fDefValue = SVX_NUMVAL_TIME; break; -/* { +/* { String sValue("31.8.1997 16:57:34"); ULONG nFormat = pFormatter->GetStandardFormat(nFormatType, LANGUAGE_GERMAN); pFormatter->IsNumberFormat( sValue, nFormat, fDefValue ); diff --git a/sw/source/ui/utlui/poolfmt.src b/sw/source/ui/utlui/poolfmt.src index de3f74fb857d..e7bd9dd7d580 100644 --- a/sw/source/ui/utlui/poolfmt.src +++ b/sw/source/ui/utlui/poolfmt.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/utlui/prcntfld.cxx b/sw/source/ui/utlui/prcntfld.cxx index 9ab9d9f47b34..b22fcbd6d933 100644 --- a/sw/source/ui/utlui/prcntfld.cxx +++ b/sw/source/ui/utlui/prcntfld.cxx @@ -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 @@ -40,10 +40,10 @@ --------------------------------------------------------------------*/ PercentField::PercentField( Window* pWin, const ResId& rResId ) : - MetricField ( pWin, rResId ), + MetricField ( pWin, rResId ), nOldMax (0), - nOldMin (0), + nOldMin (0), nLastPercent(-1), nLastValue (-1), eOldUnit (FUNIT_NONE), @@ -115,7 +115,7 @@ void PercentField::ShowPercent(BOOL bPercent) } else MetricFormatter::SetValue(nLastPercent); -// SetValue(100, FUNIT_CUSTOM); +// SetValue(100, FUNIT_CUSTOM); } else { @@ -254,7 +254,7 @@ void PercentField::SetMax(sal_Int64 nNewMax, FieldUnit eInUnit) { if (eInUnit == FUNIT_NONE) eInUnit = eOldUnit; -// SetRefValue(Convert(nNewMax, eInUnit, FUNIT_TWIP)); +// SetRefValue(Convert(nNewMax, eInUnit, FUNIT_TWIP)); } } @@ -344,7 +344,7 @@ sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit e // Umrechnen in Metrik sal_Int64 nTwipValue = (nRefValue * nValue + 50) / 100; - if (eOutUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig + if (eOutUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig return NormalizePercent(nTwipValue); else return ConvertValue(NormalizePercent(nTwipValue), 0, nOldDigits, FUNIT_TWIP, eOutUnit); @@ -356,7 +356,7 @@ sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit e sal_Int64 nAktWidth; nValue = DenormalizePercent(nValue); - if (eInUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig + if (eInUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig nAktWidth = nValue; else nAktWidth = ConvertValue(nValue, 0, nOldDigits, eInUnit, FUNIT_TWIP); diff --git a/sw/source/ui/utlui/shdwcrsr.cxx b/sw/source/ui/utlui/shdwcrsr.cxx index a5c2e6dfe419..d241a82df5f5 100644 --- a/sw/source/ui/utlui/shdwcrsr.cxx +++ b/sw/source/ui/utlui/shdwcrsr.cxx @@ -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/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 27b861991e0f..7c774be0498e 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -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/utlui/textcontrolcombo.cxx b/sw/source/ui/utlui/textcontrolcombo.cxx index c5325b554548..2c94ea523213 100644 --- a/sw/source/ui/utlui/textcontrolcombo.cxx +++ b/sw/source/ui/utlui/textcontrolcombo.cxx @@ -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 @@ -34,10 +34,10 @@ TextControlCombo::TextControlCombo( Window* _pParent, const ResId& _rResId, Control& _rCtrl, FixedText& _rFTbefore, FixedText& _rFTafter ) - :Window ( _pParent, _rResId ) - ,mrCtrl ( _rCtrl ) - ,mrFTbefore ( _rFTbefore ) - ,mrFTafter ( _rFTafter ) + :Window ( _pParent, _rResId ) + ,mrCtrl ( _rCtrl ) + ,mrFTbefore ( _rFTbefore ) + ,mrFTafter ( _rFTafter ) { } @@ -47,35 +47,35 @@ TextControlCombo::~TextControlCombo() void TextControlCombo::Arrange( FixedText& _rFTcomplete, BOOL /*bShow*/ ) { - Point aBasePos( GetPosPixel() ); - Size aMetricVals( GetSizePixel() ); + Point aBasePos( GetPosPixel() ); + Size aMetricVals( GetSizePixel() ); - long nTextHeight = _rFTcomplete.GetSizePixel().Height(); - long nCtrlHeight = mrCtrl.GetSizePixel().Height(); + long nTextHeight = _rFTcomplete.GetSizePixel().Height(); + long nCtrlHeight = mrCtrl.GetSizePixel().Height(); // calc y positions / center vertical - long nYFT = aBasePos.Y(); - long nYCtrl = nYFT; + long nYFT = aBasePos.Y(); + long nYCtrl = nYFT; if( nCtrlHeight > nTextHeight ) nYFT += aMetricVals.Height(); else nYCtrl += aMetricVals.Height(); // separate text parts - const String aReplStr( RTL_CONSTASCII_STRINGPARAM( "%POSITION_OF_CONTROL" ) ); - String aTxtBefore( _rFTcomplete.GetText() ); - String aTxtAfter; - xub_StrLen nReplPos = aTxtBefore.Search( aReplStr ); + const String aReplStr( RTL_CONSTASCII_STRINGPARAM( "%POSITION_OF_CONTROL" ) ); + String aTxtBefore( _rFTcomplete.GetText() ); + String aTxtAfter; + xub_StrLen nReplPos = aTxtBefore.Search( aReplStr ); if( nReplPos != STRING_NOTFOUND ) { - xub_StrLen nStrStartAfter = nReplPos + aReplStr.Len(); + xub_StrLen nStrStartAfter = nReplPos + aReplStr.Len(); aTxtAfter = String( aTxtBefore, nStrStartAfter, aTxtBefore.Len() - nStrStartAfter ); aTxtBefore.Erase( nReplPos ); } // arrange and fill Fixed Texts - long nX = aBasePos.X(); - long nWidth = GetTextWidth( aTxtBefore ); + long nX = aBasePos.X(); + long nWidth = GetTextWidth( aTxtBefore ); mrFTbefore.SetText( aTxtBefore ); mrFTbefore.SetPosSizePixel( nX, nYFT, nWidth, nTextHeight ); diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx index df78a355d8c8..22b07193b22d 100644 --- a/sw/source/ui/utlui/tmplctrl.cxx +++ b/sw/source/ui/utlui/tmplctrl.cxx @@ -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 @@ -61,10 +61,10 @@ class TemplatePopup_Impl : public PopupMenu public: TemplatePopup_Impl(); - USHORT GetCurId() const { return nCurId; } + USHORT GetCurId() const { return nCurId; } private: - USHORT nCurId; + USHORT nCurId; virtual void Select(); }; diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx index baaff628fe5b..311c731040ef 100644 --- a/sw/source/ui/utlui/uiitems.cxx +++ b/sw/source/ui/utlui/uiitems.cxx @@ -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 @@ -94,11 +94,11 @@ int SwPageFtnInfoItem::operator==( const SfxPoolItem& rAttr ) const SfxItemPresentation SwPageFtnInfoItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, - String& rText, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, + String& rText, const IntlWrapper* pIntl -) const +) const { switch ( ePres ) { diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 01f6c4e84d7a..08cae536d7c9 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -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 @@ -125,7 +125,7 @@ void SetMetric(MetricFormatter& rCtrl, FieldUnit eUnit) } /*-------------------------------------------------------------------- - Beschreibung: Boxinfo-Attribut setzen + Beschreibung: Boxinfo-Attribut setzen --------------------------------------------------------------------*/ @@ -138,7 +138,7 @@ void PrepareBoxInfo(SfxItemSet& rSet, const SwWrtShell& rSh) aBoxInfo = *(SvxBoxInfoItem*)pBoxInfo; // Tabellenvariante, wenn mehrere Tabellenzellen selektiert - rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert + rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert aBoxInfo.SetTable (rSh.IsTableMode() && rSh.GetCrsrCnt() > 1); // Abstandsfeld immer anzeigen aBoxInfo.SetDist ((BOOL) TRUE); @@ -153,7 +153,7 @@ void PrepareBoxInfo(SfxItemSet& rSet, const SwWrtShell& rSh) } /*-------------------------------------------------------------------- - Beschreibung: Header Footer fuellen + Beschreibung: Header Footer fuellen --------------------------------------------------------------------*/ @@ -175,7 +175,7 @@ void FillHdFt(SwFrmFmt* pFmt, const SfxItemSet& rSet) } /*-------------------------------------------------------------------- - Beschreibung: PageDesc <-> in Sets wandeln und zurueck + Beschreibung: PageDesc <-> in Sets wandeln und zurueck --------------------------------------------------------------------*/ @@ -239,7 +239,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) rHeaderSet.Get(SID_ATTR_PAGE_SHARED)).GetValue()); } else - { // Header ausschalten + { // Header ausschalten // if(rMaster.GetHeader().IsActive()) { @@ -275,7 +275,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) rFooterSet.Get(SID_ATTR_PAGE_SHARED)).GetValue()); } else - { // Footer ausschalten + { // Footer ausschalten // if(rMaster.GetFooter().IsActive()) { @@ -331,7 +331,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) --------------------------------------------------------------------*/ -void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) +void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) { const SwFrmFmt& rMaster = rPageDesc.GetMaster(); @@ -390,10 +390,10 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) // HeaderInfo, Raender, Hintergrund, Umrandung // SfxItemSet aHeaderSet( *rSet.GetPool(), - SID_ATTR_PAGE_ON, SID_ATTR_PAGE_SHARED, - SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, - RES_FRMATR_BEGIN, RES_FRMATR_END-1, + SID_ATTR_PAGE_ON, SID_ATTR_PAGE_SHARED, + SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, + RES_FRMATR_BEGIN, RES_FRMATR_END-1, 0); // dynamische oder feste Hoehe @@ -436,10 +436,10 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) // FooterInfo, Raender, Hintergrund, Umrandung // SfxItemSet aFooterSet( *rSet.GetPool(), - SID_ATTR_PAGE_ON, SID_ATTR_PAGE_SHARED, - SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, - RES_FRMATR_BEGIN, RES_FRMATR_END-1, + SID_ATTR_PAGE_ON, SID_ATTR_PAGE_SHARED, + SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, + RES_FRMATR_BEGIN, RES_FRMATR_END-1, 0); // dynamische oder feste Hoehe @@ -491,7 +491,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) /*-------------------------------------------------------------------- - Beschreibung: DefaultTabs setzen + Beschreibung: DefaultTabs setzen --------------------------------------------------------------------*/ @@ -506,7 +506,7 @@ void MakeDefTabs(SwTwips nDefDist, SvxTabStopItem& rTabs) } /*-------------------------------------------------------------------- - Beschreibung: Abstand zwischen zwei Tabs + Beschreibung: Abstand zwischen zwei Tabs --------------------------------------------------------------------*/ @@ -537,7 +537,7 @@ void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet ) if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_PARA_MODEL, FALSE, &pItem )) { const String& rDescName = ((SvxPageModelItem*)pItem)->GetValue(); - if( rDescName.Len() ) // kein Name -> PageDesc ausschalten! + if( rDescName.Len() ) // kein Name -> PageDesc ausschalten! { // nur loeschen, wenn PageDesc eingschaltet wird! rSet.ClearItem( RES_BREAK ); @@ -603,21 +603,21 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet ) } /*-------------------------------------------------------------------- - Beschreibung: Metric ermitteln + Beschreibung: Metric ermitteln --------------------------------------------------------------------*/ -FieldUnit GetDfltMetric(BOOL bWeb) +FieldUnit GetDfltMetric(BOOL bWeb) { return SW_MOD()->GetUsrPref(bWeb)->GetMetric(); } /*-------------------------------------------------------------------- - Beschreibung: Metric ermitteln + Beschreibung: Metric ermitteln --------------------------------------------------------------------*/ -void SetDfltMetric( FieldUnit eMetric, BOOL bWeb ) +void SetDfltMetric( FieldUnit eMetric, BOOL bWeb ) { SW_MOD()->ApplyUserMetric(eMetric, bWeb); } @@ -736,6 +736,19 @@ String GetAppLangDateTimeString( const DateTime& rDT ) return sRet; } +/*---------------------------------------------------------------------------- + * add a new function which can get and set the current "SID_ATTR_APPLYCHARUNIT" value + *---------------------------------------------------------------------------*/ +BOOL HasCharUnit( BOOL bWeb) +{ + return SW_MOD()->GetUsrPref(bWeb)->IsApplyCharUnit(); +} + +void SetApplyCharUnit(BOOL bApplyChar, BOOL bWeb) +{ + SW_MOD()->ApplyUserCharUnit(bApplyChar, bWeb); +} + /*-- 26.01.2006 08:06:33--------------------------------------------------- -----------------------------------------------------------------------*/ diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index e944c3b383cf..3185a4bae467 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -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 @@ -103,7 +103,7 @@ SwOneExampleFrame::SwOneExampleFrame( Window& rWin, // the controller is asynchronously set aLoadedTimer.SetTimeoutHdl(LINK(this, SwOneExampleFrame, TimeoutHdl)); -// aLoadedTimer.SetTimeout(500); +// aLoadedTimer.SetTimeout(500); aLoadedTimer.SetTimeout(200); rWin.Enable(sal_False); @@ -135,7 +135,7 @@ SwOneExampleFrame::~SwOneExampleFrame() /* -----------------------------21.12.00 10:16-------------------------------- ---------------------------------------------------------------------------*/ -void SwOneExampleFrame::CreateControl() +void SwOneExampleFrame::CreateControl() { if(_xControl.is()) return ; @@ -193,7 +193,7 @@ void SwOneExampleFrame::CreateControl() /* -----------------------------21.12.00 10:16-------------------------------- ---------------------------------------------------------------------------*/ -void SwOneExampleFrame::DisposeControl() +void SwOneExampleFrame::DisposeControl() { _xCursor = 0; if(_xControl.is()) @@ -247,20 +247,20 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) if( !bIsInitialized ) { - xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_BREAKS )), aFalseSet); + xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_BREAKS )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_DRAWINGS )), aTrueSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_FIELD_COMMANDS )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_GRAPHICS )), aTrueSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_PARAGRAPHS )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_TEXT )), aFalseSet); - xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_RULER )), aFalseSet); + xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_RULER )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_PARA_BREAKS )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_PROTECTED_SPACES )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_SOFT_HYPHENS )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_SPACES )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABLES )), aTrueSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABSTOPS )), aFalseSet); - xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_RULER )), aFalseSet); + xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_RULER )), aFalseSet); if(0 ==(nStyleFlags&EX_SHOW_ONLINE_LAYOUT)) { @@ -410,8 +410,8 @@ static const sal_Int16 nZoomValues[] = 100 }; //--------------------------------------------------------------------------- -#define ITEM_UP 100 -#define ITEM_DOWN 200 +#define ITEM_UP 100 +#define ITEM_DOWN 200 #define ITEM_ZOOM 300 void SwOneExampleFrame::CreatePopup(const Point& rPt) @@ -484,7 +484,7 @@ IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu ) ---------------------------------------------------------------------------*/ SwFrmCtrlWindow::SwFrmCtrlWindow(Window* pParent, WinBits nBits, - SwOneExampleFrame* pFrame) : + SwOneExampleFrame* pFrame) : Window(pParent, nBits), pExampleFrame(pFrame) { diff --git a/sw/source/ui/utlui/unotools.hrc b/sw/source/ui/utlui/unotools.hrc index d68577036830..2213012bfc6a 100644 --- a/sw/source/ui/utlui/unotools.hrc +++ b/sw/source/ui/utlui/unotools.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 @@ -34,8 +34,8 @@ #define PB_HELP 5 #define PB_CANCEL 6 -#define ST_MENU_ZOOM 1 -#define ST_MENU_UP 2 +#define ST_MENU_ZOOM 1 +#define ST_MENU_UP 2 #define ST_MENU_DOWN 3 #endif diff --git a/sw/source/ui/utlui/unotools.src b/sw/source/ui/utlui/unotools.src index ac805c9da947..aa4be8804cfb 100644 --- a/sw/source/ui/utlui/unotools.src +++ b/sw/source/ui/utlui/unotools.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 @@ -88,9 +88,9 @@ Resource RES_FRMEX_MENU { ItemList [ en-US ] = { - < "~Zoom" ; ST_MENU_ZOOM; > ; - < "~Upwards" ; ST_MENU_UP; > ; - < "Do~wnwards" ; ST_MENU_DOWN; > ; + < "~Zoom" ; ST_MENU_ZOOM; > ; + < "~Upwards" ; ST_MENU_UP; > ; + < "Do~wnwards" ; ST_MENU_DOWN; > ; }; }; }; diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src index dfa3e07f9053..a48e36487c03 100644 --- a/sw/source/ui/utlui/utlui.src +++ b/sw/source/ui/utlui/utlui.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 @@ -94,11 +94,11 @@ Resource RID_SHELLRES_AUTOFMTSTRS { Text [ en-US ] = "Set \"Text body\" Style"; }; - String STR_AUTOFMTREDL_SET_TMPL_INDENT +1 + String STR_AUTOFMTREDL_SET_TMPL_INDENT +1 { Text [ en-US ] = "Set \"Text body indent\" Style"; }; - String STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT +1 + String STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT +1 { Text [ en-US ] = "Set \"Hanging indent\" Style"; }; diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx index dbee2286731a..79751fd17dcb 100644 --- a/sw/source/ui/utlui/viewlayoutctrl.cxx +++ b/sw/source/ui/utlui/viewlayoutctrl.cxx @@ -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/utlui/zoomctrl.cxx b/sw/source/ui/utlui/zoomctrl.cxx index 48cf53b6263a..986cf6463cba 100644 --- a/sw/source/ui/utlui/zoomctrl.cxx +++ b/sw/source/ui/utlui/zoomctrl.cxx @@ -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/vba/service.cxx b/sw/source/ui/vba/service.cxx index 9f9cbff204dd..8200e323b80d 100644 --- a/sw/source/ui/vba/service.cxx +++ b/sw/source/ui/vba/service.cxx @@ -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 @@ -59,24 +59,24 @@ extern sdecl::ServiceDecl const serviceDecl; extern "C" { - void SAL_CALL component_getImplementationEnvironment( + void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { OSL_TRACE("In component_getImplementationEnv"); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - sal_Bool SAL_CALL component_writeInfo( + sal_Bool SAL_CALL component_writeInfo( lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { OSL_TRACE("In component_writeInfo"); // Component registration - return component_writeInfoHelper( pServiceManager, pRegistryKey, - globals::serviceDecl, document::serviceDecl, wrapformat::serviceDecl, vbaeventshelper::serviceDecl ); + return component_writeInfoHelper( pServiceManager, pRegistryKey, + globals::serviceDecl, document::serviceDecl, wrapformat::serviceDecl, vbaeventshelper::serviceDecl ); } - void * SAL_CALL component_getFactory( + void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx index 8929ae96a914..418a2dcd414e 100644 --- a/sw/source/ui/vba/vbaaddin.cxx +++ b/sw/source/ui/vba/vbaaddin.cxx @@ -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 @@ -83,14 +83,14 @@ void SAL_CALL SwVbaAddin::setInstalled( ::sal_Bool _installed ) throw (uno::Runt } } -rtl::OUString& +rtl::OUString& SwVbaAddin::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAddin") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaAddin::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx index 090f5bcc580f..585d2f865eee 100644 --- a/sw/source/ui/vba/vbaaddin.hxx +++ b/sw/source/ui/vba/vbaaddin.hxx @@ -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/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index f51e11e359b0..62faf145c6bc 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -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 @@ -87,14 +87,14 @@ SwVbaAddins::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString& SwVbaAddins::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAddins") ); return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> SwVbaAddins::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sw/source/ui/vba/vbaaddins.hxx b/sw/source/ui/vba/vbaaddins.hxx index 6d160f78e27b..6d3c269af4a3 100644 --- a/sw/source/ui/vba/vbaaddins.hxx +++ b/sw/source/ui/vba/vbaaddins.hxx @@ -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 @@ -44,9 +44,9 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // SwVbaAddins_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); -}; +}; #endif /* SW_VBA_ADDINS_HXX */ diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index 8056f9ae3deb..fd815b2b0474 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -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 @@ -61,7 +61,7 @@ using ::rtl::OUString; #define FILE_PATH_SEPERATOR "/" #else // windows #define FILE_PATH_SEPERATOR "\\" -#endif +#endif #define EXCELVERSION "11.0" @@ -93,7 +93,7 @@ SwVbaApplication::getActiveDocument() throw (uno::RuntimeException) return new SwVbaDocument( this, mxContext, getCurrentDocument() ); } -uno::Reference< word::XWindow > SAL_CALL +uno::Reference< word::XWindow > SAL_CALL SwVbaApplication::getActiveWindow() throw (uno::RuntimeException) { // #FIXME sofar can't determine Parent @@ -177,20 +177,20 @@ float SAL_CALL SwVbaApplication::CentimetersToPoints( float _Centimeters ) throw return VbaApplicationBase::CentimetersToPoints( _Centimeters ); } -uno::Reference< frame::XModel > +uno::Reference< frame::XModel > SwVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException) { return getCurrentWordDoc( mxContext ); } -rtl::OUString& +rtl::OUString& SwVbaApplication::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaApplication") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaApplication::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index 1261590d7c56..66f9bca50b30 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -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 @@ -56,10 +56,10 @@ public: virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getDisplayAutoCompleteTips() throw (css::uno::RuntimeException); virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException); diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index d4c153913553..5d098a29921a 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -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 @@ -62,14 +62,14 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R return uno::Reference< word::XRange >( pWhere ); } -rtl::OUString& +rtl::OUString& SwVbaAutoTextEntry::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAutoTextEntry") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaAutoTextEntry::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -106,14 +106,14 @@ SwVbaAutoTextEntries::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< word::XAutoTextEntry >( new SwVbaAutoTextEntry( this, mxContext, xEntry ) ) ); } -rtl::OUString& +rtl::OUString& SwVbaAutoTextEntries::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAutoTextEntries") ); return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> SwVbaAutoTextEntries::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index 4ec2d986a877..62575243b42e 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -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 @@ -72,9 +72,9 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // SwVbaAutoTextEntries_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); -}; +}; #endif /* SW_VBA_AUTOTEXTENTRY_HXX */ diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx index a710682c5194..bb67fac46156 100644 --- a/sw/source/ui/vba/vbabookmark.cxx +++ b/sw/source/ui/vba/vbabookmark.cxx @@ -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 @@ -88,14 +88,14 @@ uno::Any SAL_CALL SwVbaBookmark::Range() throw ( uno::RuntimeException ) return uno::makeAny( uno::Reference< word::XRange>( new SwVbaRange( this, mxContext, xTextDocument, xTextRange->getStart(), xTextRange->getEnd(), xTextRange->getText() ) ) ); } -rtl::OUString& +rtl::OUString& SwVbaBookmark::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmark") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaBookmark::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx index 632046c935d8..b8af46074252 100644 --- a/sw/source/ui/vba/vbabookmark.hxx +++ b/sw/source/ui/vba/vbabookmark.hxx @@ -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 @@ -47,7 +47,7 @@ private: void checkVality() throw ( css::uno::RuntimeException ); public: - SwVbaBookmark( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, + SwVbaBookmark( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException ); virtual ~SwVbaBookmark(); diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index 609b8f9df767..bccfeeff0efa 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -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 @@ -44,8 +44,8 @@ class BookmarksEnumeration : public EnumerationHelperImpl public: BookmarksEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) - { + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + { uno::Reference< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); rtl::OUString aName = xNamed->getName(); return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( m_xParent, m_xContext, mxModel, aName ) ) ); @@ -69,7 +69,7 @@ public: // XElementAccess virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return mxIndexAccess->getElementType(); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return mxIndexAccess->hasElements(); } - // XNameAcess + // XNameAcess virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName(aName) ) @@ -113,7 +113,7 @@ public: } }; -SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xBookmarks, const uno::Reference< frame::XModel >& xModel ): SwVbaBookmarks_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BookmarkCollectionHelper( xBookmarks ) ) ), mxModel( xModel ) +SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xBookmarks, const uno::Reference< frame::XModel >& xModel ): SwVbaBookmarks_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BookmarkCollectionHelper( xBookmarks ) ) ), mxModel( xModel ) { mxBookmarksSupplier.set( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW ); @@ -179,51 +179,51 @@ SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw rtl::OUString aName = rName; if( m_xNameAccess->hasByName( aName ) ) removeBookmarkByName( aName ); - + addBookmarkByName( aName, xTextRange ); return uno::makeAny( uno::Reference< word::XBookmark >( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) ); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL SwVbaBookmarks::getDefaultSorting() throw (css::uno::RuntimeException) { return word::WdBookmarkSortBy::wdSortByName; } -void SAL_CALL +void SAL_CALL SwVbaBookmarks::setDefaultSorting( sal_Int32/* _type*/ ) throw (css::uno::RuntimeException) { // not support in Writer } -sal_Bool SAL_CALL +sal_Bool SAL_CALL SwVbaBookmarks::getShowHidden() throw (css::uno::RuntimeException) { return sal_True; } -void SAL_CALL +void SAL_CALL SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ ) throw (css::uno::RuntimeException) { // not support in Writer } -sal_Bool SAL_CALL +sal_Bool SAL_CALL SwVbaBookmarks::Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException) { sal_Bool bExist = m_xNameAccess->hasByName( rName ); return bExist; } -rtl::OUString& +rtl::OUString& SwVbaBookmarks::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmarks") ); return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> SwVbaBookmarks::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx index d9047b33d49c..5efef7a31a3c 100644 --- a/sw/source/ui/vba/vbabookmarks.hxx +++ b/sw/source/ui/vba/vbabookmarks.hxx @@ -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 @@ -58,7 +58,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // SwVbaBookmarks_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); @@ -70,6 +70,6 @@ public: virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException); -}; +}; #endif /* SW_VBA_BOOKMARKS_HXX */ diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 184f406c49ac..634ab630cdc7 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -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 @@ -58,7 +58,7 @@ class SwVbaBorder : public SwVbaBorder_Base { private: uno::Reference< beans::XPropertySet > m_xProps; - sal_Int32 m_LineType; + sal_Int32 m_LineType; VbaPalette m_Palette; bool setBorderLine( table::BorderLine& rBorderLine ) { @@ -75,7 +75,7 @@ private: aTableBorder.IsTopLineValid = sal_True; aTableBorder.TopLine = rBorderLine; break; - + case word::WdBorderType::wdBorderBottom: aTableBorder.IsBottomLineValid = sal_True; aTableBorder.BottomLine = rBorderLine; @@ -96,13 +96,13 @@ private: case word::WdBorderType::wdBorderDiagonalUp: // #TODO have to ignore at the momement, would be // nice to investigate what we can do here - break; + break; default: return false; } m_xProps->setPropertyValue( sTableBorder, uno::makeAny(aTableBorder) ); return true; - } + } bool getBorderLine( table::BorderLine& rBorderLine ) { @@ -139,18 +139,18 @@ private: case word::WdBorderType::wdBorderDiagonalUp: // #TODO have to ignore at the momement, would be // nice to investigate what we can do here - break; + break; default: return false; } return true; - } + } SwVbaBorder(); // no impl -protected: +protected: virtual rtl::OUString& getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBorder") ); - return sImplName; + return sImplName; } virtual css::uno::Sequence<rtl::OUString> getServiceNames() { @@ -160,10 +160,10 @@ protected: aServiceNames.realloc( 1 ); aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Border" ) ); } - return aServiceNames; + return aServiceNames; } public: - SwVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, VbaPalette& rPalette) : SwVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {} + SwVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, VbaPalette& rPalette) : SwVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {} uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException) { @@ -186,7 +186,7 @@ public: } return uno::makeAny( nLineStyle ); } - void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException) + void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException) { // Urk no choice but to silently ignore we don't support this attribute // #TODO would be nice to support the word line styles @@ -265,14 +265,14 @@ public: RangeBorders( const uno::Reference< table::XCellRange >& xRange, const uno::Reference< uno::XComponentContext > & xContext, VbaPalette& rPalette ) : m_xRange( xRange ), m_xContext( xContext ), m_Palette( rPalette ) { } - // XIndexAccess + // XIndexAccess virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) { return sizeof( supportedIndexTable ) / sizeof( supportedIndexTable[0] ); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - + sal_Int32 nIndex = getTableIndex( Index ); if ( nIndex >= 0 && nIndex < getCount() ) { @@ -291,7 +291,7 @@ public: } }; -uno::Reference< container::XIndexAccess > +uno::Reference< container::XIndexAccess > rangeToBorderIndexAccess( const uno::Reference< table::XCellRange >& xRange, const uno::Reference< uno::XComponentContext > & xContext, VbaPalette& rPalette ) { return new RangeBorders( xRange, xContext, rPalette ); @@ -334,7 +334,7 @@ SwVbaBorders::createCollectionObject( const css::uno::Any& aSource ) return aSource; // its already a Border object } -uno::Type +uno::Type SwVbaBorders::getElementType() throw (uno::RuntimeException) { return word::XBorders::static_type(0); @@ -358,14 +358,14 @@ void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ ) throw (uno::Runtim throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); } -rtl::OUString& +rtl::OUString& SwVbaBorders::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBorders") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaBorders::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbaborders.hxx b/sw/source/ui/vba/vbaborders.hxx index e8a5ff487b98..a64ba276542b 100644 --- a/sw/source/ui/vba/vbaborders.hxx +++ b/sw/source/ui/vba/vbaborders.hxx @@ -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 @@ -49,9 +49,9 @@ public: virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); - // SwVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - + // SwVbaCollectionBaseImpl + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException); virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException); diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx index a62fd289ca5d..0e96be4c152d 100644 --- a/sw/source/ui/vba/vbadialog.cxx +++ b/sw/source/ui/vba/vbadialog.cxx @@ -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 @@ -45,7 +45,7 @@ static const WordDialogTable aWordDialogTable[] = { 0, 0 } }; -rtl::OUString +rtl::OUString SwVbaDialog::mapIndexToName( sal_Int32 nIndex ) { for( const WordDialogTable* pTable = aWordDialogTable; pTable != NULL; pTable++ ) @@ -58,14 +58,14 @@ SwVbaDialog::mapIndexToName( sal_Int32 nIndex ) return rtl::OUString(); } -rtl::OUString& +rtl::OUString& SwVbaDialog::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDialog") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaDialog::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbadialog.hxx b/sw/source/ui/vba/vbadialog.hxx index 591c77bdb41c..41f066a938cd 100644 --- a/sw/source/ui/vba/vbadialog.hxx +++ b/sw/source/ui/vba/vbadialog.hxx @@ -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/vba/vbadialogs.cxx b/sw/source/ui/vba/vbadialogs.cxx index f81e66dd5488..b52fe83a2705 100644 --- a/sw/source/ui/vba/vbadialogs.cxx +++ b/sw/source/ui/vba/vbadialogs.cxx @@ -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 @@ -40,14 +40,14 @@ SwVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException) return uno::Any( aDialog ); } -rtl::OUString& +rtl::OUString& SwVbaDialogs::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDialogs") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaDialogs::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbadialogs.hxx b/sw/source/ui/vba/vbadialogs.hxx index 075849c18a98..224a50cb081f 100644 --- a/sw/source/ui/vba/vbadialogs.hxx +++ b/sw/source/ui/vba/vbadialogs.hxx @@ -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 @@ -39,7 +39,7 @@ typedef cppu::ImplInheritanceHelper1< VbaDialogsBase, ov::word::XDialogs > SwVba class SwVbaDialogs : public SwVbaDialogs_BASE { public: - SwVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): SwVbaDialogs_BASE( xParent, xContext, xModel ) {} + SwVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): SwVbaDialogs_BASE( xParent, xContext, xModel ) {} virtual ~SwVbaDialogs() {} // XCollection diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx index cef47c7e32dc..98692d56ca86 100644 --- a/sw/source/ui/vba/vbadocument.cxx +++ b/sw/source/ui/vba/vbadocument.cxx @@ -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 @@ -62,7 +62,7 @@ SwVbaDocument::SwVbaDocument( const uno::Reference< XHelperInterface >& xParent, SwVbaDocument::SwVbaDocument( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) : SwVbaDocument_BASE( aArgs, xContext ) { Initialize(); -} +} SwVbaDocument::~SwVbaDocument() { @@ -70,10 +70,10 @@ SwVbaDocument::~SwVbaDocument() void SwVbaDocument::Initialize() { - mxTextDocument.set( getModel(), uno::UNO_QUERY_THROW ); + mxTextDocument.set( getModel(), uno::UNO_QUERY_THROW ); } -uno::Reference< word::XRange > SAL_CALL +uno::Reference< word::XRange > SAL_CALL SwVbaDocument::getContent() throw ( uno::RuntimeException ) { uno::Reference< text::XTextRange > xStart = mxTextDocument->getText()->getStart(); @@ -81,12 +81,12 @@ SwVbaDocument::getContent() throw ( uno::RuntimeException ) return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd, sal_True ) ); } -uno::Reference< word::XRange > SAL_CALL +uno::Reference< word::XRange > SAL_CALL SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd ) throw ( uno::RuntimeException ) { if( !rStart.hasValue() && !rEnd.hasValue() ) return getContent(); - + sal_Int32 nStart = 0; sal_Int32 nEnd = 0; rStart >>= nStart; @@ -120,7 +120,7 @@ SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd ) throw ( uno catch( uno::Exception ) { DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); - } + } } return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd ) ); } @@ -143,7 +143,7 @@ SwVbaDocument::CustomDocumentProperties( const uno::Any& index ) throw (uno::Run return uno::makeAny( xCol ); } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaDocument::Bookmarks( const uno::Any& rIndex ) throw ( uno::RuntimeException ) { uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( getModel(),uno::UNO_QUERY_THROW ); @@ -151,11 +151,11 @@ SwVbaDocument::Bookmarks( const uno::Any& rIndex ) throw ( uno::RuntimeException uno::Reference< XCollection > xBookmarksVba( new SwVbaBookmarks( this, mxContext, xBookmarks, getModel() ) ); if ( rIndex.getValueTypeClass() == uno::TypeClass_VOID ) return uno::makeAny( xBookmarksVba ); - + return uno::Any( xBookmarksVba->Item( rIndex, uno::Any() ) ); } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaDocument::Variables( const uno::Any& rIndex ) throw ( uno::RuntimeException ) { uno::Reference< document::XDocumentPropertiesSupplier > xDocumentPropertiesSupplier( getModel(),uno::UNO_QUERY_THROW ); @@ -165,7 +165,7 @@ SwVbaDocument::Variables( const uno::Any& rIndex ) throw ( uno::RuntimeException uno::Reference< XCollection > xVariables( new SwVbaVariables( this, mxContext, xUserDefined ) ); if ( rIndex.getValueTypeClass() == uno::TypeClass_VOID ) return uno::makeAny( xVariables ); - + return uno::Any( xVariables->Item( rIndex, uno::Any() ) ); } @@ -226,13 +226,13 @@ SwVbaDocument::PageSetup( ) throw (uno::RuntimeException) return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, xPageProps ) ) ); } -rtl::OUString& +rtl::OUString& SwVbaDocument::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDocument") ); return sImplName; } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException) { uno::Reference< word::XTemplate > xTemplate; @@ -245,18 +245,18 @@ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException) return uno::makeAny( xTemplate ); } -void SAL_CALL +void SAL_CALL SwVbaDocument::setAttachedTemplate( const css::uno::Any& /*_attachedtemplate*/ ) throw (uno::RuntimeException) { throw uno::RuntimeException(); } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaDocument::Tables( const css::uno::Any& aIndex ) throw (uno::RuntimeException) { uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xColl( new SwVbaTables( mxParent, mxContext, xModel ) ); - + if ( aIndex.hasValue() ) return xColl->Item( aIndex, uno::Any() ); return uno::makeAny( xColl ); @@ -291,44 +291,44 @@ SwVbaDocument::getControlShape( const ::rtl::OUString& sName ) return uno::Any(); } -uno::Reference< beans::XIntrospectionAccess > SAL_CALL +uno::Reference< beans::XIntrospectionAccess > SAL_CALL SwVbaDocument::getIntrospection( ) throw (uno::RuntimeException) { return uno::Reference< beans::XIntrospectionAccess >(); } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaDocument::invoke( const ::rtl::OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { OSL_TRACE("** SwVbaDocument::invoke( %s ), will barf", rtl::OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() ); - + throw uno::RuntimeException(); // unsupported operation } -void SAL_CALL +void SAL_CALL SwVbaDocument::setValue( const ::rtl::OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { throw uno::RuntimeException(); // unsupported operation } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaDocument::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) { uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW ); - + uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) ); return uno::makeAny( xControl ); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL SwVbaDocument::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException) { return sal_False; } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL SwVbaDocument::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException) { uno::Reference< container::XNameAccess > xFormControls( getFormControls() ); @@ -337,7 +337,7 @@ SwVbaDocument::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeEx return sal_False; } -uno::Reference< container::XNameAccess > +uno::Reference< container::XNameAccess > SwVbaDocument::getFormControls() { uno::Reference< container::XNameAccess > xFormControls; @@ -346,7 +346,7 @@ SwVbaDocument::getFormControls() uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< form::XFormsSupplier > xFormSupplier( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xIndexAccess( xFormSupplier->getForms(), uno::UNO_QUERY_THROW ); - // get the www-standard container ( maybe we should access the + // get the www-standard container ( maybe we should access the // 'www-standard' by name rather than index, this seems an // implementation detail xFormControls.set( xIndexAccess->getByIndex(0), uno::UNO_QUERY_THROW ); @@ -357,7 +357,7 @@ SwVbaDocument::getFormControls() return xFormControls; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaDocument::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx index ab87798a8ded..4602e9ab08b2 100644 --- a/sw/source/ui/vba/vbadocument.hxx +++ b/sw/source/ui/vba/vbadocument.hxx @@ -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/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 50ab62dd904f..475ca93751b9 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -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 @@ -47,7 +47,7 @@ sal_Int8 lcl_toMSOPropType( const uno::Type& aType ) throw ( lang::IllegalArgume switch ( aType.getTypeClass() ) { - case uno::TypeClass_BOOLEAN: + case uno::TypeClass_BOOLEAN: msoType = office::MsoDocProperties::msoPropertyTypeBoolean; break; case uno::TypeClass_FLOAT: @@ -74,7 +74,7 @@ protected: uno::Reference< frame::XModel > m_xModel; uno::Reference< beans::XPropertySet > mxProps; public: - PropertGetSetHelper( const uno::Reference< frame::XModel >& xModel ):m_xModel( xModel ) + PropertGetSetHelper( const uno::Reference< frame::XModel >& xModel ):m_xModel( xModel ) { uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( m_xModel, uno::UNO_QUERY_THROW ); mxProps.set( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW ); @@ -89,7 +89,7 @@ public: class BuiltinPropertyGetSetHelper : public PropertGetSetHelper { public: - BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) + BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) { } virtual uno::Any getPropertyValue( const rtl::OUString& rPropName ) @@ -114,7 +114,7 @@ public: CustomPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :BuiltinPropertyGetSetHelper( xModel ) { uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( mxProps, uno::UNO_QUERY_THROW ); - uno::Reference< document::XDocumentProperties > xDocProp( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW ); + uno::Reference< document::XDocumentProperties > xDocProp( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW ); mxProps.set( xDocProp->getUserDefinedProperties(), uno::UNO_QUERY_THROW ); } }; @@ -131,7 +131,7 @@ public: virtual uno::Any getPropertyValue( const rtl::OUString& rPropName ) { uno::Sequence< beans::NamedValue > stats; - try + try { // Characters, ParagraphCount & WordCount are available from // the model ( and addtionally these also update the statics object ) @@ -158,7 +158,7 @@ public: { mxModelProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphCount") ) ) >>= stats; mxProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ) ) >>= stats; - + sal_Int32 nLen = stats.getLength(); bool bFound = false; for ( sal_Int32 index = 0; index < nLen && !bFound ; ++index ) @@ -167,8 +167,8 @@ public: { aReturn = stats[ index ].Value; bFound = true; - } - } + } + } if ( !bFound ) throw uno::RuntimeException(); // bad Property } @@ -180,7 +180,7 @@ public: uno::Sequence< beans::NamedValue > stats; mxProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ) ) >>= stats; - + sal_Int32 nLen = stats.getLength(); for ( sal_Int32 index = 0; index < nLen; ++index ) { @@ -189,8 +189,8 @@ public: stats[ index ].Value = aValue; mxProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ), uno::makeAny( stats ) ); break; - } - } + } + } } }; @@ -200,7 +200,7 @@ public: rtl::OUString msMSODesc; rtl::OUString msOOOPropName; boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper; - + static DocPropInfo createDocPropInfo( const rtl::OUString& sDesc, const rtl::OUString& sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper ) { return createDocPropInfo( rtl::OUStringToOString( sDesc, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( sPropName, RTL_TEXTENCODING_UTF8 ).getStr(), rHelper ); @@ -214,24 +214,24 @@ public: aItem.mpPropGetSetHelper = rHelper; return aItem; } - uno::Any getValue() + uno::Any getValue() { if ( mpPropGetSetHelper.get() ) - return mpPropGetSetHelper->getPropertyValue( msOOOPropName ); + return mpPropGetSetHelper->getPropertyValue( msOOOPropName ); return uno::Any(); } - void setValue( const uno::Any& rValue ) + void setValue( const uno::Any& rValue ) { if ( mpPropGetSetHelper.get() ) - mpPropGetSetHelper->setPropertyValue( msOOOPropName, rValue ); + mpPropGetSetHelper->setPropertyValue( msOOOPropName, rValue ); } - uno::Reference< beans::XPropertySet > getUnoProperties() - { - + uno::Reference< beans::XPropertySet > getUnoProperties() + { + uno::Reference< beans::XPropertySet > xProps; if ( mpPropGetSetHelper.get() ) - return mpPropGetSetHelper->getUnoProperties(); - return xProps; + return mpPropGetSetHelper->getUnoProperties(); + return xProps; } }; @@ -260,7 +260,7 @@ public: m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastPrinted ] = DocPropInfo::createDocPropInfo( "Last print date", "PrintDate", aStandardHelper ); // doesn't seem to exist - throw or return nothing ? m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeCreated ] = DocPropInfo::createDocPropInfo( "Creation date", "CreationDate", aStandardHelper ); m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastSaved ] = DocPropInfo::createDocPropInfo( "Last save time", "ModifyDate", aStandardHelper ); - m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyVBATotalEdit ] = DocPropInfo::createDocPropInfo( "Total editing time", "EditingDuration", aStandardHelper ); // Not sure if this is correct + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyVBATotalEdit ] = DocPropInfo::createDocPropInfo( "Total editing time", "EditingDuration", aStandardHelper ); // Not sure if this is correct m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyPages ] = DocPropInfo::createDocPropInfo( "Number of pages", "PageCount", aUsingStatsHelper ); // special handling required ? m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyWords ] = DocPropInfo::createDocPropInfo( "Number of words", "WordCount", aUsingStatsHelper ); // special handling require ? m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCharacters ] = DocPropInfo::createDocPropInfo( "Number of characters", "CharacterCount", aUsingStatsHelper ); // special handling required ? @@ -358,22 +358,22 @@ SwVbaCustomDocumentProperty::setLinkSource( const rtl::OUString& /*rsLinkContent // #FIXME we need to store the link source somewhere } -void SAL_CALL +void SAL_CALL SwVbaCustomDocumentProperty::setName( const ::rtl::OUString& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException) { - // setName on existing property ? - // #FIXME + // setName on existing property ? + // #FIXME // do we need to delete existing property and create a new one? } -void SAL_CALL +void SAL_CALL SwVbaCustomDocumentProperty::setType( ::sal_Int8 /*Type*/ ) throw (script::BasicErrorException, uno::RuntimeException) { // setType, do we need to do a conversion? // #FIXME the underlying value needs to be changed to the new type } -void SAL_CALL +void SAL_CALL SwVbaCustomDocumentProperty::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Reference< beans::XPropertyContainer > xContainer( mPropInfo.getUnoProperties(), uno::UNO_QUERY_THROW ); @@ -382,16 +382,16 @@ SwVbaCustomDocumentProperty::Delete( ) throw (script::BasicErrorException, uno: SwVbaBuiltInDocumentProperty::SwVbaBuiltInDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ) : SwVbaDocumentProperty_BASE( xParent, xContext ), mPropInfo( rInfo ) { -} +} -void SAL_CALL +void SAL_CALL SwVbaBuiltInDocumentProperty::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) { // not valid for Builtin throw uno::RuntimeException(); } - -::rtl::OUString SAL_CALL + +::rtl::OUString SAL_CALL SwVbaBuiltInDocumentProperty::getName( ) throw (script::BasicErrorException, uno::RuntimeException) { return mPropInfo.msMSODesc; @@ -404,33 +404,33 @@ SwVbaBuiltInDocumentProperty::setName( const rtl::OUString& ) throw (script::Bas throw uno::RuntimeException(); } -::sal_Int8 SAL_CALL +::sal_Int8 SAL_CALL SwVbaBuiltInDocumentProperty::getType( ) throw (script::BasicErrorException, uno::RuntimeException) { return lcl_toMSOPropType( getValue().getValueType() ); } -void SAL_CALL +void SAL_CALL SwVbaBuiltInDocumentProperty::setType( ::sal_Int8 /*Type*/ ) throw (script::BasicErrorException, uno::RuntimeException) { // not valid for Builtin throw uno::RuntimeException(); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL SwVbaBuiltInDocumentProperty::getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException) { return sal_False; // built-in always false } -void SAL_CALL +void SAL_CALL SwVbaBuiltInDocumentProperty::setLinkToContent( ::sal_Bool /*LinkToContent*/ ) throw (script::BasicErrorException, uno::RuntimeException) { // not valid for Builtin throw uno::RuntimeException(); } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaBuiltInDocumentProperty::getValue( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Any aRet = mPropInfo.getValue(); @@ -439,34 +439,34 @@ SwVbaBuiltInDocumentProperty::getValue( ) throw (script::BasicErrorException, u return aRet; } -void SAL_CALL +void SAL_CALL SwVbaBuiltInDocumentProperty::setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException) { mPropInfo.setValue( Value ); } -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL SwVbaBuiltInDocumentProperty::getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException) { // not valid for Builtin throw uno::RuntimeException(); } -void SAL_CALL +void SAL_CALL SwVbaBuiltInDocumentProperty::setLinkSource( const rtl::OUString& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException) { // not valid for Builtin throw uno::RuntimeException(); } -rtl::OUString& +rtl::OUString& SwVbaBuiltInDocumentProperty::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperty") ); - return sImplName; + return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> SwVbaBuiltInDocumentProperty::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -490,7 +490,7 @@ class DocPropEnumeration : public DocPropEnumeration_BASE DocProps mDocProps; DocProps::iterator mIt; public: - + DocPropEnumeration( const DocProps& rProps ) : mDocProps( rProps ), mIt( mDocProps.begin() ) {} virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) { @@ -514,10 +514,10 @@ protected: uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< frame::XModel > m_xModel; uno::Reference< document::XDocumentInfo > m_xOOOBuiltIns; - + DocProps mDocProps; DocPropsByName mNamedDocProps; - + public: BuiltInPropertiesImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel ) { @@ -526,7 +526,7 @@ protected: { mDocProps[ index ] = new SwVbaBuiltInDocumentProperty( xParent, xContext, builtIns.getDocPropInfoMap()[ index ] ); mNamedDocProps[ mDocProps[ index ]->getName() ] = mDocProps[ index ]; - } + } } // XIndexAccess virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) @@ -547,7 +547,7 @@ protected: throw container::NoSuchElementException(); DocPropsByName::iterator it = mNamedDocProps.find( aName ); return uno::Any( it->second ); - + } virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { @@ -556,7 +556,7 @@ protected: DocPropsByName::iterator it_end = mNamedDocProps.end(); for( DocPropsByName::iterator it = mNamedDocProps.begin(); it != it_end; ++it, ++pName ) *pName = it->first; - return aNames; + return aNames; } virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) @@ -567,9 +567,9 @@ protected: return sal_True; } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { - return XDocumentProperty::static_type(0); + return XDocumentProperty::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { @@ -583,9 +583,9 @@ protected: SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaDocumentproperties_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BuiltInPropertiesImpl( xParent, xContext, xModel ) ) ), m_xModel( xModel ) { -} +} -uno::Reference< XDocumentProperty > SAL_CALL +uno::Reference< XDocumentProperty > SAL_CALL SwVbaBuiltinDocumentProperties::Add( const ::rtl::OUString& /*Name*/, ::sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException) { throw uno::RuntimeException( @@ -593,21 +593,21 @@ SwVbaBuiltinDocumentProperties::Add( const ::rtl::OUString& /*Name*/, ::sal_Bool } // XEnumerationAccess -uno::Type SAL_CALL +uno::Type SAL_CALL SwVbaBuiltinDocumentProperties::getElementType() throw (uno::RuntimeException) { - return XDocumentProperty::static_type(0); + return XDocumentProperty::static_type(0); } -uno::Reference< container::XEnumeration > SAL_CALL +uno::Reference< container::XEnumeration > SAL_CALL SwVbaBuiltinDocumentProperties::createEnumeration() throw (uno::RuntimeException) { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return xEnumAccess->createEnumeration(); } -// ScVbaCollectionBaseImpl -uno::Any +// ScVbaCollectionBaseImpl +uno::Any SwVbaBuiltinDocumentProperties::createCollectionObject( const uno::Any& aSource ) { // pass through @@ -615,14 +615,14 @@ SwVbaBuiltinDocumentProperties::createCollectionObject( const uno::Any& aSource } // XHelperInterface -rtl::OUString& +rtl::OUString& SwVbaBuiltinDocumentProperties::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperties") ); - return sImplName; + return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> SwVbaBuiltinDocumentProperties::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -646,11 +646,11 @@ public: { // suck in the document( custom ) properties uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( m_xModel, uno::UNO_QUERY_THROW ); - uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW ); - uno::Reference< document::XDocumentProperties > xDocProp( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW ); - mxUserDefinedProp.set( xDocProp->getUserDefinedProperties(), uno::UNO_QUERY_THROW ); + uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW ); + uno::Reference< document::XDocumentProperties > xDocProp( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW ); + mxUserDefinedProp.set( xDocProp->getUserDefinedProperties(), uno::UNO_QUERY_THROW ); mpPropGetSetHelper.reset( new CustomPropertyGetSetHelper( m_xModel ) ); - }; + }; // XIndexAccess virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) { @@ -695,9 +695,9 @@ public: } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { - return XDocumentProperty::static_type(0); + return XDocumentProperty::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) @@ -736,7 +736,7 @@ SwVbaCustomDocumentProperties::SwVbaCustomDocumentProperties( const uno::Referen m_xNameAccess.set( m_xIndexAccess, uno::UNO_QUERY_THROW ); } -uno::Reference< XDocumentProperty > SAL_CALL +uno::Reference< XDocumentProperty > SAL_CALL SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException) { CustomPropertiesImpl* pCustomProps = dynamic_cast< CustomPropertiesImpl* > ( m_xIndexAccess.get() ); @@ -756,9 +756,9 @@ SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool Link } // XHelperInterface -rtl::OUString& +rtl::OUString& SwVbaCustomDocumentProperties::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaCustomDocumentProperties") ); - return sImplName; + return sImplName; } diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx index 5159ea580601..9ab704eff385 100644 --- a/sw/source/ui/vba/vbadocumentproperties.hxx +++ b/sw/source/ui/vba/vbadocumentproperties.hxx @@ -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 @@ -46,7 +46,7 @@ public: // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); - // ScVbaCollectionBaseImpl + // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index 41a7e607533e..094dde4c0d65 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -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 @@ -67,7 +67,7 @@ getDocument( uno::Reference< uno::XComponentContext >& xContext, const uno::Refe uno::Reference< frame::XModel > xModel( xDoc, uno::UNO_QUERY ); if( !xModel.is() ) return uno::Any(); - + SwVbaDocument *pWb = new SwVbaDocument( uno::Reference< XHelperInterface >( aApplication, uno::UNO_QUERY_THROW ), xContext, xModel ); return uno::Any( uno::Reference< word::XDocument > (pWb) ); } @@ -78,8 +78,8 @@ class DocumentEnumImpl : public EnumerationHelperImpl public: DocumentEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) - { + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + { uno::Reference< text::XTextDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return getDocument( m_xContext, xDoc, m_aApplication ); } @@ -98,7 +98,7 @@ uno::Reference< container::XEnumeration > SwVbaDocuments::createEnumeration() throw (uno::RuntimeException) { // #FIXME its possible the DocumentEnumImpl here doens't reflect - // the state of this object ( although it should ) would be + // the state of this object ( although it should ) would be // safer to create an enumeration based on this objects state // rather than one effectively based of the desktop component uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); @@ -177,14 +177,14 @@ SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& ReadOnly, return VbaDocumentsBase::Open( Filename, ReadOnly, rProps ); } -rtl::OUString& +rtl::OUString& SwVbaDocuments::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDocuments") ); return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> SwVbaDocuments::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx index 81b936a1ae76..7f1c89510e1a 100644 --- a/sw/source/ui/vba/vbadocuments.hxx +++ b/sw/source/ui/vba/vbadocuments.hxx @@ -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 @@ -48,7 +48,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // SwVbaDocuments_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index a33b3c208c8f..8e9661d0af08 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -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 @@ -46,14 +46,14 @@ SwVbaField::SwVbaField( const uno::Reference< ooo::vba::XHelperInterface >& rPa } // XHelperInterface -rtl::OUString& +rtl::OUString& SwVbaField::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaField") ); - return sImplName; + return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> SwVbaField::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -276,7 +276,7 @@ uno::Any lcl_createField( const uno::Reference< XHelperInterface >& xParent, con typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > FieldEnumeration_BASE; typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > FieldCollectionHelper_BASE; -class FieldEnumeration : public FieldEnumeration_BASE +class FieldEnumeration : public FieldEnumeration_BASE { uno::Reference< XHelperInterface > mxParent; uno::Reference< uno::XComponentContext > mxContext; @@ -286,8 +286,8 @@ public: FieldEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< container::XEnumeration >& xEnumeration ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxEnumeration( xEnumeration ) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) - { + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) + { return mxEnumeration->hasMoreElements(); } virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) @@ -315,15 +315,15 @@ public: virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return mxEnumerationAccess->hasElements(); } // XIndexAccess virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) - { + { uno::Reference< container::XEnumeration > xEnumeration = mxEnumerationAccess->createEnumeration(); sal_Int32 nCount = 0; while( xEnumeration->hasMoreElements() ) { ++nCount; xEnumeration->nextElement(); - } - return nCount; + } + return nCount; } virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -349,13 +349,13 @@ public: return uno::Reference< container::XEnumeration >( new FieldEnumeration( mxParent, mxContext, mxModel, xEnumeration ) ); } }; - + SwVbaFields::SwVbaFields( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaFields_BASE( xParent, xContext , uno::Reference< container::XIndexAccess >( new FieldCollectionHelper( xParent, xContext, xModel ) ) ), mxModel( xModel ) { mxMSF.set( mxModel, uno::UNO_QUERY_THROW ); } -uno::Reference< word::XField > SAL_CALL +uno::Reference< word::XField > SAL_CALL SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& /*PreserveFormatting*/ ) throw (css::uno::RuntimeException) { sal_Int32 nType = word::WdFieldType::wdFieldEmpty; @@ -419,19 +419,19 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const rtl return xTextField; } -uno::Reference< container::XEnumeration > SAL_CALL +uno::Reference< container::XEnumeration > SAL_CALL SwVbaFields::createEnumeration() throw (uno::RuntimeException) { uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return xEnumerationAccess->createEnumeration(); } -// ScVbaCollectionBaseImpl -uno::Any +// ScVbaCollectionBaseImpl +uno::Any SwVbaFields::createCollectionObject( const uno::Any& aSource ) { return lcl_createField( mxParent, mxContext, mxModel, aSource ); -} +} sal_Int32 SAL_CALL SwVbaFields::Update() throw (uno::RuntimeException) { @@ -450,21 +450,21 @@ sal_Int32 SAL_CALL SwVbaFields::Update() throw (uno::RuntimeException) } // XHelperInterface -rtl::OUString& +rtl::OUString& SwVbaFields::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFields") ); - return sImplName; + return sImplName; } // XEnumerationAccess -uno::Type SAL_CALL +uno::Type SAL_CALL SwVbaFields::getElementType() throw (uno::RuntimeException) { - return word::XField::static_type(0); + return word::XField::static_type(0); } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> SwVbaFields::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx index 3c55acf73e9d..f421179d352d 100644 --- a/sw/source/ui/vba/vbafield.hxx +++ b/sw/source/ui/vba/vbafield.hxx @@ -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 @@ -44,7 +44,7 @@ public: // XHelperInterface virtual rtl::OUString& getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; // *** SwVbaFields *********************************************** @@ -66,12 +66,12 @@ public: // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); - // ScVbaCollectionBaseImpl + // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface virtual rtl::OUString& getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx index fccf04181993..1af48f7c1eb1 100644 --- a/sw/source/ui/vba/vbafind.cxx +++ b/sw/source/ui/vba/vbafind.cxx @@ -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 @@ -121,7 +121,7 @@ uno::Reference< text::XTextRange > SwVbaFind::FindOneElement() throw ( uno::Runt { mxTVC->gotoStart(sal_False); xFoundOne.set( mxReplaceable->findNext( mxTextRange->getStart(), uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY ); - } + } else { mxTVC->gotoEnd( sal_False ); @@ -320,7 +320,7 @@ void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ ) throw (uno::Run throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); } -sal_Bool SAL_CALL +sal_Bool SAL_CALL SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const uno::Any& MatchWholeWord, const uno::Any& MatchWildcards, const uno::Any& MatchSoundsLike, const uno::Any& MatchAllWordForms, const uno::Any& Forward, const uno::Any& Wrap, const uno::Any& Format, const uno::Any& ReplaceWith, const uno::Any& Replace, const uno::Any& /*MatchKashida*/, const uno::Any& /*MatchDiacritics*/, const uno::Any& /*MatchAlefHamza*/, const uno::Any& /*MatchControl*/, const uno::Any& /*MatchPrefix*/, const uno::Any& /*MatchSuffix*/, const uno::Any& /*MatchPhrase*/, const uno::Any& /*IgnoreSpace*/, const uno::Any& /*IgnorePunct*/ ) throw (uno::RuntimeException) { sal_Bool result = sal_False; @@ -400,21 +400,21 @@ SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const u return result; } -void SAL_CALL +void SAL_CALL SwVbaFind::ClearFormatting( ) throw (uno::RuntimeException) { uno::Sequence< beans::PropertyValue > aSearchAttribs; mxPropertyReplace->setSearchAttributes( aSearchAttribs ); } -rtl::OUString& +rtl::OUString& SwVbaFind::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFind") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaFind::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx index ef971866500d..c624a5aa7acc 100644 --- a/sw/source/ui/vba/vbafind.hxx +++ b/sw/source/ui/vba/vbafind.hxx @@ -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/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index 47f39bcbefda..4855d923ffba 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -23,8 +23,8 @@ static MapPair UnderLineTable[] = { { word::WdUnderline::wdUnderlineDouble, com::sun::star::awt::FontUnderline::DOUBLE }, { word::WdUnderline::wdUnderlineDotted, com::sun::star::awt::FontUnderline::DOTTED }, { word::WdUnderline::wdUnderlineThick, com::sun::star::awt::FontUnderline::BOLDDASH }, - { word::WdUnderline::wdUnderlineDash, com::sun::star::awt::FontUnderline::DASH }, - { word::WdUnderline::wdUnderlineDotDash, com::sun::star::awt::FontUnderline::DASHDOT }, + { word::WdUnderline::wdUnderlineDash, com::sun::star::awt::FontUnderline::DASH }, + { word::WdUnderline::wdUnderlineDotDash, com::sun::star::awt::FontUnderline::DASHDOT }, { word::WdUnderline::wdUnderlineDotDotDash, com::sun::star::awt::FontUnderline::DASHDOTDOT }, { word::WdUnderline::wdUnderlineWavy, com::sun::star::awt::FontUnderline::WAVE }, { word::WdUnderline::wdUnderlineDottedHeavy, com::sun::star::awt::FontUnderline::BOLDDOTTED }, @@ -63,7 +63,7 @@ public: static UnderLineMapper& instance() { static UnderLineMapper theMapper; - return theMapper; + return theMapper; } sal_Int32 getOOOFromMSO( sal_Int32 nMSOConst ) throw( lang::IllegalArgumentException ) @@ -86,7 +86,7 @@ SwVbaFont::SwVbaFont( const uno::Reference< XHelperInterface >& xParent, const u { } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaFont::getUnderline() throw (uno::RuntimeException) { sal_Int32 nOOVal = 0; @@ -94,7 +94,7 @@ SwVbaFont::getUnderline() throw (uno::RuntimeException) return uno::makeAny( UnderLineMapper::instance().getMSOFromOOO( nOOVal ) ); } -void SAL_CALL +void SAL_CALL SwVbaFont::setUnderline( const uno::Any& _underline ) throw (uno::RuntimeException) { sal_Int32 nMSOVal = 0; @@ -119,7 +119,7 @@ SwVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeExcep sal_Int32 nIndex = 0; _colorindex >>= nIndex; return setColor( OORGBToXLRGB(mxPalette->getByIndex( nIndex )) ); -} +} uno::Any SAL_CALL SwVbaFont::getColorIndex() throw ( uno::RuntimeException ) @@ -140,8 +140,8 @@ SwVbaFont::getColorIndex() throw ( uno::RuntimeException ) } } return uno::makeAny( nIndex ); -} -uno::Any SAL_CALL +} +uno::Any SAL_CALL SwVbaFont::getSubscript() throw ( uno::RuntimeException ) { sal_Bool bRes = sal_False; @@ -151,7 +151,7 @@ SwVbaFont::getSubscript() throw ( uno::RuntimeException ) return aLongAnyFalse; } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaFont::getSuperscript() throw ( uno::RuntimeException ) { sal_Bool bRes = sal_False; @@ -161,7 +161,7 @@ SwVbaFont::getSuperscript() throw ( uno::RuntimeException ) return aLongAnyFalse; } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaFont::getBold() throw (uno::RuntimeException) { sal_Bool bRes = sal_False; @@ -171,7 +171,7 @@ SwVbaFont::getBold() throw (uno::RuntimeException) return aLongAnyFalse; } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaFont::getItalic() throw (uno::RuntimeException) { sal_Bool bRes = sal_False; @@ -181,7 +181,7 @@ SwVbaFont::getItalic() throw (uno::RuntimeException) return aLongAnyFalse; } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaFont::getStrikethrough() throw (css::uno::RuntimeException) { sal_Bool bRes = sal_False; @@ -191,7 +191,7 @@ SwVbaFont::getStrikethrough() throw (css::uno::RuntimeException) return aLongAnyFalse; } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaFont::getShadow() throw (uno::RuntimeException) { sal_Bool bRes = sal_False; diff --git a/sw/source/ui/vba/vbafont.hxx b/sw/source/ui/vba/vbafont.hxx index 1500c2a314dd..b684daa58b63 100644 --- a/sw/source/ui/vba/vbafont.hxx +++ b/sw/source/ui/vba/vbafont.hxx @@ -26,6 +26,6 @@ public: virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException); // XHelperInterface virtual rtl::OUString& getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index b95c5e5c9e3d..0770ea319675 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -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 @@ -53,7 +53,7 @@ SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Refere aInitArgs[ 0 ].Value = uno::makeAny( getApplication() ); aInitArgs[ 1 ].Name = sDocCtxName; aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) ); - + init( aInitArgs ); } @@ -68,32 +68,32 @@ SwVbaGlobals::~SwVbaGlobals() uno::Reference<word::XApplication > SwVbaGlobals::getApplication() throw (uno::RuntimeException) { - OSL_TRACE("In SwVbaGlobals::getApplication"); + OSL_TRACE("In SwVbaGlobals::getApplication"); if ( !mxApplication.is() ) mxApplication.set( new SwVbaApplication( mxContext) ); - - return mxApplication; + + return mxApplication; } uno::Reference<word::XSystem > SAL_CALL SwVbaGlobals::getSystem() throw (uno::RuntimeException) { - return getApplication()->getSystem(); + return getApplication()->getSystem(); } -uno::Reference< word::XDocument > SAL_CALL +uno::Reference< word::XDocument > SAL_CALL SwVbaGlobals::getActiveDocument() throw (uno::RuntimeException) { - return getApplication()->getActiveDocument(); + return getApplication()->getActiveDocument(); } -uno::Reference< word::XWindow > SAL_CALL +uno::Reference< word::XWindow > SAL_CALL SwVbaGlobals::getActiveWindow() throw (uno::RuntimeException) { return getApplication()->getActiveWindow(); } -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL SwVbaGlobals::getName() throw (uno::RuntimeException) { return getApplication()->getName(); @@ -166,7 +166,7 @@ SwVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException) static uno::Sequence< rtl::OUString > serviceNames( SwVbaGlobals_BASE::getAvailableServiceNames() ); if ( !bInit ) { - rtl::OUString names[] = { + rtl::OUString names[] = { ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.word.Document" ) ), // #FIXME #TODO make Application a proper service // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.word.Application" ) ), diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index 9bb2e8fa606d..ad6ce95bce5a 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -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 @@ -46,7 +46,7 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::word::XGlobals > SwVbaGlobals_BASE; -class SwVbaGlobals : public SwVbaGlobals_BASE +class SwVbaGlobals : public SwVbaGlobals_BASE { private: css::uno::Reference< ooo::vba::word::XApplication > mxApplication; @@ -54,7 +54,7 @@ private: virtual css::uno::Reference< ooo::vba::word::XApplication > getApplication() throw (css::uno::RuntimeException); public: - + SwVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& rxContext ); virtual ~SwVbaGlobals(); @@ -65,10 +65,10 @@ public: virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException); // XMultiServiceFactory virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); @@ -77,4 +77,4 @@ public: virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; -#endif /* SW_VBA_GLOBALS_HXX */ +#endif /* SW_VBA_GLOBALS_HXX */ diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx index 6fb7061c573f..ec3b0cef270a 100644 --- a/sw/source/ui/vba/vbaheaderfooter.cxx +++ b/sw/source/ui/vba/vbaheaderfooter.cxx @@ -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 @@ -90,14 +90,14 @@ SwVbaHeaderFooter::Shapes( const uno::Any& index ) throw (uno::RuntimeException) return uno::makeAny( xCol ); } -rtl::OUString& +rtl::OUString& SwVbaHeaderFooter::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaHeaderFooter") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaHeaderFooter::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx index dba10ff767d8..2c4832d7d3bd 100644 --- a/sw/source/ui/vba/vbaheaderfooter.hxx +++ b/sw/source/ui/vba/vbaheaderfooter.hxx @@ -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/vba/vbaheaderfooterhelper.cxx b/sw/source/ui/vba/vbaheaderfooterhelper.cxx index 604cc1e11d8c..d91f37a20d08 100644 --- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx +++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx @@ -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 @@ -37,13 +37,13 @@ using namespace ::ooo::vba; #define FIRST_PAGE 1; -// Class HeaderFooterHelper +// Class HeaderFooterHelper sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException) { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW ); - + sal_Bool isOn = sal_False; xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isOn; if( !isOn ) @@ -64,7 +64,7 @@ sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xM aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextRight") ); } } - + uno::Reference< text::XText > xText( xStyleProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW ); //FIXME: can not compare in this way? return ( xText == xCurrentText ); @@ -93,7 +93,7 @@ sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XMo { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); return ( 0 == xPageCursor->getPage() % 2 ); - } + } } return sal_False; } @@ -102,7 +102,7 @@ sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xM { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW ); - + sal_Bool isOn = sal_False; xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))) >>= isOn; if( !isOn ) @@ -123,7 +123,7 @@ sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xM aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterTextRight") ); } } - + uno::Reference< text::XText > xText( xStyleProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW ); return ( xText == xCurrentText ); @@ -151,7 +151,7 @@ sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XMo { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); return ( 0 == xPageCursor->getPage() % 2 ); - } + } } return sal_False; } diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.hxx b/sw/source/ui/vba/vbaheaderfooterhelper.hxx index fd29a16015ab..0e5fd4c4508b 100644 --- a/sw/source/ui/vba/vbaheaderfooterhelper.hxx +++ b/sw/source/ui/vba/vbaheaderfooterhelper.hxx @@ -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/vba/vbainformationhelper.cxx b/sw/source/ui/vba/vbainformationhelper.cxx index 6fdf8f9f9449..b2f24406f458 100644 --- a/sw/source/ui/vba/vbainformationhelper.cxx +++ b/sw/source/ui/vba/vbainformationhelper.cxx @@ -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 @@ -62,7 +62,7 @@ double SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( const css // FIXME: handle multipul page style // it is very strange that the curros position is incorrect when open Word file. // e.g. if current cursor in the top left of the text body of the first page without header, - // the top value of current position should be 0, but is 201 when open a Word file. + // the top value of current position should be 0, but is 201 when open a Word file. nCurrentPos = nCurrentPos + nTopMargin - ( DEFAULT_PAGE_DISTANCE + TWIP_TO_MM100( nPageHeight ) ) * ( nCurrentPage - 1 ); return Millimeter::getInPoints( nCurrentPos ); } diff --git a/sw/source/ui/vba/vbainformationhelper.hxx b/sw/source/ui/vba/vbainformationhelper.hxx index 6aeb8439812b..0cf436cef57c 100644 --- a/sw/source/ui/vba/vbainformationhelper.hxx +++ b/sw/source/ui/vba/vbainformationhelper.hxx @@ -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/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx index d59d0326cf5e..34f1e2a58893 100644 --- a/sw/source/ui/vba/vbaoptions.cxx +++ b/sw/source/ui/vba/vbaoptions.cxx @@ -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 @@ -46,7 +46,7 @@ SwVbaOptions::~SwVbaOptions() { } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException ) { switch( _path ) @@ -90,7 +90,7 @@ SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException ) } default: { - DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() ); + DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() ); break; } } @@ -264,14 +264,14 @@ void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool /*_autof } -rtl::OUString& +rtl::OUString& SwVbaOptions::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaOptions") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaOptions::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx index ec1f70068e48..0a1c1f8f61eb 100644 --- a/sw/source/ui/vba/vbaoptions.hxx +++ b/sw/source/ui/vba/vbaoptions.hxx @@ -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 @@ -35,7 +35,7 @@ typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XOptions > SwVbaOptions_BASE; -class SwVbaOptions : public SwVbaOptions_BASE, +class SwVbaOptions : public SwVbaOptions_BASE, public PropListener { private: diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx index 1cdda8152207..892f2a918f42 100644 --- a/sw/source/ui/vba/vbapagesetup.cxx +++ b/sw/source/ui/vba/vbapagesetup.cxx @@ -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 @@ -36,7 +36,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -SwVbaPageSetup::SwVbaPageSetup(const uno::Reference< XHelperInterface >& xParent, +SwVbaPageSetup::SwVbaPageSetup(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException): @@ -46,7 +46,7 @@ SwVbaPageSetup::SwVbaPageSetup(const uno::Reference< XHelperInterface >& xParent mxPageProps.set( xProps, uno::UNO_QUERY_THROW ); mnOrientPortrait = word::WdOrientation::wdOrientPortrait; mnOrientLandscape = word::WdOrientation::wdOrientLandscape; -} +} double SAL_CALL SwVbaPageSetup::getGutter() throw (uno::RuntimeException) { @@ -93,7 +93,7 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isHeaderOn; if( !isHeaderOn ) mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")), uno::makeAny( sal_True ) ); - + mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin"))) >>= aktTopMargin; mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance"))) >>= aktSpacing; mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight"))) >>= aktHeaderHeight; @@ -127,7 +127,7 @@ void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))) >>= isFooterOn; if( !isFooterOn ) mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")), uno::makeAny( sal_True ) ); - + mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin"))) >>= aktBottomMargin; mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance"))) >>= aktSpacing; mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight"))) >>= aktFooterHeight; @@ -243,7 +243,7 @@ rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException wdSectionStart = word::WdSectionStart::wdSectionOddPage; else wdSectionStart = word::WdSectionStart::wdSectionNewPage; - return wdSectionStart; + return wdSectionStart; } void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) throw (uno::RuntimeException) @@ -252,14 +252,14 @@ void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) t // #FIXME: } -rtl::OUString& +rtl::OUString& SwVbaPageSetup::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPageSetup") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaPageSetup::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbapagesetup.hxx b/sw/source/ui/vba/vbapagesetup.hxx index df7c59a728ce..8449b7f908d3 100644 --- a/sw/source/ui/vba/vbapagesetup.hxx +++ b/sw/source/ui/vba/vbapagesetup.hxx @@ -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 @@ -36,16 +36,16 @@ typedef cppu::ImplInheritanceHelper1< VbaPageSetupBase, ooo::vba::word::XPageSetup > SwVbaPageSetup_BASE; -class SwVbaPageSetup : public SwVbaPageSetup_BASE +class SwVbaPageSetup : public SwVbaPageSetup_BASE { private: rtl::OUString getStyleOfFirstPage() throw (css::uno::RuntimeException); public: - SwVbaPageSetup( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent, + SwVbaPageSetup( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, - const css::uno::Reference< css::frame::XModel >& xModel, - const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw (css::uno::RuntimeException); + const css::uno::Reference< css::frame::XModel >& xModel, + const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw (css::uno::RuntimeException); virtual ~SwVbaPageSetup(){} // Attributes diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx index 12554e792e5e..40191df6f82a 100644 --- a/sw/source/ui/vba/vbapalette.cxx +++ b/sw/source/ui/vba/vbapalette.cxx @@ -12,7 +12,7 @@ static const sal_Int32 ColorTable[] = { WdColor::wdColorAutomatic, // 0 WdColor::wdColorBlack, // 1 -WdColor::wdColorBlue, // 2 +WdColor::wdColorBlue, // 2 WdColor::wdColorTurquoise, // 3 WdColor::wdColorBrightGreen, // 4 WdColor::wdColorPink, // 5 @@ -70,6 +70,6 @@ uno::Reference< container::XIndexAccess > VbaPalette::getPalette() const { - return mxPalette; + return mxPalette; } diff --git a/sw/source/ui/vba/vbapalette.hxx b/sw/source/ui/vba/vbapalette.hxx index 6179f1723c0b..130e405a13e6 100644 --- a/sw/source/ui/vba/vbapalette.hxx +++ b/sw/source/ui/vba/vbapalette.hxx @@ -7,7 +7,7 @@ class VbaPalette css::uno::Reference< css::container::XIndexAccess > mxPalette; public: VbaPalette(); - // if no palette available e.g. because the document doesn't have a + // if no palette available e.g. because the document doesn't have a // palette defined then a default palette will be returned. css::uno::Reference< css::container::XIndexAccess > getPalette() const; }; diff --git a/sw/source/ui/vba/vbapane.cxx b/sw/source/ui/vba/vbapane.cxx index dc5d5ccff882..3fcd415c1d3b 100644 --- a/sw/source/ui/vba/vbapane.cxx +++ b/sw/source/ui/vba/vbapane.cxx @@ -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 @@ -45,7 +45,7 @@ SwVbaPane::~SwVbaPane() uno::Any SAL_CALL SwVbaPane::View() throw ( css::uno::RuntimeException ) { - return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this, mxContext, mxModel ) ) ); + return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this, mxContext, mxModel ) ) ); } void SAL_CALL @@ -55,14 +55,14 @@ SwVbaPane::Close( ) throw ( css::uno::RuntimeException ) dispatchRequests( mxModel,url ); } -rtl::OUString& +rtl::OUString& SwVbaPane::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPane") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaPane::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbapane.hxx b/sw/source/ui/vba/vbapane.hxx index b8a6fff38da3..c9b11d99aa7f 100644 --- a/sw/source/ui/vba/vbapane.hxx +++ b/sw/source/ui/vba/vbapane.hxx @@ -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 @@ -39,7 +39,7 @@ private: css::uno::Reference< css::frame::XModel > mxModel; public: - SwVbaPane( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, + SwVbaPane( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException ); virtual ~SwVbaPane(); diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index b536c800a854..b97991a5500b 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -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 @@ -52,7 +52,7 @@ public: { if( Index != 1 ) throw container::NoSuchElementException(); - return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( mxParent, mxContext, mxModel ) ) ); + return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( mxParent, mxContext, mxModel ) ) ); } virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { @@ -104,14 +104,14 @@ SwVbaPanes::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString& SwVbaPanes::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPanes") ); return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> SwVbaPanes::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx index 76c24166cfa7..6294e81ba58e 100644 --- a/sw/source/ui/vba/vbapanes.hxx +++ b/sw/source/ui/vba/vbapanes.hxx @@ -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 @@ -49,9 +49,9 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // SwVbaPanes_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); -}; +}; #endif /* SW_VBA_PANES_HXX */ diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index 333fd4ca9a98..075ea6f1072e 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -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 @@ -42,20 +42,20 @@ SwVbaParagraph::~SwVbaParagraph() { } -uno::Reference< word::XRange > SAL_CALL +uno::Reference< word::XRange > SAL_CALL SwVbaParagraph::getRange( ) throw ( uno::RuntimeException ) { return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, mxTextRange->getStart(), mxTextRange->getEnd(), mxTextRange->getText(), sal_True ) ); } -rtl::OUString& +rtl::OUString& SwVbaParagraph::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraph") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaParagraph::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -75,7 +75,7 @@ class ParagraphCollectionHelper : public ParagraphCollectionHelper_BASE { private: uno::Reference< text::XTextDocument > mxTextDocument; - + uno::Reference< container::XEnumeration > getEnumeration() throw (uno::RuntimeException) { uno::Reference< container::XEnumerationAccess > xParEnumAccess( mxTextDocument->getText(), uno::UNO_QUERY_THROW ); @@ -103,7 +103,7 @@ public: } } return nCount; - } + } virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { if( Index < getCount() ) @@ -118,7 +118,7 @@ public: if( Index == nCount ) return uno::makeAny( xServiceInfo ); nCount++; - } + } } } throw lang::IndexOutOfBoundsException(); @@ -127,7 +127,7 @@ public: virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException) { return getEnumeration(); - } + } }; SwVbaParagraphs::SwVbaParagraphs( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException) : SwVbaParagraphs_BASE( xParent, xContext, new ParagraphCollectionHelper( xDocument ) ), mxTextDocument( xDocument ) @@ -154,14 +154,14 @@ SwVbaParagraphs::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< word::XParagraph >( new SwVbaParagraph( this, mxContext, mxTextDocument, xTextRange ) ) ); } -rtl::OUString& +rtl::OUString& SwVbaParagraphs::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraphs") ); return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> SwVbaParagraphs::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx index 894ac61cc7e6..4c2cc448e5c1 100644 --- a/sw/source/ui/vba/vbaparagraph.hxx +++ b/sw/source/ui/vba/vbaparagraph.hxx @@ -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 @@ -73,9 +73,9 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // SwVbaParagraphs_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); -}; +}; #endif /* SW_VBA_PARAGRAPH_HXX */ diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index 07a822ad5752..dbcadac1e3c4 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -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 @@ -91,7 +91,7 @@ void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogeth if( _keeptogether >>= bKeep ) { mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaKeepTogether") ), uno::makeAny( bKeep ) ); - } + } else { DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); @@ -111,7 +111,7 @@ void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithne if( _keepwithnext >>= bKeep ) { mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaSplit") ), uno::makeAny( bKeep ) ); - } + } else { DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); @@ -131,7 +131,7 @@ void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation if( _hyphenation >>= bHypn ) { mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaIsHyphenation") ), uno::makeAny( bHypn ) ); - } + } else { DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); @@ -179,7 +179,7 @@ void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumb if( _nolinenumber >>= noLineNum ) { mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberCount") ), uno::makeAny( noLineNum ) ); - } + } else { DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); @@ -235,7 +235,7 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe aBreakType = style::BreakType_PAGE_AFTER; } mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ), uno::makeAny( aBreakType ) ); - } + } else { DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); @@ -339,7 +339,7 @@ style::LineSpacing SwVbaParagraphFormat::getOOoLineSpacing( float _lineSpace, sa style::LineSpacing aLineSpacing; if( mode != style::LineSpacingMode::MINIMUM && mode != style::LineSpacingMode::FIX ) { - // special behaviour of word: if the space is set to these values, the rule and + // special behaviour of word: if the space is set to these values, the rule and // the height are changed accordingly if( _lineSpace == CHARACTER_INDENT_FACTOR ) { @@ -552,14 +552,14 @@ sal_Int32 SwVbaParagraphFormat::getMSWordAlignment( sal_Int32 _alignment ) return wdAlignment; } -rtl::OUString& +rtl::OUString& SwVbaParagraphFormat::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraphFormat") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaParagraphFormat::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx index 684390820e13..4a061b96b769 100644 --- a/sw/source/ui/vba/vbaparagraphformat.hxx +++ b/sw/source/ui/vba/vbaparagraphformat.hxx @@ -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 @@ -53,7 +53,7 @@ private: public: SwVbaParagraphFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::beans::XPropertySet >& rParaProps ); virtual ~SwVbaParagraphFormat(); - + // Attributes virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException); virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException); diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx index 647aedb34791..d6f719dd0b51 100644 --- a/sw/source/ui/vba/vbarange.cxx +++ b/sw/source/ui/vba/vbarange.cxx @@ -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 @@ -67,8 +67,8 @@ void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, c if( !mxText.is() ) { mxText = mxTextDocument->getText(); - } - + } + mxTextCursor = SwVbaRangeHelper::initCursor( rStart, mxText ); mxTextCursor->collapseToStart(); @@ -250,7 +250,7 @@ SwVbaRange::getStyle() throw ( uno::RuntimeException ) uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xStyleProps( xStylesAccess->getByName( aStyleName ), uno::UNO_QUERY_THROW ); - return uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, xStyleProps ) ); + return uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, xStyleProps ) ); } void SAL_CALL @@ -324,14 +324,14 @@ void SAL_CALL SwVbaRange::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeExceptio mxTextCursor->gotoRange( xEnd, sal_True ); } -rtl::OUString& +rtl::OUString& SwVbaRange::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaRange") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaRange::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx index 1f1b3a3bbc8b..ca3a4ea21b07 100644 --- a/sw/source/ui/vba/vbarange.hxx +++ b/sw/source/ui/vba/vbarange.hxx @@ -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 @@ -54,7 +54,7 @@ public: SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException); virtual ~SwVbaRange(); css::uno::Reference< css::text::XTextDocument > getDocument() { return mxTextDocument; } - + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() throw (css::uno::RuntimeException); #ifdef TOMORROW void setXTextRange( const css::uno::Reference< css::text::XTextRange >& xRange ) throw (css::uno::RuntimeException); diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx index 4fd9e5f143f1..337fd9d6ae27 100644 --- a/sw/source/ui/vba/vbarangehelper.cxx +++ b/sw/source/ui/vba/vbarangehelper.cxx @@ -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 @@ -33,7 +33,7 @@ using namespace ::com::sun::star; /** * get a range in a xText by creating - * a cursor that iterates over the text. If the iterating cursor is + * a cursor that iterates over the text. If the iterating cursor is * equal to the desired position, the range equivalent is returned. * Some special cases are tables that are inside of the text, because the * position has to be adjusted. @@ -56,7 +56,7 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u if( _position == nPos ) { xRange = xCursor->getStart(); - } + } else { bCanGo = xCursor->goRight( 1, sal_False ); @@ -73,7 +73,7 @@ void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRa sal_Int32 nlastIndex = 0; sal_Int32 nIndex = 0; uno::Reference< text::XTextRange > xRange = rTextRange; - + while(( nIndex = rStr.indexOf('\n', nlastIndex)) >= 0 ) { xRange = xRange->getEnd(); diff --git a/sw/source/ui/vba/vbarangehelper.hxx b/sw/source/ui/vba/vbarangehelper.hxx index 71bdf20f94a2..530c7e1fa12d 100644 --- a/sw/source/ui/vba/vbarangehelper.hxx +++ b/sw/source/ui/vba/vbarangehelper.hxx @@ -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/vba/vbareplacement.cxx b/sw/source/ui/vba/vbareplacement.cxx index 81f2bb193412..2bd7dcfa580c 100644 --- a/sw/source/ui/vba/vbareplacement.cxx +++ b/sw/source/ui/vba/vbareplacement.cxx @@ -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 @@ -50,14 +50,14 @@ void SAL_CALL SwVbaReplacement::setText( const ::rtl::OUString& _text ) throw (u mxPropertyReplace->setReplaceString( _text ); } -rtl::OUString& +rtl::OUString& SwVbaReplacement::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaReplacement") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaReplacement::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbareplacement.hxx b/sw/source/ui/vba/vbareplacement.hxx index b257fb7a3abc..c0f66af45fdc 100644 --- a/sw/source/ui/vba/vbareplacement.hxx +++ b/sw/source/ui/vba/vbareplacement.hxx @@ -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/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx index 2e685fbb1676..4df6f0b5b31a 100644 --- a/sw/source/ui/vba/vbasection.cxx +++ b/sw/source/ui/vba/vbasection.cxx @@ -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 @@ -66,14 +66,14 @@ SwVbaSection::PageSetup( ) throw (uno::RuntimeException) return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, mxPageProps ) ) ); } -rtl::OUString& +rtl::OUString& SwVbaSection::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSection") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaSection::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbasection.hxx b/sw/source/ui/vba/vbasection.hxx index 90a2972c2f52..9dd40586998b 100644 --- a/sw/source/ui/vba/vbasection.hxx +++ b/sw/source/ui/vba/vbasection.hxx @@ -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/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index c0f887f0f249..6a4ae0e45ef7 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -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 @@ -96,11 +96,11 @@ public: } virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - if ( Index < 0 || Index >= getCount() ) + if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); uno::Reference< beans::XPropertySet > xPageProps( mxSections[ Index ], uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XSection >( new SwVbaSection( mxParent, mxContext, mxModel, xPageProps ) ) ); + return uno::makeAny( uno::Reference< word::XSection >( new SwVbaSection( mxParent, mxContext, mxModel, xPageProps ) ) ); } virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { @@ -123,8 +123,8 @@ class SectionsEnumWrapper : public EnumerationHelperImpl public: SectionsEnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ){} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) - { + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + { uno::Reference< beans::XPropertySet > xPageProps( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XSection > ( new SwVbaSection( m_xParent, m_xContext, mxModel, xPageProps ) ) ); } @@ -166,14 +166,14 @@ SwVbaSections::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString& SwVbaSections::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSections") ); return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> SwVbaSections::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sw/source/ui/vba/vbasections.hxx b/sw/source/ui/vba/vbasections.hxx index 3204689af5d8..9cb35cf74eb0 100644 --- a/sw/source/ui/vba/vbasections.hxx +++ b/sw/source/ui/vba/vbasections.hxx @@ -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 @@ -51,9 +51,9 @@ public: virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException); // SwVbaSections_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); -}; +}; #endif /* SW_VBA_SECTIONS_HXX */ diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index 620e44fa413b..17d4e2f5a3af 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -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 @@ -73,7 +73,7 @@ uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( un { uno::Reference< text::XTextRange > xTextRange; uno::Reference< lang::XServiceInfo > xServiceInfo( mxModel->getCurrentSelection(), uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextRanges") ) ) ) + if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextRanges") ) ) ) { uno::Reference< container::XIndexAccess > xTextRanges( xServiceInfo, uno::UNO_QUERY_THROW ); if( xTextRanges->getCount() > 0 ) @@ -89,7 +89,7 @@ uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( un return xTextRange; } -uno::Reference< word::XRange > SAL_CALL +uno::Reference< word::XRange > SAL_CALL SwVbaSelection::getRange() throw ( uno::RuntimeException ) { uno::Reference< text::XTextRange > xTextRange = GetSelectedRange(); @@ -187,7 +187,7 @@ SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( void SAL_CALL SwVbaSelection::Delete( const uno::Any& /*_unit*/, const uno::Any& /*_count*/ ) throw ( uno::RuntimeException ) { - // FIXME: handle the arguments: _unit and _count + // FIXME: handle the arguments: _unit and _count rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Delete")); dispatchRequests( mxModel,url ); } @@ -208,7 +208,7 @@ void SwVbaSelection::NextCell( sal_Int32 nCount, E_DIRECTION eDirection ) throw rtl::OUString aCellName; xCellProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CellName") ) ) >>= aCellName; uno::Reference< text::XTextTableCursor > xTextTableCursor = xTextTable->createCursorByCellName( aCellName ); - // move the table cursor + // move the table cursor switch( eDirection ) { case MOVE_LEFT: @@ -255,17 +255,17 @@ SwVbaSelection::MoveRight( const uno::Any& _unit, const uno::Any& _count, const _count >>= nCount; if( _extend.hasValue() ) _extend >>= nExtend; - + if( nCount == 0 ) return; - + if( nCount < 0 ) { // TODO: call MoveLeft; MoveLeft( _unit, uno::makeAny( -nCount ), _extend ); return; } - + switch( nUnit ) { case word::WdUnits::wdCell: @@ -300,16 +300,16 @@ SwVbaSelection::MoveLeft( const uno::Any& _unit, const uno::Any& _count, const u _count >>= nCount; if( _extend.hasValue() ) _extend >>= nExtend; - + if( nCount == 0 ) return; - + if( nCount < 0 ) { MoveRight( _unit, uno::makeAny( -nCount ), _extend ); return; } - + switch( nUnit ) { case word::WdUnits::wdCell: @@ -344,17 +344,17 @@ SwVbaSelection::MoveDown( const uno::Any& _unit, const uno::Any& _count, const u _count >>= nCount; if( _extend.hasValue() ) _extend >>= nExtend; - + if( nCount == 0 ) return; - + if( nCount < 0 ) { // TODO: call MoveLeft; //MoveUp( _unit, uno::makeAny( -nCount ), _extend ); return; } - + switch( nUnit ) { case word::WdUnits::wdLine: @@ -376,7 +376,7 @@ SwVbaSelection::MoveDown( const uno::Any& _unit, const uno::Any& _count, const u void SAL_CALL SwVbaSelection::TypeParagraph() throw ( uno::RuntimeException ) { - // #FIXME: if the selection is an entire paragraph, it's replaced + // #FIXME: if the selection is an entire paragraph, it's replaced // by the new paragraph sal_Bool isCollapsed = mxTextViewCursor->isCollapsed(); InsertParagraph(); @@ -415,7 +415,7 @@ SwVbaSelection::setParagraphFormat( const uno::Reference< word::XParagraphFormat return getRange()->setParagraphFormat( rParagraphFormat ); } -uno::Reference< word::XFind > SAL_CALL +uno::Reference< word::XFind > SAL_CALL SwVbaSelection::getFind() throw ( uno::RuntimeException ) { uno::Reference< text::XTextRange > xTextRange = GetSelectedRange(); @@ -565,12 +565,12 @@ SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException) // Hacky implementation due to missing api ( and lack of knowledge ) // we can only support a selection that is a single table if ( !aIndex.hasValue() ) // currently we can't support multiple tables in a selection - throw uno::RuntimeException(); + throw uno::RuntimeException(); // if the current selection is a XTextTableCursor and the index is 1 then we can service this request, otherwise we just have to throw uno::Reference< text::XTextTableCursor > xTextTableCursor( mxModel->getCurrentSelection(), uno::UNO_QUERY ); if ( !xTextTableCursor.is() ) - throw uno::RuntimeException(); + throw uno::RuntimeException(); sal_Int32 nIndex = 0; aIndex >>= nIndex; @@ -578,7 +578,7 @@ SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException) uno::Any aRet; if ( nIndex != 1 ) - throw uno::RuntimeException(); + throw uno::RuntimeException(); SwXTextTableCursor* pTTCursor = dynamic_cast< SwXTextTableCursor* >( xTextTableCursor.get() ); if ( pTTCursor ) { @@ -588,12 +588,12 @@ SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException) { uno::Reference< text::XTextTable > xTbl = SwXTextTables::GetObject(*pFmt); uno::Reference< css::text::XTextDocument > xTextDoc( mxModel, uno::UNO_QUERY_THROW ); - uno::Reference< word::XTable > xVBATbl = new SwVbaTable( mxParent, mxContext, xTextDoc, xTbl ); + uno::Reference< word::XTable > xVBATbl = new SwVbaTable( mxParent, mxContext, xTextDoc, xTbl ); aRet <<= xVBATbl; } } return aRet; - + } uno::Any SAL_CALL @@ -618,7 +618,7 @@ SwVbaSelection::getHeaderFooter() throw ( uno::RuntimeException ) nIndex = word::WdHeaderFooterIndex::wdHeaderFooterEvenPages; else if( HeaderFooterHelper::isFirstPageHeader( mxModel, xCurrentText ) || HeaderFooterHelper::isFirstPageFooter( mxModel, xCurrentText ) ) nIndex = word::WdHeaderFooterIndex::wdHeaderFooterFirstPage; - + return uno::Reference< word::XHeaderFooter >( new SwVbaHeaderFooter( this, mxContext, mxModel, xPageStyleProps, isHeader, nIndex ) ); } @@ -631,7 +631,7 @@ SwVbaSelection::ShapeRange( ) throw (uno::RuntimeException) uno::Reference< drawing::XShapes > xShapes( mxModel->getCurrentSelection(), uno::UNO_QUERY ); if ( !xShapes.is() ) - throw uno::RuntimeException(); + throw uno::RuntimeException(); uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< drawing::XDrawPage > xDrawPage = xDrawPageSupplier->getDrawPage(); @@ -658,14 +658,14 @@ void SAL_CALL SwVbaSelection::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeExce getRange()->setEnd( _end ); } -rtl::OUString& +rtl::OUString& SwVbaSelection::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSelection") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaSelection::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx index a5079340ee19..afbf79a6c3ff 100644 --- a/sw/source/ui/vba/vbaselection.hxx +++ b/sw/source/ui/vba/vbaselection.hxx @@ -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 @@ -61,7 +61,7 @@ private: public: SwVbaSelection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException ); virtual ~SwVbaSelection(); - + // Attribute virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException); diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index cf49da020284..a8bb6bee9c51 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -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 @@ -41,13 +41,13 @@ SwVbaStyle::SwVbaStyle( const uno::Reference< XHelperInterface >& xParent, const mxStyle.set( _xPropertySet, uno::UNO_QUERY_THROW ); } -void SAL_CALL +void SAL_CALL SwVbaStyle::setName( const ::rtl::OUString& Name ) throw (uno::RuntimeException) { mxStyle->setName(Name); } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL SwVbaStyle::getName() throw (uno::RuntimeException) { return mxStyle->getName(); @@ -82,9 +82,9 @@ void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) throw (uno::R uno::Reference< lang::XServiceInfo > xServiceInfo( mxStyle, uno::UNO_QUERY_THROW ); if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.ParagraphStyle") ) ) ) nType = word::WdStyleType::wdStyleTypeParagraph; - else if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.CharacterStyle") ) ) ) + else if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.CharacterStyle") ) ) ) nType = word::WdStyleType::wdStyleTypeCharacter; - else // if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.NumberingStyle") ) ) ) + else // if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.NumberingStyle") ) ) ) nType = word::WdStyleType::wdStyleTypeList; return nType; } diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx index 401baa5337a1..bfa12e0caa8d 100644 --- a/sw/source/ui/vba/vbastyle.hxx +++ b/sw/source/ui/vba/vbastyle.hxx @@ -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/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index 371c1225cafa..58a88e2e7936 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -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 @@ -200,7 +200,7 @@ public: // XElementAccess virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return style::XStyle::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return getCount() > 0; } - // XNameAcess + // XNameAcess virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName(aName) ) @@ -242,7 +242,7 @@ public: // XIndexAccess virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) - { + { uno::Sequence< rtl::OUString > aStyleTypes = getStyleTypes(); sal_Int32 nCount = 0; for( sal_Int32 i = 0; i < aStyleTypes.getLength(); i++ ) @@ -251,12 +251,12 @@ public: nCount += xIndexAccess->getCount(); } return nCount; - } + } virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); - + // FIXME: need to make a alphabetically sorted list of style names uno::Sequence< rtl::OUString > aStyleTypes = getStyleTypes(); for( sal_Int32 i = 0; i < aStyleTypes.getLength(); i++ ) @@ -286,20 +286,20 @@ SwVbaStyles::SwVbaStyles( const uno::Reference< XHelperInterface >& xParent, con mxMSF.set( mxModel, uno::UNO_QUERY_THROW ); } -uno::Any +uno::Any SwVbaStyles::createCollectionObject(const uno::Any& aObject) { uno::Reference< beans::XPropertySet > xStyleProp( aObject, uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, xStyleProp ) ) ); } -uno::Type SAL_CALL +uno::Type SAL_CALL SwVbaStyles::getElementType() throw (uno::RuntimeException) { return word::XStyle::static_type(0); } -uno::Reference< container::XEnumeration > SAL_CALL +uno::Reference< container::XEnumeration > SAL_CALL SwVbaStyles::createEnumeration() throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); diff --git a/sw/source/ui/vba/vbastyles.hxx b/sw/source/ui/vba/vbastyles.hxx index 9cd2e2ff5b1a..76e08c6ba2ff 100644 --- a/sw/source/ui/vba/vbastyles.hxx +++ b/sw/source/ui/vba/vbastyles.hxx @@ -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 @@ -41,11 +41,11 @@ public: virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; -#endif +#endif diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index 42d1c09ccbac..66e5d1fd4ce9 100644 --- a/sw/source/ui/vba/vbasystem.cxx +++ b/sw/source/ui/vba/vbasystem.cxx @@ -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 @@ -97,7 +97,7 @@ SwVbaSystem::getCursor() throw (uno::RuntimeException) } } -void SAL_CALL +void SAL_CALL SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) { try @@ -131,11 +131,11 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) break; } default: - throw uno::RuntimeException( rtl::OUString( + throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() ); // TODO: isn't this a flaw in the API? It should be allowed to throw an // IllegalArgumentException, or so - } + } } catch( const uno::Exception& ) { @@ -143,7 +143,7 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) } } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( uno::RuntimeException ) { if( rFilename.getLength() == 0 ) @@ -167,14 +167,14 @@ SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OU return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( &maPrivateProfileStringListener ) ) ); } -rtl::OUString& +rtl::OUString& SwVbaSystem::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSystem") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaSystem::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx index deeb6f00fdf4..df548a76a580 100644 --- a/sw/source/ui/vba/vbasystem.hxx +++ b/sw/source/ui/vba/vbasystem.hxx @@ -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 @@ -40,7 +40,7 @@ private: rtl::OUString maFileName; ByteString maGroupName; ByteString maKey; -public: +public: PrivateProfileStringListener(){}; virtual ~PrivateProfileStringListener(); void Initialize( const rtl::OUString& rFileName, const ByteString& rGroupName, const ByteString& rKey ); diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx index 11969d6717a0..7598dfc6cf7e 100644 --- a/sw/source/ui/vba/vbatable.cxx +++ b/sw/source/ui/vba/vbatable.cxx @@ -18,16 +18,16 @@ SwVbaTable::SwVbaTable( const uno::Reference< ooo::vba::XHelperInterface >& rPa mxTextTable.set( xTextTable, uno::UNO_QUERY_THROW ); } -uno::Reference< word::XRange > SAL_CALL +uno::Reference< word::XRange > SAL_CALL SwVbaTable::Range( ) throw (script::BasicErrorException, uno::RuntimeException) { return new SwVbaRange( mxParent, mxContext, mxTextDocument, mxTextTable->getAnchor() ); } -void SAL_CALL +void SAL_CALL SwVbaTable::Select( ) throw (script::BasicErrorException, uno::RuntimeException) { - uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); + uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< frame::XController > xController = xModel->getCurrentController(); uno::Reference< text::XTextViewCursorSupplier > xViewCursorSupplier( xController, uno::UNO_QUERY_THROW ); @@ -39,20 +39,20 @@ SwVbaTable::Select( ) throw (script::BasicErrorException, uno::RuntimeException // go to the end of the table and span the view uno::Reference< text::XTextViewCursor > xCursor = xViewCursorSupplier->getViewCursor(); xCursor->gotoEnd(sal_True); - + } -void SAL_CALL +void SAL_CALL SwVbaTable::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Reference< table::XTableRows > xRows( mxTextTable->getRows() ); xRows->removeByIndex( 0, xRows->getCount() ); } -uno::Reference< word::XRange > SAL_CALL +uno::Reference< word::XRange > SAL_CALL SwVbaTable::ConvertToText( const uno::Any& /*Separator*/, const uno::Any& /*NestedTables*/ ) throw (script::BasicErrorException, uno::RuntimeException) { - // #FIXME the helper api uses the dreaded dispatch mechanism, holding off + // #FIXME the helper api uses the dreaded dispatch mechanism, holding off // implementation while I look for alternative solution throw uno::RuntimeException(); } @@ -76,14 +76,14 @@ SwVbaTable::Borders( const uno::Any& index ) throw (uno::RuntimeException) } // XHelperInterface -rtl::OUString& +rtl::OUString& SwVbaTable::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTable") ); - return sImplName; + return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> SwVbaTable::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx index 7d913d718895..c28a3cdaf313 100644 --- a/sw/source/ui/vba/vbatable.hxx +++ b/sw/source/ui/vba/vbatable.hxx @@ -23,6 +23,6 @@ public: virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); // XHelperInterface virtual rtl::OUString& getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index 9a10622400d3..53178d1c791d 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -39,8 +39,8 @@ public: TableEnumerationImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xDocument, const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxParent( xParent ), mxContext( xContext ), mxDocument( xDocument ), mxIndexAccess( xIndexAccess ), mnCurIndex(0) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) - { + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) + { return ( mnCurIndex < mxIndexAccess->getCount() ); } virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) @@ -49,15 +49,15 @@ public: throw container::NoSuchElementException(); return lcl_createTable( mxParent, mxContext, mxDocument, mxIndexAccess->getByIndex( mnCurIndex++ ) ); } - + }; - + SwVbaTables::SwVbaTables( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xDocument ) : SwVbaTables_BASE( xParent, xContext , lcl_getTables( xDocument ) ), mxDocument( xDocument ) { } -uno::Reference< word::XTable > SAL_CALL +uno::Reference< word::XTable > SAL_CALL SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& /*DefaultTableBehavior*/, const uno::Any& /*AutoFitBehavior*/ ) throw (script::BasicErrorException, uno::RuntimeException) { sal_Int32 nCols = 0; @@ -66,7 +66,7 @@ SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& N // Preconditions if ( !( pVbaRange && ( NumRows >>= nRows ) && ( NumColumns >>= nCols ) ) ) throw uno::RuntimeException(); // #FIXME better exception?? - if ( nCols <= 0 || nRows <= 0 ) + if ( nCols <= 0 || nRows <= 0 ) throw uno::RuntimeException(); // #FIXME better exception?? uno::Reference< frame::XModel > xModel( pVbaRange->getDocument(), uno::UNO_QUERY_THROW ); @@ -82,42 +82,42 @@ SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& N */ xTable->initialize( nRows, nCols ); uno::Reference< text::XText > xText = xTextRange->getText(); - uno::Reference< text::XTextContent > xContext( xTable, uno::UNO_QUERY_THROW ); - + uno::Reference< text::XTextContent > xContext( xTable, uno::UNO_QUERY_THROW ); + xText->insertTextContent( xTextRange, xContext, true ); uno::Reference< word::XTable > xVBATable( new SwVbaTable( mxParent, mxContext, pVbaRange->getDocument(), xTable ) ); return xVBATable; } -uno::Reference< container::XEnumeration > SAL_CALL +uno::Reference< container::XEnumeration > SAL_CALL SwVbaTables::createEnumeration() throw (uno::RuntimeException) { return new TableEnumerationImpl( mxParent, mxContext, mxDocument, m_xIndexAccess ); } -// ScVbaCollectionBaseImpl -uno::Any +// ScVbaCollectionBaseImpl +uno::Any SwVbaTables::createCollectionObject( const uno::Any& aSource ) { return lcl_createTable( mxParent, mxContext, mxDocument, aSource ); -} +} // XHelperInterface -rtl::OUString& +rtl::OUString& SwVbaTables::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTables") ); - return sImplName; + return sImplName; } // XEnumerationAccess -uno::Type SAL_CALL +uno::Type SAL_CALL SwVbaTables::getElementType() throw (uno::RuntimeException) { - return word::XTable::static_type(0); + return word::XTable::static_type(0); } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> SwVbaTables::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbatables.hxx b/sw/source/ui/vba/vbatables.hxx index a789337a2839..79df2f90b7ac 100644 --- a/sw/source/ui/vba/vbatables.hxx +++ b/sw/source/ui/vba/vbatables.hxx @@ -17,12 +17,12 @@ public: // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); - // ScVbaCollectionBaseImpl + // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface virtual rtl::OUString& getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index 68476b301a17..71dc7acd8532 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -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 @@ -64,7 +64,7 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep sGroup = msName.copy( 0, msName.lastIndexOf( sal_Unicode('.') ) ); // OSL_TRACE("SwVbaTemplate::AutoTextEntries: %s", rtl::OUStringToOString( sGroup, RTL_TEXTENCODING_UTF8 ).getStr() ); } - + uno::Reference< container::XIndexAccess > xGroup; if( xAutoTextContainer->hasByName( sGroup ) ) { diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx index 073e5cc5db1e..4e3359960418 100644 --- a/sw/source/ui/vba/vbatemplate.hxx +++ b/sw/source/ui/vba/vbatemplate.hxx @@ -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 @@ -38,7 +38,7 @@ private: css::uno::Reference< css::frame::XModel > mxModel; rtl::OUString msName; public: - SwVbaTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, + SwVbaTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& ); virtual ~SwVbaTemplate(); diff --git a/sw/source/ui/vba/vbavariable.cxx b/sw/source/ui/vba/vbavariable.cxx index b62dc5642114..1799c7b505e3 100644 --- a/sw/source/ui/vba/vbavariable.cxx +++ b/sw/source/ui/vba/vbavariable.cxx @@ -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 @@ -84,14 +84,14 @@ SwVbaVariable::getIndex() throw ( css::uno::RuntimeException ) return 0; } -rtl::OUString& +rtl::OUString& SwVbaVariable::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaVariable") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaVariable::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx index af076804ef17..868597915dcd 100644 --- a/sw/source/ui/vba/vbavariable.hxx +++ b/sw/source/ui/vba/vbavariable.hxx @@ -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 @@ -41,7 +41,7 @@ private: rtl::OUString maName; public: - SwVbaVariable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, + SwVbaVariable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const rtl::OUString& rName ) throw ( css::uno::RuntimeException ); virtual ~SwVbaVariable(); diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx index 6aa662702a12..85b64f6542e4 100644 --- a/sw/source/ui/vba/vbavariables.cxx +++ b/sw/source/ui/vba/vbavariables.cxx @@ -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 @@ -82,14 +82,14 @@ SwVbaVariables::Add( const rtl::OUString& rName, const uno::Any& rValue ) throw return uno::makeAny( uno::Reference< word::XVariable >( new SwVbaVariable( getParent(), mxContext, mxUserDefined, rName ) ) ); } -rtl::OUString& +rtl::OUString& SwVbaVariables::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaVariables") ); return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> SwVbaVariables::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sw/source/ui/vba/vbavariables.hxx b/sw/source/ui/vba/vbavariables.hxx index 4933ef6e75a4..739c875571e1 100644 --- a/sw/source/ui/vba/vbavariables.hxx +++ b/sw/source/ui/vba/vbavariables.hxx @@ -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 @@ -50,12 +50,12 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // SwVbaVariables_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); // XVariables virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException); -}; +}; #endif /* SW_VBA_VARIABLES_HXX */ diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx index 9cb8bf1490ce..2cf6194454fb 100644 --- a/sw/source/ui/vba/vbaview.cxx +++ b/sw/source/ui/vba/vbaview.cxx @@ -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 @@ -71,7 +71,7 @@ SwVbaView::~SwVbaView() { } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL SwVbaView::getSeekView() throw (css::uno::RuntimeException) { // FIXME: if the view cursor is in table, field, section and frame @@ -122,7 +122,7 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException) return word::WdSeekView::wdSeekMainDocument; } -void SAL_CALL +void SAL_CALL SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException) { // FIXME: save the current cursor position, if the cursor is in the main @@ -187,19 +187,19 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio } } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL SwVbaView::getSplitSpecial() throw (css::uno::RuntimeException) { return word::WdSpecialPane::wdPaneNone; } -void SAL_CALL +void SAL_CALL SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */) throw (css::uno::RuntimeException) { // not support in Writer } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL SwVbaView::getTableGridLines() throw (css::uno::RuntimeException) { sal_Bool bShowTableGridLine = sal_False; @@ -207,13 +207,13 @@ SwVbaView::getTableGridLines() throw (css::uno::RuntimeException) return bShowTableGridLine; } -void SAL_CALL +void SAL_CALL SwVbaView::setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException) { mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowTableBoundaries")), uno::makeAny( _tablegridlines ) ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL SwVbaView::getType() throw (css::uno::RuntimeException) { // FIXME: handle wdPrintPreview type @@ -222,7 +222,7 @@ SwVbaView::getType() throw (css::uno::RuntimeException) return bOnlineLayout ? word::WdViewType::wdWebView : word::WdViewType::wdPrintView; } -void SAL_CALL +void SAL_CALL SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException) { // FIXME: handle wdPrintPreview type @@ -241,12 +241,12 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException) } case word::WdViewType::wdPrintPreview: { - PrintPreviewHelper( uno::Any(),word::getView( mxModel ) ); + PrintPreviewHelper( uno::Any(),word::getView( mxModel ) ); break; } default: DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() ); - + } } @@ -258,7 +258,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) rtl::OUString aPropIsShared; rtl::OUString aPropBodyDistance; rtl::OUString aPropText; - + switch( nType ) { case word::WdSeekView::wdSeekCurrentPageFooter: @@ -286,7 +286,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) } uno::Reference< text::XPageCursor > xPageCursor( mxViewCursor, uno::UNO_QUERY_THROW ); - + if( nType == word::WdSeekView::wdSeekFirstPageFooter || nType == word::WdSeekView::wdSeekFirstPageHeader ) { @@ -329,12 +329,12 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) DebugHelper::exception( SbERR_BAD_ACTION, rtl::OUString() ); } break; - } + } default: { break; } - } + } xStyle = word::getCurrentPageStyle( mxModel ); uno::Reference< beans::XPropertySet > xPageProps( xStyle, uno::UNO_QUERY_THROW ); @@ -382,7 +382,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) uno::Reference< text::XTextRange > SwVbaView::getFirstObjectPosition( const uno::Reference< text::XText >& xText ) throw (uno::RuntimeException) { - // if the first object is table, get the position of first cell + // if the first object is table, get the position of first cell uno::Reference< text::XTextRange > xTextRange; uno::Reference< container::XEnumerationAccess > xParaAccess( xText, uno::UNO_QUERY_THROW ); uno::Reference< container::XEnumeration> xParaEnum = xParaAccess->createEnumeration(); @@ -401,14 +401,14 @@ uno::Reference< text::XTextRange > SwVbaView::getFirstObjectPosition( const uno: return xTextRange; } -rtl::OUString& +rtl::OUString& SwVbaView::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaView") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaView::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx index 03e183ec38a3..ebb89ac700c9 100644 --- a/sw/source/ui/vba/vbaview.hxx +++ b/sw/source/ui/vba/vbaview.hxx @@ -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 @@ -47,7 +47,7 @@ private: css::uno::Reference< css::text::XTextRange > getFirstObjectPosition( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException); public: - SwVbaView( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, + SwVbaView( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException ); virtual ~SwVbaView(); diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx index e3d9bddbc7aa..dc5913aaa174 100644 --- a/sw/source/ui/vba/vbawindow.cxx +++ b/sw/source/ui/vba/vbawindow.cxx @@ -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 @@ -56,10 +56,10 @@ SwVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& RouteDocument ) document.Close(SaveChanges, FileName, RouteDocument ); } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaWindow::getView() throw (uno::RuntimeException) { - return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this, mxContext, m_xModel ) ) ); + return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this, mxContext, m_xModel ) ) ); } void SAL_CALL SwVbaWindow::setView( const uno::Any& _view ) throw (uno::RuntimeException) @@ -69,33 +69,33 @@ void SAL_CALL SwVbaWindow::setView( const uno::Any& _view ) throw (uno::RuntimeE { SwVbaView view( this, mxContext, m_xModel ); view.setType( nType ); - } + } } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaWindow::Panes( const uno::Any& aIndex ) throw (uno::RuntimeException) { uno::Reference< XCollection > xPanes( new SwVbaPanes( this, mxContext, m_xModel ) ); if( aIndex.getValueTypeClass() == uno::TypeClass_VOID ) return uno::makeAny( xPanes ); - return uno::Any( xPanes->Item( aIndex, uno::Any() ) ); + return uno::Any( xPanes->Item( aIndex, uno::Any() ) ); } -uno::Any SAL_CALL +uno::Any SAL_CALL SwVbaWindow::ActivePane() throw (uno::RuntimeException) { - return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( this, mxContext, m_xModel ) ) ); + return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( this, mxContext, m_xModel ) ) ); } -rtl::OUString& +rtl::OUString& SwVbaWindow::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaWindow") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaWindow::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbawindow.hxx b/sw/source/ui/vba/vbawindow.hxx index 0809d2b73685..1ef1ff91411c 100644 --- a/sw/source/ui/vba/vbawindow.hxx +++ b/sw/source/ui/vba/vbawindow.hxx @@ -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 @@ -36,8 +36,8 @@ typedef cppu::ImplInheritanceHelper1< VbaWindowBase, ov::word::XWindow > WindowImpl_BASE; class SwVbaWindow : public WindowImpl_BASE -{ -public: +{ +public: SwVbaWindow( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel ); diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx index 4125cc00aaa0..84cef6c25163 100644 --- a/sw/source/ui/vba/vbawrapformat.cxx +++ b/sw/source/ui/vba/vbawrapformat.cxx @@ -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 @@ -111,7 +111,7 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException) m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SurroundContour") )) >>= bContour; if( bContour ) nType = word::WdWrapType::wdWrapTight; - else + else nType = word::WdWrapType::wdWrapSquare; break; } @@ -220,14 +220,14 @@ void SAL_CALL SwVbaWrapFormat::setDistanceRight( float _distanceright ) throw (u setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin") ), _distanceright ); } -rtl::OUString& +rtl::OUString& SwVbaWrapFormat::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaWrapFormat") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SwVbaWrapFormat::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sw/source/ui/vba/vbawrapformat.hxx b/sw/source/ui/vba/vbawrapformat.hxx index 71520d78aaae..1ee8eb7a4c77 100644 --- a/sw/source/ui/vba/vbawrapformat.hxx +++ b/sw/source/ui/vba/vbawrapformat.hxx @@ -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/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx index 82dfacf4f18d..e489b0b69dbf 100644 --- a/sw/source/ui/vba/wordvbahelper.cxx +++ b/sw/source/ui/vba/wordvbahelper.cxx @@ -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 @@ -47,7 +47,7 @@ namespace vba namespace word { -SwDocShell* getDocShell( const uno::Reference< frame::XModel>& xModel ) +SwDocShell* getDocShell( const uno::Reference< frame::XModel>& xModel ) { uno::Reference< lang::XUnoTunnel > xTunnel( xModel, uno::UNO_QUERY_THROW ); SwXTextDocument* pXDoc = reinterpret_cast< SwXTextDocument * >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(SwXTextDocument::getUnoTunnelId()))); @@ -88,5 +88,5 @@ sal_Int32 getPageCount( const uno::Reference< frame::XModel>& xModel ) throw (un } } // word -} // +} // } // diff --git a/sw/source/ui/vba/wordvbahelper.hxx b/sw/source/ui/vba/wordvbahelper.hxx index 0629d613a724..489cf25ea378 100644 --- a/sw/source/ui/vba/wordvbahelper.hxx +++ b/sw/source/ui/vba/wordvbahelper.hxx @@ -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 @@ -35,9 +35,9 @@ class SwDocShell; class SwView; -namespace ooo +namespace ooo { - namespace vba + namespace vba { namespace word { diff --git a/sw/source/ui/web/wdocsh.cxx b/sw/source/ui/web/wdocsh.cxx index 4953e715fe45..2ecbc408746b 100644 --- a/sw/source/ui/web/wdocsh.cxx +++ b/sw/source/ui/web/wdocsh.cxx @@ -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 @@ -103,8 +103,8 @@ void SwWebDocShell::FillClass( SvGlobalName * pClassName, } else if (nVersion == SOFFICE_FILEFORMAT_8) { - *pClassName = SvGlobalName( SO3_SWWEB_CLASSID_60 ); - *pClipFormat = SOT_FORMATSTR_ID_STARWRITERWEB_8; + *pClassName = SvGlobalName( SO3_SWWEB_CLASSID_60 ); + *pClipFormat = SOT_FORMATSTR_ID_STARWRITERWEB_8; *pLongUserName = SW_RESSTR(STR_WRITER_WEBDOC_FULLTYPE); } *pUserName = SW_RESSTR(STR_HUMAN_SWWEBDOC_NAME); diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src index 3d24d885dfa8..08b670796217 100644 --- a/sw/source/ui/web/web.src +++ b/sw/source/ui/web/web.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/web/wformsh.cxx b/sw/source/ui/web/wformsh.cxx index 0ce34812216f..b9e919f51d26 100644 --- a/sw/source/ui/web/wformsh.cxx +++ b/sw/source/ui/web/wformsh.cxx @@ -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/web/wfrmsh.cxx b/sw/source/ui/web/wfrmsh.cxx index df391080d467..41001f3fca6f 100644 --- a/sw/source/ui/web/wfrmsh.cxx +++ b/sw/source/ui/web/wfrmsh.cxx @@ -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/web/wgrfsh.cxx b/sw/source/ui/web/wgrfsh.cxx index a8c85f5b0627..e6d6bfa7f1d1 100644 --- a/sw/source/ui/web/wgrfsh.cxx +++ b/sw/source/ui/web/wgrfsh.cxx @@ -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/web/wlistsh.cxx b/sw/source/ui/web/wlistsh.cxx index 3c2c578ea628..12095134ad02 100644 --- a/sw/source/ui/web/wlistsh.cxx +++ b/sw/source/ui/web/wlistsh.cxx @@ -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/web/wolesh.cxx b/sw/source/ui/web/wolesh.cxx index db23229adb36..3b8c84a2b954 100644 --- a/sw/source/ui/web/wolesh.cxx +++ b/sw/source/ui/web/wolesh.cxx @@ -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/web/wtabsh.cxx b/sw/source/ui/web/wtabsh.cxx index ebf8d18a5dd7..2ecab1b10c7d 100644 --- a/sw/source/ui/web/wtabsh.cxx +++ b/sw/source/ui/web/wtabsh.cxx @@ -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/web/wtextsh.cxx b/sw/source/ui/web/wtextsh.cxx index 05c454d5c431..6f9aadb2f56d 100644 --- a/sw/source/ui/web/wtextsh.cxx +++ b/sw/source/ui/web/wtextsh.cxx @@ -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/web/wview.cxx b/sw/source/ui/web/wview.cxx index 9a55aaf94a28..6899f6dedc11 100644 --- a/sw/source/ui/web/wview.cxx +++ b/sw/source/ui/web/wview.cxx @@ -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 @@ -103,7 +103,7 @@ SFX_IMPL_INTERFACE( SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) ) { SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(SvxSearchDialogWrapper::GetChildWindowId()); - SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS| + SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS| SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, SW_RES(RID_WEBTOOLS_TOOLBOX) ); } @@ -160,13 +160,13 @@ void SwWebView::SelectShell() else { - // DELETEZ(pxSelectionObj); //Selektionsobjekt loeschen + // DELETEZ(pxSelectionObj); //Selektionsobjekt loeschen SfxDispatcher &rDispatcher = *GetViewFrame()->GetDispatcher(); SwToolbarConfigItem *pBarCfg = SW_MOD()->GetWebToolbarConfig(); if( GetCurShell() ) { - rDispatcher.Flush(); // alle gecachten Shells wirklich loeschen + rDispatcher.Flush(); // alle gecachten Shells wirklich loeschen //Zur alten Selektion merken welche Toolbar sichtbar war sal_Int32 nId = rDispatcher.GetObjectBarId( SFX_OBJECTBAR_OBJECT ); diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx index 182fb5e37854..8a4c68cbd0b3 100644 --- a/sw/source/ui/wrtsh/delete.cxx +++ b/sw/source/ui/wrtsh/delete.cxx @@ -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 @@ -100,7 +100,7 @@ BOOL SwWrtShell::TryRemoveIndent() } /*------------------------------------------------------------------------ - Beschreibung: Zeile loeschen + Beschreibung: Zeile loeschen ------------------------------------------------------------------------*/ @@ -116,8 +116,8 @@ long SwWrtShell::DelLine() SetMark(); SwCrsrShell::RightMargin(); //Warum soll hier noch ein Zeichen in der naechsten Zeile geloescht werden? -// if(!IsEndOfPara()) -// SwCrsrShell::Right(); +// if(!IsEndOfPara()) +// SwCrsrShell::Right(); long nRet = Delete(); Pop(FALSE); if( nRet ) @@ -272,7 +272,7 @@ long SwWrtShell::DelRight() case nsSelectionType::SEL_TXT: case nsSelectionType::SEL_TBL: case nsSelectionType::SEL_NUM: - // wenn eine Selektion existiert, diese loeschen. + // wenn eine Selektion existiert, diese loeschen. if( IsSelection() ) { if( !IsBlockMode() || HasSelection() ) diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx index dc196de9d9da..3e649a9057c6 100644 --- a/sw/source/ui/wrtsh/move.cxx +++ b/sw/source/ui/wrtsh/move.cxx @@ -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 @@ -37,16 +37,16 @@ #include <viewopt.hxx> #include <crsskip.hxx> -/* Immer: - - Zuruecksetzen des Cursorstacks - - Timer nachtriggern - - gfs. GCAttr +/* Immer: + - Zuruecksetzen des Cursorstacks + - Timer nachtriggern + - gfs. GCAttr bei Selektion - - SttSelect() + - SttSelect() sonst - - EndSelect() + - EndSelect() */ const long nReadOnlyScrollOfst = 10; @@ -251,10 +251,10 @@ BOOL SwWrtShell::GoStart( BOOL bKeepArea, BOOL *pMoveTable, else if( bBoxSelection && pMoveTable ) { // JP 09.01.96: wir haben eine Boxselektion (oder leere Zelle) - // und wollen selektieren (pMoveTable wird im - // SelAll gesetzt). Dann darf die Tabelle nicht - // verlassen werden; sonst ist keine Selektion der - // gesamten Tabelle moeglich! + // und wollen selektieren (pMoveTable wird im + // SelAll gesetzt). Dann darf die Tabelle nicht + // verlassen werden; sonst ist keine Selektion der + // gesamten Tabelle moeglich! *pMoveTable = TRUE; return TRUE; } @@ -404,9 +404,9 @@ BOOL SwWrtShell::EndPara( BOOL bSelect ) /*------------------------------------------------------------------------ - Beschreibung: Spaltenweises Springen - Parameter: mit oder ohne SSelection - Return: Erfolg oder Misserfolg + Beschreibung: Spaltenweises Springen + Parameter: mit oder ohne SSelection + Return: Erfolg oder Misserfolg ------------------------------------------------------------------------*/ @@ -523,7 +523,7 @@ BOOL SwWrtShell::PushCrsr(SwTwips lOffset, BOOL bSelect) if( bIsFrmSel ) { -// CallChgLnk(); +// CallChgLnk(); // bei Frames immer nur die obere Ecke nehmen, damit dieser // wieder selektiert werden kann aOldRect.SSize( 5, 5 ); @@ -637,7 +637,7 @@ BOOL SwWrtShell::PageCrsr(SwTwips lOffset, BOOL bSelect) // da sie immer zu einer Anzeige des Cursors fuehrt, also auch, // wenn nach dem Blaettern in einen Bereich ohne gueltige Position // geblaettert wurde. - // ViewShell::StartAction(); + // ViewShell::StartAction(); PageMove eDir = lOffset > 0? MV_PAGE_DOWN: MV_PAGE_UP; // Richtungswechsel und Stack vorhanden if( eDir != ePageMove && ePageMove != MV_NO && PopCrsr( TRUE, bSelect )) diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx index 9acf40160bc3..45d1765671cd 100644 --- a/sw/source/ui/wrtsh/select.cxx +++ b/sw/source/ui/wrtsh/select.cxx @@ -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 @@ -45,7 +45,7 @@ #include <mdiexp.hxx> #include <fmtcol.hxx> #include <frmfmt.hxx> -#include <swundo.hxx> // fuer Undo-Ids +#include <swundo.hxx> // fuer Undo-Ids #include <swevent.hxx> #include <swdtflvr.hxx> #include <crsskip.hxx> @@ -114,7 +114,7 @@ void SwWrtShell::SelSentence(const Point *pPt, BOOL ) if(pPt) aStart = *pPt; bSelLn = TRUE; - bSelWrd = FALSE; // SelWord abschalten, sonst geht kein SelLine weiter + bSelWrd = FALSE; // SelWord abschalten, sonst geht kein SelLine weiter } void SwWrtShell::SelPara(const Point *pPt, BOOL ) @@ -195,7 +195,7 @@ long SwWrtShell::SelAll() } /*------------------------------------------------------------------------ - Beschreibung: Textsuche + Beschreibung: Textsuche ------------------------------------------------------------------------*/ @@ -216,7 +216,7 @@ ULONG SwWrtShell::SearchPattern( const SearchOptions& rSearchOpt, BOOL bSearchIn return nRet; } /*------------------------------------------------------------------------ - Beschreibung: Suche nach Vorlagen + Beschreibung: Suche nach Vorlagen ------------------------------------------------------------------------*/ @@ -352,7 +352,7 @@ long SwWrtShell::ResetSelect(const Point *,BOOL) } else { - /* ACT_KONTEXT() macht eine Action auf - + /* ACT_KONTEXT() macht eine Action auf - um im Basicablauf keine Probleme mit der Shellumschaltung zu bekommen, darf GetChgLnk().Call() erst nach @@ -459,28 +459,28 @@ long SwWrtShell::ExtSelWrd(const Point *pPt, BOOL ) // check the direction of the selection with the new point BOOL bRet = FALSE, bMoveCrsr = TRUE, bToTop = FALSE; - SwCrsrShell::SelectWord( &aStart ); // select the startword - SwCrsrShell::Push(); // save the cursor - SwCrsrShell::SetCrsr( *pPt ); // and check the direction + SwCrsrShell::SelectWord( &aStart ); // select the startword + SwCrsrShell::Push(); // save the cursor + SwCrsrShell::SetCrsr( *pPt ); // and check the direction switch( SwCrsrShell::CompareCursor( StackMkCurrPt )) { - case -1: bToTop = FALSE; break; - case 1: bToTop = TRUE; break; - default: bMoveCrsr = FALSE; break; + case -1: bToTop = FALSE; break; + case 1: bToTop = TRUE; break; + default: bMoveCrsr = FALSE; break; } - SwCrsrShell::Pop( FALSE ); // retore the saved cursor + SwCrsrShell::Pop( FALSE ); // retore the saved cursor if( bMoveCrsr ) { // select to Top but cursor select to Bottom? or - // select to Bottom but cursor select to Top? --> swap the cursor + // select to Bottom but cursor select to Top? --> swap the cursor if( bToTop ) SwapPam(); - SwCrsrShell::Push(); // save cur cursor - if( SwCrsrShell::SelectWord( pPt )) // select the current word + SwCrsrShell::Push(); // save cur cursor + if( SwCrsrShell::SelectWord( pPt )) // select the current word { if( bToTop ) SwapPam(); @@ -619,7 +619,7 @@ long SwWrtShell::SttLeaveSelect(const Point *, BOOL ) if(SwCrsrShell::HasSelection() && !IsSelTblCells() && bClearMark) { return 0; } -// if( IsSelTblCells() ) aSelTblLink.Call(this); +// if( IsSelTblCells() ) aSelTblLink.Call(this); ClearMark(); return 1; } @@ -746,8 +746,8 @@ void SwWrtShell::EnterSelFrmMode(const Point *pPos) HideCrsr(); // gleicher Aufruf von BeginDrag an der SwFEShell - fnDrag = &SwWrtShell::BeginFrmDrag; - fnEndDrag = &SwWrtShell::UpdateLayoutFrm; + fnDrag = &SwWrtShell::BeginFrmDrag; + fnEndDrag = &SwWrtShell::UpdateLayoutFrm; SwBaseShell::SetFrmMode( FLY_DRAG_START, this ); Invalidate(); } @@ -756,8 +756,8 @@ void SwWrtShell::EnterSelFrmMode(const Point *pPos) void SwWrtShell::LeaveSelFrmMode() { - fnDrag = &SwWrtShell::BeginDrag; - fnEndDrag = &SwWrtShell::EndDrag; + fnDrag = &SwWrtShell::BeginDrag; + fnEndDrag = &SwWrtShell::EndDrag; bLayoutMode = FALSE; bStartDrag = FALSE; Edit(); @@ -765,7 +765,7 @@ void SwWrtShell::LeaveSelFrmMode() Invalidate(); } /*------------------------------------------------------------------------ - Beschreibung: Rahmengebundenes Macro ausfuehren + Beschreibung: Rahmengebundenes Macro ausfuehren ------------------------------------------------------------------------*/ @@ -935,10 +935,10 @@ BOOL SwWrtShell::SelectTableCell() return FALSE; } /*------------------------------------------------------------------------ - Beschreibung: Prueft, ob eine Wortselektion vorliegt. + Beschreibung: Prueft, ob eine Wortselektion vorliegt. Gemaess den Regeln fuer intelligentes Cut / Paste werden umgebende Spaces rausgeschnitten. - Return: Liefert Art der Wortselektion zurueck. + Return: Liefert Art der Wortselektion zurueck. ------------------------------------------------------------------------*/ diff --git a/sw/source/ui/wrtsh/wrtsh.hrc b/sw/source/ui/wrtsh/wrtsh.hrc index a82a4c3c1b48..deccbdbbf7a2 100644 --- a/sw/source/ui/wrtsh/wrtsh.hrc +++ b/sw/source/ui/wrtsh/wrtsh.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 diff --git a/sw/source/ui/wrtsh/wrtsh.src b/sw/source/ui/wrtsh/wrtsh.src index 21547d107758..377f9aef8fcf 100644 --- a/sw/source/ui/wrtsh/wrtsh.src +++ b/sw/source/ui/wrtsh/wrtsh.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/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index 04f87e877aa5..9f0b753c1315 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -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 @@ -36,7 +36,7 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #if STLPORT_VERSION>=321 -#include <math.h> // prevent conflict between exception and std::exception +#include <math.h> // prevent conflict between exception and std::exception #endif #include <hintids.hxx> #include <svx/svdview.hxx> @@ -196,7 +196,7 @@ BOOL SwWrtShell::IsEndWrd() /*------------------------------------------------------------------------ - Beschreibung: Abfrage, ob Einfuegen moeglich ist; gfs. Beep + Beschreibung: Abfrage, ob Einfuegen moeglich ist; gfs. Beep ------------------------------------------------------------------------*/ @@ -211,7 +211,7 @@ BOOL SwWrtShell::_CanInsert() return TRUE; } /*------------------------------------------------------------------------ - Beschreibung: String einfuegen + Beschreibung: String einfuegen ------------------------------------------------------------------------*/ void SwWrtShell::InsertByWord( const String & rStr) @@ -324,7 +324,7 @@ void SwWrtShell::Insert( const String &rPath, const String &rFilter, EnterSelFrmMode(); BOOL bSetGrfSize = TRUE; - BOOL bOwnMgr = FALSE; + BOOL bOwnMgr = FALSE; if ( !pFrmMgr ) { @@ -534,7 +534,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName } /*------------------------------------------------------------------------ - Beschreibung: Object in die Core einfuegen. + Beschreibung: Object in die Core einfuegen. Vom ClipBoard oder Insert ------------------------------------------------------------------------*/ @@ -839,7 +839,7 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj, //ist resized), the Object should be resized too. //If this request comes from the Object itself, the Frame //in the Writer core should be resized. - if ( pFlyPrtRect ) //Request from core? + if ( pFlyPrtRect ) //Request from core? { xObj->SetVisArea( OutputDevice::LogicToLogic( pFlyPrtRect->SVRect(), MAP_TWIP, xObj->GetMapUnit() )); @@ -909,7 +909,7 @@ void SwWrtShell::ConnectObj( svt::EmbeddedObjectRef& xObj, const SwRect &rPrt, } /*------------------------------------------------------------------------ - Beschreibung: Einfuegen harter Seitenumbruch; + Beschreibung: Einfuegen harter Seitenumbruch; Selektionen werden ueberschrieben ------------------------------------------------------------------------*/ @@ -928,6 +928,8 @@ void SwWrtShell::InsertPageBreak(const String *pPageDesc, USHORT nPgNum ) if(HasSelection()) DelRight(); SwFEShell::SplitNode(); + // delete the numbered attribute of the last line if the last line is empty + GetDoc()->ClearLineNumAttrs( *GetCrsr()->GetPoint() ); } const SwPageDesc *pDesc = pPageDesc @@ -944,7 +946,7 @@ void SwWrtShell::InsertPageBreak(const String *pPageDesc, USHORT nPgNum ) } } /*------------------------------------------------------------------------ - Beschreibung: Einfuegen harter Zeilenumbruch; + Beschreibung: Einfuegen harter Zeilenumbruch; Selektionen werden ueberschrieben ------------------------------------------------------------------------*/ @@ -966,7 +968,7 @@ void SwWrtShell::InsertLineBreak() } } /*------------------------------------------------------------------------ - Beschreibung: Einfuegen harter Spaltenumbruch; + Beschreibung: Einfuegen harter Spaltenumbruch; Selektionen werden ueberschrieben ------------------------------------------------------------------------*/ @@ -992,8 +994,8 @@ void SwWrtShell::InsertColumnBreak() } /*------------------------------------------------------------------------ - Beschreibung: Einfuegen Fussnote - Parameter: rStr -- optionales Fussnotenzeichen + Beschreibung: Einfuegen Fussnote + Parameter: rStr -- optionales Fussnotenzeichen ------------------------------------------------------------------------*/ @@ -1025,7 +1027,7 @@ void SwWrtShell::InsertFootnote(const String &rStr, BOOL bEndNote, BOOL bEdit ) } } /*------------------------------------------------------------------------ - Beschreibung: SplitNode; hier auch, da + Beschreibung: SplitNode; hier auch, da - selektierter Inhalt geloescht wird; - der Cursorstack gfs. zurueckgesetzt wird. ------------------------------------------------------------------------*/ @@ -1053,8 +1055,8 @@ void SwWrtShell::SplitNode( BOOL bAutoFmt, BOOL bCheckTableStart ) } /*------------------------------------------------------------------------ - Beschreibung: Numerierung anschalten - Parameter: Optionale Angabe eines Namens fuer die benannte Liste; + Beschreibung: Numerierung anschalten + Parameter: Optionale Angabe eines Namens fuer die benannte Liste; dieser bezeichnet eine Position, wenn er in eine Zahl konvertierbar ist und kleiner ist als nMaxRules. -------------------------------------------------------------------------*/ @@ -1142,9 +1144,9 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum) // check, if numbering of the outline level of the pararaph // style is active. If not, activate this outline level. nActivateOutlineLvl = pColl->GetAssignedOutlineStyleLevel(); - ASSERT( pColl->IsAssignedToListLevelOfOutlineStyle(), //<-end,zhaojianwei + ASSERT( pColl->IsAssignedToListLevelOfOutlineStyle(), //<-end,zhaojianwei "<SwWrtShell::NumOrBulletOn(..)> - paragraph style with outline rule, but no outline level" ); - if ( pColl->IsAssignedToListLevelOfOutlineStyle() && //<-end,zhaojianwei + if ( pColl->IsAssignedToListLevelOfOutlineStyle() && //<-end,zhaojianwei pCollRule->Get( static_cast<USHORT>(nActivateOutlineLvl) ).GetNumberingType() == SVX_NUM_NUMBER_NONE ) { @@ -1463,7 +1465,7 @@ void SwWrtShell::NumOrBulletOff() // <- #i29560# /*------------------------------------------------------------------------ - Beschreibung: Default-Bulletliste erfragen + Beschreibung: Default-Bulletliste erfragen ------------------------------------------------------------------------*/ void SwWrtShell::BulletOn() @@ -1485,7 +1487,7 @@ SelectionType SwWrtShell::GetSelectionType() const if ( BasicActionPend() ) return IsSelFrmMode() ? nsSelectionType::SEL_FRM : nsSelectionType::SEL_TXT; -// if ( IsTableMode() ) +// if ( IsTableMode() ) // return nsSelectionType::SEL_TBL | nsSelectionType::SEL_TBL_CELLS; SwView &_rView = ((SwView&)GetView()); @@ -1501,7 +1503,7 @@ SelectionType SwWrtShell::GetSelectionType() const nCnt = nsSelectionType::SEL_DRW_TXT; else { - if (GetView().IsFormMode()) // Nur Forms selektiert + if (GetView().IsFormMode()) // Nur Forms selektiert nCnt = nsSelectionType::SEL_DRW_FORM; else nCnt = nsSelectionType::SEL_DRW; // Irgendein Draw-Objekt @@ -1568,8 +1570,8 @@ SelectionType SwWrtShell::GetSelectionType() const } /*------------------------------------------------------------------------ - Beschreibung: Finden der TextCollection mit dem Name rCollname - Return: Pointer auf die Collection oder 0, wenn keine + Beschreibung: Finden der TextCollection mit dem Name rCollname + Return: Pointer auf die Collection oder 0, wenn keine TextCollection mit diesem Namen existiert oder diese eine Defaultvorlage ist. ------------------------------------------------------------------------*/ @@ -1587,8 +1589,8 @@ SwTxtFmtColl *SwWrtShell::GetParaStyle(const String &rCollName, GetStyle eCreate return pColl; } /*------------------------------------------------------------------------ - Beschreibung: Finden der Zeichenvorlage mit dem Name rCollname - Return: Pointer auf die Collection oder 0, wenn keine + Beschreibung: Finden der Zeichenvorlage mit dem Name rCollname + Return: Pointer auf die Collection oder 0, wenn keine Zeichenvorlage mit diesem Namen existiert oder diese eine Defaultvorlage oder automatische Vorlage ist. ------------------------------------------------------------------------*/ @@ -1608,8 +1610,8 @@ SwCharFmt *SwWrtShell::GetCharStyle(const String &rFmtName, GetStyle eCreate ) } /*------------------------------------------------------------------------ - Beschreibung: Finden des Tabellenformates mit dem Name rFmtname - Return: Pointer auf das Format oder 0, wenn kein + Beschreibung: Finden des Tabellenformates mit dem Name rFmtname + Return: Pointer auf das Format oder 0, wenn kein Rahmenformat mit diesem Namen existiert oder dieses eine Defaultformat oder automatisches Format ist. ------------------------------------------------------------------------*/ @@ -1628,7 +1630,7 @@ SwFrmFmt *SwWrtShell::GetTblStyle(const String &rFmtName) /*------------------------------------------------------------------------ - Beschreibung: Anwenden der Vorlagen + Beschreibung: Anwenden der Vorlagen ------------------------------------------------------------------------*/ @@ -1644,7 +1646,7 @@ void SwWrtShell::SetPageStyle(const String &rCollName) } /*------------------------------------------------------------------------ - Beschreibung: Zugriff Vorlagen + Beschreibung: Zugriff Vorlagen ------------------------------------------------------------------------*/ @@ -1655,7 +1657,7 @@ String SwWrtShell::GetCurPageStyle( const BOOL bCalcFrm ) const } /*------------------------------------------------------------------------ - Beschreibung: Aktuelle Vorlage anhand der geltenden Attribute aendern + Beschreibung: Aktuelle Vorlage anhand der geltenden Attribute aendern ------------------------------------------------------------------------*/ @@ -1677,16 +1679,16 @@ void SwWrtShell::QuickUpdateStyle() void SwWrtShell::AutoUpdatePara(SwTxtFmtColl* pColl, const SfxItemSet& rStyleSet) { SfxItemSet aCoreSet( GetAttrPool(), - RES_CHRATR_BEGIN, RES_CHRATR_END - 1, - RES_PARATR_BEGIN, RES_PARATR_END - 1, - RES_FRMATR_BEGIN, RES_FRMATR_END - 1, - SID_ATTR_TABSTOP_POS, SID_ATTR_TABSTOP_POS, - SID_ATTR_TABSTOP_DEFAULTS, SID_ATTR_TABSTOP_DEFAULTS, - SID_ATTR_TABSTOP_OFFSET, SID_ATTR_TABSTOP_OFFSET, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, - SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP, - SID_ATTR_PARA_PAGENUM, SID_ATTR_PARA_PAGENUM, - 0 ); + RES_CHRATR_BEGIN, RES_CHRATR_END - 1, + RES_PARATR_BEGIN, RES_PARATR_END - 1, + RES_FRMATR_BEGIN, RES_FRMATR_END - 1, + SID_ATTR_TABSTOP_POS, SID_ATTR_TABSTOP_POS, + SID_ATTR_TABSTOP_DEFAULTS, SID_ATTR_TABSTOP_DEFAULTS, + SID_ATTR_TABSTOP_OFFSET, SID_ATTR_TABSTOP_OFFSET, + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, + SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP, + SID_ATTR_PARA_PAGENUM, SID_ATTR_PARA_PAGENUM, + 0 ); GetCurAttr( aCoreSet ); BOOL bReset = FALSE; SfxItemIter aParaIter( aCoreSet ); diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx index 17af61be8bad..ac874a9791cf 100644 --- a/sw/source/ui/wrtsh/wrtsh2.cxx +++ b/sw/source/ui/wrtsh/wrtsh2.cxx @@ -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 @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#include <hintids.hxx> // define ITEMIDs +#include <hintids.hxx> // define ITEMIDs #include <svl/macitem.hxx> #include <sfx2/frame.hxx> #include <vcl/msgbox.hxx> @@ -41,7 +41,7 @@ #include <sfx2/linkmgr.hxx> #include <fmtinfmt.hxx> #include <frmatr.hxx> -#include <swtypes.hxx> // SET_CURR_SHELL +#include <swtypes.hxx> // SET_CURR_SHELL #include <wrtsh.hxx> #include <docsh.hxx> #include <fldbas.hxx> // Felder @@ -51,7 +51,7 @@ #include <reffld.hxx> #include <swundo.hxx> #include <doc.hxx> -#include <viewopt.hxx> // SwViewOptions +#include <viewopt.hxx> // SwViewOptions #include <frmfmt.hxx> // fuer UpdateTable #include <swtable.hxx> // fuer UpdateTable #include <mdiexp.hxx> @@ -154,8 +154,8 @@ BOOL SwWrtShell::StartInputFldDlg( SwField* pFld, BOOL bNextButton, Window* pParentWin, ByteString* pWindowState ) { //JP 14.08.96: Bug 30332 - nach Umbau der modularietaet im SFX, muss jetzt -// das TopWindow der Application benutzt werden. -// SwFldInputDlg* pDlg = new SwFldInputDlg( GetWin(), *this, pFld ); +// das TopWindow der Application benutzt werden. +// SwFldInputDlg* pDlg = new SwFldInputDlg( GetWin(), *this, pFld ); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); @@ -268,18 +268,18 @@ void SwWrtShell::ClickToField( const SwField& rFld ) nSlotId = FN_INSERT_FRAME; break; - case JE_FMT_GRAPHIC: nSlotId = SID_INSERT_GRAPHIC; break; - case JE_FMT_OLE: nSlotId = SID_INSERT_OBJECT; break; + case JE_FMT_GRAPHIC: nSlotId = SID_INSERT_GRAPHIC; break; + case JE_FMT_OLE: nSlotId = SID_INSERT_OBJECT; break; -// case JE_FMT_TEXT: +// case JE_FMT_TEXT: } - Right( CRSR_SKIP_CHARS, TRUE, 1, FALSE ); // Feld selektieren + Right( CRSR_SKIP_CHARS, TRUE, 1, FALSE ); // Feld selektieren if( nSlotId ) { StartUndo( UNDO_START ); - //#97295# immediately select the right shell + //#97295# immediately select the right shell GetView().StopShellTimer(); GetView().GetViewFrame()->GetDispatcher()->Execute( nSlotId, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD ); @@ -428,7 +428,7 @@ void LoadURL( const String& rURL, ViewShell* pVSh, USHORT nFilter, SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, FALSE ); //#39076# Silent kann lt. SFX entfernt werden. -// SfxBoolItem aSilent( SID_SILENT, TRUE ); +// SfxBoolItem aSilent( SID_SILENT, TRUE ); SfxBoolItem aBrowse( SID_BROWSE, TRUE ); if( nFilter & URLLOAD_NEWVIEW ) diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx index 460d89a07a1c..2f277f67f245 100644 --- a/sw/source/ui/wrtsh/wrtsh3.cxx +++ b/sw/source/ui/wrtsh/wrtsh3.cxx @@ -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/wrtsh/wrtsh4.cxx b/sw/source/ui/wrtsh/wrtsh4.cxx index 541674e912a3..f1c9c6355642 100644 --- a/sw/source/ui/wrtsh/wrtsh4.cxx +++ b/sw/source/ui/wrtsh/wrtsh4.cxx @@ -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 @@ -65,7 +65,7 @@ BOOL SwWrtShell::_SttWrd() } /* * Das Ende eines Wortes ist das Folgen von Trennzeichen auf - * nicht-Trennzeichen. Unter dem Ende eines Wortes wird + * nicht-Trennzeichen. Unter dem Ende eines Wortes wird * ebenfalls die Folge von Worttrennzeichen auf Interpunktions- * zeichen verstanden. Das Absatzende ist ebenfalls Wortende. */ @@ -93,9 +93,9 @@ BOOL SwWrtShell::_EndWrd() BOOL SwWrtShell::_NxtWrd() { BOOL bRet = FALSE; - while( IsEndPara() ) // wenn schon am Ende, dann naechsten ??? + while( IsEndPara() ) // wenn schon am Ende, dann naechsten ??? { - if(!SwCrsrShell::Right(1,CRSR_SKIP_CHARS)) // Document - Ende ?? + if(!SwCrsrShell::Right(1,CRSR_SKIP_CHARS)) // Document - Ende ?? { Pop( FALSE ); return bRet; @@ -125,9 +125,9 @@ BOOL SwWrtShell::_PrvWrd() { BOOL bRet = FALSE; while( IsSttPara() ) - { // wenn schon am Anfang, dann naechsten ??? + { // wenn schon am Anfang, dann naechsten ??? if(!SwCrsrShell::Left(1,CRSR_SKIP_CHARS)) - { // Document - Anfang ?? + { // Document - Anfang ?? Pop( FALSE ); return bRet; } diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx index f3c62f9f9dff..7ea609d14e45 100644 --- a/sw/source/ui/wrtsh/wrtundo.cxx +++ b/sw/source/ui/wrtsh/wrtundo.cxx @@ -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 @@ -35,7 +35,7 @@ #include <sfx2/app.hxx> #include <svl/slstitm.hxx> #include <wrtsh.hxx> -#include <swundo.hxx> // fuer Undo-Ids +#include <swundo.hxx> // fuer Undo-Ids #include <swdtflvr.hxx> #ifndef _WRTSH_HRC @@ -106,7 +106,7 @@ void SwWrtShell::Do( DoType eDoType, USHORT nCnt ) SwTransferable::CreateSelection( *this ); // Bug 32918: nach loeschen der Numerierung bleibt die Obj. Leiste stehen - // Warum wird hier nicht immer ein CallChgLink gerufen? + // Warum wird hier nicht immer ein CallChgLink gerufen? CallChgLnk(); } |