diff options
| author | Valentin Kettner <vakevk+libreoffice@gmail.com> | 2014-05-27 13:55:31 +0200 |
|---|---|---|
| committer | Valentin Kettner <vakevk+libreoffice@gmail.com> | 2014-06-03 19:12:03 +0200 |
| commit | 4269e3a7435b45cbbcd45d959e1e8c8e761a94a0 (patch) | |
| tree | c78a7cdc96d10f10868709b59bb0c2848099e0f5 /sw | |
| parent | b7dd4ad818be23aae8163cab760b5edc4f7eaaf3 (diff) | |
Changed DocumentDeviceManager includes to IDocumentDeviceAccess.
In places other than sw/core/
Change-Id: Ie1b67f58cf7777240d9db6a867cd33a7a1cbbcaf
Diffstat (limited to 'sw')
31 files changed, 259 insertions, 259 deletions
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 86f45c3dbab1..8162258b726a 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -37,7 +37,7 @@ #include <shellio.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <IDocumentDeviceAccess.hxx> #include <pam.hxx> #include <editsh.hxx> @@ -98,7 +98,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->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) || ReadHTML != po || !po->pTemplate ) + if( !pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE) || ReadHTML != po || !po->pTemplate ) po->SetTemplate( *pDoc ); } @@ -498,7 +498,7 @@ SwDoc* Reader::GetTemplateDoc() pTemplate->SetOle2Link( Link() ); // always FALSE pTemplate->GetIDocumentUndoRedo().DoUndo( false ); - pTemplate->GetDocumentSettingManager().set(IDocumentSettingAccess::BROWSE_MODE, bTmplBrowseMode ); + pTemplate->getIDocumentSettingAccess().set(IDocumentSettingAccess::BROWSE_MODE, bTmplBrowseMode ); pTemplate->RemoveAllFmtLanguageDependencies(); ReadXML->SetOrganizerMode( true ); @@ -559,7 +559,7 @@ void Reader::MakeHTMLDummyTemplateDoc() ClearTemplate(); pTemplate = new SwDoc; pTemplate->acquire(); - pTemplate->GetDocumentSettingManager().set(IDocumentSettingAccess::BROWSE_MODE, bTmplBrowseMode ); + pTemplate->getIDocumentSettingAccess().set(IDocumentSettingAccess::BROWSE_MODE, bTmplBrowseMode ); pTemplate->getIDocumentDeviceAccess().getPrinter( true ); pTemplate->RemoveAllFmtLanguageDependencies(); aChkDateTime = Date( 1, 1, 2300 ); // year 2300 should be sufficient @@ -848,8 +848,8 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName ) pESh->StartAllAction(); } - bool bWasPurgeOle = pOutDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::PURGE_OLE); - pOutDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::PURGE_OLE, false); + bool bWasPurgeOle = pOutDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::PURGE_OLE); + pOutDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::PURGE_OLE, false); sal_uLong nError = 0; if( pMedium ) @@ -861,7 +861,7 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName ) else if( xStg.is() ) nError = rxWriter->Write( *pPam, xStg, pRealFileName ); - pOutDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::PURGE_OLE, bWasPurgeOle ); + pOutDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::PURGE_OLE, bWasPurgeOle ); if( pESh ) { diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index a5cd58c49d72..ab62ba6b20a5 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -76,7 +76,7 @@ #include <fmtftn.hxx> // FOOTNOTES #include "doc.hxx" -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include "swerror.h" #include "charatr.hxx" #include "paratr.hxx" @@ -2246,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->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) || - pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::BROWSE_MODE)) + if( pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE) || + pDoc->getIDocumentSettingAccess().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 a18356f7f0c5..f42afc1f2b93 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -78,7 +78,7 @@ #include <docstat.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <pam.hxx> #include <ndtxt.hxx> #include <mdiexp.hxx> @@ -193,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.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) + if( !rDoc.getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE) ) { rDoc.InsertPoolItem( rPam, SwFmtPageDesc( rDoc.GetPageDescFromPool( RES_POOLPAGE_HTML, false )), 0 ); @@ -332,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->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE); - pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, true); + bOldIsHTMLMode = pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE); + pDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::HTML_MODE, true); pCSS1Parser = new SwCSS1Parser( pDoc, aFontHeights, sBaseURL, IsNewDoc() ); pCSS1Parser->SetIgnoreFontFamily( rHtmlOptions.IsIgnoreFontFamily() ); @@ -412,7 +412,7 @@ SwHTMLParser::~SwHTMLParser() #endif bool bAsync = pDoc->IsInLoadAsynchron(); pDoc->SetInLoadAsynchron( false ); - pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, bOldIsHTMLMode); + pDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::HTML_MODE, bOldIsHTMLMode); if( pDoc->GetDocShell() && nEventId ) Application::RemoveUserEvent( nEventId ); @@ -422,7 +422,7 @@ SwHTMLParser::~SwHTMLParser() if( pDoc->GetDocShell() ) { // Gelinkte Bereiche updaten - sal_uInt16 nLinkMode = pDoc->GetDocumentSettingManager().getLinkUpdateMode( true ); + sal_uInt16 nLinkMode = pDoc->getIDocumentSettingAccess().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 3ba62ee32290..5fb5ba142b20 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -77,7 +77,7 @@ #include <statstr.hrc> #include <swerror.h> #include <rtl/strbuf.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #define MAX_INDENT_LEVEL 20 @@ -206,7 +206,7 @@ sal_uLong SwHTMLWriter::WriteStream() nHTMLMode |= HTMLMODE_NO_BR_AT_PAREND; } - eCSS1Unit = (FieldUnit)SW_MOD()->GetMetric( pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ); + eCSS1Unit = (FieldUnit)SW_MOD()->GetMetric( pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE) ); bool bWriteUTF8 = bWriteClipboardDoc; eDestEnc = bWriteUTF8 ? RTL_TEXTENCODING_UTF8 : rHtmlOptions.GetTextEncoding(); @@ -230,8 +230,8 @@ sal_uLong SwHTMLWriter::WriteStream() if( pTemplate ) { pTemplate->acquire(); - bOldHTMLMode = pTemplate->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE); - pTemplate->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, true); + bOldHTMLMode = pTemplate->getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE); + pTemplate->getIDocumentSettingAccess().set(IDocumentSettingAccess::HTML_MODE, true); nOldTxtFmtCollCnt = pTemplate->GetTxtFmtColls()->size(); nOldCharFmtCnt = pTemplate->GetCharFmts()->size(); @@ -358,8 +358,8 @@ sal_uLong SwHTMLWriter::WriteStream() const SfxPoolItem *pItem; const SfxItemSet& rPageItemSet = pCurrPageDesc->GetMaster().GetAttrSet(); if( !bWriteClipboardDoc && pDoc->GetDocShell() && - (!pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) && - !pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::BROWSE_MODE)) && + (!pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE) && + !pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::BROWSE_MODE)) && SFX_ITEM_SET == rPageItemSet.GetItemState( RES_HEADER, true, &pItem) ) { const SwFrmFmt *pHeaderFmt = @@ -379,7 +379,7 @@ sal_uLong SwHTMLWriter::WriteStream() OutFootEndNotes(); if( !bWriteClipboardDoc && pDoc->GetDocShell() && - (!pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) && !pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::BROWSE_MODE)) && + (!pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE) && !pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::BROWSE_MODE)) && SFX_ITEM_SET == rPageItemSet.GetItemState( RES_FOOTER, true, &pItem) ) { const SwFrmFmt *pFooterFmt = @@ -467,7 +467,7 @@ sal_uLong SwHTMLWriter::WriteStream() "falsche Anzahl CharFmts geloescht" ); // HTML-Modus wieder restaurieren - pTemplate->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, bOldHTMLMode); + pTemplate->getIDocumentSettingAccess().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 99bbe8112eae..be1cfe601182 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -29,7 +29,7 @@ #include <doc.hxx> #include <docary.hxx> #include <IMark.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <numrule.hxx> #include <swerror.h> @@ -134,8 +134,8 @@ Writer::~Writer() /* * Document Interface Access */ -IDocumentSettingAccess* Writer::getIDocumentSettingAccess() { return &pDoc->GetDocumentSettingManager(); } -const IDocumentSettingAccess* Writer::getIDocumentSettingAccess() const { return &pDoc->GetDocumentSettingManager(); } +IDocumentSettingAccess* Writer::getIDocumentSettingAccess() { return &pDoc->getIDocumentSettingAccess(); } +const IDocumentSettingAccess* Writer::getIDocumentSettingAccess() const { return &pDoc->getIDocumentSettingAccess(); } 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 af416cd213de..6c03014e5af5 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -109,7 +109,7 @@ #include <fmtautofmt.hxx> #include <docsh.hxx> #include <docary.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <osl/file.hxx> #include <vcl/embeddedfontshelper.hxx> @@ -5053,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->GetDocumentSettingManager().get( IDocumentSettingAccess::EMBED_FONTS )) + if( !m_rExport.pDoc->getIDocumentSettingAccess().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 0bd98ec15b46..f293b38ff6fb 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -41,7 +41,7 @@ #include <algorithm> #include <IMark.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <docsh.hxx> #include <ndtxt.hxx> #include <wrtww8.hxx> @@ -825,11 +825,11 @@ void DocxExport::WriteSettings() pFS->singleElementNS( XML_w, XML_mirrorMargins, FSEND ); // Embed Fonts - if( pDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::EMBED_FONTS )) + if( pDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::EMBED_FONTS )) pFS->singleElementNS( XML_w, XML_embedTrueTypeFonts, FSEND ); // Embed System Fonts - if( pDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::EMBED_SYSTEM_FONTS )) + if( pDoc->getIDocumentSettingAccess().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 1cf778233dfb..1bc795e400a8 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -62,7 +62,7 @@ #include <ndtxt.hxx> #include <pam.hxx> #include <doc.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <docary.hxx> #include <swtable.hxx> #include <swtblfmt.hxx> @@ -2376,13 +2376,13 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) pTmpSet = new SfxItemSet( rNode.GetSwAttrSet() ); SvxULSpaceItem aUL( *(SvxULSpaceItem*)pItem ); // #i25901#- consider compatibility option - if (!pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES)) + if (!pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES)) { if( !(ND_HAS_PREV_LAYNODE & nPrvNxtNd )) aUL.SetUpper( 0 ); } // #i25901# - consider compatibility option - if (!pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS)) + if (!pDoc->getIDocumentSettingAccess().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 ccd43551dacb..6c79c5eded19 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -58,7 +58,7 @@ #include <fmtrowsplt.hxx> #include <frmatr.hxx> #include <doc.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <viewopt.hxx> #include <docary.hxx> #include <pam.hxx> @@ -324,11 +324,11 @@ static void WriteDop( WW8Export& rWrt ) WW8Dop& rDop = *rWrt.pDop; // i#78951#, store the value of unknown compatability options - rDop.SetCompatabilityOptions( rWrt.pDoc->GetDocumentSettingManager().Getn32DummyCompatibilityOptions1()); - rDop.SetCompatabilityOptions2( rWrt.pDoc->GetDocumentSettingManager().Getn32DummyCompatibilityOptions2()); + rDop.SetCompatabilityOptions( rWrt.pDoc->getIDocumentSettingAccess().Getn32DummyCompatibilityOptions1()); + rDop.SetCompatabilityOptions2( rWrt.pDoc->getIDocumentSettingAccess().Getn32DummyCompatibilityOptions2()); - rDop.fNoLeading = !rWrt.pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_EXT_LEADING); - rDop.fUsePrinterMetrics = !rWrt.pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE); + rDop.fNoLeading = !rWrt.pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::ADD_EXT_LEADING); + rDop.fUsePrinterMetrics = !rWrt.pDoc->getIDocumentSettingAccess().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->GetDocumentSettingManager().get(IDocumentSettingAccess::PARA_SPACE_MAX); + rDop.fDontUseHTMLAutoSpacing = rWrt.pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::PARA_SPACE_MAX); - rDop.fExpShRtn = !rWrt.pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK); // #i56856# + rDop.fExpShRtn = !rWrt.pDoc->getIDocumentSettingAccess().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->GetDocumentSettingManager().getForbiddenCharacters(rTypo.GetConvertedLang(), + if (0 != (pForbidden = pDoc->getIDocumentSettingAccess().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->GetDocumentSettingManager().getCharacterCompressionType(); + rTypo.iJustification = pDoc->getIDocumentSettingAccess().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 0d00fd336c35..3ddec916d842 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -91,7 +91,7 @@ #include <txtftn.hxx> #include <poolfmt.hxx> #include <doc.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <docary.hxx> #include <pam.hxx> #include <paratr.hxx> @@ -4740,7 +4740,7 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing ) OSL_ENSURE( pSet, "No attrset for lineheight :-(" ); if ( pSet ) { - nSpace = nSpace + (short)( AttrSetToLineHeight( GetExport().pDoc->GetDocumentSettingManager(), + nSpace = nSpace + (short)( AttrSetToLineHeight( GetExport().pDoc->getIDocumentSettingAccess(), *pSet, *Application::GetDefaultDevice(), nScript ) ); } } @@ -5168,7 +5168,7 @@ static void ParaTabStopDelAdd( WW8Export& rWrt, void WW8AttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStops ) { - const bool bTabsRelativeToIndex = m_rWW8Export.pCurPam->GetDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT ); + const bool bTabsRelativeToIndex = m_rWW8Export.pCurPam->GetDoc()->getIDocumentSettingAccess().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 082b0b1c4119..114108c876d7 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -83,7 +83,7 @@ #include <swtable.hxx> #include <fchrfmt.hxx> #include <charfmt.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <fltini.hxx> @@ -1844,17 +1844,17 @@ void SwWW8ImplReader::ImportDop() // #i78951# - remember the unknown compatibility options // so as to export them out - rDoc.GetDocumentSettingManager().Setn32DummyCompatibilityOptions1( pWDop->GetCompatabilityOptions()); - rDoc.GetDocumentSettingManager().Setn32DummyCompatibilityOptions2( pWDop->GetCompatabilityOptions2()); + rDoc.getIDocumentSettingAccess().Setn32DummyCompatibilityOptions1( pWDop->GetCompatabilityOptions()); + rDoc.getIDocumentSettingAccess().Setn32DummyCompatibilityOptions2( pWDop->GetCompatabilityOptions2()); // 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.GetDocumentSettingManager().set(IDocumentSettingAccess::PARA_SPACE_MAX, pWDop->fDontUseHTMLAutoSpacing); - rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES, true ); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::PARA_SPACE_MAX, pWDop->fDontUseHTMLAutoSpacing); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES, true ); // move tabs on alignment - rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::TAB_COMPAT, true); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::TAB_COMPAT, true); // #i24363# tab stops relative to indent - rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT, false); + rDoc.getIDocumentSettingAccess().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.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); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::USE_VIRTUAL_DEVICE, !pWDop->fUsePrinterMetrics); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE, true); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::ADD_FLY_OFFSETS, true ); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::ADD_EXT_LEADING, !pWDop->fNoLeading); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::OLD_NUMBERING, false); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING, false); // #i47448# + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, !pWDop->fExpShRtn); // #i49277#, #i56856# + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT, false); // #i53199# + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::OLD_LINE_SPACING, false); // #i25901# - set new compatibility option // 'Add paragraph and table spacing at bottom of table cells' - rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS, true); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS, true); // #i11860# - set new compatibility option // 'Use former object positioning' to <sal_False> - rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::USE_FORMER_OBJECT_POS, false); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::USE_FORMER_OBJECT_POS, false); // #i27767# - set new compatibility option // 'Conder Wrapping mode when positioning object' to <sal_True> - rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION, true); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION, true); - rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING, false); // #i13832#, #i24135# + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING, false); // #i13832#, #i24135# - rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::TABLE_ROW_KEEP, true); //SetTableRowKeep( true ); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::TABLE_ROW_KEEP, true); //SetTableRowKeep( true ); - rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION, true); // #i3952# + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION, true); // #i3952# - 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); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::INVERT_BORDER_SPACING, true); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA, true); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::TAB_OVERFLOW, true); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::UNBREAKABLE_NUMBERINGS, true); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::CLIPPED_PICTURES, true); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::TAB_OVER_MARGIN, true); + rDoc.getIDocumentSettingAccess().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.GetDocumentSettingManager().set(IDocumentSettingAccess::PROTECT_FORM, pWDop->fProtEnabled ); + rDoc.getIDocumentSettingAccess().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.GetDocumentSettingManager().setForbiddenCharacters(rTypo.GetConvertedLang(), + rDoc.getIDocumentSettingAccess().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.GetDocumentSettingManager().setForbiddenCharacters(LANGUAGE_JAPANESE,aForbidden); + rDoc.getIDocumentSettingAccess().setForbiddenCharacters(LANGUAGE_JAPANESE,aForbidden); } - rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION, rTypo.fKerningPunct); - rDoc.GetDocumentSettingManager().setCharacterCompressionType(static_cast<SwCharCompressType>(rTypo.iJustification)); + rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION, rTypo.fKerningPunct); + rDoc.getIDocumentSettingAccess().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.GetDocumentSettingManager().set(IDocumentSettingAccess::PROTECT_FORM, false ); + mrReader.rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::PROTECT_FORM, false ); } if (bInsertPageDesc) diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index bac0593e0325..de10966c796d 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -72,7 +72,7 @@ #include <ndtxt.hxx> #include <pam.hxx> #include <doc.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <pagedesc.hxx> #include <fmtanchr.hxx> #include <fmtcntnt.hxx> @@ -258,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.GetDocumentSettingManager().set(IDocumentSettingAccess::ADD_EXT_LEADING, false); + rDoc.getIDocumentSettingAccess().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 c2f6a3b29aa1..aab22939c5df 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -49,7 +49,7 @@ #include <swerror.h> #include <fltini.hxx> #include <doc.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <docary.hxx> #include <docsh.hxx> #include <unotextrange.hxx> @@ -957,9 +957,9 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c rDoc.PropagateOutlineRule(); // #i62875# - if ( rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && !docfunc::ExistsDrawObjs( rDoc ) ) + if ( rDoc.getIDocumentSettingAccess().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && !docfunc::ExistsDrawObjs( rDoc ) ) { - rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false); + rDoc.getIDocumentSettingAccess().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 8b2d359acf33..66ce6d821726 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -58,7 +58,7 @@ #include <comphelper/servicehelper.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <pausethreadstarting.hxx> @@ -180,7 +180,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) } sal_uInt16 const eUnit = SvXMLUnitConverter::GetMeasureUnit( - SW_MOD()->GetMetric(pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE))); + SW_MOD()->GetMetric(pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE))); if (GetMM100UnitConverter().GetXMLMeasureUnit() != eUnit ) { GetMM100UnitConverter().SetXMLMeasureUnit( eUnit ); @@ -234,12 +234,12 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) } // adjust document class (eClass) - if (pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT)) + if (pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::GLOBAL_DOCUMENT)) { eClass = XML_TEXT_GLOBAL; // additionally, we take care of the save-linked-sections-thingy - mbSaveLinkedSections = pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS); + mbSaveLinkedSections = pDoc->getIDocumentSettingAccess().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. @@ -390,7 +390,7 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps) pValue[nIndex].Name = "ShowRedlineChanges"; pValue[nIndex++].Value.setValue( &bShowRedlineChanges, ::getBooleanCppuType() ); - sal_Bool bInBrowse = pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::BROWSE_MODE); + sal_Bool bInBrowse = pDoc->getIDocumentSettingAccess().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 4de4087da301..154a9e96caf5 100644 --- a/sw/source/filter/xml/xmlfonte.cxx +++ b/sw/source/filter/xml/xmlfonte.cxx @@ -25,7 +25,7 @@ #include <doc.hxx> #include <xmlexp.hxx> #include <xmlimp.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -79,14 +79,14 @@ XMLFontAutoStylePool* SwXMLExport::CreateFontAutoStylePool() // the embedding only in one of them. if(( getExportFlags() & EXPORT_CONTENT ) == 0 ) blockFontEmbedding = true; - if( !getDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::EMBED_FONTS )) + if( !getDoc()->getIDocumentSettingAccess().get( IDocumentSettingAccess::EMBED_FONTS )) blockFontEmbedding = true; return new SwXMLFontAutoStylePool_Impl( *this, !blockFontEmbedding ); } void SwXMLImport::NotifyEmbeddedFontRead() { - getDoc()->GetDocumentSettingManager().set( IDocumentSettingAccess::EMBED_FONTS, true ); + getDoc()->getIDocumentSettingAccess().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 e4ad8875e7c9..3dd3c4ce0722 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -34,7 +34,7 @@ #include <xmloff/XMLFontStylesContext.hxx> #include <xmloff/ProgressBarHelper.hxx> #include <doc.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <IDocumentDeviceAccess.hxx> #include <unofreg.hxx> #include <TextCursorHelper.hxx> @@ -1051,7 +1051,7 @@ void SwXMLImport::SetViewSettings(const Sequence < PropertyValue > & aViewProps) pDoc->GetDocShell()->SetVisArea ( aRect ); if (bChangeBrowseMode) - pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::BROWSE_MODE, bBrowseMode ); + pDoc->getIDocumentSettingAccess().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 e0c67af64d4a..eb62da943e58 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -27,7 +27,7 @@ #include <view.hxx> #include <docsh.hxx> #include <IDocumentDeviceAccess.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <swmodule.hxx> #include <wrtsh.hxx> #include <uitool.hxx> @@ -1363,7 +1363,7 @@ bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) } if (m_pWrtShell) { - m_pWrtShell->GetDoc()->GetDocumentSettingManager().set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, + m_pWrtShell->GetDoc()->getIDocumentSettingAccess().set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, m_pMathBaselineAlignmentCB->IsChecked() ); bRet |= m_pMathBaselineAlignmentCB->IsValueChangedFromSaved(); } @@ -1414,7 +1414,7 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& rSet ) m_pFillSpaceRB->Check( FILL_SPACE == eMode ); if (m_pWrtShell) { - m_pMathBaselineAlignmentCB->Check( m_pWrtShell->GetDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) ); + m_pMathBaselineAlignmentCB->Check( m_pWrtShell->GetDoc()->getIDocumentSettingAccess().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 ea4dba7cba66..22e1fe1b4edc 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -45,7 +45,7 @@ #include <doc.hxx> #include <wrtsh.hxx> #include <IDocumentDeviceAccess.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <uitool.hxx> #include <initui.hxx> #include <fldbas.hxx> @@ -396,7 +396,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) if( pAppView ) { SwWrtShell &rWrtSh = pAppView->GetWrtShell(); - const bool bAlignFormulas = rWrtSh.GetDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ); + const bool bAlignFormulas = rWrtSh.GetDoc()->getIDocumentSettingAccess().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 fb081c1f0850..e3612d1a8b61 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -69,7 +69,7 @@ #include <docstyle.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <IDocumentDeviceAccess.hxx> #include <docstat.hxx> #include <pagedesc.hxx> @@ -261,7 +261,7 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium ) SW_MOD()->SetEmbeddedLoadSave( SFX_CREATE_MODE_EMBEDDED == GetCreateMode() ); - pRdr->GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, ISA(SwWebDocShell)); + pRdr->GetDoc()->getIDocumentSettingAccess().set(IDocumentSettingAccess::HTML_MODE, ISA(SwWebDocShell)); /* #106748# Restore the pool default if reading a saved document. */ pDoc->RemoveAllFmtLanguageDependencies(); @@ -312,10 +312,10 @@ bool SwDocShell::Save() // #i62875# // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible if ( pWrtShell && pDoc && - pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && + pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && docfunc::AllDrawObjsOnPage( *pDoc ) ) { - pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false); + pDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false); } sal_uLong nErr = ERR_SWG_WRITE_ERROR, nVBWarning = ERRCODE_NONE; @@ -404,8 +404,8 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium ) pView->GetPostItMgr()->UpdateDataOnActiveSidebarWin(); } - if( pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT) && - !pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS) ) + if( pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::GLOBAL_DOCUMENT) && + !pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS) ) RemoveOLEObjects(); { @@ -433,17 +433,17 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium ) // #i62875# // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible if ( pWrtShell && - pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && + pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && docfunc::AllDrawObjsOnPage( *pDoc ) ) { - pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false); + pDoc->getIDocumentSettingAccess().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()->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT) && !ISA( SwGlobalDocShell ) ) + if( GetDoc()->getIDocumentSettingAccess().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 @@ -609,10 +609,10 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) // #i62875# // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible if ( pWrtShell && - pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && + pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && docfunc::AllDrawObjsOnPage( *pDoc ) ) { - pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false); + pDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false); } if( xWriter->IsStgWriter() && @@ -642,15 +642,15 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) nSaveType = 2; // Change Flags of the Document accordingly - 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); + bool bIsHTMLModeSave = GetDoc()->getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE); + bool bIsGlobalDocSave = GetDoc()->getIDocumentSettingAccess().get(IDocumentSettingAccess::GLOBAL_DOCUMENT); + bool bIsGlblDocSaveLinksSave = GetDoc()->getIDocumentSettingAccess().get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS); if( nMyType != nSaveType ) { - GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, 1 == nSaveType); - GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT, 2 == nSaveType); + GetDoc()->getIDocumentSettingAccess().set(IDocumentSettingAccess::HTML_MODE, 1 == nSaveType); + GetDoc()->getIDocumentSettingAccess().set(IDocumentSettingAccess::GLOBAL_DOCUMENT, 2 == nSaveType); if( 2 != nSaveType ) - GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, false); + GetDoc()->getIDocumentSettingAccess().set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, false); } // if the target format is storage based, then the output storage must be already created @@ -675,9 +675,9 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) if( nMyType != nSaveType ) { - GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, bIsHTMLModeSave ); - GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT, bIsGlobalDocSave); - GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, bIsGlblDocSaveLinksSave); + GetDoc()->getIDocumentSettingAccess().set(IDocumentSettingAccess::HTML_MODE, bIsHTMLModeSave ); + GetDoc()->getIDocumentSettingAccess().set(IDocumentSettingAccess::GLOBAL_DOCUMENT, bIsGlobalDocSave); + GetDoc()->getIDocumentSettingAccess().set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, bIsGlblDocSaveLinksSave); } return bRet; @@ -997,7 +997,7 @@ void SwDocShell::GetState(SfxItemSet& rSet) case SID_BROWSER_MODE: case FN_PRINT_LAYOUT: { - bool bState = GetDoc()->GetDocumentSettingManager().get(IDocumentSettingAccess::BROWSE_MODE); + bool bState = GetDoc()->getIDocumentSettingAccess().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 2655ee36a28f..4ba1dd0bb1aa 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -74,7 +74,7 @@ #include <docstyle.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <IDocumentDeviceAccess.hxx> #include <pagedesc.hxx> #include <shellio.hxx> @@ -150,7 +150,7 @@ SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog( void SwDocShell::ToggleBrowserMode(bool bSet, SwView* _pView ) { - GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::BROWSE_MODE, bSet ); + GetDoc()->getIDocumentSettingAccess().set(IDocumentSettingAccess::BROWSE_MODE, bSet ); UpdateFontList(); SwView* pTempView = _pView ? _pView : (SwView*)GetView(); if( pTempView ) @@ -1328,7 +1328,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie } } #endif - bool bWasBrowseMode = pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::BROWSE_MODE); + bool bWasBrowseMode = pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::BROWSE_MODE); RemoveLink(); // now also the UNO-Model has to be informed about the new Doc #51535# @@ -1339,7 +1339,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie AddLink(); //#116402# update font list when new document is created UpdateFontList(); - pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::BROWSE_MODE, bWasBrowseMode); + pDoc->getIDocumentSettingAccess().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 ef0eb77360b6..e0d3c771c723 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -59,7 +59,7 @@ #include <wdocsh.hxx> #include <swmodule.hxx> #include <doc.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <IDocumentDeviceAccess.hxx> #include <docfac.hxx> #include <docstyle.hxx> @@ -104,7 +104,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) if ( bWeb ) bHTMLTemplSet = SetHTMLTemplate( *GetDoc() );// Styles from HTML.vor else if( ISA( SwGlobalDocShell ) ) - GetDoc()->GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); // Globaldokument + GetDoc()->getIDocumentSettingAccess().set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); // Globaldokument if ( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) SwTransferable::InitOle( this, *pDoc ); @@ -120,12 +120,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->GetDocumentSettingManager().setForbiddenCharacters( eLang, aForbidden); + pDoc->getIDocumentSettingAccess().setForbiddenCharacters( eLang, aForbidden); } } - pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION, + pDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION, !aAsian.IsKerningWesternTextOnly()); - pDoc->GetDocumentSettingManager().setCharacterCompressionType(static_cast<SwCharCompressType>(aAsian.GetCharDistanceCompression())); + pDoc->getIDocumentSettingAccess().setCharacterCompressionType(static_cast<SwCharCompressType>(aAsian.GetCharDistanceCompression())); pDoc->getIDocumentDeviceAccess().setPrintData(*SW_MOD()->GetPrtOptions(bWeb)); SubInitNew(); @@ -288,7 +288,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->GetDocumentSettingManager().set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, + pDoc->getIDocumentSettingAccess().set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, SW_MOD()->GetUsrPref( bWeb )->IsAlignMathObjectsToBaseline() ); } @@ -401,7 +401,7 @@ void SwDocShell::AddLink() SwDocFac aFactory; pDoc = aFactory.GetDoc(); pDoc->acquire(); - pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, ISA(SwWebDocShell) ); + pDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::HTML_MODE, ISA(SwWebDocShell) ); } else pDoc->acquire(); @@ -531,13 +531,13 @@ bool SwDocShell::Load( SfxMedium& rMedium ) // by this formats. if( ISA( SwWebDocShell ) ) { - if( !pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) - pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::HTML_MODE, true); + if( !pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE) ) + pDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::HTML_MODE, true); } if( ISA( SwGlobalDocShell ) ) { - if( !pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT) ) - pDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); + if( !pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::GLOBAL_DOCUMENT) ) + pDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); } } } @@ -616,8 +616,8 @@ void SwDocShell::SubInitNew() UpdateFontList(); InitDraw(); - pDoc->GetDocumentSettingManager().setLinkUpdateMode( GLOBALSETTING ); - pDoc->GetDocumentSettingManager().setFieldUpdateFlags( AUTOUPD_GLOBALSETTING ); + pDoc->getIDocumentSettingAccess().setLinkUpdateMode( GLOBALSETTING ); + pDoc->getIDocumentSettingAccess().setFieldUpdateFlags( AUTOUPD_GLOBALSETTING ); bool bWeb = ISA(SwWebDocShell); @@ -679,7 +679,7 @@ void SwDocShell::SubInitNew() * Document Interface Access */ IDocumentDeviceAccess* SwDocShell::getIDocumentDeviceAccess() { return &pDoc->getIDocumentDeviceAccess(); } -const IDocumentSettingAccess* SwDocShell::getIDocumentSettingAccess() const { return &pDoc->GetDocumentSettingManager(); } +const IDocumentSettingAccess* SwDocShell::getIDocumentSettingAccess() const { return &pDoc->getIDocumentSettingAccess(); } 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 f2cf47358f8e..ec4332cc4fe8 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -57,7 +57,7 @@ #include "viewopt.hxx" #include <doc.hxx> #include <IDocumentUndoRedo.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <IDocumentDeviceAccess.hxx> #include "swstyle.h" #include "frmfmt.hxx" @@ -159,7 +159,7 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) SfxTemplateItem aItem(nWhich, aName); sal_uInt16 nMask = 0; - if( pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) + if( pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE) ) nMask = SWSTYLEBIT_HTML; else { @@ -185,7 +185,7 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) case SID_STYLE_FAMILY3: - if( pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) + if( pDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE) ) rSet.DisableItem( nWhich ); else { @@ -201,7 +201,7 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) case SID_STYLE_FAMILY4: { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); - if( pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) && !rHtmlOpt.IsPrintLayoutExtension()) + if( pDoc->getIDocumentSettingAccess().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 2626a0f80a2a..a073a5def9dc 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -39,7 +39,7 @@ #include <ccoll.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <cmdid.h> #include <swstyle.h> #include <app.hrc> @@ -2385,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.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) + if( SFX_STYLE_FAMILY_PARA == eFam && rDoc.getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE) ) { // then only HTML-Templates are of interest if( USHRT_MAX == nSMask ) @@ -2544,7 +2544,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() continue; } - if( rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) && !(nId & USER_FMT) && + if( rDoc.getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE) && !(nId & USER_FMT) && !( RES_POOLCHR_HTML_BEGIN <= nId && nId < RES_POOLCHR_HTML_END ) && RES_POOLCHR_INET_NORMAL != nId && @@ -2563,7 +2563,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() // PoolFormate if( bAll ) { - if( !rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) + if( ! rDoc.getIDocumentSettingAccess().get(IDocumentSettingAccess::HTML_MODE) ) AppendStyleList(SwStyleNameMapper::GetChrFmtUINameArray(), bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, cCHAR); @@ -2588,7 +2588,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() nSearchFamily == SFX_STYLE_FAMILY_ALL ) { sal_uInt16 nSMask = nSrchMask; - if( rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) + if( rDoc.getIDocumentSettingAccess().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 fc4ac6bb4817..7cee393f2097 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -79,7 +79,7 @@ #include <ddefld.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <IDocumentDeviceAccess.hxx> #include <pagedesc.hxx> #include <IMark.hxx> @@ -313,7 +313,7 @@ void SwTransferable::InitOle( SfxObjectShell* pDoc, SwDoc& rDoc ) const Size aSz( OLESIZE ); SwRect aVis( Point( DOCUMENTBORDER, DOCUMENTBORDER ), aSz ); pDoc->SetVisArea( aVis.SVRect() ); - rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::BROWSE_MODE, true ); + rDoc.getIDocumentSettingAccess().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 8c263a1b5bd5..e9aa004de4b1 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -94,7 +94,7 @@ #include <crsskip.hxx> #include <fmtinfmt.hxx> #include <doc.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include "swabstdlg.hxx" #include "dialog.hrc" @@ -1018,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()->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ); + && FLY_AS_CHAR == eSet && rSh.GetDoc()->getIDocumentSettingAccess().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 ee0ceb656364..472e1399e38f 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -44,6 +44,7 @@ #include <tools/diagnose_ex.h> #include <doc.hxx> +#include <IDocumentSettingAccess.hxx> #include <fmturl.hxx> #include <fmtclds.hxx> #include <fmtcnct.hxx> @@ -63,7 +64,6 @@ #include <swwait.hxx> #include <docstat.hxx> #include <IDocumentStatistics.hxx> -#include <DocumentSettingManager.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp> @@ -483,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()->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) ) ); + rSh.GetDoc()->getIDocumentSettingAccess().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 e54aeccac648..71b57499ddb2 100644 --- a/sw/source/uibase/uiview/swcli.cxx +++ b/sw/source/uibase/uiview/swcli.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <wrtsh.hxx> #include <doc.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <swtypes.hxx> #include <view.hxx> #include <edtwin.hxx> @@ -165,7 +165,7 @@ void SwOleClient::FormatChanged() if ( pView && xObj.is() && SotExchange::IsMath( xObj->getClassID() ) ) { SwWrtShell & rWrtSh = pView->GetWrtShell(); - if (rWrtSh.GetDoc()->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT )) + if (rWrtSh.GetDoc()->getIDocumentSettingAccess().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 45a4d38ded72..eebfc4396b5d 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -71,7 +71,7 @@ #include <srcview.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <drawdoc.hxx> #include <wdocsh.hxx> #include <wview.hxx> @@ -192,7 +192,7 @@ void SwView::GotFocus() const { SwWrtShell& rWrtShell = GetWrtShell(); rWrtShell.GetDoc()->SetCurrentViewShell( GetWrtShellPtr() ); - rWrtShell.GetDoc()->GetDocumentSettingManager().set( IDocumentSettingAccess::BROWSE_MODE, + rWrtShell.GetDoc()->getIDocumentSettingAccess().set( IDocumentSettingAccess::BROWSE_MODE, rWrtShell.GetViewOptions()->getBrowseMode() ); } } @@ -757,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()->GetDocumentSettingManager().get( IDocumentSettingAccess::EMBED_FONTS )) + if( pDocSh->GetDoc()->getIDocumentSettingAccess().get( IDocumentSettingAccess::EMBED_FONTS )) pDocSh->UpdateFontList(); bool bWebDShell = pDocSh->ISA(SwWebDocShell); @@ -808,7 +808,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) if( !bOldShellWasSrcView && bWebDShell && !m_bOldShellWasPagePreview ) aUsrPref.setBrowseMode( true ); else - aUsrPref.setBrowseMode( rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::BROWSE_MODE) ); + aUsrPref.setBrowseMode( rDoc.getIDocumentSettingAccess().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 baf93d50896e..ed9bba1ffdb2 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/i18n/XForbiddenCharacters.hpp> #include <com/sun/star/document/PrinterIndependentLayout.hpp> #include <doc.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <IDocumentDeviceAccess.hxx> #include <docsh.hxx> #include <fldupde.hxx> @@ -329,14 +329,14 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf default: throw IllegalArgumentException(); } - mpDoc->GetDocumentSettingManager().setLinkUpdateMode(nMode); + mpDoc->getIDocumentSettingAccess().setLinkUpdateMode(nMode); } break; case HANDLE_FIELD_AUTO_UPDATE: { bool bUpdateField = *(sal_Bool*)rValue.getValue(); - SwFldUpdateFlags nFlag = mpDoc->GetDocumentSettingManager().getFieldUpdateFlags(true); - mpDoc->GetDocumentSettingManager().setFieldUpdateFlags( bUpdateField ? + SwFldUpdateFlags nFlag = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true); + mpDoc->getIDocumentSettingAccess().setFieldUpdateFlags( bUpdateField ? nFlag == AUTOUPD_FIELD_AND_CHARTS ? AUTOUPD_FIELD_AND_CHARTS : AUTOUPD_FIELD_ONLY : @@ -346,8 +346,8 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_CHART_AUTO_UPDATE: { bool bUpdateChart = *(sal_Bool*)rValue.getValue(); - SwFldUpdateFlags nFlag = mpDoc->GetDocumentSettingManager().getFieldUpdateFlags(true); - mpDoc->GetDocumentSettingManager().setFieldUpdateFlags( (nFlag == AUTOUPD_FIELD_ONLY || nFlag == AUTOUPD_FIELD_AND_CHARTS ) ? + SwFldUpdateFlags nFlag = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true); + mpDoc->getIDocumentSettingAccess().setFieldUpdateFlags( (nFlag == AUTOUPD_FIELD_ONLY || nFlag == AUTOUPD_FIELD_AND_CHARTS ) ? bUpdateChart ? AUTOUPD_FIELD_AND_CHARTS : AUTOUPD_FIELD_ONLY : @@ -358,20 +358,20 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf { bool bParaSpace = false; rValue >>= bParaSpace; - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::PARA_SPACE_MAX, bParaSpace ); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::PARA_SPACE_MAX, bParaSpace ); } break; case HANDLE_ADD_PARA_TABLE_SPACING_AT_START: { bool bParaSpacePage = false; rValue >>= bParaSpacePage; - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES, bParaSpacePage ); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES, bParaSpacePage ); } break; case HANDLE_ALIGN_TAB_STOP_POSITION: { bool bAlignTab = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::TAB_COMPAT, bAlignTab); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::TAB_COMPAT, bAlignTab); } break; case HANDLE_PRINTER_NAME: @@ -436,7 +436,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_IS_KERN_ASIAN_PUNCTUATION: { bool bIsKern = *(sal_Bool*)(rValue).getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION, bIsKern); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION, bIsKern); SwEditShell* pEditSh = mpDoc->GetEditShell(); if(pEditSh) pEditSh->ChgHyphenation(); @@ -455,7 +455,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf default: throw IllegalArgumentException(); } - mpDoc->GetDocumentSettingManager().setCharacterCompressionType(static_cast < SwCharCompressType > (nMode) ); + mpDoc->getIDocumentSettingAccess().setCharacterCompressionType(static_cast < SwCharCompressType > (nMode) ); } break; case HANDLE_APPLY_USER_DATA: @@ -466,7 +466,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_SAVE_GLOBAL_DOCUMENT_LINKS: { bool bSaveGlobal = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, bSaveGlobal ); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, bSaveGlobal ); } break; case HANDLE_CURRENT_DATABASE_DATA_SOURCE: @@ -530,31 +530,31 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf bool bSet = false; if(!(rValue >>= bSet)) throw IllegalArgumentException(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::LABEL_DOCUMENT, bSet); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::LABEL_DOCUMENT, bSet); } break; case HANDLE_IS_ADD_FLY_OFFSET: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::ADD_FLY_OFFSETS, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::ADD_FLY_OFFSETS, bTmp); } break; case HANDLE_IS_ADD_EXTERNAL_LEADING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::ADD_EXT_LEADING, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::ADD_EXT_LEADING, bTmp); } break; case HANDLE_OLD_NUMBERING: // #111955# { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::OLD_NUMBERING, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::OLD_NUMBERING, bTmp); } break; case HANDLE_OUTLINELEVEL_YIELDS_NUMBERING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE, bTmp); } break; case HANDLE_ALLOW_PRINTJOB_CANCEL: @@ -568,25 +568,25 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_USE_FORMER_LINE_SPACING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::OLD_LINE_SPACING, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::OLD_LINE_SPACING, bTmp); } break; case HANDLE_ADD_PARA_SPACING_TO_TABLE_CELLS: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS, bTmp); } break; case HANDLE_USE_FORMER_OBJECT_POSITIONING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::USE_FORMER_OBJECT_POS, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::USE_FORMER_OBJECT_POS, bTmp); } break; case HANDLE_USE_FORMER_TEXT_WRAPPING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING, bTmp); } break; case HANDLE_CHANGES_PASSWORD: @@ -607,37 +607,37 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_CONSIDER_WRAP_ON_OBJPOS: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION, bTmp ); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION, bTmp ); } break; case HANDLE_IGNORE_FIRST_LINE_INDENT_IN_NUMBERING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING, bTmp); + mpDoc->getIDocumentSettingAccess().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->GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, bTmp); + mpDoc->getIDocumentSettingAccess().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->GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT, bTmp); } break; case HANDLE_TABLE_ROW_KEEP: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::TABLE_ROW_KEEP, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::TABLE_ROW_KEEP, bTmp); } break; case HANDLE_IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION, bTmp); } break; case HANDLE_LOAD_READONLY: @@ -648,19 +648,19 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, bTmp); + mpDoc->getIDocumentSettingAccess().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->GetDocumentSettingManager().set(IDocumentSettingAccess::CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME, bTmp); + mpDoc->getIDocumentSettingAccess().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->GetDocumentSettingManager().set(IDocumentSettingAccess::UNIX_FORCE_ZERO_EXT_LEADING, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::UNIX_FORCE_ZERO_EXT_LEADING, bTmp); } break; case HANDLE_USE_OLD_PRINTER_METRICS: @@ -669,7 +669,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_TABS_RELATIVE_TO_INDENT: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT, bTmp); } break; case HANDLE_RSID: @@ -689,14 +689,14 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_PROTECT_FORM: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::PROTECT_FORM, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::PROTECT_FORM, bTmp); } break; // #i89181# case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, bTmp); } break; case HANDLE_MODIFYPASSWORDINFO: @@ -717,85 +717,85 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_MATH_BASELINE_ALIGNMENT: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, bTmp ); + mpDoc->getIDocumentSettingAccess().set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, bTmp ); } break; case HANDLE_INVERT_BORDER_SPACING: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::INVERT_BORDER_SPACING, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::INVERT_BORDER_SPACING, bTmp); } break; case HANDLE_COLLAPSE_EMPTY_CELL_PARA: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA, bTmp); } break; case HANDLE_SMALL_CAPS_PERCENTAGE_66: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::SMALL_CAPS_PERCENTAGE_66, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::SMALL_CAPS_PERCENTAGE_66, bTmp); } break; case HANDLE_TAB_OVERFLOW: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::TAB_OVERFLOW, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::TAB_OVERFLOW, bTmp); } break; case HANDLE_UNBREAKABLE_NUMBERINGS: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::UNBREAKABLE_NUMBERINGS, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::UNBREAKABLE_NUMBERINGS, bTmp); } break; case HANDLE_STYLES_NODEFAULT: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::STYLES_NODEFAULT, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::STYLES_NODEFAULT, bTmp); } break; case HANDLE_FLOATTABLE_NOMARGINS: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::FLOATTABLE_NOMARGINS, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::FLOATTABLE_NOMARGINS, bTmp); } break; case HANDLE_CLIPPED_PICTURES: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::CLIPPED_PICTURES, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::CLIPPED_PICTURES, bTmp); } break; case HANDLE_BACKGROUND_PARA_OVER_DRAWINGS: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::BACKGROUND_PARA_OVER_DRAWINGS, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::BACKGROUND_PARA_OVER_DRAWINGS, bTmp); } break; case HANDLE_EMBED_FONTS: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::EMBED_FONTS, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::EMBED_FONTS, bTmp); } break; case HANDLE_EMBED_SYSTEM_FONTS: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::EMBED_SYSTEM_FONTS, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::EMBED_SYSTEM_FONTS, bTmp); } break; case HANDLE_TAB_OVER_MARGIN: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::TAB_OVER_MARGIN, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::TAB_OVER_MARGIN, bTmp); } break; case HANDLE_SURROUND_TEXT_WRAP_SMALL: { bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->GetDocumentSettingManager().set(IDocumentSettingAccess::SURROUND_TEXT_WRAP_SMALL, bTmp); + mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::SURROUND_TEXT_WRAP_SMALL, bTmp); } break; case HANDLE_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING: @@ -856,38 +856,38 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_LINK_UPDATE_MODE: { - rValue <<= static_cast < sal_Int16 > ( mpDoc->GetDocumentSettingManager().getLinkUpdateMode(true) ); + rValue <<= static_cast < sal_Int16 > ( mpDoc->getIDocumentSettingAccess().getLinkUpdateMode(true) ); } break; case HANDLE_FIELD_AUTO_UPDATE: { - SwFldUpdateFlags nFlags = mpDoc->GetDocumentSettingManager().getFieldUpdateFlags(true); + SwFldUpdateFlags nFlags = mpDoc->getIDocumentSettingAccess().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->GetDocumentSettingManager().getFieldUpdateFlags(true); + SwFldUpdateFlags nFlags = mpDoc->getIDocumentSettingAccess().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->GetDocumentSettingManager().get(IDocumentSettingAccess::PARA_SPACE_MAX); + sal_Bool bParaSpace = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::PARA_SPACE_MAX); rValue.setValue(&bParaSpace, ::getBooleanCppuType()); } break; case HANDLE_ADD_PARA_TABLE_SPACING_AT_START: { - sal_Bool bParaSpace = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES); + sal_Bool bParaSpace = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES); rValue.setValue(&bParaSpace, ::getBooleanCppuType()); } break; case HANDLE_ALIGN_TAB_STOP_POSITION: { - sal_Bool bAlignTab = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::TAB_COMPAT); + sal_Bool bAlignTab = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::TAB_COMPAT); rValue.setValue(&bAlignTab, ::getBooleanCppuType()); } break; @@ -920,7 +920,7 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_IS_KERN_ASIAN_PUNCTUATION: { - sal_Bool bParaSpace = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION); + sal_Bool bParaSpace = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION); rValue.setValue(&bParaSpace, ::getBooleanCppuType()); } break; @@ -931,12 +931,12 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_CHARACTER_COMPRESSION_TYPE: { - rValue <<= static_cast < sal_Int16 > (mpDoc->GetDocumentSettingManager().getCharacterCompressionType()); + rValue <<= static_cast < sal_Int16 > (mpDoc->getIDocumentSettingAccess().getCharacterCompressionType()); } break; case HANDLE_SAVE_GLOBAL_DOCUMENT_LINKS: { - sal_Bool bSaveGlobal = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS); + sal_Bool bSaveGlobal = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS); rValue.setValue(&bSaveGlobal, ::getBooleanCppuType()); } break; @@ -971,8 +971,8 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf case HANDLE_PRINTER_INDEPENDENT_LAYOUT: { // returns short (see css.document.PrinterIndependentLayout) - sal_Int16 nVirDevType = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ? - ( mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE) ? + sal_Int16 nVirDevType = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ? + ( mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE) ? document::PrinterIndependentLayout::HIGH_RESOLUTION : document::PrinterIndependentLayout::LOW_RESOLUTION ) : document::PrinterIndependentLayout::DISABLED; @@ -981,31 +981,31 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_IS_LABEL_DOC: { - bool bLabel = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::LABEL_DOCUMENT); + bool bLabel = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::LABEL_DOCUMENT); rValue <<= bLabel; } break; case HANDLE_IS_ADD_FLY_OFFSET: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_FLY_OFFSETS); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::ADD_FLY_OFFSETS); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_IS_ADD_EXTERNAL_LEADING: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_EXT_LEADING); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::ADD_EXT_LEADING); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_OLD_NUMBERING: // #111955# { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::OLD_NUMBERING); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::OLD_NUMBERING); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_OUTLINELEVEL_YIELDS_NUMBERING: // #111955# { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; @@ -1017,25 +1017,25 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_USE_FORMER_LINE_SPACING: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::OLD_LINE_SPACING); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::OLD_LINE_SPACING); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_ADD_PARA_SPACING_TO_TABLE_CELLS: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_USE_FORMER_OBJECT_POSITIONING: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_USE_FORMER_TEXT_WRAPPING: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; @@ -1046,37 +1046,37 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_CONSIDER_WRAP_ON_OBJPOS: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_IGNORE_FIRST_LINE_INDENT_IN_NUMBERING: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().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->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().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->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_TABLE_ROW_KEEP : { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::TABLE_ROW_KEEP); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::TABLE_ROW_KEEP); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; @@ -1087,19 +1087,19 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().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->GetDocumentSettingManager().get(IDocumentSettingAccess::CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().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->GetDocumentSettingManager().get(IDocumentSettingAccess::UNIX_FORCE_ZERO_EXT_LEADING); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::UNIX_FORCE_ZERO_EXT_LEADING); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; @@ -1111,7 +1111,7 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_TABS_RELATIVE_TO_INDENT: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; @@ -1127,14 +1127,14 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_PROTECT_FORM: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::PROTECT_FORM); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::PROTECT_FORM); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; // #i89181# case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; @@ -1145,85 +1145,85 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_MATH_BASELINE_ALIGNMENT: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_INVERT_BORDER_SPACING: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::INVERT_BORDER_SPACING); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get(IDocumentSettingAccess::INVERT_BORDER_SPACING); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_COLLAPSE_EMPTY_CELL_PARA: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA ); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_SMALL_CAPS_PERCENTAGE_66: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::SMALL_CAPS_PERCENTAGE_66 ); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::SMALL_CAPS_PERCENTAGE_66 ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_TAB_OVERFLOW: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::TAB_OVERFLOW ); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::TAB_OVERFLOW ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_UNBREAKABLE_NUMBERINGS: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::UNBREAKABLE_NUMBERINGS ); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::UNBREAKABLE_NUMBERINGS ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_STYLES_NODEFAULT: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::STYLES_NODEFAULT ); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::STYLES_NODEFAULT ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_FLOATTABLE_NOMARGINS: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::FLOATTABLE_NOMARGINS ); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::FLOATTABLE_NOMARGINS ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_CLIPPED_PICTURES: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::CLIPPED_PICTURES ); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::CLIPPED_PICTURES ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_BACKGROUND_PARA_OVER_DRAWINGS: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::BACKGROUND_PARA_OVER_DRAWINGS ); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::BACKGROUND_PARA_OVER_DRAWINGS ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_EMBED_FONTS: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::EMBED_FONTS ); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::EMBED_FONTS ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_EMBED_SYSTEM_FONTS: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::EMBED_SYSTEM_FONTS ); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::EMBED_SYSTEM_FONTS ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_TAB_OVER_MARGIN: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::TAB_OVER_MARGIN ); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::TAB_OVER_MARGIN ); rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; case HANDLE_SURROUND_TEXT_WRAP_SMALL: { - sal_Bool bTmp = mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::SURROUND_TEXT_WRAP_SMALL ); + sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().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 be6bc22b7349..ac09758b2672 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -94,7 +94,7 @@ #include <unodefaults.hxx> #include <SwXDocumentSettings.hxx> #include <doc.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <IDocumentDeviceAccess.hxx> #include <editeng/forbiddencharacterstable.hxx> #include <svl/zforlist.hxx> @@ -3840,7 +3840,7 @@ Sequence< OUString > SwXOutlineTarget::getSupportedServiceNames(void) throw( Run } SwXDocumentPropertyHelper::SwXDocumentPropertyHelper(SwDoc& rDoc) : -SvxUnoForbiddenCharsTable ( rDoc.GetDocumentSettingManager().getForbiddenCharacterTable() ) +SvxUnoForbiddenCharsTable ( rDoc.getIDocumentSettingAccess().getForbiddenCharacterTable() ) ,m_pDoc(&rDoc) { } diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 0dce5403126d..2653bc0cf304 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -82,7 +82,7 @@ #include <swdtflvr.hxx> #include <crsskip.hxx> #include <doc.hxx> -#include <DocumentSettingManager.hxx> +#include <IDocumentSettingAccess.hxx> #include <wrtsh.hrc> #include <SwStyleNameMapper.hxx> #include <sfx2/request.hxx> @@ -515,7 +515,7 @@ bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrmFm SwFlyFrmFmt *pFmt = SwFEShell::InsertObject( xRef, &aFrmMgr.GetAttrSet() ); // --> #i972# - if ( bStarMath && mpDoc->GetDocumentSettingManager().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) ) + if ( bStarMath && mpDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) ) AlignFormulaToBaseline( xRef.GetObject() ); if (pFlyFrmFmt) |