summaryrefslogtreecommitdiff
path: root/sw/source/ui/app
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/app')
-rw-r--r--sw/source/ui/app/app.src22
-rw-r--r--sw/source/ui/app/appenv.cxx20
-rw-r--r--sw/source/ui/app/apphdl.cxx18
-rw-r--r--sw/source/ui/app/applab.cxx32
-rw-r--r--sw/source/ui/app/appopt.cxx40
-rw-r--r--sw/source/ui/app/docsh.cxx62
-rw-r--r--sw/source/ui/app/docsh2.cxx98
-rw-r--r--sw/source/ui/app/docshdrw.cxx2
-rw-r--r--sw/source/ui/app/docshini.cxx20
-rw-r--r--sw/source/ui/app/docst.cxx52
-rw-r--r--sw/source/ui/app/docstyle.cxx214
-rw-r--r--sw/source/ui/app/error.src14
-rw-r--r--sw/source/ui/app/mainwn.cxx4
-rw-r--r--sw/source/ui/app/mn.src4
-rw-r--r--sw/source/ui/app/swdll.cxx2
-rw-r--r--sw/source/ui/app/swmodul1.cxx20
-rw-r--r--sw/source/ui/app/swmodule.cxx16
-rw-r--r--sw/source/ui/app/swwait.cxx2
18 files changed, 321 insertions, 321 deletions
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 4831b71b82b2..0d20e7379ce5 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
@@ -58,13 +58,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; \
};
@@ -172,12 +172,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
@@ -478,7 +478,7 @@ String STR_FDLG_OUTLINE_LEVEL
String STR_FDLG_STYLE
{
- Text [ en-US ] = "Style: ";
+ Text [ en-US ] = "Style: ";
};
String STR_PAGEOFFSET
diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx
index bf00c939a948..9c016b42d75a 100644
--- a/sw/source/ui/app/appenv.cxx
+++ b/sw/source/ui/app/appenv.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -83,9 +83,9 @@
#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
// Function used for labels and envelopes in applab.cxx and appenv.cxx
@@ -142,7 +142,7 @@ String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText
}
rSh.InsertLineBreak();
}
- rSh.DelLeft(); // Again remove last linebreak
+ rSh.DelLeft(); // Again remove last linebreak
return sRet;
}
@@ -160,15 +160,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;
// Get current shell
pMyDocSh = (SwDocShell*) SfxObjectShell::Current();
- pOldSh = pMyDocSh ? pMyDocSh->GetWrtShell() : 0;
+ pOldSh = pMyDocSh ? pMyDocSh->GetWrtShell() : 0;
// Create new document (don't show!)
SfxObjectShellRef xDocSh( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
@@ -510,7 +510,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
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 c73421f1e90c..4676f13bcdb6 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -72,7 +72,7 @@
#include <srcview.hxx>
#include <wrtsh.hxx>
#include <docsh.hxx>
-#include <cmdid.h> // Funktion-Ids
+#include <cmdid.h> // Funktion-Ids
#include <initui.hxx>
#include <uitool.hxx>
#include <swmodule.hxx>
@@ -85,7 +85,7 @@
#include <cfgitems.hxx>
#include <prtopt.hxx>
#include <modcfg.hxx>
-#include <globals.h> // globale Konstanten z.B.
+#include <globals.h> // globale Konstanten z.B.
#include <app.hrc>
#include <fontcfg.hxx>
#include <barcfg.hxx>
@@ -257,7 +257,7 @@ SwView* lcl_LoadDoc(SwView* pView, const String& rURL)
return pNewView;
}
/*--------------------------------------------------------------------
- Beschreibung: Felddialog starten
+ Beschreibung: Felddialog starten
--------------------------------------------------------------------*/
void NewXForms( SfxRequest& rReq ); // implementation: below
@@ -267,10 +267,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* );
@@ -726,7 +726,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();
@@ -858,7 +858,7 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal
}
-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 dfc364e1dcaa..9bc1b97667d9 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -112,10 +112,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 ); // Insert Fly
+ const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Insert Fly
OSL_ENSURE( pFmt, "Fly not inserted" );
- rSh.UnSelectFrm(); //Frame was selected automatically
+ rSh.UnSelectFrm(); //Frame was selected automatically
rSh.SetTxtFmtColl( rSh.GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
@@ -151,10 +151,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 ); // Insert Fly
+ const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Insert Fly
OSL_ENSURE( pFmt, "Fly not inserted" );
- rSh.UnSelectFrm(); //Frame was selected automatically
+ rSh.UnSelectFrm(); //Frame was selected automatically
rSh.SetTxtFmtColl( rSh.GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
@@ -237,7 +237,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
SwWrtShell *pSh = pNewView->GetWrtShellPtr();
OSL_ENSURE( pSh, "missing WrtShell" );
- { // block for locks the dispatcher!!
+ { // block for locks the dispatcher!!
SwWait aWait( (SwDocShell&)*xDocSh, sal_True );
@@ -246,7 +246,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
pSh->DoUndo( sal_False );
pSh->StartAllAction();
- pSh->SetNewDoc(); // Avoid performance problems
+ pSh->SetNewDoc(); // Avoid performance problems
SwPageDesc aDesc = pSh->GetPageDesc( 0 );
SwFrmFmt& rFmt = aDesc.GetMaster();
@@ -268,7 +268,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
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,
@@ -297,7 +297,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
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
@@ -319,17 +319,17 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
// 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);
@@ -365,10 +365,10 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
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));
@@ -384,9 +384,9 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
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 2a3299498c7a..61d77c354d54 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
#include <hintids.hxx>
-#include <cmdid.h> // Funktion-Ids
+#include <cmdid.h> // Funktion-Ids
#include <com/sun/star/i18n/ScriptType.hpp>
@@ -58,8 +58,8 @@
#include <wrtsh.hxx>
#include <IDocumentDeviceAccess.hxx>
#include <uitool.hxx>
-#include <initui.hxx> // fuer ::GetGlossaries()
-#include <fldbas.hxx> //fuer UpdateFields
+#include <initui.hxx> // fuer ::GetGlossaries()
+#include <fldbas.hxx> //fuer UpdateFields
#include <wview.hxx>
#include <cfgitems.hxx>
#include <prtopt.hxx>
@@ -73,7 +73,7 @@
#include <editeng/unolingu.hxx>
#include <globals.hrc>
-#include <globals.h> // globale Konstanten z.B.
+#include <globals.h> // globale Konstanten z.B.
#include <svl/slstitm.hxx>
#include "swabstdlg.hxx"
#include <swwrtshitem.hxx>
@@ -83,7 +83,7 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-SfxItemSet* SwModule::CreateItemSet( USHORT nId )
+SfxItemSet* SwModule::CreateItemSet( USHORT nId )
{
BOOL bTextDialog = (nId == SID_SW_EDITOPTIONS) ? TRUE : FALSE;
@@ -109,25 +109,25 @@ SfxItemSet* SwModule::CreateItemSet( USHORT nId )
/********************************************************************/
/* Options/Edit */
/********************************************************************/
- 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,
+ 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,
+ 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,
#if OSL_DEBUG_LEVEL > 1
- FN_PARAM_SWTEST, FN_PARAM_SWTEST,
+ FN_PARAM_SWTEST, FN_PARAM_SWTEST,
#endif
0);
@@ -281,7 +281,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) )
@@ -404,7 +404,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 a7083b41cb14..5bfd6ea179ee 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -68,18 +68,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>
@@ -98,7 +98,7 @@
#include <fldbas.hxx>
#include <docary.hxx>
// <--
-#include <swerror.h> // Fehlermeldungen
+#include <swerror.h> // Fehlermeldungen
#include <helpid.h>
#include <cmdid.h>
#include <globals.hrc>
@@ -321,7 +321,7 @@ BOOL SwDocShell::Save()
pView->GetEditWin().StopQuickHelp();
SwWait aWait( *this, TRUE );
- CalcLayoutForOLEObjects(); // format for OLE objets
+ CalcLayoutForOLEObjects(); // format for OLE objets
// #i62875#
// reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible
if ( pWrtShell && pDoc &&
@@ -448,7 +448,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
}
}
- CalcLayoutForOLEObjects(); // format for OLE objets
+ CalcLayoutForOLEObjects(); // format for OLE objets
// #i62875#
// reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible
if ( pWrtShell && pDoc &&
@@ -551,7 +551,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
WriterRef xWriter;
SwReaderWriter::GetWriter( pFlt->GetUserData(), rMedium.GetBaseURL( true ), xWriter );
if( !xWriter.Is() )
- { // Filter not available
+ { // Filter not available
InfoBox( 0,
SW_RESSTR(STR_DLLNOTFOUND) ).Execute();
return FALSE;
@@ -624,7 +624,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
SwDocStat aDocStat( pDoc->GetDocStat() );;
pDoc->UpdateDocStat( aDocStat );
// <--
- CalcLayoutForOLEObjects(); // format for OLE objets
+ CalcLayoutForOLEObjects(); // format for OLE objets
// #i62875#
// reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible
if ( pWrtShell && pDoc &&
@@ -761,7 +761,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);
@@ -795,7 +795,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
}
/*--------------------------------------------------------------------
- Beschreibung: Haende weg
+ Beschreibung: Haende weg
--------------------------------------------------------------------*/
@@ -859,7 +859,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 );
}
@@ -993,7 +993,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)
{
@@ -1005,7 +1005,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))
@@ -1097,15 +1097,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 );
@@ -1113,11 +1113,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();
}
@@ -1261,7 +1261,7 @@ static const char* pEventNames[] =
"OnLayoutFinished"
};
-Sequence< OUString > SwDocShell::GetEventNames()
+Sequence< OUString > SwDocShell::GetEventNames()
{
Sequence< OUString > aRet = SfxObjectShell::GetEventNames();
sal_Int32 nLen = aRet.getLength();
@@ -1297,13 +1297,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;
@@ -1311,13 +1311,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 )
@@ -1325,12 +1325,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 );
@@ -1345,7 +1345,7 @@ bool SwDocShell::SetProtectionPassword( const String &rNewPassword )
return bRes;
}
-
+
bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash )
{
bool bRes = false;
@@ -1353,7 +1353,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 )
@@ -1363,8 +1363,8 @@ bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal
bRes = true;
return bRes;
-}
-
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 4531e1bfc1d4..3047c3dea74a 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -74,8 +74,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>
@@ -122,7 +122,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;
@@ -133,7 +133,7 @@ using namespace ::sfx2;
extern BOOL FindPhyStyle( SwDoc& , const String& , SfxStyleFamily );
/*--------------------------------------------------------------------
- Beschreibung: DocInfo kreieren (virtuell)
+ Beschreibung: DocInfo kreieren (virtuell)
--------------------------------------------------------------------*/
SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog(
@@ -166,7 +166,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();
}
@@ -240,7 +240,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 )
@@ -283,7 +283,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
/*--------------------------------------------------------------------
- Beschreibung: Benachrichtigung Doc schliessen
+ Beschreibung: Benachrichtigung Doc schliessen
--------------------------------------------------------------------*/
USHORT SwDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
@@ -307,17 +307,17 @@ USHORT SwDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
}
/*--------------------------------------------------------------------
- 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
@@ -337,7 +337,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;
@@ -413,7 +413,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
@@ -446,14 +446,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
@@ -527,10 +527,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)
{
@@ -540,7 +540,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() );
@@ -564,14 +564,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
@@ -584,7 +584,7 @@ BOOL SwDocShell::Remove(USHORT nIdx1, // siehe Insert
bRet = TRUE;
}
else
- bRet = SfxObjectShell::Remove( nIdx1,
+ bRet = SfxObjectShell::Remove( nIdx1,
nIdx2,
nIdx3 );
@@ -678,7 +678,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;
@@ -699,7 +699,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) )
@@ -711,7 +711,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;
@@ -919,7 +919,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;
@@ -1106,7 +1106,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;
@@ -1134,16 +1134,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*/
@@ -1175,8 +1175,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 ) )
@@ -1251,7 +1251,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
{
uno::Reference<XFilePickerControlAccess> xCtrlAcc(xFP, UNO_QUERY);
- bool bOutline[MAXLEVEL] = {false};
+ bool bOutline[MAXLEVEL] = {false};
const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
if( rOutlNds.Count() )
{
@@ -1267,16 +1267,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 =
@@ -1323,11 +1323,11 @@ void SwDocShell::Execute(SfxRequest& rReq)
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;
}
@@ -1505,14 +1505,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);
}
// #FIXME check with new Event handling
@@ -1596,8 +1596,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();
@@ -1648,7 +1648,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 3e082122aae7..1fb22eeccedf 100644
--- a/sw/source/ui/app/docshdrw.cxx
+++ b/sw/source/ui/app/docshdrw.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index 33e97d92904a..a3d72763bc56 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -121,13 +121,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
if ( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
@@ -358,7 +358,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
}
/*--------------------------------------------------------------------
- Beschreibung: Ctor mit SfxCreateMode ?????
+ Beschreibung: Ctor mit SfxCreateMode ?????
--------------------------------------------------------------------*/
@@ -415,7 +415,7 @@ SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ):
}
/*--------------------------------------------------------------------
- Beschreibung: Dtor
+ Beschreibung: Dtor
--------------------------------------------------------------------*/
@@ -478,7 +478,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);
@@ -489,7 +489,7 @@ void SwDocShell::AddLink()
}
/*--------------------------------------------------------------------
- Beschreibung: neue FontList erzeugen Aenderung Drucker
+ Beschreibung: neue FontList erzeugen Aenderung Drucker
--------------------------------------------------------------------*/
@@ -667,9 +667,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;
String aStreamName;
aStreamName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("styles.xml"));
@@ -718,7 +718,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 842e79829def..4f0f7c25ff68 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -72,7 +72,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
--------------------------------------------------------------------*/
@@ -738,7 +738,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();
@@ -799,7 +799,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();
}
@@ -808,7 +808,7 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
}
/*--------------------------------------------------------------------
- Beschreibung: Delete
+ Beschreibung: Delete
--------------------------------------------------------------------*/
@@ -830,7 +830,7 @@ USHORT SwDocShell::Delete(const String &rName, USHORT nFamily)
}
/*--------------------------------------------------------------------
- Beschreibung: Vorlage anwenden
+ Beschreibung: Vorlage anwenden
--------------------------------------------------------------------*/
@@ -901,7 +901,7 @@ USHORT SwDocShell::ApplyStyles(const String &rName, USHORT nFamily,
}
/*--------------------------------------------------------------------
- Beschreibung: Giesskanne starten
+ Beschreibung: Giesskanne starten
--------------------------------------------------------------------*/
@@ -960,7 +960,7 @@ USHORT SwDocShell::DoWaterCan(const String &rName, USHORT nFamily)
}
/*--------------------------------------------------------------------
- Beschreibung: Vorlage Updaten
+ Beschreibung: Vorlage Updaten
--------------------------------------------------------------------*/
@@ -1053,7 +1053,7 @@ USHORT SwDocShell::UpdateStyle(const String &rName, USHORT nFamily, SwWrtShell*
}
/*--------------------------------------------------------------------
- Beschreibung: NewByExample
+ Beschreibung: NewByExample
--------------------------------------------------------------------*/
@@ -1066,7 +1066,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
@@ -1214,7 +1214,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
@@ -1229,8 +1229,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 )
@@ -1256,7 +1256,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 922a819310b7..95ce69ec43f8 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -71,11 +71,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.
@@ -119,16 +119,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 );
@@ -140,7 +140,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);
@@ -165,22 +165,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);
@@ -208,11 +208,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 )
@@ -222,7 +222,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);
@@ -246,12 +246,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 )
{
@@ -284,8 +284,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 )
{
@@ -324,11 +324,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;
@@ -360,7 +360,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
--------------------------------------------------------------------*/
@@ -380,7 +380,7 @@ void SwPoolFmtList::Append( char cChar, const String& rStr )
}
/*--------------------------------------------------------------------
- Beschreibung: Liste kompletti loeschen
+ Beschreibung: Liste kompletti loeschen
--------------------------------------------------------------------*/
@@ -394,10 +394,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 ),
@@ -409,24 +409,24 @@ 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,
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)
{
@@ -453,7 +453,7 @@ SwDocStyleSheet::SwDocStyleSheet( const SwDocStyleSheet& rOrg) :
}
/*--------------------------------------------------------------------
- Beschreibung: Zuruecksetzen
+ Beschreibung: Zuruecksetzen
--------------------------------------------------------------------*/
@@ -466,7 +466,7 @@ void SwDocStyleSheet::Reset()
}
/*--------------------------------------------------------------------
- Beschreibung: virtuelle Methoden
+ Beschreibung: virtuelle Methoden
--------------------------------------------------------------------*/
@@ -501,7 +501,7 @@ const String& SwDocStyleSheet::GetParent() const
}
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 );
@@ -521,7 +521,7 @@ const String& SwDocStyleSheet::GetParent() const
}
/*--------------------------------------------------------------------
- Beschreibung: Nachfolger
+ Beschreibung: Nachfolger
--------------------------------------------------------------------*/
@@ -536,7 +536,7 @@ const String& SwDocStyleSheet::GetFollow() const
}
/*--------------------------------------------------------------------
- Beschreibung: Welche Verkettung ist moeglich
+ Beschreibung: Welche Verkettung ist moeglich
--------------------------------------------------------------------*/
@@ -556,7 +556,7 @@ BOOL SwDocStyleSheet::HasFollowSupport() const
}
/*--------------------------------------------------------------------
- Beschreibung: Parent ?
+ Beschreibung: Parent ?
--------------------------------------------------------------------*/
@@ -588,7 +588,7 @@ BOOL SwDocStyleSheet::HasClearParentSupport() const
}
/*--------------------------------------------------------------------
- Beschreibung: textuelle Beschreibung ermitteln
+ Beschreibung: textuelle Beschreibung ermitteln
--------------------------------------------------------------------*/
String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
{
@@ -763,7 +763,7 @@ String SwDocStyleSheet::GetDescription()
}
/*--------------------------------------------------------------------
- Beschreibung: Namen setzen
+ Beschreibung: Namen setzen
--------------------------------------------------------------------*/
@@ -888,7 +888,7 @@ BOOL SwDocStyleSheet::SetName( const String& rStr)
}
/*--------------------------------------------------------------------
- Beschreibung: Ableitungshirachie
+ Beschreibung: Ableitungshirachie
--------------------------------------------------------------------*/
@@ -943,7 +943,7 @@ BOOL SwDocStyleSheet::SetParent( const String& rStr)
}
/*--------------------------------------------------------------------
- Beschreibung: Nachfolger detzen
+ Beschreibung: Nachfolger detzen
--------------------------------------------------------------------*/
@@ -1000,7 +1000,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()
@@ -1024,7 +1024,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
@@ -1187,7 +1187,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
pCColl->AssignToListLevelOfOutlineStyle(pColl->GetAssignedOutlineStyleLevel());
else
pCColl->DeleteAssignmentToListLevelOfOutlineStyle();
-
+
SwTxtFmtColl* pFindFmt;
@@ -1339,7 +1339,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
const SfxPoolItem* pItem = aIter.GetCurItem();
while( TRUE )
{
- if( IsInvalidItem( pItem ) ) // Clearen
+ if( IsInvalidItem( pItem ) ) // Clearen
{
// use method <SwDoc::ResetAttrAtFormat(..)> in order to
// create an Undo object for the attribute reset.
@@ -1365,7 +1365,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
delete pNewDsc;
}
else
- rDoc.ChgFmt(*pFmt, aSet); // alles gesetzten Putten
+ rDoc.ChgFmt(*pFmt, aSet); // alles gesetzten Putten
}
else
{
@@ -1526,7 +1526,7 @@ void lcl_DeleteInfoStyles( USHORT nFamily, SvPtrarr& rArr, SwDoc& rDoc )
}
/*--------------------------------------------------------------------
- Beschreibung: Das Format ermitteln
+ Beschreibung: Das Format ermitteln
--------------------------------------------------------------------*/
BOOL SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
@@ -1715,7 +1715,7 @@ BOOL SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
}
/*--------------------------------------------------------------------
- Beschreibung: Neues Format in der Core anlegen
+ Beschreibung: Neues Format in der Core anlegen
--------------------------------------------------------------------*/
@@ -1827,18 +1827,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
--------------------------------------------------------------------*/
@@ -1849,9 +1849,9 @@ void SwDocStyleSheet::SetPhysical(BOOL bPhys)
if(!bPhys)
{
pCharFmt = 0;
- pColl = 0;
+ pColl = 0;
pFrmFmt = 0;
- pDesc = 0;
+ pDesc = 0;
}
}
@@ -1876,10 +1876,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;
@@ -1988,7 +1988,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;
}
@@ -2002,9 +2002,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 );
@@ -2027,7 +2027,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 )
@@ -2052,9 +2052,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*/ )
{
@@ -2077,7 +2077,7 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Create( const SfxStyleSheetBase& /*rOr
}
-SfxStyleSheetBase* SwDocStyleSheetPool::Create( const String &,
+SfxStyleSheetBase* SwDocStyleSheetPool::Create( const String &,
SfxStyleFamily, USHORT )
{
OSL_ENSURE( !this, "Create im SW-Stylesheet-Pool geht nicht" );
@@ -2563,18 +2563,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;
@@ -2630,18 +2630,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
@@ -2797,7 +2797,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 760ee7fa7982..822bf54dc83f 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
@@ -30,11 +30,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
@@ -46,7 +46,7 @@ String STR_COMCORE_CANT_SHOW
Text [ en-US ] = "Graphic cannot be displayed." ;
};
/*--------------------------------------------------------------------
- Beschreibung: Boxes
+ Beschreibung: Boxes
--------------------------------------------------------------------*/
InfoBox ERR_CLPBRD_WRITE
{
@@ -58,8 +58,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 c8d5c995cfda..8af33aca1c10 100644
--- a/sw/source/ui/app/mainwn.cxx
+++ b/sw/source/ui/app/mainwn.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -129,7 +129,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 82954e440683..c0334101bfd2 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
@@ -440,7 +440,7 @@
};\
MenuItem\
{\
- Identifier = FN_HIDE_NOTE_AUTHOR ;\
+ Identifier = FN_HIDE_NOTE_AUTHOR ;\
HelpID = FN_HIDE_NOTE_AUTHOR ;\
Text [ en-US ] = "Hide ~author" ;\
};\
diff --git a/sw/source/ui/app/swdll.cxx b/sw/source/ui/app/swdll.cxx
index 0ff247a4bbf1..2c58a9dea182 100644
--- a/sw/source/ui/app/swdll.cxx
+++ b/sw/source/ui/app/swdll.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 770052f0c6d3..7cb6513f3fcc 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,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>
@@ -119,7 +119,7 @@ void lcl_SetUIPrefs(const SwViewOption* pPref, SwView* pView, ViewShell* pSh )
pView->GetPostItMgr()->PrepareView(true);
}
-SwWrtShell* GetActiveWrtShell()
+SwWrtShell* GetActiveWrtShell()
{
SwView *pActive = ::GetActiveView();
if( pActive )
@@ -150,7 +150,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.
------------------------------------------------------------------------*/
@@ -361,7 +361,7 @@ SwNavigationConfig* SwModule::GetNavigationConfig()
return pNavigationConfig;
}
-SwPrintOptions* SwModule::GetPrtOptions(sal_Bool bWeb)
+SwPrintOptions* SwModule::GetPrtOptions(sal_Bool bWeb)
{
if(bWeb && !pWebPrtOpt)
{
@@ -375,7 +375,7 @@ SwPrintOptions* SwModule::GetPrtOptions(sal_Bool bWeb)
return bWeb ? pWebPrtOpt : pPrtOpt;
}
-SwChapterNumRules* SwModule::GetChapterNumRules()
+SwChapterNumRules* SwModule::GetChapterNumRules()
{
if(!pChapterNumRules)
pChapterNumRules = new SwChapterNumRules;
@@ -453,9 +453,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 % (SAL_N_ELEMENTS(aColArr)) ] );
}
@@ -555,7 +555,7 @@ const Color &SwModule::GetRedlineMarkColor()
return pModuleConfig->GetMarkAlignColor();
}
-const SwViewOption* SwModule::GetViewOption(sal_Bool bWeb)
+const SwViewOption* SwModule::GetViewOption(sal_Bool bWeb)
{
return GetUsrPref( bWeb );
}
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index dc6e304847b8..5ba0b1ba0122 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,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>
@@ -139,7 +139,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>
@@ -199,10 +199,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();
@@ -273,7 +273,7 @@ void SwDLL::RegisterFactories()
if ( SvtModuleOptions().IsWriter() )
SwView::RegisterFactory ( 2 );
- SwWebView::RegisterFactory ( 5 );
+ SwWebView::RegisterFactory ( 5 );
if ( SvtModuleOptions().IsWriter() )
{
@@ -437,14 +437,14 @@ void SwDLL::RegisterControls()
|*
\************************************************************************/
-void SwModule::InitAttrPool()
+void SwModule::InitAttrPool()
{
OSL_ENSURE(!pAttrPool, "Pool already exists!");
pAttrPool = new SwAttrPool(0);
SetPool(pAttrPool);
}
-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 86a12833817b..c77ee6655a60 100644
--- a/sw/source/ui/app/swwait.cxx
+++ b/sw/source/ui/app/swwait.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 20:51:49 +0000