diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-11-15 21:27:29 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-11-15 21:27:29 -0500 |
| commit | d8bb96e54339133a708eaa82b37730f793680497 (patch) | |
| tree | 82baabcf205a67b61ef8c51b17f6d7d2fbf69b98 /sc/source | |
| parent | Cleaned up ScDocShell a bit. (diff) | |
| download | core-d8bb96e54339133a708eaa82b37730f793680497.tar.gz core-d8bb96e54339133a708eaa82b37730f793680497.zip | |
Let's not use macro for this sort of stuff.
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 82 |
1 files changed, 47 insertions, 35 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index fd4efe4768ae..c5e6002b891e 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2489,38 +2489,31 @@ sal_Bool ScDocShell::HasAutomaticTableName( const String& rFilter ) || rFilter.EqualsAscii( pFilterRtf ); } -//================================================================== - -#define __SCDOCSHELL_INIT \ - aDocument ( SCDOCMODE_DOCUMENT, this ), \ - aDdeTextFmt(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("TEXT"))), \ - nPrtToScreenFactor( 1.0 ), \ - pImpl ( new DocShell_Impl ), \ - bHeaderOn ( true ), \ - bFooterOn ( true ), \ - bIsEmpty ( true ), \ - bIsInUndo ( false ), \ - bDocumentModifiedPending( false ), \ - bUpdateEnabled ( true ), \ - nDocumentLock ( 0 ), \ - nCanUpdate (com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG), \ - pOldAutoDBRange ( NULL ), \ - pDocHelper ( NULL ), \ - pAutoStyleList ( NULL ), \ - pPaintLockData ( NULL ), \ - pOldJobSetup ( NULL ), \ - pSolverSaveData ( NULL ), \ - pSheetSaveData ( NULL ), \ - pModificator ( NULL ) - -//------------------------------------------------------------------ - -ScDocShell::ScDocShell( const ScDocShell& rShell ) - : SvRefBase(), - SotObject(), - SfxObjectShell( rShell.GetCreateMode() ), - SfxListener(), - __SCDOCSHELL_INIT +ScDocShell::ScDocShell( const ScDocShell& rShell ) : + SvRefBase(), + SotObject(), + SfxObjectShell( rShell.GetCreateMode() ), + SfxListener(), + aDocument ( SCDOCMODE_DOCUMENT, this ), + aDdeTextFmt(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("TEXT"))), + nPrtToScreenFactor( 1.0 ), + pImpl ( new DocShell_Impl ), + bHeaderOn ( true ), + bFooterOn ( true ), + bIsEmpty ( true ), + bIsInUndo ( false ), + bDocumentModifiedPending( false ), + bUpdateEnabled ( true ), + nDocumentLock ( 0 ), + nCanUpdate (com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG), + pOldAutoDBRange ( NULL ), + pDocHelper ( NULL ), + pAutoStyleList ( NULL ), + pPaintLockData ( NULL ), + pOldJobSetup ( NULL ), + pSolverSaveData ( NULL ), + pSheetSaveData ( NULL ), + pModificator ( NULL ) { RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ScDocShell" ); @@ -2546,9 +2539,28 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) //------------------------------------------------------------------ -ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) - : SfxObjectShell( i_nSfxCreationFlags ) - , __SCDOCSHELL_INIT +ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) : + SfxObjectShell( i_nSfxCreationFlags ), + aDocument ( SCDOCMODE_DOCUMENT, this ), + aDdeTextFmt(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("TEXT"))), + nPrtToScreenFactor( 1.0 ), + pImpl ( new DocShell_Impl ), + bHeaderOn ( true ), + bFooterOn ( true ), + bIsEmpty ( true ), + bIsInUndo ( false ), + bDocumentModifiedPending( false ), + bUpdateEnabled ( true ), + nDocumentLock ( 0 ), + nCanUpdate (com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG), + pOldAutoDBRange ( NULL ), + pDocHelper ( NULL ), + pAutoStyleList ( NULL ), + pPaintLockData ( NULL ), + pOldJobSetup ( NULL ), + pSolverSaveData ( NULL ), + pSheetSaveData ( NULL ), + pModificator ( NULL ) { RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ScDocShell" ); |