Skip to content

C
core
Kaydet (Commit) 5cbf6e93 authored tarafından Henry Castro's avatar Henry Castro
Dosyalara gözat
Seçenekler

sc: prefix members of ScDocShell 

Change-Id: I7c2a4e5e850b26da515719f7df869f12c49b0ad3
Reviewed-on: https://gerrit.libreoffice.org/55148Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarHenry Castro <hcastro@collabora.com>
üst bfed5c38
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 109 deletions
sc/source/ui/docshell/docsh.cxx
Dosyayı görüntüle @ 5cbf6e93
This diff is collapsed.
sc/source/ui/docshell/docsh2.cxx
Dosyayı görüntüle @ 5cbf6e93
......@@ -43,7 +43,7 @@ bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
{
bool bRet = SfxObjectShell::InitNew( xStor );
aDocument.MakeTable(0);
m_aDocument.MakeTable(0);
// Additional tables are created by the first View, if bIsEmpty is still sal_True
if( bRet )
......@@ -57,10 +57,10 @@ bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
// InitOptions sets the document languages, must be called before CreateStandardStyles
InitOptions(false);
aDocument.GetStyleSheetPool()->CreateStandardStyles();
aDocument.UpdStlShtPtrsFrmNms();
m_aDocument.GetStyleSheetPool()->CreateStandardStyles();
m_aDocument.UpdStlShtPtrsFrmNms();
if (!mbUcalcTest)
if (!m_bUcalcTest)
{
/* Create styles that are imported through Orcus */
......@@ -73,8 +73,8 @@ bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
ScOrcusFilters* pOrcus = ScFormatFilter::Get().GetOrcusFilters();
if (pOrcus)
{
pOrcus->importODS_Styles(aDocument, aPath);
aDocument.GetStyleSheetPool()->setAllStandard();
pOrcus->importODS_Styles(m_aDocument, aPath);
m_aDocument.GetStyleSheetPool()->setAllStandard();
}
}
......@@ -87,7 +87,7 @@ bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
void ScDocShell::SetEmpty(bool bSet)
{
bIsEmpty = bSet;
m_bIsEmpty = bSet;
}
void ScDocShell::InitItems()
......@@ -96,7 +96,7 @@ void ScDocShell::InitItems()
// Printer Options are set in GetPrinter when printing
UpdateFontList();
ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer();
ScDrawLayer* pDrawLayer = m_aDocument.GetDrawLayer();
if (pDrawLayer)
{
PutItem( SvxColorListItem ( pDrawLayer->GetColorList(), SID_COLOR_TABLE ) );
......@@ -108,7 +108,7 @@ void ScDocShell::InitItems()
PutItem( SvxLineEndListItem ( pDrawLayer->GetLineEndList(), SID_LINEEND_LIST ) );
// Other modifications after creation of the DrawLayer
pDrawLayer->SetNotifyUndoActionHdl( LINK( pDocFunc, ScDocFunc, NotifyDrawUndo ) );
pDrawLayer->SetNotifyUndoActionHdl( LINK( m_pDocFunc, ScDocFunc, NotifyDrawUndo ) );
}
else if (!utl::ConfigManager::IsFuzzing())
{
......@@ -117,12 +117,12 @@ void ScDocShell::InitItems()
}
if (!utl::ConfigManager::IsFuzzing() &&
(!aDocument.GetForbiddenCharacters() || !aDocument.IsValidAsianCompression() || !aDocument.IsValidAsianKerning()))
(!m_aDocument.GetForbiddenCharacters() || !m_aDocument.IsValidAsianCompression() || !m_aDocument.IsValidAsianKerning()))
{
// get settings from SvxAsianConfig
SvxAsianConfig aAsian;
if (!aDocument.GetForbiddenCharacters())
if (!m_aDocument.GetForbiddenCharacters())
{
// set forbidden characters if necessary
uno::Sequence<lang::Locale> aLocales = aAsian.GetStartEndCharLocales();
......@@ -141,41 +141,41 @@ void ScDocShell::InitItems()
xForbiddenTable->SetForbiddenCharacters( eLang, aForbidden );
}
aDocument.SetForbiddenCharacters( xForbiddenTable );
m_aDocument.SetForbiddenCharacters( xForbiddenTable );
}
}
if ( !aDocument.IsValidAsianCompression() )
if ( !m_aDocument.IsValidAsianCompression() )
{
// set compression mode from configuration if not already set (e.g. XML import)
aDocument.SetAsianCompression( aAsian.GetCharDistanceCompression() );
m_aDocument.SetAsianCompression( aAsian.GetCharDistanceCompression() );
}
if ( !aDocument.IsValidAsianKerning() )
if ( !m_aDocument.IsValidAsianKerning() )
{
// set asian punctuation kerning from configuration if not already set (e.g. XML import)
aDocument.SetAsianKerning( !aAsian.IsKerningWesternTextOnly() ); // reversed
m_aDocument.SetAsianKerning( !aAsian.IsKerningWesternTextOnly() ); // reversed
}
}
}
void ScDocShell::ResetDrawObjectShell()
{
ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer();
ScDrawLayer* pDrawLayer = m_aDocument.GetDrawLayer();
if (pDrawLayer)
pDrawLayer->SetObjectShell( nullptr );
}
ScDrawLayer* ScDocShell::MakeDrawLayer()
{
ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer();
ScDrawLayer* pDrawLayer = m_aDocument.GetDrawLayer();
if (!pDrawLayer)
{
aDocument.InitDrawLayer(this);
pDrawLayer = aDocument.GetDrawLayer();
m_aDocument.InitDrawLayer(this);
pDrawLayer = m_aDocument.GetDrawLayer();
InitItems(); // including Undo and Basic
Broadcast( SfxHint( SfxHintId::ScDrawLayerNew ) );
if (nDocumentLock)
if (m_nDocumentLock)
pDrawLayer->setLock(true);
}
return pDrawLayer;
......
sc/source/ui/docshell/docsh6.cxx
Dosyayı görüntüle @ 5cbf6e93
......@@ -74,12 +74,12 @@ static void lcl_SetTopRight( tools::Rectangle& rRect, const Point& rPos )
void ScDocShell::SetVisAreaOrSize( const tools::Rectangle& rVisArea )
{
bool bNegativePage = aDocument.IsNegativePage( aDocument.GetVisibleTab() );
bool bNegativePage = m_aDocument.IsNegativePage( m_aDocument.GetVisibleTab() );
tools::Rectangle aArea = rVisArea;
// when loading, don't check for negative values, because the sheet orientation
// might be set later
if ( !aDocument.IsImportingXML() )
if ( !m_aDocument.IsImportingXML() )
{
if ( ( bNegativePage ? (aArea.Right() > 0) : (aArea.Left() < 0) ) || aArea.Top() < 0 )
{
......@@ -105,7 +105,7 @@ void ScDocShell::SetVisAreaOrSize( const tools::Rectangle& rVisArea )
// when loading an ole object, the VisArea is set from the document's
// view settings and must be used as-is (document content may not be complete yet).
if ( !aDocument.IsImportingXML() )
if ( !m_aDocument.IsImportingXML() )
SnapVisArea( aArea );
//TODO/LATER: it's unclear which IPEnv is used here
......@@ -121,7 +121,7 @@ void ScDocShell::SetVisAreaOrSize( const tools::Rectangle& rVisArea )
//TODO/LATER: formerly in SvInplaceObject
SfxObjectShell::SetVisArea( aArea );
if (bIsInplace) // adjust zoom in the InPlace View
if (m_bIsInplace) // adjust zoom in the InPlace View
{
ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
if (pViewSh)
......@@ -131,13 +131,13 @@ void ScDocShell::SetVisAreaOrSize( const tools::Rectangle& rVisArea )
}
}
if (aDocument.IsEmbedded())
if (m_aDocument.IsEmbedded())
{
ScRange aOld;
aDocument.GetEmbedded( aOld);
aDocument.SetEmbedded( aDocument.GetVisibleTab(), aArea );
m_aDocument.GetEmbedded( aOld);
m_aDocument.SetEmbedded( m_aDocument.GetVisibleTab(), aArea );
ScRange aNew;
aDocument.GetEmbedded( aNew);
m_aDocument.GetEmbedded( aNew);
if (aOld != aNew)
PostPaint(0,0,0,MAXCOL,MAXROW,MAXTAB,PaintPartFlags::Grid);
......@@ -164,19 +164,19 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, bool bSnapSize )
tools::Rectangle aOldArea = SfxObjectShell::GetVisArea();
tools::Rectangle aNewArea = aOldArea;
bool bEmbedded = aDocument.IsEmbedded();
bool bEmbedded = m_aDocument.IsEmbedded();
if (bEmbedded)
aNewArea = aDocument.GetEmbeddedRect();
aNewArea = m_aDocument.GetEmbeddedRect();
else
{
SCTAB nTab = pViewData->GetTabNo();
if ( nTab != aDocument.GetVisibleTab() )
aDocument.SetVisibleTab( nTab );
if ( nTab != m_aDocument.GetVisibleTab() )
m_aDocument.SetVisibleTab( nTab );
bool bNegativePage = aDocument.IsNegativePage( nTab );
bool bNegativePage = m_aDocument.IsNegativePage( nTab );
SCCOL nX = pViewData->GetPosX(SC_SPLIT_LEFT);
SCROW nY = pViewData->GetPosY(SC_SPLIT_BOTTOM);
tools::Rectangle aMMRect = aDocument.GetMMRect( nX,nY, nX,nY, nTab );
tools::Rectangle aMMRect = m_aDocument.GetMMRect( nX,nY, nX,nY, nTab );
if (bNegativePage)
lcl_SetTopRight( aNewArea, aMMRect.TopRight() );
else
......@@ -193,7 +193,7 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, bool bSnapSize )
SfxStyleSheetBasePool* ScDocShell::GetStyleSheetPool()
{
return static_cast<SfxStyleSheetBasePool*>(aDocument.GetStyleSheetPool());
return static_cast<SfxStyleSheetBasePool*>(m_aDocument.GetStyleSheetPool());
}
// After loading styles from another document (LoadStyles, Insert), the SetItems
......@@ -230,12 +230,12 @@ static void lcl_AdjustPool( SfxStyleSheetBasePool* pStylePool )
void ScDocShell::LoadStyles( SfxObjectShell &rSource )
{
aDocument.StylesToNames();
m_aDocument.StylesToNames();
SfxObjectShell::LoadStyles(rSource);
lcl_AdjustPool( GetStyleSheetPool() ); // adjust SetItems
aDocument.UpdStlShtPtrsFrmNms();
m_aDocument.UpdStlShtPtrsFrmNms();
UpdateAllRowHeights();
......@@ -252,7 +252,7 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, bool bReplace, bool bCellS
return;
ScStyleSheetPool* pSourcePool = rSource.GetDocument().GetStyleSheetPool();
ScStyleSheetPool* pDestPool = aDocument.GetStyleSheetPool();
ScStyleSheetPool* pDestPool = m_aDocument.GetStyleSheetPool();
SfxStyleFamily eFamily = bCellStyles ?
( bPageStyles ? SfxStyleFamily::All : SfxStyleFamily::Para ) :
......@@ -310,7 +310,7 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, bool bReplace, bool bCellS
void ScDocShell::ReconnectDdeLink(SfxObjectShell& rServer)
{
::sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager();
::sfx2::LinkManager* pLinkManager = m_aDocument.GetLinkManager();
if (!pLinkManager)
return;
......@@ -321,7 +321,7 @@ void ScDocShell::UpdateLinks()
{
typedef std::unordered_set<OUString> StrSetType;
sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager();
sfx2::LinkManager* pLinkManager = m_aDocument.GetLinkManager();
StrSetType aNames;
// out with the no longer used links
......@@ -345,23 +345,23 @@ void ScDocShell::UpdateLinks()
// enter new links
SCTAB nTabCount = aDocument.GetTableCount();
SCTAB nTabCount = m_aDocument.GetTableCount();
for (SCTAB i = 0; i < nTabCount; ++i)
{
if (!aDocument.IsLinked(i))
if (!m_aDocument.IsLinked(i))
continue;
OUString aDocName = aDocument.GetLinkDoc(i);
OUString aFltName = aDocument.GetLinkFlt(i);
OUString aOptions = aDocument.GetLinkOpt(i);
sal_uLong nRefresh = aDocument.GetLinkRefreshDelay(i);
OUString aDocName = m_aDocument.GetLinkDoc(i);
OUString aFltName = m_aDocument.GetLinkFlt(i);
OUString aOptions = m_aDocument.GetLinkOpt(i);
sal_uLong nRefresh = m_aDocument.GetLinkRefreshDelay(i);
bool bThere = false;
for (SCTAB j = 0; j < i && !bThere; ++j) // several times in the document?
{
if (aDocument.IsLinked(j)
&& aDocument.GetLinkDoc(j) == aDocName
&& aDocument.GetLinkFlt(j) == aFltName
&& aDocument.GetLinkOpt(j) == aOptions)
if (m_aDocument.IsLinked(j)
&& m_aDocument.GetLinkDoc(j) == aDocName
&& m_aDocument.GetLinkFlt(j) == aFltName
&& m_aDocument.GetLinkOpt(j) == aOptions)
// Ignore refresh delay in compare, it should be the
// same for identical links and we don't want dupes
// if it ain't.
......@@ -387,7 +387,7 @@ void ScDocShell::UpdateLinks()
void ScDocShell::ReloadTabLinks()
{
sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager();
sfx2::LinkManager* pLinkManager = m_aDocument.GetLinkManager();
bool bAny = false;
size_t nCount = pLinkManager->GetLinks().size();
......@@ -420,7 +420,7 @@ void ScDocShell::ReloadTabLinks()
void ScDocShell::SetFormulaOptions( const ScFormulaOptions& rOpt, bool bForLoading )
{
aDocument.SetGrammar( rOpt.GetFormulaSyntax() );
m_aDocument.SetGrammar( rOpt.GetFormulaSyntax() );
// This is nasty because it resets module globals from within a docshell!
// For actual damage caused see fdo#82183 where an unconditional
......@@ -468,7 +468,7 @@ void ScDocShell::SetFormulaOptions( const ScFormulaOptions& rOpt, bool bForLoadi
}
// Per document interpreter settings.
aDocument.SetCalcConfig( rOpt.GetCalcConfig() );
m_aDocument.SetCalcConfig( rOpt.GetCalcConfig() );
}
void ScDocShell::CheckConfigOptions()
......
sc/source/ui/docshell/docsh8.cxx
Dosyayı görüntüle @ 5cbf6e93
......@@ -378,10 +378,10 @@ ErrCode ScDocShell::DBaseImport( const OUString& rFullFileName, rtl_TextEncoding
break;
}
aDocument.SetString( static_cast<SCCOL>(i), 0, 0, aHeader );
m_aDocument.SetString( static_cast<SCCOL>(i), 0, 0, aHeader );
}
lcl_setScalesToColumns(aDocument, aScales);
lcl_setScalesToColumns(m_aDocument, aScales);
SCROW nRow = 1; // 0 is column titles
bool bEnd = false;
......@@ -394,7 +394,7 @@ ErrCode ScDocShell::DBaseImport( const OUString& rFullFileName, rtl_TextEncoding
for (i=0; i<nColCount; i++)
{
ScDatabaseDocUtil::StrData aStrData;
ScDatabaseDocUtil::PutData( &aDocument, nCol, nRow, 0,
ScDatabaseDocUtil::PutData( &m_aDocument, nCol, nRow, 0,
xRow, i+1, pTypeArr[i], false,
&aStrData );
......@@ -751,20 +751,20 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding
SCCOL nFirstCol, nLastCol;
SCROW nFirstRow, nLastRow;
SCTAB nTab = GetSaveTab();
aDocument.GetDataStart( nTab, nFirstCol, nFirstRow );
aDocument.GetCellArea( nTab, nLastCol, nLastRow );
m_aDocument.GetDataStart( nTab, nFirstCol, nFirstRow );
m_aDocument.GetCellArea( nTab, nLastCol, nLastRow );
if ( nFirstCol > nLastCol )
nFirstCol = nLastCol;
if ( nFirstRow > nLastRow )
nFirstRow = nLastRow;
ScProgress aProgress( this, ScResId( STR_SAVE_DOC ),
nLastRow - nFirstRow, true );
SvNumberFormatter* pNumFmt = aDocument.GetFormatTable();
SvNumberFormatter* pNumFmt = m_aDocument.GetFormatTable();
bool bHasFieldNames = true;
for ( SCCOL nDocCol = nFirstCol; nDocCol <= nLastCol && bHasFieldNames; nDocCol++ )
{ // only Strings in first row => are field names
if ( !aDocument.HasStringData( nDocCol, nFirstRow, nTab ) )
if ( !m_aDocument.HasStringData( nDocCol, nFirstRow, nTab ) )
bHasFieldNames = false;
}
......@@ -781,7 +781,7 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding
bHasMemo, eCharSet );
// also needed for exception catch
SCROW nDocRow = 0;
ScFieldEditEngine aEditEngine(&aDocument, aDocument.GetEditPool());
ScFieldEditEngine aEditEngine(&m_aDocument, m_aDocument.GetEditPool());
OUString aString;
OUString aTabName;
......@@ -908,7 +908,7 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding
{
case sdbc::DataType::LONGVARCHAR:
{
ScRefCellValue aCell(aDocument, ScAddress(nDocCol, nDocRow, nTab));
ScRefCellValue aCell(m_aDocument, ScAddress(nDocCol, nDocRow, nTab));
if (!aCell.isEmpty())
{
if (aCell.meType == CELLTYPE_EDIT)
......@@ -918,7 +918,7 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding
else
{
lcl_getLongVarCharString(
aString, aDocument, nDocCol, nDocRow, nTab, *pNumFmt);
aString, m_aDocument, nDocCol, nDocRow, nTab, *pNumFmt);
}
xRowUpdate->updateString( nCol+1, aString );
}
......@@ -928,7 +928,7 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding
break;
case sdbc::DataType::VARCHAR:
aString = aDocument.GetString(nDocCol, nDocRow, nTab);
aString = m_aDocument.GetString(nDocCol, nDocRow, nTab);
xRowUpdate->updateString( nCol+1, aString );
if ( nErr == ERRCODE_NONE && pColLengths[nCol] < aString.getLength() )
nErr = SCWARN_EXPORT_DATALOST;
......@@ -936,16 +936,16 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding
case sdbc::DataType::DATE:
{
aDocument.GetValue( nDocCol, nDocRow, nTab, fVal );
m_aDocument.GetValue( nDocCol, nDocRow, nTab, fVal );
// differentiate between 0 with value and 0 no-value
bool bIsNull = (fVal == 0.0);
if ( bIsNull )
bIsNull = !aDocument.HasValueData( nDocCol, nDocRow, nTab );
bIsNull = !m_aDocument.HasValueData( nDocCol, nDocRow, nTab );
if ( bIsNull )
{
xRowUpdate->updateNull( nCol+1 );
if ( nErr == ERRCODE_NONE &&
aDocument.HasStringData( nDocCol, nDocRow, nTab ) )
m_aDocument.HasStringData( nDocCol, nDocRow, nTab ) )
nErr = SCWARN_EXPORT_DATALOST;
}
else
......@@ -959,9 +959,9 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding
case sdbc::DataType::DECIMAL:
case sdbc::DataType::BIT:
aDocument.GetValue( nDocCol, nDocRow, nTab, fVal );
m_aDocument.GetValue( nDocCol, nDocRow, nTab, fVal );
if ( fVal == 0.0 && nErr == ERRCODE_NONE &&
aDocument.HasStringData( nDocCol, nDocRow, nTab ) )
m_aDocument.HasStringData( nDocCol, nDocRow, nTab ) )
nErr = SCWARN_EXPORT_DATALOST;
if ( pColTypes[nCol] == sdbc::DataType::BIT )
xRowUpdate->updateBoolean( nCol+1, ( fVal != 0.0 ) );
......@@ -973,7 +973,7 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding
OSL_FAIL( "ScDocShell::DBaseExport: unknown FieldType" );
if ( nErr == ERRCODE_NONE )
nErr = SCWARN_EXPORT_DATALOST;
aDocument.GetValue( nDocCol, nDocRow, nTab, fVal );
m_aDocument.GetValue( nDocCol, nDocRow, nTab, fVal );
xRowUpdate->updateDouble( nCol+1, fVal );
}
}
......@@ -1005,7 +1005,7 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding
SCCOL nDocCol = nFirstCol;
const sal_Int32* pColTypes = aColTypes.getConstArray();
const sal_Int32* pColLengths = aColLengths.getConstArray();
ScHorizontalCellIterator aIter( &aDocument, nTab, nFirstCol,
ScHorizontalCellIterator aIter( &m_aDocument, nTab, nFirstCol,
nDocRow, nLastCol, nDocRow);
ScRefCellValue* pCell = nullptr;
bool bTest = true;
......@@ -1020,12 +1020,12 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding
lcl_getLongVarCharEditString(aString, *pCell, aEditEngine);
else
lcl_getLongVarCharString(
aString, aDocument, nDocCol, nDocRow, nTab, *pNumFmt);
aString, m_aDocument, nDocCol, nDocRow, nTab, *pNumFmt);
}
break;
case sdbc::DataType::VARCHAR:
aString = aDocument.GetString(nDocCol, nDocRow, nTab);
aString = m_aDocument.GetString(nDocCol, nDocRow, nTab);
break;
// NOTE: length of DECIMAL fields doesn't need to be
......
sc/source/ui/inc/docsh.hxx
Dosyayı görüntüle @ 5cbf6e93
......@@ -85,34 +85,34 @@ enum class LOKCommentNotificationType { Add, Modify, Remove };
class SC_DLLPUBLIC ScDocShell final: public SfxObjectShell, public SfxListener
{
ScDocument aDocument;
ScDocument m_aDocument;
OUString aDdeTextFmt;
OUString m_aDdeTextFmt;
double nPrtToScreenFactor;
DocShell_Impl* pImpl;
ScDocFunc* pDocFunc;
double m_nPrtToScreenFactor;
DocShell_Impl* m_pImpl;
ScDocFunc* m_pDocFunc;
bool bHeaderOn;
bool bFooterOn;
bool bIsInplace:1; // Is set by the View
bool bIsEmpty:1;
bool bIsInUndo:1;
bool bDocumentModifiedPending:1;
bool bUpdateEnabled:1;
bool mbUcalcTest:1; // avoid loading the styles in the ucalc test
sal_uInt16 nDocumentLock;
sal_Int16 nCanUpdate; // stores the UpdateDocMode from loading a document till update links
bool m_bHeaderOn;
bool m_bFooterOn;
bool m_bIsInplace:1; // Is set by the View
bool m_bIsEmpty:1;
bool m_bIsInUndo:1;
bool m_bDocumentModifiedPending:1;
bool m_bUpdateEnabled:1;
bool m_bUcalcTest:1; // avoid loading the styles in the ucalc test
sal_uInt16 m_nDocumentLock;
sal_Int16 m_nCanUpdate; // stores the UpdateDocMode from loading a document till update links
ScDBData* pOldAutoDBRange;
ScDBData* m_pOldAutoDBRange;
ScAutoStyleList* pAutoStyleList;
ScPaintLockData* pPaintLockData;
ScOptSolverSave* pSolverSaveData;
ScSheetSaveData* pSheetSaveData;
ScFormatSaveData* mpFormatSaveData;
ScAutoStyleList* m_pAutoStyleList;
ScPaintLockData* m_pPaintLockData;
ScOptSolverSave* m_pSolverSaveData;
ScSheetSaveData* m_pSheetSaveData;
ScFormatSaveData* m_pFormatSaveData;
ScDocShellModificator* pModificator; // #109979#; is used to load XML (created in BeforeXMLLoading and destroyed in AfterXMLLoading)
ScDocShellModificator* m_pModificator; // #109979#; is used to load XML (created in BeforeXMLLoading and destroyed in AfterXMLLoading)
css::uno::Reference< ooo::vba::excel::XWorkbook> mxAutomationWorkbookObject;
......@@ -223,8 +223,8 @@ public:
void GetDocStat( ScDocStat& rDocStat );
ScDocument& GetDocument() { return aDocument; }
ScDocFunc& GetDocFunc() { return *pDocFunc; }
ScDocument& GetDocument() { return m_aDocument; }
ScDocFunc& GetDocFunc() { return *m_pDocFunc; }
css::uno::Reference<css::datatransfer::XTransferable2> GetClipData() { return m_xClipData; }
void SetClipData(const css::uno::Reference<css::datatransfer::XTransferable2>& xTransferable) { m_xClipData = xTransferable; }
......@@ -325,7 +325,7 @@ public:
void PostPaintGridAll();
void PostPaintExtras();
bool IsPaintLocked() const { return pPaintLockData != nullptr; }
bool IsPaintLocked() const { return m_pPaintLockData != nullptr; }
void PostDataChanged();
......@@ -338,7 +338,7 @@ public:
void LockPaint();
void UnlockPaint();
sal_uInt16 GetLockCount() const { return nDocumentLock;}
sal_uInt16 GetLockCount() const { return m_nDocumentLock;}
void SetLockCount(sal_uInt16 nNew);
void LockDocument();
......@@ -350,14 +350,14 @@ public:
virtual SfxStyleSheetBasePool* GetStyleSheetPool() override;
void SetInplace( bool bInplace );
bool IsEmpty() const { return bIsEmpty; }
bool IsEmpty() const { return m_bIsEmpty; }
void SetEmpty(bool bSet);
bool IsInUndo() const { return bIsInUndo; }
bool IsInUndo() const { return m_bIsInUndo; }
void SetInUndo(bool bSet);
void CalcOutputFactor();
double GetOutputFactor() const { return nPrtToScreenFactor;}
double GetOutputFactor() const { return m_nPrtToScreenFactor;}
void GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
SCTAB nCurTab,
bool& rbHeader,
......@@ -372,21 +372,21 @@ public:
virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ) override;
const OUString& GetDdeTextFmt() const { return aDdeTextFmt; }
const OUString& GetDdeTextFmt() const { return m_aDdeTextFmt; }
SfxBindings* GetViewBindings();
ScTabViewShell* GetBestViewShell( bool bOnlyVisible = true );
void SetDocumentModifiedPending( bool bVal )
{ bDocumentModifiedPending = bVal; }
{ m_bDocumentModifiedPending = bVal; }
bool IsDocumentModifiedPending() const
{ return bDocumentModifiedPending; }
{ return m_bDocumentModifiedPending; }
bool IsUpdateEnabled() const
{ return bUpdateEnabled; }
{ return m_bUpdateEnabled; }
void SetUpdateEnabled(bool bValue)
{ bUpdateEnabled = bValue; }
{ m_bUpdateEnabled = bValue; }
OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice...
......@@ -411,7 +411,7 @@ public:
virtual HiddenInformation GetHiddenInformationState( HiddenInformation nStates ) override;
const ScOptSolverSave* GetSolverSaveData() const { return pSolverSaveData; } // may be null
const ScOptSolverSave* GetSolverSaveData() const { return m_pSolverSaveData; } // may be null
void SetSolverSaveData( const ScOptSolverSave& rData );
ScSheetSaveData* GetSheetSaveData();
ScFormatSaveData* GetFormatSaveData();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment