summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorValentin Kettner <vakevk+libreoffice@gmail.com>2014-05-27 13:55:31 +0200
committerValentin Kettner <vakevk+libreoffice@gmail.com>2014-06-03 19:12:03 +0200
commit4269e3a7435b45cbbcd45d959e1e8c8e761a94a0 (patch)
treec78a7cdc96d10f10868709b59bb0c2848099e0f5 /sw/source/filter
parentb7dd4ad818be23aae8163cab760b5edc4f7eaaf3 (diff)
Changed DocumentDeviceManager includes to IDocumentDeviceAccess.
In places other than sw/core/ Change-Id: Ie1b67f58cf7777240d9db6a867cd33a7a1cbbcaf
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/basflt/shellio.cxx14
-rw-r--r--sw/source/filter/html/css1atr.cxx6
-rw-r--r--sw/source/filter/html/swhtml.cxx12
-rw-r--r--sw/source/filter/html/wrthtml.cxx16
-rw-r--r--sw/source/filter/writer/writer.cxx6
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx4
-rw-r--r--sw/source/filter/ww8/docxexport.cxx6
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx6
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx18
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par.cxx70
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx4
-rw-r--r--sw/source/filter/xml/swxml.cxx6
-rw-r--r--sw/source/filter/xml/xmlexp.cxx10
-rw-r--r--sw/source/filter/xml/xmlfonte.cxx6
-rw-r--r--sw/source/filter/xml/xmlimp.cxx4
16 files changed, 97 insertions, 97 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 );