diff options
58 files changed, 336 insertions, 379 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 8b41e32334d8..587767e119a4 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -248,7 +248,6 @@ void StartGrammarChecking( SwDoc &rDoc ); // Represents the model of a Writer document. class SW_DLLPUBLIC SwDoc : public IInterface, - public IDocumentSettingAccess, public IDocumentRedlineAccess, public IDocumentLinksAdministration, public IDocumentFieldsAccess, @@ -592,26 +591,10 @@ public: virtual sal_Int32 getReferenceCount() const SAL_OVERRIDE; // IDocumentSettingAccess - virtual bool get(/*[in]*/ DocumentSettingId id) const SAL_OVERRIDE; - virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value) SAL_OVERRIDE; - virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const SAL_OVERRIDE; - virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) SAL_OVERRIDE; - virtual rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() SAL_OVERRIDE; - virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const SAL_OVERRIDE; - virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const SAL_OVERRIDE; - virtual void setLinkUpdateMode( /*[in]*/ sal_uInt16 nMode ) SAL_OVERRIDE; - virtual SwFldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const SAL_OVERRIDE; - virtual void setFieldUpdateFlags( /*[in]*/ SwFldUpdateFlags eMode ) SAL_OVERRIDE; - virtual SwCharCompressType getCharacterCompressionType() const SAL_OVERRIDE; - virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType ) SAL_OVERRIDE; virtual sal_uInt32 getRsid() const; virtual void setRsid( sal_uInt32 nVal ); virtual sal_uInt32 getRsidRoot() const; virtual void setRsidRoot( sal_uInt32 nVal ); - virtual sal_uInt32 Getn32DummyCompatabilityOptions1() const SAL_OVERRIDE; - virtual void Setn32DummyCompatabilityOptions1( const sal_uInt32 CompatabilityOptions1 ) SAL_OVERRIDE; - virtual sal_uInt32 Getn32DummyCompatabilityOptions2() const SAL_OVERRIDE; - virtual void Setn32DummyCompatabilityOptions2( const sal_uInt32 CompatabilityOptions2 ) SAL_OVERRIDE; // IDocumentDeviceAccess IDocumentDeviceAccess const & getIDocumentDeviceAccess() const; diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index c0ca4b5f768f..377c1255f429 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -18,6 +18,7 @@ */ #include <doc.hxx> +#include <DocumentSettingManager.hxx> //For SwFmt::getIDocumentSettingAccess() #include <fmtcolfunc.hxx> #include <frame.hxx> #include <format.hxx> @@ -753,7 +754,7 @@ bool SwFmt::IsShadowTransparent() const /* * Document Interface Access */ -const IDocumentSettingAccess* SwFmt::getIDocumentSettingAccess() const { return GetDoc(); } +const IDocumentSettingAccess* SwFmt::getIDocumentSettingAccess() const { return & GetDoc()->GetDocumentSettingManager(); } const IDocumentDrawModelAccess* SwFmt::getIDocumentDrawModelAccess() const { return GetDoc(); } IDocumentDrawModelAccess* SwFmt::getIDocumentDrawModelAccess() { return GetDoc(); } const IDocumentLayoutAccess* SwFmt::getIDocumentLayoutAccess() const { return GetDoc(); } diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index 14cdadc9347a..36c0aa2fcac0 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -38,6 +38,7 @@ #include <ndtxt.hxx> #include <IMark.hxx> +#include <DocumentSettingManager.hxx> #include <hints.hxx> #include <xmloff/odffields.hxx> @@ -701,7 +702,7 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const bool bAtStartA = pA != NULL && pA->GetMarkStart() == *GetPoint(); bool bAtStartB = pB != NULL && pB->GetMarkStart() == *GetMark(); bRet = ( pA != pB ) || bAtStartA || bAtStartB; - bool bProtectForm = pDoc->get( IDocumentSettingAccess::PROTECT_FORM ); + bool bProtectForm = pDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::PROTECT_FORM ); if ( bProtectForm ) bRet |= ( pA == NULL || pB == NULL ); } diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx index 7ca4fbd50123..524b231e5ffe 100644 --- a/sw/source/core/doc/DocumentDeviceManager.cxx +++ b/sw/source/core/doc/DocumentDeviceManager.cxx @@ -21,6 +21,7 @@ #include <IDocumentDeviceAccess.hxx> #include <doc.hxx> +#include <DocumentSettingManager.hxx> #include <sfx2/printer.hxx> #include <vcl/virdev.hxx> #include <vcl/outdev.hxx> @@ -76,14 +77,14 @@ void DocumentDeviceManager::setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDe mpPrt->SetMapMode( aMapMode ); } - if ( m_rSwdoc.GetDrawModel() && !m_rSwdoc.get( IDocumentSettingAccess::USE_VIRTUAL_DEVICE ) ) + if ( m_rSwdoc.GetDrawModel() && !m_rSwdoc.GetDocumentSettingManager().get( IDocumentSettingAccess::USE_VIRTUAL_DEVICE ) ) m_rSwdoc.GetDrawModel()->SetRefDevice( mpPrt ); } if ( bCallPrtDataChanged && // #i41075# Do not call PrtDataChanged() if we do not // use the printer for formatting: - !m_rSwdoc.get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ) + !m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ) PrtDataChanged(); } @@ -106,7 +107,7 @@ void DocumentDeviceManager::setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]* delete mpVirDev; mpVirDev = pVd; - if ( m_rSwdoc.GetDrawModel() && m_rSwdoc.get( IDocumentSettingAccess::USE_VIRTUAL_DEVICE ) ) + if ( m_rSwdoc.GetDrawModel() && m_rSwdoc.GetDocumentSettingManager().get( IDocumentSettingAccess::USE_VIRTUAL_DEVICE ) ) m_rSwdoc.GetDrawModel()->SetRefDevice( mpVirDev ); } } @@ -114,7 +115,7 @@ void DocumentDeviceManager::setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]* OutputDevice* DocumentDeviceManager::getReferenceDevice(/*[in]*/ bool bCreate ) const { OutputDevice* pRet = 0; - if ( !m_rSwdoc.get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ) + if ( !m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ) { pRet = getPrinter( bCreate ); @@ -133,8 +134,8 @@ OutputDevice* DocumentDeviceManager::getReferenceDevice(/*[in]*/ bool bCreate ) void DocumentDeviceManager::setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /*[in]*/ bool bNewHiRes ) { - if ( m_rSwdoc.get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) != bNewVirtual || - m_rSwdoc.get(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE) != bNewHiRes ) + if ( m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) != bNewVirtual || + m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE) != bNewHiRes ) { if ( bNewVirtual ) { @@ -160,8 +161,8 @@ void DocumentDeviceManager::setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /* m_rSwdoc.GetDrawModel()->SetRefDevice( pPrinter ); } - m_rSwdoc.set(IDocumentSettingAccess::USE_VIRTUAL_DEVICE, bNewVirtual ); - m_rSwdoc.set(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE, bNewHiRes ); + m_rSwdoc.GetDocumentSettingManager().set(IDocumentSettingAccess::USE_VIRTUAL_DEVICE, bNewVirtual ); + m_rSwdoc.GetDocumentSettingManager().set(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE, bNewHiRes ); PrtDataChanged(); m_rSwdoc.SetModified(); } @@ -209,7 +210,7 @@ void DocumentDeviceManager::setJobsetup(/*[in]*/ const JobSetup &rJobSetup ) bDataChanged = true; } } - if ( bDataChanged && !m_rSwdoc.get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ) + if ( bDataChanged && !m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ) PrtDataChanged(); } @@ -257,7 +258,7 @@ VirtualDevice& DocumentDeviceManager::CreateVirtualDevice_() const pNewVir->SetReferenceDevice( VirtualDevice::REFDEV_MODE_MSO1 ); // #i60945# External leading compatibility for unix systems. - if ( m_rSwdoc.get(IDocumentSettingAccess::UNIX_FORCE_ZERO_EXT_LEADING ) ) + if ( m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::UNIX_FORCE_ZERO_EXT_LEADING ) ) pNewVir->Compat_ZeroExtleadBug(); MapMode aMapMode( pNewVir->GetMapMode() ); @@ -321,7 +322,7 @@ void DocumentDeviceManager::PrtDataChanged() bDraw = false; if( m_rSwdoc.GetDrawModel() ) { - m_rSwdoc.GetDrawModel()->SetAddExtLeading( m_rSwdoc.get(IDocumentSettingAccess::ADD_EXT_LEADING) ); + m_rSwdoc.GetDrawModel()->SetAddExtLeading( m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_EXT_LEADING) ); m_rSwdoc.GetDrawModel()->SetRefDevice( getReferenceDevice( false ) ); } @@ -340,7 +341,7 @@ void DocumentDeviceManager::PrtDataChanged() } if ( bDraw && m_rSwdoc.GetDrawModel() ) { - const bool bTmpAddExtLeading = m_rSwdoc.get(IDocumentSettingAccess::ADD_EXT_LEADING); + const bool bTmpAddExtLeading = m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_EXT_LEADING); if ( bTmpAddExtLeading != m_rSwdoc.GetDrawModel()->IsAddExtLeading() ) m_rSwdoc.GetDrawModel()->SetAddExtLeading( bTmpAddExtLeading ); diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index c35bcc509b3b..a830ff18f35f 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -149,48 +149,6 @@ sal_Int32 SwDoc::getReferenceCount() const } /* IDocumentSettingAccess */ -bool SwDoc::get(/*[in]*/ DocumentSettingId id) const -{ - return m_pDocumentSettingManager->get(id); -} - -void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value) -{ - m_pDocumentSettingManager->set(id,value); -} - -const i18n::ForbiddenCharacters* - SwDoc::getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const -{ - return m_pDocumentSettingManager->getForbiddenCharacters(nLang,bLocaleData); -} - -void SwDoc::setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, - /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rFChars ) -{ - m_pDocumentSettingManager->setForbiddenCharacters(nLang,rFChars); -} - -rtl::Reference<SvxForbiddenCharactersTable>& SwDoc::getForbiddenCharacterTable() -{ - return m_pDocumentSettingManager->getForbiddenCharacterTable(); -} - -const rtl::Reference<SvxForbiddenCharactersTable>& SwDoc::getForbiddenCharacterTable() const -{ - return m_pDocumentSettingManager->getForbiddenCharacterTable(); -} - -sal_uInt16 SwDoc::getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const -{ - return m_pDocumentSettingManager->getLinkUpdateMode(bGlobalSettings); -} - -void SwDoc::setLinkUpdateMode( /*[in]*/sal_uInt16 eMode ) -{ - m_pDocumentSettingManager->setLinkUpdateMode(eMode); -} - sal_uInt32 SwDoc::getRsid() const { return mnRsid; @@ -223,45 +181,6 @@ void SwDoc::setRsidRoot( sal_uInt32 nVal ) mnRsidRoot = nVal; } -SwFldUpdateFlags SwDoc::getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const -{ - return m_pDocumentSettingManager->getFieldUpdateFlags(bGlobalSettings); -} - -void SwDoc::setFieldUpdateFlags(/*[in]*/SwFldUpdateFlags eMode ) -{ - m_pDocumentSettingManager->setFieldUpdateFlags(eMode); -} - -SwCharCompressType SwDoc::getCharacterCompressionType() const -{ - return m_pDocumentSettingManager->getCharacterCompressionType(); -} - -void SwDoc::setCharacterCompressionType( /*[in]*/SwCharCompressType n ) -{ - m_pDocumentSettingManager->setCharacterCompressionType(n); -} - -sal_uInt32 SwDoc::Getn32DummyCompatabilityOptions1() const -{ - return GetDocumentSettingManager().Getn32DummyCompatabilityOptions1(); -} - -void SwDoc::Setn32DummyCompatabilityOptions1( const sal_uInt32 CompatabilityOptions1 ) -{ - GetDocumentSettingManager().Setn32DummyCompatabilityOptions1( CompatabilityOptions1 ); -} - -sal_uInt32 SwDoc::Getn32DummyCompatabilityOptions2() const -{ - return GetDocumentSettingManager().Getn32DummyCompatabilityOptions2(); -} - -void SwDoc::Setn32DummyCompatabilityOptions2( const sal_uInt32 CompatabilityOptions2 ) -{ - GetDocumentSettingManager().Setn32DummyCompatabilityOptions2( CompatabilityOptions2 ); -} // IDocumentDeviceAccess IDocumentDeviceAccess const & SwDoc::getIDocumentDeviceAccess() const @@ -2113,17 +2032,17 @@ bool SwDoc::EmbedAllLinks() bool SwDoc::IsInsTblFormatNum() const { - return SW_MOD()->IsInsTblFormatNum(get(IDocumentSettingAccess::HTML_MODE)); + return SW_MOD()->IsInsTblFormatNum(GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE)); } bool SwDoc::IsInsTblChangeNumFormat() const { - return SW_MOD()->IsInsTblChangeNumFormat(get(IDocumentSettingAccess::HTML_MODE)); + return SW_MOD()->IsInsTblChangeNumFormat(GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE)); } bool SwDoc::IsInsTblAlignNum() const { - return SW_MOD()->IsInsTblAlignNum(get(IDocumentSettingAccess::HTML_MODE)); + return SW_MOD()->IsInsTblAlignNum(GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE)); } /// Set up the InsertDB as Undo table diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 8b7e1ba72b91..8489e3757fb4 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -39,6 +39,7 @@ #include <swhints.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include <docsh.hxx> #include <rootfrm.hxx> #include <poolfmt.hxx> @@ -594,7 +595,7 @@ void SwDoc::InitDrawModel() // Set the LinkManager in the model so that linked graphics can be inserted. // The WinWord import needs it too. mpDrawModel->SetLinkManager( &GetLinkManager() ); - mpDrawModel->SetAddExtLeading( get(IDocumentSettingAccess::ADD_EXT_LEADING) ); + mpDrawModel->SetAddExtLeading( GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_EXT_LEADING) ); OutputDevice* pRefDev = getIDocumentDeviceAccess().getReferenceDevice( false ); if ( pRefDev ) diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index 5b1793fc55af..d727d89e32c1 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -32,6 +32,7 @@ #include <fmtanchr.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include <docary.hxx> #include <pam.hxx> #include <ndtxt.hxx> @@ -153,7 +154,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, // document for every single one and replace linked sections (GlobalDoc) for links (HTML). // Finally, we save this document as a GlobalDoc/HTMLDoc. if( !mpDocShell || !mpDocShell->GetMedium() || - ( SPLITDOC_TO_GLOBALDOC == eDocType && get(IDocumentSettingAccess::GLOBAL_DOCUMENT) ) ) + ( SPLITDOC_TO_GLOBALDOC == eDocType && GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT) ) ) return false; sal_uInt16 nOutl = 0; @@ -487,7 +488,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, switch( eDocType ) { case SPLITDOC_TO_HTML: - if( get(IDocumentSettingAccess::GLOBAL_DOCUMENT) ) + if( GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT) ) { // save all remaining sections while( !GetSections().empty() ) @@ -500,8 +501,8 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, default: // save the Globaldoc - set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); - set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, false); + GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); + GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, false); } // The medium isn't locked after reopening the document. diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 1541be24dfae..b925f861f4ff 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -62,6 +62,7 @@ #include <ndole.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include <rootfrm.hxx> #include <pagefrm.hxx> #include <cntfrm.hxx> @@ -710,7 +711,7 @@ SwFlyFrmFmt* SwDoc::MakeFlySection( RndStdIds eAnchorType, pFrmFmt = GetFrmFmtFromPool( RES_POOLFRM_FRAME ); sal_uInt16 nCollId = static_cast<sal_uInt16>( - get(IDocumentSettingAccess::HTML_MODE) ? RES_POOLCOLL_TEXT : RES_POOLCOLL_FRAME ); + GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ? RES_POOLCOLL_TEXT : RES_POOLCOLL_FRAME ); /* If there is no adjust item in the paragraph style for the content node of the new fly section propagate an existing adjust item at the anchor to the new content node. */ @@ -1842,7 +1843,7 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer ) } } - SwFldUpdateFlags nFldUpdFlag = getFieldUpdateFlags(true); + SwFldUpdateFlags nFldUpdFlag = GetDocumentSettingManager().getFieldUpdateFlags(true); if( ( AUTOUPD_FIELD_ONLY == nFldUpdFlag || AUTOUPD_FIELD_AND_CHARTS == nFldUpdFlag ) && GetUpdtFlds().IsFieldsDirty() diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 90f8eae12f7b..358aac4e994e 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -314,7 +314,7 @@ SwDoc::SwDoc() OUTLINE_RULE ); AddNumRule(mpOutlineRule); // Counting of phantoms depends on <IsOldNumbering()> - mpOutlineRule->SetCountPhantoms( !get(IDocumentSettingAccess::OLD_NUMBERING) ); + mpOutlineRule->SetCountPhantoms( !GetDocumentSettingManager().get(IDocumentSettingAccess::OLD_NUMBERING) ); new SwTxtNode( SwNodeIndex(GetUndoManager().GetUndoNodes().GetEndOfContent()), @@ -760,7 +760,7 @@ void SwDoc::ClearDoc() OUTLINE_RULE ); AddNumRule(mpOutlineRule); // Counting of phantoms depends on <IsOldNumbering()> - mpOutlineRule->SetCountPhantoms( !get(IDocumentSettingAccess::OLD_NUMBERING) ); + mpOutlineRule->SetCountPhantoms( !GetDocumentSettingManager().get(IDocumentSettingAccess::OLD_NUMBERING) ); // remove the dummy pagedec from the array and delete all the old ones maPageDescs.erase( maPageDescs.begin() + nDummyPgDsc ); @@ -861,7 +861,7 @@ IGrammarContact* getGrammarContact( const SwTxtNode& rTxtNode ) void SwDoc::UpdateLinks( bool bUI ) { SfxObjectCreateMode eMode; - sal_uInt16 nLinkMode = getLinkUpdateMode( true ); + sal_uInt16 nLinkMode = GetDocumentSettingManager().getLinkUpdateMode( true ); if ( GetDocShell()) { sal_uInt16 nUpdateDocMode = GetDocShell()->GetUpdateDocMode(); if( (nLinkMode != NEVER || document::UpdateDocMode::FULL_UPDATE == nUpdateDocMode) && diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index c723102f24f9..bf5081f0f6c5 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -36,6 +36,7 @@ #include <pagedesc.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include <pagefrm.hxx> #include <ndtxt.hxx> #include <swtable.hxx> @@ -1704,7 +1705,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx, else nRightMargin = aNdRect.Width(); //#i24363# tab stops relative to indent - if( pDoc->get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT) ) + if( pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT) ) { // left margin of paragraph style const SvxLRSpaceItem& rLRSpace = pTOXNd->GetTxtColl()->GetLRSpace(); diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index 5340ee390bec..b6330c54ca71 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -46,6 +46,7 @@ #include <viewopt.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include <fmtanchr.hxx> #include <fmtornt.hxx> #include <fmtsrnd.hxx> @@ -187,7 +188,7 @@ static void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl, { SetAllScriptItem( rSet, SvxWeightItem( WEIGHT_BOLD, RES_CHRATR_WEIGHT ) ); SvxFontHeightItem aHItem(240, 100, RES_CHRATR_FONTSIZE); - const bool bHTMLMode = pDoc->get(IDocumentSettingAccess::HTML_MODE); + const bool bHTMLMode = pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE); if( bHTMLMode ) aHItem.SetHeight( aHeadlineSizes[ MAXLEVEL + nLevel ] ); else @@ -356,7 +357,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage ) mpTxtFmtCollTbl->push_back( pNewColl ); } - bool bNoDefault = get( IDocumentSettingAccess::STYLES_NODEFAULT ); + bool bNoDefault = GetDocumentSettingManager().get( IDocumentSettingAccess::STYLES_NODEFAULT ); if ( !bNoDefault ) { switch( nId ) @@ -387,7 +388,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage ) RES_PARATR_LINESPACING ); SvxULSpaceItem aUL( 0, PT_7, RES_UL_SPACE ); aLSpc.SetPropLineSpace( (const sal_uInt8) 120 ); - if( get(IDocumentSettingAccess::HTML_MODE) ) aUL.SetLower( HTML_PARSPACE ); + if( GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) aUL.SetLower( HTML_PARSPACE ); aSet.Put( aUL ); aSet.Put( aLSpc ); } @@ -466,7 +467,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage ) SvxFontHeightItem aFntSize( PT_14, 100, RES_CHRATR_FONTSIZE ); SvxULSpaceItem aUL( PT_12, PT_6, RES_UL_SPACE ); - if( get(IDocumentSettingAccess::HTML_MODE) ) + if( GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) aUL.SetLower( HTML_PARSPACE ); aSet.Put( SvxFmtKeepItem( true, RES_KEEP )); @@ -639,7 +640,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage ) case RES_POOLCOLL_SENDADRESS: // Sender address { - if( get(IDocumentSettingAccess::HTML_MODE) ) + if( GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) SetAllScriptItem( aSet, SvxPostureItem(ITALIC_NORMAL, RES_CHRATR_POSTURE) ); else { @@ -1290,7 +1291,7 @@ SwFmt* SwDoc::GetFmtFromPool( sal_uInt16 nId ) case RES_POOLFRM_FRAME: { - if ( get(IDocumentSettingAccess::HTML_MODE) ) + if ( GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) { aSet.Put( SwFmtAnchor( FLY_AS_CHAR )); aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::LINE_CENTER, text::RelOrientation::PRINT_AREA ) ); diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index a1473d246d3d..493d95769a7b 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -40,6 +40,7 @@ #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <UndoManager.hxx> +#include <DocumentSettingManager.hxx> #include <cntfrm.hxx> #include <pam.hxx> #include <swcrsr.hxx> @@ -4099,7 +4100,7 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, bool bCallUpdate ) // TL_CHART2: update charts (when cursor leaves cell and // automatic update is enabled) - if (AUTOUPD_FIELD_AND_CHARTS == getFieldUpdateFlags(true)) + if (AUTOUPD_FIELD_AND_CHARTS == GetDocumentSettingManager().getFieldUpdateFlags(true)) pTblNd->GetTable().UpdateCharts(); } SetModified(); diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 34d92501dbae..48d933938ecf 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -60,6 +60,7 @@ #include <rootfrm.hxx> #include <istyleaccess.hxx> #include <IDocumentListItems.hxx> +#include <DocumentSettingManager.hxx> #include <switerator.hxx> #include "ndole.hxx" @@ -1912,7 +1913,7 @@ SwOLENodes* SwCntntNode::CreateOLENodesArray( const SwFmtColl& rColl, bool bOnly /* * Document Interface Access */ -const IDocumentSettingAccess* SwNode::getIDocumentSettingAccess() const { return GetDoc(); } +const IDocumentSettingAccess* SwNode::getIDocumentSettingAccess() const { return &GetDoc()->GetDocumentSettingManager(); } const IDocumentDeviceAccess* SwNode::getIDocumentDeviceAccess() const { return &GetDoc()->getIDocumentDeviceAccess(); } const IDocumentRedlineAccess* SwNode::getIDocumentRedlineAccess() const { return GetDoc(); } const IDocumentStylePoolAccess* SwNode::getIDocumentStylePoolAccess() const { return GetDoc(); } diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index 4886a8e62241..7f6236dbae17 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -36,6 +36,7 @@ #include <shellio.hxx> #include <hintids.hxx> #include <com/sun/star/embed/ElementModes.hpp> +#include <DocumentSettingManager.hxx> using namespace com::sun::star; @@ -110,9 +111,9 @@ SwDrawDocument::SwDrawDocument( SwDoc* pD ) : } } - SetForbiddenCharsTable( pD->getForbiddenCharacterTable() ); + SetForbiddenCharsTable( pD->GetDocumentSettingManager().getForbiddenCharacterTable() ); // Implementation for asian compression - SetCharCompressType( static_cast<sal_uInt16>(pD->getCharacterCompressionType() )); + SetCharCompressType( static_cast<sal_uInt16>(pD->GetDocumentSettingManager().getCharacterCompressionType() )); } // Destructor diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 75307c17e28d..944634350cdb 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -45,6 +45,7 @@ #include <fmtanchr.hxx> #include "shellres.hxx" #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include <com/sun/star/embed/Aspects.hpp> @@ -843,7 +844,7 @@ void SwDrawView::CheckPossibilities() SwDoc* pDoc = Imp().GetShell()->GetDoc(); const bool bProtectMathPos = SotExchange::IsMath( xObj->getClassID() ) && FLY_AS_CHAR == pFly->GetFmt()->GetAnchor().GetAnchorId() - && pDoc->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ); + && pDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ); if (bProtectMathPos) bMoveProtect = true; } diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx index ef432da45247..3478c0dcd7f6 100644 --- a/sw/source/core/edit/edfld.cxx +++ b/sw/source/core/edit/edfld.cxx @@ -36,6 +36,7 @@ #include <hints.hxx> #include <switerator.hxx> #include <fieldhint.hxx> +#include <DocumentSettingManager.hxx> /// count field types with a ResId, if 0 count all sal_uInt16 SwEditShell::GetFldTypeCount(sal_uInt16 nResId, bool bUsed ) const @@ -412,7 +413,7 @@ SwFldUpdateFlags SwEditShell::GetFldUpdateFlags(bool bDocSettings) const void SwEditShell::SetLabelDoc( bool bFlag ) { - GetDoc()->set(IDocumentSettingAccess::LABEL_DOCUMENT, bFlag ); + GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::LABEL_DOCUMENT, bFlag ); } bool SwEditShell::IsLabelDoc() const diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 03d3a39b9977..25a76bd6b9b6 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -37,6 +37,7 @@ #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> #include <IDocumentSettingAccess.hxx> +#include <DocumentSettingManager.hxx> #include <cmdid.h> #include <poolfmt.hrc> #include <frmfmt.hxx> @@ -2280,7 +2281,7 @@ sal_uInt8 SwFEShell::IsSelObjProtected( sal_uInt16 eType ) const // set FLYPROTECT_POS if it is a Math object anchored 'as char' and baseline alignment is activated const bool bProtectMathPos = SotExchange::IsMath( xObj->getClassID() ) && FLY_AS_CHAR == pFly->GetFmt()->GetAnchor().GetAnchorId() - && mpDoc->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ); + && mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ); if ((FLYPROTECT_POS & eType) && bProtectMathPos) nChk |= FLYPROTECT_POS; } diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index cb422141eab7..72f947ee76d4 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -27,6 +27,7 @@ #include <txtfrm.hxx> #include <vector> #include <svx/svdogrp.hxx> +#include <DocumentSettingManager.hxx> using namespace ::com::sun::star; @@ -216,7 +217,7 @@ void SwAnchoredDrawObject::UpdateLayoutDir() if ( !NotYetPositioned() && GetFrmFmt().GetLayoutDir() != nOldLayoutDir && - GetFrmFmt().GetDoc()->get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && + GetFrmFmt().GetDoc()->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && !IsOutsidePage() ) { mbCaptureAfterLayoutDirChange = true; diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 85a09bb30616..869f5a3bf289 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -41,6 +41,8 @@ #include <layouter.hxx> #include <flyfrms.hxx> +#include <DocumentSettingManager.hxx> + // Move methods /// Return value tells whether the Frm should be moved. @@ -853,7 +855,7 @@ void SwLayoutFrm::MakeAll() bool SwTxtNode::IsCollapse() const { - if (GetDoc()->get( IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA ) + if (GetDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA ) && GetTxt().isEmpty()) { sal_uLong nIdx=GetIndex(); diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 0f9b78f09809..37f6ddafe143 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -60,6 +60,7 @@ #include <sortedobjs.hxx> #include <objectformatter.hxx> #include <switerator.hxx> +#include <DocumentSettingManager.hxx> // ftnfrm.cxx: void sw_RemoveFtns( SwFtnBossFrm* pBoss, bool bPageOnly, bool bEndNotes ); @@ -135,7 +136,7 @@ SwFrmNotify::~SwFrmNotify() if ( !bInvalidPrePos && pPre->IsTabFrm() ) { SwTabFrm* pPreTab = static_cast<SwTabFrm*>(pPre); - if ( pPreTab->GetFmt()->GetDoc()->get(IDocumentSettingAccess::TABLE_ROW_KEEP) ) + if ( pPreTab->GetFmt()->GetDoc()->GetDocumentSettingManager().get(IDocumentSettingAccess::TABLE_ROW_KEEP) ) { SwRowFrm* pLastRow = static_cast<SwRowFrm*>(pPreTab->GetLastLower()); if ( pLastRow && pLastRow->ShouldRowKeepWithNext() ) @@ -1819,7 +1820,7 @@ long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) const { long nRight=0; - if (!pCaller->IsTxtFrm() || !((SwTxtFrm*)pCaller)->GetTxtNode()->GetDoc()->get(IDocumentSettingAccess::INVERT_BORDER_SPACING)) { + if (!pCaller->IsTxtFrm() || !((SwTxtFrm*)pCaller)->GetTxtNode()->GetDoc()->GetDocumentSettingManager().get(IDocumentSettingAccess::INVERT_BORDER_SPACING)) { // OD 23.01.2003 #106895# - for cell frame in R2L text direction the left // and right border are painted on the right respectively left. if ( pCaller->IsCellFrm() && pCaller->IsRightToLeft() ) @@ -1867,7 +1868,7 @@ long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const { long nLeft=0; - if (!pCaller->IsTxtFrm() || !((SwTxtFrm*)pCaller)->GetTxtNode()->GetDoc()->get(IDocumentSettingAccess::INVERT_BORDER_SPACING)) { + if (!pCaller->IsTxtFrm() || !((SwTxtFrm*)pCaller)->GetTxtNode()->GetDoc()->GetDocumentSettingManager().get(IDocumentSettingAccess::INVERT_BORDER_SPACING)) { // OD 23.01.2003 #106895# - for cell frame in R2L text direction the left // and right border are painted on the right respectively left. if ( pCaller->IsCellFrm() && pCaller->IsRightToLeft() ) @@ -1885,7 +1886,7 @@ long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const if (pCaller->IsTxtFrm()) { const SwTxtFrm* pTxtFrm = (const SwTxtFrm*)pCaller; - if (pTxtFrm->GetTxtNode()->GetDoc()->get(IDocumentSettingAccess::FLOATTABLE_NOMARGINS)) + if (pTxtFrm->GetTxtNode()->GetDoc()->GetDocumentSettingManager().get(IDocumentSettingAccess::FLOATTABLE_NOMARGINS)) { // If this is explicitly requested, ignore the margins next to the floating table. if (lcl_hasTabFrm(pTxtFrm)) diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 8d16d93cb737..e9996070a26d 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -68,6 +68,7 @@ #include <svx/sdr/contact/viewobjectcontactredirector.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/sdr/contact/viewcontact.hxx> +#include <DocumentSettingManager.hxx> #include <ndole.hxx> #include <svx/charthelper.hxx> @@ -3292,7 +3293,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c pLines->LockLines( false ); } - if ( pSh->GetDoc()->get( IDocumentSettingAccess::BACKGROUND_PARA_OVER_DRAWINGS ) ) + if ( pSh->GetDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::BACKGROUND_PARA_OVER_DRAWINGS ) ) pPage->PaintBaBo( aPaintRect, pPage, true, /*bOnlyTxtBackground=*/true ); if( pSh->GetWin() ) diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 94aaa6c281a3..f8dfce209ce1 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -64,6 +64,7 @@ #include <objectformatter.hxx> #include <layouter.hxx> #include <switerator.hxx> +#include <DocumentSettingManager.hxx> extern void AppendObjs( const SwFrmFmts *pTbl, sal_uLong nIndex, SwFrm *pFrm, SwPageFrm *pPage ); @@ -1774,7 +1775,7 @@ void SwTabFrm::MakeAll() // #131283# // Indicates that two individual rows may keep together, based on the keep // attribute set at the first paragraph in the first cell. - const bool bTableRowKeep = !bDontSplit && GetFmt()->GetDoc()->get(IDocumentSettingAccess::TABLE_ROW_KEEP); + const bool bTableRowKeep = !bDontSplit && GetFmt()->GetDoc()->GetDocumentSettingManager().get(IDocumentSettingAccess::TABLE_ROW_KEEP); // The Magic Move: Used for the table row keep feature. // If only the last row of the table wants to keep (implicitly by setting @@ -5241,7 +5242,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const // Calculate the height of the keeping lines // (headlines + following keeping lines): SwTwips nKeepHeight = nRepeatHeight; - if ( GetFmt()->GetDoc()->get(IDocumentSettingAccess::TABLE_ROW_KEEP) ) + if ( GetFmt()->GetDoc()->GetDocumentSettingManager().get(IDocumentSettingAccess::TABLE_ROW_KEEP) ) { sal_uInt16 nKeepRows = nRepeat; diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 6fc290f235b4..5e0bd5b84919 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -41,6 +41,7 @@ #include <viewsh.hxx> #include <viewopt.hxx> #include <doc.hxx> +#include <DocumentSettingManager.hxx> #include <viscrs.hxx> #include <frmfmt.hxx> #include <swtable.hxx> @@ -1645,7 +1646,7 @@ bool SwFrm::IsProtected() const if (this->IsCntntFrm() && ((SwCntntFrm*)this)->GetNode()) { const SwDoc *pDoc=((SwCntntFrm*)this)->GetNode()->GetDoc(); - bool isFormProtected=pDoc->get(IDocumentSettingAccess::PROTECT_FORM ); + bool isFormProtected=pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::PROTECT_FORM ); if (isFormProtected) { return false; // TODO a hack for now, well deal with it later, I we return true here we have a "double" locking diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 99d77d02ee58..188d0124da1d 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -47,6 +47,7 @@ #include <cntfrm.hxx> #include <frmatr.hxx> #include <ndole.hxx> +#include <DocumentSettingManager.hxx> #include <comphelper/classids.hxx> #include <vcl/graph.hxx> @@ -847,7 +848,7 @@ bool SwOLEObj::UnloadObject( uno::Reference< embed::XEmbeddedObject > xObj, cons SfxObjectShell* p = pDoc->GetPersist(); if( p ) { - if( pDoc->get(IDocumentSettingAccess::PURGE_OLE) ) + if( pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::PURGE_OLE) ) { try { diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 8ed3059f7342..ca536da9305f 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -63,6 +63,7 @@ #include <fmtautofmt.hxx> #include <istyleaccess.hxx> #include <unicode/uchar.h> +#include <DocumentSettingManager.hxx> #include <unomid.h> @@ -159,7 +160,7 @@ lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, OUStringBuffer& rText, nRedlinesMasked = lcl_MaskRedlines( rNode, rText, nStt, nEnd, cChar ); } - const bool bHideHidden = !SW_MOD()->GetViewOption(rDoc.get(IDocumentSettingAccess::HTML_MODE))->IsShowHiddenChar(); + const bool bHideHidden = !SW_MOD()->GetViewOption(rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE))->IsShowHiddenChar(); // If called from word count, we want to mask the hidden ranges even // if they are visible: diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index cc34a43400b0..04fd73bcbfb0 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -65,6 +65,7 @@ #include <sortedobjs.hxx> #include <anchoredobject.hxx> #include <wrtsh.hxx> +#include <DocumentSettingManager.hxx> #include "../../uibase/inc/view.hxx" #include <PostItMgr.hxx> @@ -2169,7 +2170,7 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt ) *mpOpt = rOpt; // First the options are taken. mpOpt->SetUIOptions(rOpt); - mpDoc->set(IDocumentSettingAccess::HTML_MODE, 0 != ::GetHtmlMode(mpDoc->GetDocShell())); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, 0 != ::GetHtmlMode(mpDoc->GetDocShell())); if( bBrowseModeChanged ) { @@ -2506,8 +2507,8 @@ SwPostItMgr* SwViewShell::GetPostItMgr() /* * Document Interface Access */ -const IDocumentSettingAccess* SwViewShell::getIDocumentSettingAccess() const { return mpDoc; } -IDocumentSettingAccess* SwViewShell::getIDocumentSettingAccess() { return mpDoc; } +const IDocumentSettingAccess* SwViewShell::getIDocumentSettingAccess() const { return &mpDoc->GetDocumentSettingManager(); } +IDocumentSettingAccess* SwViewShell::getIDocumentSettingAccess() { return &mpDoc->GetDocumentSettingManager(); } const IDocumentDeviceAccess* SwViewShell::getIDocumentDeviceAccess() const { return &mpDoc->getIDocumentDeviceAccess(); } IDocumentDeviceAccess* SwViewShell::getIDocumentDeviceAccess() { return &mpDoc->getIDocumentDeviceAccess(); } const IDocumentMarkAccess* SwViewShell::getIDocumentMarkAccess() const { return mpDoc->getIDocumentMarkAccess(); } diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index de00eb4a6065..1620e0f67d2a 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -20,6 +20,7 @@ #include <sfx2/printer.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include <docsh.hxx> #include <viewsh.hxx> #include <rootfrm.hxx> @@ -69,7 +70,7 @@ void SwViewShell::Init( const SwViewOption *pNewOpt ) } SwDocShell* pDShell = mpDoc->GetDocShell(); - mpDoc->set(IDocumentSettingAccess::HTML_MODE, 0 != ::GetHtmlMode( pDShell ) ); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, 0 != ::GetHtmlMode( pDShell ) ); // JP 02.02.99: Bug 61335 - set readonly flag at ViewOptions before creating layout. Otherwise, // one would have to reformat again. diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index fe70db6a1d53..52b8a0dc9e7c 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -37,6 +37,7 @@ #include <shellio.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include <pam.hxx> #include <editsh.hxx> #include <undobj.hxx> @@ -96,7 +97,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) // For Web documents the default template was set already by InitNew, // unless the filter is not HTML, // or a SetTemplateName was called in ConvertFrom. - if( !pDoc->get(IDocumentSettingAccess::HTML_MODE) || ReadHTML != po || !po->pTemplate ) + if( !pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) || ReadHTML != po || !po->pTemplate ) po->SetTemplate( *pDoc ); } @@ -496,7 +497,7 @@ SwDoc* Reader::GetTemplateDoc() pTemplate->SetOle2Link( Link() ); // always FALSE pTemplate->GetIDocumentUndoRedo().DoUndo( false ); - pTemplate->set(IDocumentSettingAccess::BROWSE_MODE, bTmplBrowseMode ); + pTemplate->GetDocumentSettingManager().set(IDocumentSettingAccess::BROWSE_MODE, bTmplBrowseMode ); pTemplate->RemoveAllFmtLanguageDependencies(); ReadXML->SetOrganizerMode( true ); @@ -557,7 +558,7 @@ void Reader::MakeHTMLDummyTemplateDoc() ClearTemplate(); pTemplate = new SwDoc; pTemplate->acquire(); - pTemplate->set(IDocumentSettingAccess::BROWSE_MODE, bTmplBrowseMode ); + pTemplate->GetDocumentSettingManager().set(IDocumentSettingAccess::BROWSE_MODE, bTmplBrowseMode ); pTemplate->getIDocumentDeviceAccess().getPrinter( true ); pTemplate->RemoveAllFmtLanguageDependencies(); aChkDateTime = Date( 1, 1, 2300 ); // year 2300 should be sufficient @@ -846,8 +847,8 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName ) pESh->StartAllAction(); } - bool bWasPurgeOle = pOutDoc->get(IDocumentSettingAccess::PURGE_OLE); - pOutDoc->set(IDocumentSettingAccess::PURGE_OLE, false); + bool bWasPurgeOle = pOutDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::PURGE_OLE); + pOutDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::PURGE_OLE, false); sal_uLong nError = 0; if( pMedium ) @@ -859,7 +860,7 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName ) else if( xStg.is() ) nError = rxWriter->Write( *pPam, xStg, pRealFileName ); - pOutDoc->set(IDocumentSettingAccess::PURGE_OLE, bWasPurgeOle ); + pOutDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::PURGE_OLE, bWasPurgeOle ); if( pESh ) { diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index f20010d7a534..a5cd58c49d72 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -76,6 +76,7 @@ #include <fmtftn.hxx> // FOOTNOTES #include "doc.hxx" +#include <DocumentSettingManager.hxx> #include "swerror.h" #include "charatr.hxx" #include "paratr.hxx" @@ -2245,8 +2246,8 @@ void SwHTMLWriter::OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt ) // The background color is normally only used in Browse-Mode. // We always use it for a HTML document, but for a text document // only if viewed in Browse-Mode. - if( pDoc->get(IDocumentSettingAccess::HTML_MODE) || - pDoc->get(IDocumentSettingAccess::BROWSE_MODE)) + if( pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) || + pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::BROWSE_MODE)) { SwViewShell *pVSh = 0; pDoc->GetEditShell( &pVSh ); diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index c0e10c17a790..a18356f7f0c5 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -78,6 +78,7 @@ #include <docstat.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include <pam.hxx> #include <ndtxt.hxx> #include <mdiexp.hxx> @@ -192,7 +193,7 @@ sal_uLong HTMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam, // Die HTML-Seitenvorlage setzen, wenn des kein HTML-Dokument ist, // sonst ist sie schon gesetzt. - if( !rDoc.get(IDocumentSettingAccess::HTML_MODE) ) + if( !rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) { rDoc.InsertPoolItem( rPam, SwFmtPageDesc( rDoc.GetPageDescFromPool( RES_POOLPAGE_HTML, false )), 0 ); @@ -331,8 +332,8 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn, // Waehrend des Imports in den HTML-Modus schalten, damit die // richrigen Vorlagen angelegt werden - bOldIsHTMLMode = pDoc->get(IDocumentSettingAccess::HTML_MODE); - pDoc->set(IDocumentSettingAccess::HTML_MODE, true); + bOldIsHTMLMode = pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE); + pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, true); pCSS1Parser = new SwCSS1Parser( pDoc, aFontHeights, sBaseURL, IsNewDoc() ); pCSS1Parser->SetIgnoreFontFamily( rHtmlOptions.IsIgnoreFontFamily() ); @@ -411,7 +412,7 @@ SwHTMLParser::~SwHTMLParser() #endif bool bAsync = pDoc->IsInLoadAsynchron(); pDoc->SetInLoadAsynchron( false ); - pDoc->set(IDocumentSettingAccess::HTML_MODE, bOldIsHTMLMode); + pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, bOldIsHTMLMode); if( pDoc->GetDocShell() && nEventId ) Application::RemoveUserEvent( nEventId ); @@ -421,7 +422,7 @@ SwHTMLParser::~SwHTMLParser() if( pDoc->GetDocShell() ) { // Gelinkte Bereiche updaten - sal_uInt16 nLinkMode = pDoc->getLinkUpdateMode( true ); + sal_uInt16 nLinkMode = pDoc->GetDocumentSettingManager().getLinkUpdateMode( true ); if( nLinkMode != NEVER && bAsync && SFX_CREATE_MODE_INTERNAL!=pDoc->GetDocShell()->GetCreateMode() ) pDoc->GetLinkManager().UpdateAllLinks( nLinkMode == MANUAL, diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 2e9b9e7568b4..3ba62ee32290 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -77,6 +77,7 @@ #include <statstr.hrc> #include <swerror.h> #include <rtl/strbuf.hxx> +#include <DocumentSettingManager.hxx> #define MAX_INDENT_LEVEL 20 @@ -205,7 +206,7 @@ sal_uLong SwHTMLWriter::WriteStream() nHTMLMode |= HTMLMODE_NO_BR_AT_PAREND; } - eCSS1Unit = (FieldUnit)SW_MOD()->GetMetric( pDoc->get(IDocumentSettingAccess::HTML_MODE) ); + eCSS1Unit = (FieldUnit)SW_MOD()->GetMetric( pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ); bool bWriteUTF8 = bWriteClipboardDoc; eDestEnc = bWriteUTF8 ? RTL_TEXTENCODING_UTF8 : rHtmlOptions.GetTextEncoding(); @@ -229,8 +230,8 @@ sal_uLong SwHTMLWriter::WriteStream() if( pTemplate ) { pTemplate->acquire(); - bOldHTMLMode = pTemplate->get(IDocumentSettingAccess::HTML_MODE); - pTemplate->set(IDocumentSettingAccess::HTML_MODE, true); + bOldHTMLMode = pTemplate->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE); + pTemplate->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, true); nOldTxtFmtCollCnt = pTemplate->GetTxtFmtColls()->size(); nOldCharFmtCnt = pTemplate->GetCharFmts()->size(); @@ -357,8 +358,8 @@ sal_uLong SwHTMLWriter::WriteStream() const SfxPoolItem *pItem; const SfxItemSet& rPageItemSet = pCurrPageDesc->GetMaster().GetAttrSet(); if( !bWriteClipboardDoc && pDoc->GetDocShell() && - (!pDoc->get(IDocumentSettingAccess::HTML_MODE) && - !pDoc->get(IDocumentSettingAccess::BROWSE_MODE)) && + (!pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) && + !pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::BROWSE_MODE)) && SFX_ITEM_SET == rPageItemSet.GetItemState( RES_HEADER, true, &pItem) ) { const SwFrmFmt *pHeaderFmt = @@ -378,7 +379,7 @@ sal_uLong SwHTMLWriter::WriteStream() OutFootEndNotes(); if( !bWriteClipboardDoc && pDoc->GetDocShell() && - (!pDoc->get(IDocumentSettingAccess::HTML_MODE) && !pDoc->get(IDocumentSettingAccess::BROWSE_MODE)) && + (!pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) && !pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::BROWSE_MODE)) && SFX_ITEM_SET == rPageItemSet.GetItemState( RES_FOOTER, true, &pItem) ) { const SwFrmFmt *pFooterFmt = @@ -466,7 +467,7 @@ sal_uLong SwHTMLWriter::WriteStream() "falsche Anzahl CharFmts geloescht" ); // HTML-Modus wieder restaurieren - pTemplate->set(IDocumentSettingAccess::HTML_MODE, bOldHTMLMode); + pTemplate->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, bOldHTMLMode); if( 0 == pTemplate->release() ) delete pTemplate; diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 4d8255b3dd05..99bbe8112eae 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -29,6 +29,7 @@ #include <doc.hxx> #include <docary.hxx> #include <IMark.hxx> +#include <DocumentSettingManager.hxx> #include <numrule.hxx> #include <swerror.h> @@ -133,8 +134,8 @@ Writer::~Writer() /* * Document Interface Access */ -IDocumentSettingAccess* Writer::getIDocumentSettingAccess() { return pDoc; } -const IDocumentSettingAccess* Writer::getIDocumentSettingAccess() const { return pDoc; } +IDocumentSettingAccess* Writer::getIDocumentSettingAccess() { return &pDoc->GetDocumentSettingManager(); } +const IDocumentSettingAccess* Writer::getIDocumentSettingAccess() const { return &pDoc->GetDocumentSettingManager(); } IDocumentStylePoolAccess* Writer::getIDocumentStylePoolAccess() { return pDoc; } const IDocumentStylePoolAccess* Writer::getIDocumentStylePoolAccess() const { return pDoc; } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 7fc9acb4bb88..af416cd213de 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -109,6 +109,7 @@ #include <fmtautofmt.hxx> #include <docsh.hxx> #include <docary.hxx> +#include <DocumentSettingManager.hxx> #include <osl/file.hxx> #include <vcl/embeddedfontshelper.hxx> @@ -5052,7 +5053,7 @@ void DocxAttributeOutput::FontPitchType( FontPitch ePitch ) const void DocxAttributeOutput::EmbedFont( const OUString& name, FontFamily family, FontPitch pitch, rtl_TextEncoding encoding ) { - if( !m_rExport.pDoc->get( IDocumentSettingAccess::EMBED_FONTS )) + if( !m_rExport.pDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::EMBED_FONTS )) return; // no font embedding with this document EmbedFontStyle( name, XML_embedRegular, family, ITALIC_NONE, WEIGHT_NORMAL, pitch, encoding ); EmbedFontStyle( name, XML_embedBold, family, ITALIC_NONE, WEIGHT_BOLD, pitch, encoding ); diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 28db5ecef9ac..0bd98ec15b46 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -41,6 +41,7 @@ #include <algorithm> #include <IMark.hxx> +#include <DocumentSettingManager.hxx> #include <docsh.hxx> #include <ndtxt.hxx> #include <wrtww8.hxx> @@ -824,11 +825,11 @@ void DocxExport::WriteSettings() pFS->singleElementNS( XML_w, XML_mirrorMargins, FSEND ); // Embed Fonts - if( pDoc->get( IDocumentSettingAccess::EMBED_FONTS )) + if( pDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::EMBED_FONTS )) pFS->singleElementNS( XML_w, XML_embedTrueTypeFonts, FSEND ); // Embed System Fonts - if( pDoc->get( IDocumentSettingAccess::EMBED_SYSTEM_FONTS )) + if( pDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::EMBED_SYSTEM_FONTS )) pFS->singleElementNS( XML_w, XML_embedSystemFonts, FSEND ); // Default Tab Stop diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 55c3fa2aab63..1cf778233dfb 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -62,6 +62,7 @@ #include <ndtxt.hxx> #include <pam.hxx> #include <doc.hxx> +#include <DocumentSettingManager.hxx> #include <docary.hxx> #include <swtable.hxx> #include <swtblfmt.hxx> @@ -2375,13 +2376,13 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) pTmpSet = new SfxItemSet( rNode.GetSwAttrSet() ); SvxULSpaceItem aUL( *(SvxULSpaceItem*)pItem ); // #i25901#- consider compatibility option - if (!pDoc->get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES)) + if (!pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES)) { if( !(ND_HAS_PREV_LAYNODE & nPrvNxtNd )) aUL.SetUpper( 0 ); } // #i25901# - consider compatibility option - if (!pDoc->get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS)) + if (!pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS)) { if( !(ND_HAS_NEXT_LAYNODE & nPrvNxtNd )) aUL.SetLower( 0 ); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index a94765cc6328..527eebc1102d 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -327,8 +327,8 @@ static void WriteDop( WW8Export& rWrt ) rDop.SetCompatabilityOptions( rWrt.pDoc->GetDocumentSettingManager().Getn32DummyCompatabilityOptions1()); rDop.SetCompatabilityOptions2( rWrt.pDoc->GetDocumentSettingManager().Getn32DummyCompatabilityOptions2()); - rDop.fNoLeading = !rWrt.pDoc->get(IDocumentSettingAccess::ADD_EXT_LEADING); - rDop.fUsePrinterMetrics = !rWrt.pDoc->get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE); + rDop.fNoLeading = !rWrt.pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_EXT_LEADING); + rDop.fUsePrinterMetrics = !rWrt.pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE); // write default TabStop const SvxTabStopItem& rTabStop = @@ -408,9 +408,9 @@ static void WriteDop( WW8Export& rWrt ) rDop.cParasFtnEdn = rDStat.nPara; rDop.cLinesFtnEdn = rDStat.nPara; - rDop.fDontUseHTMLAutoSpacing = rWrt.pDoc->get(IDocumentSettingAccess::PARA_SPACE_MAX); + rDop.fDontUseHTMLAutoSpacing = rWrt.pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::PARA_SPACE_MAX); - rDop.fExpShRtn = !rWrt.pDoc->get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK); // #i56856# + rDop.fExpShRtn = !rWrt.pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK); // #i56856# rDop.Write( *rWrt.pTableStrm, *rWrt.pFib ); } @@ -564,7 +564,7 @@ void WW8Export::ExportDopTypography(WW8DopTypography &rTypo) for (rTypo.reserved1=8;rTypo.reserved1>0;rTypo.reserved1-=2) { - if (0 != (pForbidden = pDoc->getForbiddenCharacters(rTypo.GetConvertedLang(), + if (0 != (pForbidden = pDoc->GetDocumentSettingManager().getForbiddenCharacters(rTypo.GetConvertedLang(), false))) { int nIdx = (rTypo.reserved1-2)/2; @@ -633,7 +633,7 @@ void WW8Export::ExportDopTypography(WW8DopTypography &rTypo) const IDocumentSettingAccess* pIDocumentSettingAccess = GetWriter().getIDocumentSettingAccess(); rTypo.fKerningPunct = sal_uInt16(pIDocumentSettingAccess->get(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION)); - rTypo.iJustification = pDoc->getCharacterCompressionType(); + rTypo.iJustification = pDoc->GetDocumentSettingManager().getCharacterCompressionType(); } // It can only be found something with this method, if it is used within diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 0e8680a55e72..0d00fd336c35 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -91,6 +91,7 @@ #include <txtftn.hxx> #include <poolfmt.hxx> #include <doc.hxx> +#include <DocumentSettingManager.hxx> #include <docary.hxx> #include <pam.hxx> #include <paratr.hxx> @@ -4739,7 +4740,7 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing ) OSL_ENSURE( pSet, "No attrset for lineheight :-(" ); if ( pSet ) { - nSpace = nSpace + (short)( AttrSetToLineHeight( *GetExport().pDoc, + nSpace = nSpace + (short)( AttrSetToLineHeight( GetExport().pDoc->GetDocumentSettingManager(), *pSet, *Application::GetDefaultDevice(), nScript ) ); } } @@ -5167,7 +5168,7 @@ static void ParaTabStopDelAdd( WW8Export& rWrt, void WW8AttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStops ) { - const bool bTabsRelativeToIndex = m_rWW8Export.pCurPam->GetDoc()->get( IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT ); + const bool bTabsRelativeToIndex = m_rWW8Export.pCurPam->GetDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT ); long nCurrentLeft = 0; if ( bTabsRelativeToIndex ) diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index fd2b3c2e75a9..0bbce89c18ff 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1849,12 +1849,12 @@ void SwWW8ImplReader::ImportDop() // The distance between two paragraphs is the sum of the bottom distance of // the first paragraph and the top distance of the second one - rDoc.set(IDocumentSettingAccess::PARA_SPACE_MAX, pWDop->fDontUseHTMLAutoSpacing); - rDoc.set(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES, true ); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::PARA_SPACE_MAX, pWDop->fDontUseHTMLAutoSpacing); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES, true ); // move tabs on alignment - rDoc.set(IDocumentSettingAccess::TAB_COMPAT, true); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::TAB_COMPAT, true); // #i24363# tab stops relative to indent - rDoc.set(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT, false); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT, false); // Import Default Tabs long nDefTabSiz = pWDop->dxaTab; @@ -1886,41 +1886,41 @@ void SwWW8ImplReader::ImportDop() xViewDataSupplier->setViewData(xIndexAccess); } - rDoc.set(IDocumentSettingAccess::USE_VIRTUAL_DEVICE, !pWDop->fUsePrinterMetrics); - rDoc.set(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE, true); - rDoc.set(IDocumentSettingAccess::ADD_FLY_OFFSETS, true ); - rDoc.set(IDocumentSettingAccess::ADD_EXT_LEADING, !pWDop->fNoLeading); - rDoc.set(IDocumentSettingAccess::OLD_NUMBERING, false); - rDoc.set(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING, false); // #i47448# - rDoc.set(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, !pWDop->fExpShRtn); // #i49277#, #i56856# - rDoc.set(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT, false); // #i53199# - rDoc.set(IDocumentSettingAccess::OLD_LINE_SPACING, false); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::USE_VIRTUAL_DEVICE, !pWDop->fUsePrinterMetrics); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE, true); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::ADD_FLY_OFFSETS, true ); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::ADD_EXT_LEADING, !pWDop->fNoLeading); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::OLD_NUMBERING, false); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING, false); // #i47448# + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, !pWDop->fExpShRtn); // #i49277#, #i56856# + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT, false); // #i53199# + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::OLD_LINE_SPACING, false); // #i25901# - set new compatibility option // 'Add paragraph and table spacing at bottom of table cells' - rDoc.set(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS, true); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS, true); // #i11860# - set new compatibility option // 'Use former object positioning' to <sal_False> - rDoc.set(IDocumentSettingAccess::USE_FORMER_OBJECT_POS, false); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::USE_FORMER_OBJECT_POS, false); // #i27767# - set new compatibility option // 'Conder Wrapping mode when positioning object' to <sal_True> - rDoc.set(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION, true); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION, true); - rDoc.set(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING, false); // #i13832#, #i24135# + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING, false); // #i13832#, #i24135# - rDoc.set(IDocumentSettingAccess::TABLE_ROW_KEEP, true); //SetTableRowKeep( true ); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::TABLE_ROW_KEEP, true); //SetTableRowKeep( true ); - rDoc.set(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION, true); // #i3952# + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION, true); // #i3952# - rDoc.set(IDocumentSettingAccess::INVERT_BORDER_SPACING, true); - rDoc.set(IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA, true); - rDoc.set(IDocumentSettingAccess::TAB_OVERFLOW, true); - rDoc.set(IDocumentSettingAccess::UNBREAKABLE_NUMBERINGS, true); - rDoc.set(IDocumentSettingAccess::CLIPPED_PICTURES, true); - rDoc.set(IDocumentSettingAccess::TAB_OVER_MARGIN, true); - rDoc.set(IDocumentSettingAccess::SURROUND_TEXT_WRAP_SMALL, true); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::INVERT_BORDER_SPACING, true); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA, true); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::TAB_OVERFLOW, true); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::UNBREAKABLE_NUMBERINGS, true); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::CLIPPED_PICTURES, true); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::TAB_OVER_MARGIN, true); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::SURROUND_TEXT_WRAP_SMALL, true); // COMPATIBILITY FLAGS END @@ -1958,7 +1958,7 @@ void SwWW8ImplReader::ImportDop() const SvtFilterOptions& rOpt = SvtFilterOptions::Get(); if (rOpt.IsUseEnhancedFields()) - rDoc.set(IDocumentSettingAccess::PROTECT_FORM, pWDop->fProtEnabled ); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::PROTECT_FORM, pWDop->fProtEnabled ); } void SwWW8ImplReader::ImportDopTypography(const WW8DopTypography &rTypo) @@ -1970,7 +1970,7 @@ void SwWW8ImplReader::ImportDopTypography(const WW8DopTypography &rTypo) { i18n::ForbiddenCharacters aForbidden(rTypo.rgxchFPunct, rTypo.rgxchLPunct); - rDoc.setForbiddenCharacters(rTypo.GetConvertedLang(), + rDoc.GetDocumentSettingManager().setForbiddenCharacters(rTypo.GetConvertedLang(), aForbidden); // Obviously cannot set the standard level 1 for japanese, so // bail out now while we can. @@ -1992,11 +1992,11 @@ void SwWW8ImplReader::ImportDopTypography(const WW8DopTypography &rTypo) { i18n::ForbiddenCharacters aForbidden(rTypo.GetJapanNotBeginLevel1(), rTypo.GetJapanNotEndLevel1()); - rDoc.setForbiddenCharacters(LANGUAGE_JAPANESE,aForbidden); + rDoc.GetDocumentSettingManager().setForbiddenCharacters(LANGUAGE_JAPANESE,aForbidden); } - rDoc.set(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION, rTypo.fKerningPunct); - rDoc.setCharacterCompressionType(static_cast<SwCharCompressType>(rTypo.iJustification)); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION, rTypo.fKerningPunct); + rDoc.GetDocumentSettingManager().setCharacterCompressionType(static_cast<SwCharCompressType>(rTypo.iJustification)); } /** @@ -4423,7 +4423,7 @@ void wwSectionManager::InsertSegments() { // here we have the special case that the whole document is protected, with the exception of this section. // I want to address this when I do the section rework, so for the moment we disable the overall protection then... - mrReader.rDoc.set(IDocumentSettingAccess::PROTECT_FORM, false ); + mrReader.rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::PROTECT_FORM, false ); } if (bInsertPageDesc) diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index c55fd660debf..bac0593e0325 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -72,6 +72,7 @@ #include <ndtxt.hxx> #include <pam.hxx> #include <doc.hxx> +#include <DocumentSettingManager.hxx> #include <pagedesc.hxx> #include <fmtanchr.hxx> #include <fmtcntnt.hxx> @@ -257,7 +258,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection) // seem to not add external leading in word, or the character would run across // two line in some cases. if (eType != GRID_NONE) - rDoc.set(IDocumentSettingAccess::ADD_EXT_LEADING, false); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::ADD_EXT_LEADING, false); //force to set document as standard page mode bool bSquaredMode = false; diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index c2f84be71bb6..c2f6a3b29aa1 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -49,6 +49,7 @@ #include <swerror.h> #include <fltini.hxx> #include <doc.hxx> +#include <DocumentSettingManager.hxx> #include <docary.hxx> #include <docsh.hxx> #include <unotextrange.hxx> @@ -956,9 +957,9 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c rDoc.PropagateOutlineRule(); // #i62875# - if ( rDoc.get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && !docfunc::ExistsDrawObjs( rDoc ) ) + if ( rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && !docfunc::ExistsDrawObjs( rDoc ) ) { - rDoc.set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false); } // Convert all instances of <SdrOle2Obj> into <SdrGrafObj>, because the diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 3d3e8467bddb..8b2d359acf33 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -58,6 +58,7 @@ #include <comphelper/servicehelper.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> +#include <DocumentSettingManager.hxx> #include <pausethreadstarting.hxx> @@ -179,7 +180,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) } sal_uInt16 const eUnit = SvXMLUnitConverter::GetMeasureUnit( - SW_MOD()->GetMetric(pDoc->get(IDocumentSettingAccess::HTML_MODE))); + SW_MOD()->GetMetric(pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE))); if (GetMM100UnitConverter().GetXMLMeasureUnit() != eUnit ) { GetMM100UnitConverter().SetXMLMeasureUnit( eUnit ); @@ -233,12 +234,12 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) } // adjust document class (eClass) - if (pDoc->get(IDocumentSettingAccess::GLOBAL_DOCUMENT)) + if (pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT)) { eClass = XML_TEXT_GLOBAL; // additionally, we take care of the save-linked-sections-thingy - mbSaveLinkedSections = pDoc->get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS); + mbSaveLinkedSections = pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS); } // MIB: 03/26/04: The Label information is saved in the settings, so // we don't need it here. @@ -389,7 +390,7 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps) pValue[nIndex].Name = "ShowRedlineChanges"; pValue[nIndex++].Value.setValue( &bShowRedlineChanges, ::getBooleanCppuType() ); - sal_Bool bInBrowse = pDoc->get(IDocumentSettingAccess::BROWSE_MODE); + sal_Bool bInBrowse = pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::BROWSE_MODE); pValue[nIndex].Name = "InBrowseMode"; pValue[nIndex++].Value.setValue( &bInBrowse, ::getBooleanCppuType() ); diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx index 76811a12db3c..4de4087da301 100644 --- a/sw/source/filter/xml/xmlfonte.cxx +++ b/sw/source/filter/xml/xmlfonte.cxx @@ -25,6 +25,7 @@ #include <doc.hxx> #include <xmlexp.hxx> #include <xmlimp.hxx> +#include <DocumentSettingManager.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -78,14 +79,15 @@ XMLFontAutoStylePool* SwXMLExport::CreateFontAutoStylePool() // the embedding only in one of them. if(( getExportFlags() & EXPORT_CONTENT ) == 0 ) blockFontEmbedding = true; - if( !getDoc()->get( IDocumentSettingAccess::EMBED_FONTS )) + if( !getDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::EMBED_FONTS )) blockFontEmbedding = true; return new SwXMLFontAutoStylePool_Impl( *this, !blockFontEmbedding ); } void SwXMLImport::NotifyEmbeddedFontRead() { - getDoc()->set( IDocumentSettingAccess::EMBED_FONTS, true ); + getDoc()->GetDocumentSettingManager().set( IDocumentSettingAccess::EMBED_FONTS, true ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ + diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 49632abb5501..9b13528b7a86 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -34,6 +34,7 @@ #include <xmloff/XMLFontStylesContext.hxx> #include <xmloff/ProgressBarHelper.hxx> #include <doc.hxx> +#include <DocumentSettingManager.hxx> #include <unofreg.hxx> #include <TextCursorHelper.hxx> #include <unotext.hxx> @@ -1049,7 +1050,7 @@ void SwXMLImport::SetViewSettings(const Sequence < PropertyValue > & aViewProps) pDoc->GetDocShell()->SetVisArea ( aRect ); if (bChangeBrowseMode) - pDoc->set(IDocumentSettingAccess::BROWSE_MODE, bBrowseMode ); + pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::BROWSE_MODE, bBrowseMode ); if (bChangeShowRedline) GetTextImport()->SetShowChanges( bShowRedlineChanges ); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 5436f899f4f3..e0c67af64d4a 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -27,6 +27,7 @@ #include <view.hxx> #include <docsh.hxx> #include <IDocumentDeviceAccess.hxx> +#include <DocumentSettingManager.hxx> #include <swmodule.hxx> #include <wrtsh.hxx> #include <uitool.hxx> @@ -1362,7 +1363,7 @@ bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) } if (m_pWrtShell) { - m_pWrtShell->GetDoc()->set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, + m_pWrtShell->GetDoc()->GetDocumentSettingManager().set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, m_pMathBaselineAlignmentCB->IsChecked() ); bRet |= m_pMathBaselineAlignmentCB->IsValueChangedFromSaved(); } @@ -1413,7 +1414,7 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& rSet ) m_pFillSpaceRB->Check( FILL_SPACE == eMode ); if (m_pWrtShell) { - m_pMathBaselineAlignmentCB->Check( m_pWrtShell->GetDoc()->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) ); + m_pMathBaselineAlignmentCB->Check( m_pWrtShell->GetDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) ); m_pMathBaselineAlignmentCB->SaveValue(); } else { m_pMathBaselineAlignmentCB->Hide(); diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index 9af525d744ad..ea4dba7cba66 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -45,6 +45,7 @@ #include <doc.hxx> #include <wrtsh.hxx> #include <IDocumentDeviceAccess.hxx> +#include <DocumentSettingManager.hxx> #include <uitool.hxx> #include <initui.hxx> #include <fldbas.hxx> @@ -395,7 +396,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) if( pAppView ) { SwWrtShell &rWrtSh = pAppView->GetWrtShell(); - const bool bAlignFormulas = rWrtSh.GetDoc()->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ); + const bool bAlignFormulas = rWrtSh.GetDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ); pPref->SetAlignMathObjectsToBaseline( bAlignFormulas ); // don't align formulas in documents that are currently loading diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index e3ceb11f1044..d8ab4c73a33b 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -69,6 +69,7 @@ #include <docstyle.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include <docstat.hxx> #include <pagedesc.hxx> #include <pview.hxx> @@ -259,7 +260,7 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium ) SW_MOD()->SetEmbeddedLoadSave( SFX_CREATE_MODE_EMBEDDED == GetCreateMode() ); - pRdr->GetDoc()->set(IDocumentSettingAccess::HTML_MODE, ISA(SwWebDocShell)); + pRdr->GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, ISA(SwWebDocShell)); /* #106748# Restore the pool default if reading a saved document. */ pDoc->RemoveAllFmtLanguageDependencies(); @@ -310,10 +311,10 @@ bool SwDocShell::Save() // #i62875# // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible if ( pWrtShell && pDoc && - pDoc->get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && + pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && docfunc::AllDrawObjsOnPage( *pDoc ) ) { - pDoc->set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false); + pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false); } sal_uLong nErr = ERR_SWG_WRITE_ERROR, nVBWarning = ERRCODE_NONE; @@ -402,8 +403,8 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium ) pView->GetPostItMgr()->UpdateDataOnActiveSidebarWin(); } - if( pDoc->get(IDocumentSettingAccess::GLOBAL_DOCUMENT) && - !pDoc->get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS) ) + if( pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT) && + !pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS) ) RemoveOLEObjects(); { @@ -431,17 +432,17 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium ) // #i62875# // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible if ( pWrtShell && - pDoc->get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && + pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && docfunc::AllDrawObjsOnPage( *pDoc ) ) { - pDoc->set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false); + pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false); } sal_uLong nErr = ERR_SWG_WRITE_ERROR, nVBWarning = ERRCODE_NONE; uno::Reference < embed::XStorage > xStor = rMedium.GetOutputStorage(); if( SfxObjectShell::SaveAs( rMedium ) ) { - if( GetDoc()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT) && !ISA( SwGlobalDocShell ) ) + if( GetDoc()->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT) && !ISA( SwGlobalDocShell ) ) { // This is to set the correct class id if SaveAs is // called from SwDoc::SplitDoc to save a normal doc as @@ -607,10 +608,10 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) // #i62875# // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible if ( pWrtShell && - pDoc->get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && + pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && docfunc::AllDrawObjsOnPage( *pDoc ) ) { - pDoc->set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false); + pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false); } if( xWriter->IsStgWriter() && @@ -640,15 +641,15 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) nSaveType = 2; // Change Flags of the Document accordingly - bool bIsHTMLModeSave = GetDoc()->get(IDocumentSettingAccess::HTML_MODE); - bool bIsGlobalDocSave = GetDoc()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT); - bool bIsGlblDocSaveLinksSave = GetDoc()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS); + bool bIsHTMLModeSave = GetDoc()->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE); + bool bIsGlobalDocSave = GetDoc()->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT); + bool bIsGlblDocSaveLinksSave = GetDoc()->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS); if( nMyType != nSaveType ) { - GetDoc()->set(IDocumentSettingAccess::HTML_MODE, 1 == nSaveType); - GetDoc()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, 2 == nSaveType); + GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, 1 == nSaveType); + GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT, 2 == nSaveType); if( 2 != nSaveType ) - GetDoc()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, false); + GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, false); } // if the target format is storage based, then the output storage must be already created @@ -673,9 +674,9 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) if( nMyType != nSaveType ) { - GetDoc()->set(IDocumentSettingAccess::HTML_MODE, bIsHTMLModeSave ); - GetDoc()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, bIsGlobalDocSave); - GetDoc()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, bIsGlblDocSaveLinksSave); + GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, bIsHTMLModeSave ); + GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT, bIsGlobalDocSave); + GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, bIsGlblDocSaveLinksSave); } return bRet; @@ -995,7 +996,7 @@ void SwDocShell::GetState(SfxItemSet& rSet) case SID_BROWSER_MODE: case FN_PRINT_LAYOUT: { - bool bState = GetDoc()->get(IDocumentSettingAccess::BROWSE_MODE); + bool bState = GetDoc()->GetDocumentSettingManager().get(IDocumentSettingAccess::BROWSE_MODE); if(FN_PRINT_LAYOUT == nWhich) bState = !bState; rSet.Put( SfxBoolItem( nWhich, bState)); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index e68de4052b3e..508db8841b97 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -74,6 +74,7 @@ #include <docstyle.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include <pagedesc.hxx> #include <shellio.hxx> #include <pview.hxx> @@ -148,7 +149,7 @@ SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog( void SwDocShell::ToggleBrowserMode(bool bSet, SwView* _pView ) { - GetDoc()->set(IDocumentSettingAccess::BROWSE_MODE, bSet ); + GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::BROWSE_MODE, bSet ); UpdateFontList(); SwView* pTempView = _pView ? _pView : (SwView*)GetView(); if( pTempView ) @@ -1326,7 +1327,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie } } #endif - bool bWasBrowseMode = pDoc->get(IDocumentSettingAccess::BROWSE_MODE); + bool bWasBrowseMode = pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::BROWSE_MODE); RemoveLink(); // now also the UNO-Model has to be informed about the new Doc #51535# @@ -1337,7 +1338,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie AddLink(); //#116402# update font list when new document is created UpdateFontList(); - pDoc->set(IDocumentSettingAccess::BROWSE_MODE, bWasBrowseMode); + pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::BROWSE_MODE, bWasBrowseMode); pSrcView->SetPool(&GetPool()); const OUString& rMedname = GetMedium()->GetName(); diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 82026d628ae4..d3a3776cce4e 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -59,6 +59,7 @@ #include <wdocsh.hxx> #include <swmodule.hxx> #include <doc.hxx> +#include <DocumentSettingManager.hxx> #include <docfac.hxx> #include <docstyle.hxx> #include <shellio.hxx> @@ -102,7 +103,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) if ( bWeb ) bHTMLTemplSet = SetHTMLTemplate( *GetDoc() );// Styles from HTML.vor else if( ISA( SwGlobalDocShell ) ) - GetDoc()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); // Globaldokument + GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); // Globaldokument if ( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) SwTransferable::InitOle( this, *pDoc ); @@ -118,12 +119,12 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) ForbiddenCharacters aForbidden; aAsian.GetStartEndChars( pLocales[i], aForbidden.beginLine, aForbidden.endLine); LanguageType eLang = LanguageTag::convertToLanguageType(pLocales[i]); - pDoc->setForbiddenCharacters( eLang, aForbidden); + pDoc->GetDocumentSettingManager().setForbiddenCharacters( eLang, aForbidden); } } - pDoc->set(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION, + pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION, !aAsian.IsKerningWesternTextOnly()); - pDoc->setCharacterCompressionType(static_cast<SwCharCompressType>(aAsian.GetCharDistanceCompression())); + pDoc->GetDocumentSettingManager().setCharacterCompressionType(static_cast<SwCharCompressType>(aAsian.GetCharDistanceCompression())); pDoc->getIDocumentDeviceAccess().setPrintData(*SW_MOD()->GetPrtOptions(bWeb)); SubInitNew(); @@ -286,7 +287,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) // the default for documents created via 'File/New' should be 'on' // (old documents, where this property was not yet implemented, will get the // value 'false' in the SwDoc c-tor) - pDoc->set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, + pDoc->GetDocumentSettingManager().set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, SW_MOD()->GetUsrPref( bWeb )->IsAlignMathObjectsToBaseline() ); } @@ -399,7 +400,7 @@ void SwDocShell::AddLink() SwDocFac aFactory; pDoc = aFactory.GetDoc(); pDoc->acquire(); - pDoc->set(IDocumentSettingAccess::HTML_MODE, ISA(SwWebDocShell) ); + pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, ISA(SwWebDocShell) ); } else pDoc->acquire(); @@ -529,13 +530,13 @@ bool SwDocShell::Load( SfxMedium& rMedium ) // by this formats. if( ISA( SwWebDocShell ) ) { - if( !pDoc->get(IDocumentSettingAccess::HTML_MODE) ) - pDoc->set(IDocumentSettingAccess::HTML_MODE, true); + if( !pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) + pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, true); } if( ISA( SwGlobalDocShell ) ) { - if( !pDoc->get(IDocumentSettingAccess::GLOBAL_DOCUMENT) ) - pDoc->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); + if( !pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT) ) + pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); } } } @@ -614,8 +615,8 @@ void SwDocShell::SubInitNew() UpdateFontList(); InitDraw(); - pDoc->setLinkUpdateMode( GLOBALSETTING ); - pDoc->setFieldUpdateFlags( AUTOUPD_GLOBALSETTING ); + pDoc->GetDocumentSettingManager().setLinkUpdateMode( GLOBALSETTING ); + pDoc->GetDocumentSettingManager().setFieldUpdateFlags( AUTOUPD_GLOBALSETTING ); bool bWeb = ISA(SwWebDocShell); @@ -677,7 +678,7 @@ void SwDocShell::SubInitNew() * Document Interface Access */ IDocumentDeviceAccess* SwDocShell::getIDocumentDeviceAccess() { return &pDoc->getIDocumentDeviceAccess(); } -const IDocumentSettingAccess* SwDocShell::getIDocumentSettingAccess() const { return pDoc; } +const IDocumentSettingAccess* SwDocShell::getIDocumentSettingAccess() const { return &pDoc->GetDocumentSettingManager(); } IDocumentChartDataProviderAccess* SwDocShell::getIDocumentChartDataProviderAccess() { return pDoc; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 6ea1f326465d..b483a07ccf8e 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -57,6 +57,7 @@ #include "viewopt.hxx" #include <doc.hxx> #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include "swstyle.h" #include "frmfmt.hxx" #include "charfmt.hxx" @@ -157,7 +158,7 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) SfxTemplateItem aItem(nWhich, aName); sal_uInt16 nMask = 0; - if( pDoc->get(IDocumentSettingAccess::HTML_MODE) ) + if( pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) nMask = SWSTYLEBIT_HTML; else { @@ -183,7 +184,7 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) case SID_STYLE_FAMILY3: - if( pDoc->get(IDocumentSettingAccess::HTML_MODE) ) + if( pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) rSet.DisableItem( nWhich ); else { @@ -199,7 +200,7 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) case SID_STYLE_FAMILY4: { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); - if( pDoc->get(IDocumentSettingAccess::HTML_MODE) && !rHtmlOpt.IsPrintLayoutExtension()) + if( pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) && !rHtmlOpt.IsPrintLayoutExtension()) rSet.DisableItem( nWhich ); else { diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 4aaeb10a7c80..2626a0f80a2a 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -39,6 +39,7 @@ #include <ccoll.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include <cmdid.h> #include <swstyle.h> #include <app.hrc> @@ -2384,7 +2385,7 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const OUString& rName, SfxStyleFamily eFam, sal_uInt16 n ) { sal_uInt16 nSMask = n; - if( SFX_STYLE_FAMILY_PARA == eFam && rDoc.get(IDocumentSettingAccess::HTML_MODE) ) + if( SFX_STYLE_FAMILY_PARA == eFam && rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) { // then only HTML-Templates are of interest if( USHRT_MAX == nSMask ) @@ -2543,7 +2544,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() continue; } - if( rDoc.get(IDocumentSettingAccess::HTML_MODE) && !(nId & USER_FMT) && + if( rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) && !(nId & USER_FMT) && !( RES_POOLCHR_HTML_BEGIN <= nId && nId < RES_POOLCHR_HTML_END ) && RES_POOLCHR_INET_NORMAL != nId && @@ -2562,7 +2563,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() // PoolFormate if( bAll ) { - if( !rDoc.get(IDocumentSettingAccess::HTML_MODE) ) + if( !rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) AppendStyleList(SwStyleNameMapper::GetChrFmtUINameArray(), bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, cCHAR); @@ -2587,7 +2588,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() nSearchFamily == SFX_STYLE_FAMILY_ALL ) { sal_uInt16 nSMask = nSrchMask; - if( rDoc.get(IDocumentSettingAccess::HTML_MODE) ) + if( rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) { // then only HTML-Template are of interest if( SFXSTYLEBIT_ALL_VISIBLE == ( nSMask & SFXSTYLEBIT_ALL_VISIBLE ) ) diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 62938d50dc52..ca778e205a2c 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -79,6 +79,7 @@ #include <ddefld.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include <pagedesc.hxx> #include <IMark.hxx> #include <docary.hxx> @@ -311,7 +312,7 @@ void SwTransferable::InitOle( SfxObjectShell* pDoc, SwDoc& rDoc ) const Size aSz( OLESIZE ); SwRect aVis( Point( DOCUMENTBORDER, DOCUMENTBORDER ), aSz ); pDoc->SetVisArea( aVis.SVRect() ); - rDoc.set(IDocumentSettingAccess::BROWSE_MODE, true ); + rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::BROWSE_MODE, true ); } uno::Reference < embed::XEmbeddedObject > SwTransferable::FindOLEObj( sal_Int64& nAspect ) const diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index aa63b4fa1597..8c263a1b5bd5 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -94,6 +94,7 @@ #include <crsskip.hxx> #include <fmtinfmt.hxx> #include <doc.hxx> +#include <DocumentSettingManager.hxx> #include "swabstdlg.hxx" #include "dialog.hrc" @@ -1017,7 +1018,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) // pre-conditions are met then align the formula to the baseline of the text const uno::Reference < embed::XEmbeddedObject > xObj( rSh.GetOleRef() ); const bool bDoMathBaselineAlignment = xObj.is() && SotExchange::IsMath( xObj->getClassID() ) - && FLY_AS_CHAR == eSet && rSh.GetDoc()->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ); + && FLY_AS_CHAR == eSet && rSh.GetDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ); if (bDoMathBaselineAlignment) rSh.AlignFormulaToBaseline( xObj ); diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index 6656c24f7b82..ee0ceb656364 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -63,6 +63,7 @@ #include <swwait.hxx> #include <docstat.hxx> #include <IDocumentStatistics.hxx> +#include <DocumentSettingManager.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp> @@ -482,7 +483,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) // disable vertical positioning for Math Objects anchored 'as char' if baseline alignment is activated aSet.Put( SfxBoolItem( FN_MATH_BASELINE_ALIGNMENT, - rSh.GetDoc()->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) ) ); + rSh.GetDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) ) ); const uno::Reference < embed::XEmbeddedObject > xObj( rSh.GetOleRef() ); aSet.Put( SfxBoolItem( FN_OLE_IS_MATH, xObj.is() && SotExchange::IsMath( xObj->getClassID() ) ) ); diff --git a/sw/source/uibase/uiview/swcli.cxx b/sw/source/uibase/uiview/swcli.cxx index d3e1f832293c..e54aeccac648 100644 --- a/sw/source/uibase/uiview/swcli.cxx +++ b/sw/source/uibase/uiview/swcli.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <wrtsh.hxx> #include <doc.hxx> +#include <DocumentSettingManager.hxx> #include <swtypes.hxx> #include <view.hxx> #include <edtwin.hxx> @@ -164,7 +165,7 @@ void SwOleClient::FormatChanged() if ( pView && xObj.is() && SotExchange::IsMath( xObj->getClassID() ) ) { SwWrtShell & rWrtSh = pView->GetWrtShell(); - if (rWrtSh.GetDoc()->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT )) + if (rWrtSh.GetDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT )) rWrtSh.AlignFormulaToBaseline( xObj ); } } diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 1d3ecd94193d..45a4d38ded72 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -71,6 +71,7 @@ #include <srcview.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> +#include <DocumentSettingManager.hxx> #include <drawdoc.hxx> #include <wdocsh.hxx> #include <wview.hxx> @@ -191,7 +192,7 @@ void SwView::GotFocus() const { SwWrtShell& rWrtShell = GetWrtShell(); rWrtShell.GetDoc()->SetCurrentViewShell( GetWrtShellPtr() ); - rWrtShell.GetDoc()->set( IDocumentSettingAccess::BROWSE_MODE, + rWrtShell.GetDoc()->GetDocumentSettingManager().set( IDocumentSettingAccess::BROWSE_MODE, rWrtShell.GetViewOptions()->getBrowseMode() ); } } @@ -756,7 +757,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) // but loading of docs with embedded fonts happens after SwDocShell is created // but before SwEditWin (which handles the VCL event) is created. So update // manually. - if( pDocSh->GetDoc()->get( IDocumentSettingAccess::EMBED_FONTS )) + if( pDocSh->GetDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::EMBED_FONTS )) pDocSh->UpdateFontList(); bool bWebDShell = pDocSh->ISA(SwWebDocShell); @@ -807,7 +808,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) if( !bOldShellWasSrcView && bWebDShell && !m_bOldShellWasPagePreview ) aUsrPref.setBrowseMode( true ); else - aUsrPref.setBrowseMode( rDoc.get(IDocumentSettingAccess::BROWSE_MODE) ); + aUsrPref.setBrowseMode( rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::BROWSE_MODE) ); //For the BrowseMode we do not assume a factor. if( aUsrPref.getBrowseMode() && aUsrPref.GetZoomType() != SVX_ZOOM_PERCENT ) diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx index c3763ee1d48c..d68e72230183 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/i18n/XForbiddenCharacters.hpp> #include <com/sun/star/document/PrinterIndependentLayout.hpp> #include <doc.hxx> +#include <DocumentSettingManager.hxx> #include <docsh.hxx> #include <fldupde.hxx> #include <linkenum.hxx> @@ -327,14 +328,14 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf default: throw IllegalArgumentException(); } - mpDoc->setLinkUpdateMode(nMode); + mpDoc->GetDocumentSettingManager().setLinkUpdateMode(nMode); } break; case HANDLE_FIELD_AUTO_UPDATE: { bool bUpdateField = *(sal_Bool*)rValue.getValue(); - SwFldUpdateFlags nFlag = mpDoc->getFieldUpdateFlags(true); - mpDoc->setFieldUpdateFlags( bUpdateField ? + SwFldUpdateFlags nFlag = mpDoc->GetDocumentSettingManager().getFieldUpdateFlags(true); + mpDoc->GetDocumentSettingManager().setFieldUpdateFlags( bUpdateField ? nFlag == AUTOUPD_FIELD_AND_CHARTS ? AUTOUPD_FIELD_AND_CHARTS : AUTOUPD_FIELD_ONLY : @@ -344,8 +345,8 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_CHART_AUTO_UPDATE: { bool bUpdateChart = *(sal_Bool*)rValue.getValue(); - SwFldUpdateFlags nFlag = mpDoc->getFieldUpdateFlags(true); - mpDoc->setFieldUpdateFlags( (nFlag == AUTOUPD_FIELD_ONLY || nFlag == AUTOUPD_FIELD_AND_CHARTS ) ? + SwFldUpdateFlags nFlag = mpDoc->GetDocumentSettingManager().getFieldUpdateFlags(true); + mpDoc->GetDocumentSettingManager().setFieldUpdateFlags( (nFlag == AUTOUPD_FIELD_ONLY || nFlag == AUTOUPD_FIELD_AND_CHARTS ) ? bUpdateChart ? AUTOUPD_FIELD_AND_CHARTS : AUTOUPD_FIELD_ONLY : @@ -356,20 +357,20 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf { bool bParaSpace = false; rValue >>= bParaSpace; - mpDoc->set(IDocumentSettingAccess::PARA_SPACE_MAX, bParaSpace ); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::PARA_SPACE_MAX, bParaSpace ); } break; case HANDLE_ADD_PARA_TABLE_SPACING_AT_START: { bool bParaSpacePage = false; rValue >>= bParaSpacePage; - mpDoc->set(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES, bParaSpacePage ); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES, bParaSpacePage ); } break; case HANDLE_ALIGN_TAB_STOP_POSITION: { bool bAlignTab = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::TAB_COMPAT, bAlignTab); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::TAB_COMPAT, bAlignTab); } break; case HANDLE_PRINTER_NAME: @@ -434,7 +435,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_IS_KERN_ASIAN_PUNCTUATION: { bool bIsKern = *(sal_Bool*)(rValue).getValue(); - mpDoc->set(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION, bIsKern); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION, bIsKern); SwEditShell* pEditSh = mpDoc->GetEditShell(); if(pEditSh) pEditSh->ChgHyphenation(); @@ -453,7 +454,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf default: throw IllegalArgumentException(); } - mpDoc->setCharacterCompressionType(static_cast < SwCharCompressType > (nMode) ); + mpDoc->GetDocumentSettingManager().setCharacterCompressionType(static_cast < SwCharCompressType > (nMode) ); } break; case HANDLE_APPLY_USER_DATA: @@ -464,7 +465,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_SAVE_GLOBAL_DOCUMENT_LINKS: { bool bSaveGlobal = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, bSaveGlobal ); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, bSaveGlobal ); } break; case HANDLE_CURRENT_DATABASE_DATA_SOURCE: @@ -528,31 +529,31 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf bool bSet = false; if(!(rValue >>= bSet)) throw IllegalArgumentException(); - mpDoc->set(IDocumentSettingAccess::LABEL_DOCUMENT, bSet); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::LABEL_DOCUMENT, bSet); } break; case HANDLE_IS_ADD_FLY_OFFSET: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::ADD_FLY_OFFSETS, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::ADD_FLY_OFFSETS, bTmp); } break; case HANDLE_IS_ADD_EXTERNAL_LEADING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::ADD_EXT_LEADING, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::ADD_EXT_LEADING, bTmp); } break; case HANDLE_OLD_NUMBERING: // #111955# { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::OLD_NUMBERING, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::OLD_NUMBERING, bTmp); } break; case HANDLE_OUTLINELEVEL_YIELDS_NUMBERING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE, bTmp); } break; case HANDLE_ALLOW_PRINTJOB_CANCEL: @@ -566,25 +567,25 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_USE_FORMER_LINE_SPACING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::OLD_LINE_SPACING, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::OLD_LINE_SPACING, bTmp); } break; case HANDLE_ADD_PARA_SPACING_TO_TABLE_CELLS: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS, bTmp); } break; case HANDLE_USE_FORMER_OBJECT_POSITIONING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::USE_FORMER_OBJECT_POS, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::USE_FORMER_OBJECT_POS, bTmp); } break; case HANDLE_USE_FORMER_TEXT_WRAPPING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING, bTmp); } break; case HANDLE_CHANGES_PASSWORD: @@ -605,37 +606,37 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_CONSIDER_WRAP_ON_OBJPOS: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION, bTmp ); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION, bTmp ); } break; case HANDLE_IGNORE_FIRST_LINE_INDENT_IN_NUMBERING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING, bTmp); } break; case HANDLE_DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, bTmp); } break; case HANDLE_DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT, bTmp); } break; case HANDLE_TABLE_ROW_KEEP: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::TABLE_ROW_KEEP, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::TABLE_ROW_KEEP, bTmp); } break; case HANDLE_IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION, bTmp); } break; case HANDLE_LOAD_READONLY: @@ -646,19 +647,19 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, bTmp); } break; case HANDLE_CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAMES: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME, bTmp); } break; case HANDLE_UNIX_FORCE_ZERO_EXT_LEADING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::UNIX_FORCE_ZERO_EXT_LEADING, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::UNIX_FORCE_ZERO_EXT_LEADING, bTmp); } break; case HANDLE_USE_OLD_PRINTER_METRICS: @@ -667,7 +668,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_TABS_RELATIVE_TO_INDENT: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT, bTmp); } break; case HANDLE_RSID: @@ -687,14 +688,14 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_PROTECT_FORM: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::PROTECT_FORM, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::PROTECT_FORM, bTmp); } break; // #i89181# case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, bTmp); } break; case HANDLE_MODIFYPASSWORDINFO: @@ -715,85 +716,85 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_MATH_BASELINE_ALIGNMENT: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, bTmp ); + mpDoc->GetDocumentSettingManager().set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, bTmp ); } break; case HANDLE_INVERT_BORDER_SPACING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::INVERT_BORDER_SPACING, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::INVERT_BORDER_SPACING, bTmp); } break; case HANDLE_COLLAPSE_EMPTY_CELL_PARA: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA, bTmp); } break; case HANDLE_SMALL_CAPS_PERCENTAGE_66: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::SMALL_CAPS_PERCENTAGE_66, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::SMALL_CAPS_PERCENTAGE_66, bTmp); } break; case HANDLE_TAB_OVERFLOW: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::TAB_OVERFLOW, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::TAB_OVERFLOW, bTmp); } break; case HANDLE_UNBREAKABLE_NUMBERINGS: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::UNBREAKABLE_NUMBERINGS, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::UNBREAKABLE_NUMBERINGS, bTmp); } break; case HANDLE_STYLES_NODEFAULT: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::STYLES_NODEFAULT, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::STYLES_NODEFAULT, bTmp); } break; case HANDLE_FLOATTABLE_NOMARGINS: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::FLOATTABLE_NOMARGINS, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::FLOATTABLE_NOMARGINS, bTmp); } break; case HANDLE_CLIPPED_PICTURES: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::CLIPPED_PICTURES, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::CLIPPED_PICTURES, bTmp); } break; case HANDLE_BACKGROUND_PARA_OVER_DRAWINGS: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::BACKGROUND_PARA_OVER_DRAWINGS, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::BACKGROUND_PARA_OVER_DRAWINGS, bTmp); } break; case HANDLE_EMBED_FONTS: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::EMBED_FONTS, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::EMBED_FONTS, bTmp); } break; case HANDLE_EMBED_SYSTEM_FONTS: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::EMBED_SYSTEM_FONTS, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::EMBED_SYSTEM_FONTS, bTmp); } break; case HANDLE_TAB_OVER_MARGIN: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::TAB_OVER_MARGIN, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::TAB_OVER_MARGIN, bTmp); } break; case HANDLE_SURROUND_TEXT_WRAP_SMALL: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::SURROUND_TEXT_WRAP_SMALL, bTmp); + mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::SURROUND_TEXT_WRAP_SMALL, bTmp); } break; case HANDLE_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING: @@ -854,38 +855,38 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_LINK_UPDATE_MODE: { - rValue <<= static_cast < sal_Int16 > ( mpDoc->getLinkUpdateMode(true) ); + rValue <<= static_cast < sal_Int16 > ( mpDoc->GetDocumentSettingManager().getLinkUpdateMode(true) ); } break; case HANDLE_FIELD_AUTO_UPDATE: { - SwFldUpdateFlags nFlags = mpDoc->getFieldUpdateFlags(true); + SwFldUpdateFlags nFlags = mpDoc->GetDocumentSettingManager().getFieldUpdateFlags(true); sal_Bool bFieldUpd = (nFlags == AUTOUPD_FIELD_ONLY || nFlags == AUTOUPD_FIELD_AND_CHARTS ); rValue.setValue(&bFieldUpd, ::getBooleanCppuType()); } break; case HANDLE_CHART_AUTO_UPDATE: { - SwFldUpdateFlags nFlags = mpDoc->getFieldUpdateFlags(true); + SwFldUpdateFlags nFlags = mpDoc->GetDocumentSettingManager().getFieldUpdateFlags(true); sal_Bool bChartUpd = nFlags == AUTOUPD_FIELD_AND_CHARTS; rValue.setValue(&bChartUpd, ::getBooleanCppuType()); } break; case HANDLE_ADD_PARA_TABLE_SPACING: { - sal_Bool bParaSpace = mpDoc->get(IDocumentSettingAccess::PARA_SPACE_MAX); + sal_Bool bParaSpace = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::PARA_SPACE_MAX); rValue.setValue(&bParaSpace, ::getBooleanCppuType()); } break; case HANDLE_ADD_PARA_TABLE_SPACING_AT_START: { - sal_Bool bParaSpace = mpDoc->get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES); + sal_Bool bParaSpace = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES); rValue.setValue(&bParaSpace, ::getBooleanCppuType()); } break; case HANDLE_ALIGN_TAB_STOP_POSITION: { - sal_Bool bAlignTab = mpDoc->get(IDocumentSettingAccess::TAB_COMPAT); + sal_Bool bAlignTab = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::TAB_COMPAT); rValue.setValue(&bAlignTab, ::getBooleanCppuType()); } break; @@ -918,7 +919,7 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_IS_KERN_ASIAN_PUNCTUATION: { - sal_Bool bParaSpace = mpDoc->get(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION); + sal_Bool bParaSpace = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION); rValue.setValue(&bParaSpace, ::getBooleanCppuType()); } break; @@ -929,12 +930,12 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_CHARACTER_COMPRESSION_TYPE: { - rValue <<= static_cast < sal_Int16 > (mpDoc->getCharacterCompressionType()); + rValue <<= static_cast < sal_Int16 > (mpDoc->GetDocumentSettingManager().getCharacterCompressionType()); } break; case HANDLE_SAVE_GLOBAL_DOCUMENT_LINKS: { - sal_Bool bSaveGlobal = mpDoc->get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS); + sal_Bool bSaveGlobal = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS); rValue.setValue(&bSaveGlobal, ::getBooleanCppuType()); } break; @@ -969,8 +970,8 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_PRINTER_INDEPENDENT_LAYOUT: { // returns short (see css.document.PrinterIndependentLayout) - sal_Int16 nVirDevType = mpDoc->get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ? - ( mpDoc->get(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE) ? + sal_Int16 nVirDevType = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ? + ( mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE) ? document::PrinterIndependentLayout::HIGH_RESOLUTION : document::PrinterIndependentLayout::LOW_RESOLUTION ) : document::PrinterIndependentLayout::DISABLED; @@ -979,31 +980,31 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_IS_LABEL_DOC: { - bool bLabel = mpDoc->get(IDocumentSettingAccess::LABEL_DOCUMENT); + bool bLabel = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::LABEL_DOCUMENT); rValue <<= bLabel; } break; case HANDLE_IS_ADD_FLY_OFFSET: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::ADD_FLY_OFFSETS); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_FLY_OFFSETS); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_IS_ADD_EXTERNAL_LEADING: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::ADD_EXT_LEADING); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_EXT_LEADING); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_OLD_NUMBERING: // #111955# { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::OLD_NUMBERING); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::OLD_NUMBERING); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_OUTLINELEVEL_YIELDS_NUMBERING: // #111955# { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; @@ -1015,25 +1016,25 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_USE_FORMER_LINE_SPACING: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::OLD_LINE_SPACING); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::OLD_LINE_SPACING); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_ADD_PARA_SPACING_TO_TABLE_CELLS: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_USE_FORMER_OBJECT_POSITIONING: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_USE_FORMER_TEXT_WRAPPING: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; @@ -1044,37 +1045,37 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_CONSIDER_WRAP_ON_OBJPOS: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_IGNORE_FIRST_LINE_INDENT_IN_NUMBERING: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_TABLE_ROW_KEEP : { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::TABLE_ROW_KEEP); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::TABLE_ROW_KEEP); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; @@ -1085,19 +1086,19 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAMES: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_UNIX_FORCE_ZERO_EXT_LEADING: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::UNIX_FORCE_ZERO_EXT_LEADING); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::UNIX_FORCE_ZERO_EXT_LEADING); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; @@ -1109,7 +1110,7 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_TABS_RELATIVE_TO_INDENT: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; @@ -1125,14 +1126,14 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_PROTECT_FORM: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::PROTECT_FORM); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::PROTECT_FORM); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; // #i89181# case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; @@ -1143,85 +1144,85 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_MATH_BASELINE_ALIGNMENT: { - sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_INVERT_BORDER_SPACING: { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::INVERT_BORDER_SPACING); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().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 ); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_SMALL_CAPS_PERCENTAGE_66: { - sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::SMALL_CAPS_PERCENTAGE_66 ); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::SMALL_CAPS_PERCENTAGE_66 ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_TAB_OVERFLOW: { - sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::TAB_OVERFLOW ); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::TAB_OVERFLOW ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_UNBREAKABLE_NUMBERINGS: { - sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::UNBREAKABLE_NUMBERINGS ); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::UNBREAKABLE_NUMBERINGS ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_STYLES_NODEFAULT: { - sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::STYLES_NODEFAULT ); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::STYLES_NODEFAULT ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_FLOATTABLE_NOMARGINS: { - sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::FLOATTABLE_NOMARGINS ); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::FLOATTABLE_NOMARGINS ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_CLIPPED_PICTURES: { - sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::CLIPPED_PICTURES ); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::CLIPPED_PICTURES ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_BACKGROUND_PARA_OVER_DRAWINGS: { - sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::BACKGROUND_PARA_OVER_DRAWINGS ); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::BACKGROUND_PARA_OVER_DRAWINGS ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_EMBED_FONTS: { - sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::EMBED_FONTS ); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::EMBED_FONTS ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_EMBED_SYSTEM_FONTS: { - sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::EMBED_SYSTEM_FONTS ); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::EMBED_SYSTEM_FONTS ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_TAB_OVER_MARGIN: { - sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::TAB_OVER_MARGIN ); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::TAB_OVER_MARGIN ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_SURROUND_TEXT_WRAP_SMALL: { - sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::SURROUND_TEXT_WRAP_SMALL ); + sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::SURROUND_TEXT_WRAP_SMALL ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index ea708ecd0372..5c8343524948 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -94,6 +94,7 @@ #include <unodefaults.hxx> #include <SwXDocumentSettings.hxx> #include <doc.hxx> +#include <DocumentSettingManager.hxx> #include <editeng/forbiddencharacterstable.hxx> #include <svl/zforlist.hxx> #include <drawdoc.hxx> @@ -3838,7 +3839,7 @@ Sequence< OUString > SwXOutlineTarget::getSupportedServiceNames(void) throw( Run } SwXDocumentPropertyHelper::SwXDocumentPropertyHelper(SwDoc& rDoc) : -SvxUnoForbiddenCharsTable ( rDoc.getForbiddenCharacterTable() ) +SvxUnoForbiddenCharsTable ( rDoc.GetDocumentSettingManager().getForbiddenCharacterTable() ) ,m_pDoc(&rDoc) { } diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 6c03ee9c7a3e..0dce5403126d 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -82,6 +82,7 @@ #include <swdtflvr.hxx> #include <crsskip.hxx> #include <doc.hxx> +#include <DocumentSettingManager.hxx> #include <wrtsh.hrc> #include <SwStyleNameMapper.hxx> #include <sfx2/request.hxx> @@ -514,7 +515,7 @@ bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrmFm SwFlyFrmFmt *pFmt = SwFEShell::InsertObject( xRef, &aFrmMgr.GetAttrSet() ); // --> #i972# - if ( bStarMath && mpDoc->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) ) + if ( bStarMath && mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) ) AlignFormulaToBaseline( xRef.GetObject() ); if (pFlyFrmFmt) |