[Libreoffice-commits] core.git: 2 commits - sc/CppunitTest_sc_ucalc.mk sc/qa sc/source
Markus Mohrhard
markus.mohrhard at googlemail.com
Tue Jul 9 15:03:50 PDT 2013
sc/CppunitTest_sc_ucalc.mk | 7
sc/qa/unit/ucalc_sharedformula.cxx | 2
sc/source/ui/inc/docsh.hxx | 451 +++++++++++++++++++++++++++++++++++
sc/source/ui/inc/docshell.hxx | 466 -------------------------------------
4 files changed, 454 insertions(+), 472 deletions(-)
New commits:
commit 6e6634b87dc4873e42efb9e2577ffc59776866ec
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Tue Jul 9 23:55:57 2013 +0200
Revert "Separate ScDocShell declaration with ScDocShellRef declaration."
This reverts commit 572478433647e9d8a657a2271f0ef6bf349de526.
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index e3995a4..59aa7a4 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -11,7 +11,7 @@
#include "editutil.hxx"
#include "formulacell.hxx"
#include "cellvalue.hxx"
-#include "docshell.hxx"
+#include "docsh.hxx"
void Test::testSharedFormulas()
{
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index aeeb4b5..ec2201f 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -17,14 +17,459 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DOCSH_HXX
-#define SC_DOCSH_HXX
+#ifndef SC_DOCSHELL_HXX
+#define SC_DOCSHELL_HXX
+
+
+#include <sfx2/objsh.hxx>
+
+#include <sfx2/docfac.hxx>
+#include <sfx2/sfxmodelfactory.hxx>
+#include <sfx2/viewsh.hxx>
+
+#include "scdllapi.h"
+#include "scdll.hxx"
+#include "document.hxx"
+#include "appoptio.hxx"
+#include "formulaopt.hxx"
+#include "shellids.hxx"
+#include "refreshtimer.hxx"
+#include "optutil.hxx"
+
+#include <boost/unordered_map.hpp>
+#include <cppuhelper/implbase1.hxx>
+
+#include <config_telepathy.h>
+
+class ScEditEngineDefaulter;
+class SfxStyleSheetBasePool;
+class SfxStyleSheetHint;
+class INetURLObject;
+
+class ScViewData;
+class ScDocFunc;
+class ScDrawLayer;
+class ScTabViewShell;
+class ScSbxDocHelper;
+class ScAutoStyleList;
+class ScRange;
+class ScMarkData;
+class ScPaintLockData;
+class ScChangeAction;
+class VirtualDevice;
+class ScImportOptions;
+class ScDocShellModificator;
+class ScOptSolverSave;
+class ScSheetSaveData;
+class ScFlatBoolRowSegments;
+struct ScColWidthParam;
+#if ENABLE_TELEPATHY
+class ScCollaboration;
+#endif
+
+namespace sfx2 { class FileDialogHelper; }
+struct DocShell_Impl;
+
+typedef ::boost::unordered_map< sal_uLong, sal_uLong > ScChangeActionMergeMap;
+
+//==================================================================
+
+//enum ScDBFormat { SC_FORMAT_SDF, SC_FORMAT_DBF };
+
+ // Extra flags for Repaint
+#define SC_PF_LINES 1
+#define SC_PF_TESTMERGE 2
+#define SC_PF_WHOLEROWS 4
+
+class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
+{
+ ScDocument aDocument;
+
+ String aDdeTextFmt;
+
+ double nPrtToScreenFactor;
+ DocShell_Impl* pImpl;
+ ScDocFunc* 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;
+ sal_uInt16 nDocumentLock;
+ sal_Int16 nCanUpdate; // stores the UpdateDocMode from loading a document till update links
+
+ ScDBData* pOldAutoDBRange;
+
+ ScSbxDocHelper* pDocHelper;
+
+ ScAutoStyleList* pAutoStyleList;
+ ScPaintLockData* pPaintLockData;
+ ScOptSolverSave* pSolverSaveData;
+ ScSheetSaveData* pSheetSaveData;
+
+ ScDocShellModificator* pModificator; // #109979#; is used to load XML (created in BeforeXMLLoading and destroyed in AfterXMLLoading)
+#if ENABLE_TELEPATHY
+ ScCollaboration* mpCollaboration;
+#endif
+
+ SC_DLLPRIVATE void InitItems();
+ SC_DLLPRIVATE void DoEnterHandler();
+ SC_DLLPRIVATE void InitOptions(bool bForLoading);
+ SC_DLLPRIVATE void ResetDrawObjectShell();
+
+ // SUNWS needs a forward declared friend, otherwise types and members
+ // of the outer class are not accessible.
+ class PrepareSaveGuard;
+ friend class ScDocShell::PrepareSaveGuard;
+ /** Do things that need to be done before saving to our own format and
+ necessary clean ups in dtor. */
+ class PrepareSaveGuard
+ {
+ public:
+ explicit PrepareSaveGuard( ScDocShell & rDocShell );
+ ~PrepareSaveGuard();
+ private:
+ ScDocShell & mrDocShell;
+ };
+
+ SC_DLLPRIVATE sal_Bool LoadXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
+ SC_DLLPRIVATE sal_Bool SaveXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
+ SC_DLLPRIVATE SCTAB GetSaveTab();
+
+ SC_DLLPRIVATE bool SaveCurrentChart( SfxMedium& rMedium );
+
+ SC_DLLPRIVATE sal_uLong DBaseImport( const String& rFullFileName, CharSet eCharSet,
+ ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc );
+ SC_DLLPRIVATE sal_uLong DBaseExport(
+ const OUString& rFullFileName, CharSet eCharSet, bool& bHasMemo );
+
+ SC_DLLPRIVATE static bool MoveFile( const INetURLObject& rSource, const INetURLObject& rDest );
+ SC_DLLPRIVATE static bool KillFile( const INetURLObject& rURL );
+ SC_DLLPRIVATE static bool IsDocument( const INetURLObject& rURL );
+
+ SC_DLLPRIVATE void LockPaint_Impl(sal_Bool bDoc);
+ SC_DLLPRIVATE void UnlockPaint_Impl(sal_Bool bDoc);
+ SC_DLLPRIVATE void LockDocument_Impl(sal_uInt16 nNew);
+ SC_DLLPRIVATE void UnlockDocument_Impl(sal_uInt16 nNew);
+
+ SC_DLLPRIVATE void EnableSharedSettings( bool bEnable );
+ SC_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > LoadSharedDocument();
+
+ SC_DLLPRIVATE void UseSheetSaveEntries();
+
+ SC_DLLPRIVATE ScDocFunc *CreateDocFunc();
+
+protected:
+
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+
+public:
+ TYPEINFO();
+
+ SFX_DECL_INTERFACE(SCID_DOC_SHELL)
+ SFX_DECL_OBJECTFACTORY();
+
+ ScDocShell( const ScDocShell& rDocShell );
+ ScDocShell( const sal_uInt64 i_nSfxCreationFlags = SFXMODEL_EMBEDDED_OBJECT );
+ ~ScDocShell();
+
+ using SotObject::GetInterface;
+ using SfxShell::Activate; // with sal_Bool bMDI
+ using SfxShell::Deactivate; // with sal_Bool bMDI
+
+#if ENABLE_TELEPATHY
+ SC_DLLPRIVATE ScCollaboration* GetCollaboration();
+#endif
+ virtual void Activate();
+ virtual void Deactivate();
+
+ virtual ::svl::IUndoManager*
+ GetUndoManager();
+
+ virtual void FillClass( SvGlobalName * pClassName,
+ sal_uInt32 * pFormat,
+ OUString * pAppName,
+ OUString * pFullTypeName,
+ OUString * pShortTypeName,
+ sal_Int32 nFileFormat,
+ sal_Bool bTemplate = false ) const;
+
+ virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
+ virtual sal_Bool Load( SfxMedium& rMedium );
+ virtual sal_Bool LoadFrom( SfxMedium& rMedium );
+ virtual sal_Bool ConvertFrom( SfxMedium &rMedium );
+ virtual bool LoadExternal( SfxMedium& rMedium );
+ virtual sal_Bool Save();
+ virtual sal_Bool SaveAs( SfxMedium& rMedium );
+ virtual sal_Bool ConvertTo( SfxMedium &rMedium );
+ virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = false );
+ virtual void PrepareReload();
+ virtual sal_Bool IsInformationLost();
+ virtual void LoadStyles( SfxObjectShell &rSource );
+ virtual sal_Bool Insert( SfxObjectShell &rSource,
+ sal_uInt16 nSourceIdx1, sal_uInt16 nSourceIdx2, sal_uInt16 nSourceIdx3,
+ sal_uInt16 &nIdx1, sal_uInt16 &nIdx2, sal_uInt16 &nIdx3, sal_uInt16 &rIdxDeleted );
+
+ virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); // SfxInPlaceObject
+ virtual sal_Bool DoSaveCompleted( SfxMedium * pNewStor); // SfxObjectShell
+ virtual sal_Bool QuerySlotExecutable( sal_uInt16 nSlotId );
+
+ virtual void Draw( OutputDevice *, const JobSetup & rSetup,
+ sal_uInt16 nAspect = ASPECT_CONTENT );
+
+ virtual void SetVisArea( const Rectangle & rVisArea );
+
+ using SfxObjectShell::GetVisArea;
+ virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const;
+
+ virtual Printer* GetDocumentPrinter();
+
+ virtual void SetModified( sal_Bool = sal_True );
+
+ void SetVisAreaOrSize( const Rectangle& rVisArea, sal_Bool bModifyStart );
+
+ virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( Window *pParent,
+ const SfxItemSet &rSet );
+
+ void GetDocStat( ScDocStat& rDocStat );
+
+ ScDocument* GetDocument() { return &aDocument; }
+ ScDocFunc& GetDocFunc() { return *pDocFunc; }
+ void SetDocFunc( ScDocFunc *pDF ) { pDocFunc = pDF; }
+
+ SfxPrinter* GetPrinter( sal_Bool bCreateIfNotExist = sal_True );
+ sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL );
+
+ void UpdateFontList();
+
+ String CreateObjectName( const String& rPrefix );
+
+ ScDrawLayer* MakeDrawLayer();
+
+ void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt );
+
+ void GetSbxState( SfxItemSet &rSet );
+ void GetDrawObjState( SfxItemSet &rSet );
+
+ void Execute( SfxRequest& rReq );
+ void GetState( SfxItemSet &rSet );
+ void ExecutePageStyle ( SfxViewShell& rCaller, SfxRequest& rReq, SCTAB nCurTab );
+ void GetStatePageStyle( SfxViewShell& rCaller, SfxItemSet& rSet, SCTAB nCurTab );
+
+ void CompareDocument( ScDocument& rOtherDoc );
+ void MergeDocument( ScDocument& rOtherDoc, bool bShared = false, bool bCheckDuplicates = false, sal_uLong nOffset = 0, ScChangeActionMergeMap* pMergeMap = NULL, bool bInverseMap = false );
+ bool MergeSharedDocument( ScDocShell* pSharedDocShell );
+
+ ScChangeAction* GetChangeAction( const ScAddress& rPos );
+ void SetChangeComment( ScChangeAction* pAction, const String& rComment );
+ void ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,sal_Bool bPrevNext=sal_True );
+ /// Protect/unprotect ChangeTrack and return <TRUE/> if
+ /// protection was successfully changed.
+ /// If bJustQueryIfProtected==sal_True protection is not
+ /// changed and <TRUE/> is returned if not protected or
+ /// password was entered correctly.
+ bool ExecuteChangeProtectionDialog( Window* _pParent, sal_Bool bJustQueryIfProtected = false );
+
+ void SetPrintZoom( SCTAB nTab, sal_uInt16 nScale, sal_uInt16 nPages );
+ bool AdjustPrintZoom( const ScRange& rRange );
+
+ void LoadStylesArgs( ScDocShell& rSource, bool bReplace, bool bCellStyles, bool bPageStyles );
+
+ void PageStyleModified( const OUString& rStyleName, sal_Bool bApi );
+
+ void NotifyStyle( const SfxStyleSheetHint& rHint );
+ void DoAutoStyle( const ScRange& rRange, const String& rStyle );
+
+ Window* GetActiveDialogParent();
+ void ErrorMessage( sal_uInt16 nGlobStrId );
+ sal_Bool IsEditable() const;
+
+ sal_Bool AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab );
+ void UpdateAllRowHeights( const ScMarkData* pTabMark = NULL );
+ void UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore = false );
+
+ void RefreshPivotTables( const ScRange& rSource );
+ void DoConsolidate( const ScConsolidateParam& rParam, sal_Bool bRecord = sal_True );
+ void UseScenario( SCTAB nTab, const String& rName, sal_Bool bRecord = sal_True );
+ SCTAB MakeScenario( SCTAB nTab, const String& rName, const String& rComment,
+ const Color& rColor, sal_uInt16 nFlags,
+ ScMarkData& rMark, sal_Bool bRecord = sal_True );
+ void ModifyScenario( SCTAB nTab, const String& rName, const String& rComment,
+ const Color& rColor, sal_uInt16 nFlags );
+ sal_uLong TransferTab( ScDocShell& rSrcDocShell, SCTAB nSrcPos,
+ SCTAB nDestPos, sal_Bool bInsertNew,
+ sal_Bool bNotifyAndPaint );
+
+ sal_Bool MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, sal_Bool bRecord );
+
+ void DoRecalc( bool bApi );
+ void DoHardRecalc( bool bApi );
+
+ void UpdateOle( const ScViewData* pViewData, sal_Bool bSnapSize = false);
+ sal_Bool IsOle();
+
+ void DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
+ ScDBData* GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGetDBSelection eSel );
+ ScDBData* GetAnonymousDBData(const ScRange& rRange);
+ ScDBData* GetOldAutoDBRange(); // has to be deleted by caller!
+ void CancelAutoDBRange(); // called when dialog is cancelled
+
+ virtual void ReconnectDdeLink(SfxObjectShell& rServer);
+ void UpdateLinks();
+ sal_Bool ReloadTabLinks();
+
+ void SetFormulaOptions(const ScFormulaOptions& rOpt );
+ virtual void CheckConfigOptions();
+
+ void PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos );
+
+ void PostPaint( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
+ SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab, sal_uInt16 nPart,
+ sal_uInt16 nExtFlags = 0 );
+ void PostPaint( const ScRangeList& rRanges, sal_uInt16 nPart, sal_uInt16 nExtFlags = 0 );
+
+ void PostPaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab );
+ void PostPaintCell( const ScAddress& rPos );
+ void PostPaintGridAll();
+ void PostPaintExtras();
+
+ bool IsPaintLocked() const { return pPaintLockData != NULL; }
+
+ void PostDataChanged();
+
+ void UpdatePaintExt( sal_uInt16& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
+ SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab );
+ void UpdatePaintExt( sal_uInt16& rExtFlags, const ScRange& rRange );
+
+ void SetDocumentModified( sal_Bool bIsModified = sal_True );
+ void SetDrawModified( sal_Bool bIsModified = sal_True );
+
+ void LockPaint();
+ void UnlockPaint();
+ sal_uInt16 GetLockCount() const;
+ void SetLockCount(sal_uInt16 nNew);
+
+ void LockDocument();
+ void UnlockDocument();
+
+ DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
+
+ virtual SfxStyleSheetBasePool* GetStyleSheetPool();
+
+ void SetInplace( bool bInplace );
+ bool IsEmpty() const;
+ void SetEmpty(bool bSet);
+
+ bool IsInUndo() const { return bIsInUndo; }
+ void SetInUndo(bool bSet);
+
+ void CalcOutputFactor();
+ double GetOutputFactor() const;
+ void GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
+ SCTAB nCurTab,
+ bool& rbHeader,
+ bool& rbFooter );
+
+ virtual long DdeGetData( const OUString& rItem, const OUString& rMimeType,
+ ::com::sun::star::uno::Any & rValue );
+ virtual long DdeSetData( const OUString& rItem, const OUString& rMimeType,
+ const ::com::sun::star::uno::Any & rValue );
+ virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem );
+
+ const String& GetDdeTextFmt() const { return aDdeTextFmt; }
+
+ SfxBindings* GetViewBindings();
+
+ ScTabViewShell* GetBestViewShell( sal_Bool bOnlyVisible = sal_True );
+ ScSbxDocHelper* GetDocHelperObject() { return pDocHelper; }
+
+ void SetDocumentModifiedPending( bool bVal )
+ { bDocumentModifiedPending = bVal; }
+ bool IsDocumentModifiedPending() const
+ { return bDocumentModifiedPending; }
+
+ bool IsUpdateEnabled() const
+ { return bUpdateEnabled; }
+ void SetUpdateEnabled(bool bValue)
+ { bUpdateEnabled = bValue; }
+
+ OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice...
+
+ static ScViewData* GetViewData();
+ static SCTAB GetCurTab();
+
+ static ScDocShell* GetShellByNum( sal_uInt16 nDocNo );
+ static String GetOwnFilterName();
+ static String GetHtmlFilterName();
+ static String GetWebQueryFilterName();
+ static String GetAsciiFilterName();
+ static String GetLotusFilterName();
+ static String GetDBaseFilterName();
+ static String GetDifFilterName();
+ static sal_Bool HasAutomaticTableName( const String& rFilter );
+
+ DECL_LINK( RefreshDBDataHdl, ScRefreshTimer* );
+
+ void BeforeXMLLoading();
+ void AfterXMLLoading(sal_Bool bRet);
+
+ virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates );
+
+ const ScOptSolverSave* GetSolverSaveData() const { return pSolverSaveData; } // may be null
+ void SetSolverSaveData( const ScOptSolverSave& rData );
+ ScSheetSaveData* GetSheetSaveData();
+
+ void ResetKeyBindings( ScOptionsUtil::KeyBindingType eType );
+
+ // password protection for Calc (derived from SfxObjectShell)
+ // see also: FID_CHG_RECORD, SID_CHG_PROTECT
+ virtual bool IsChangeRecording() const;
+ virtual bool HasChangeRecordProtection() const;
+ virtual void SetChangeRecording( bool bActivate );
+ virtual bool SetProtectionPassword( const String &rPassword );
+ virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash );
+
+
+ void SnapVisArea( Rectangle& rRect ) const;
+};
+
+
+void UpdateAcceptChangesDialog();
-#include "docshell.hxx"
SV_DECL_REF(ScDocShell)
SV_IMPL_REF(ScDocShell)
+
+/** Create before modifications of the document and then destroy.
+ If noted in the ctor AutoCalcShellDisabled and IdleDisabled,
+ switches them off and restores the dtor AutoCalcShellDisabled
+ also before a ScDocShell SetDocumentModified.
+ Call SetDocumentModified after instead of the ScDocShell.
+ In the dtor, if ScDocShell bDocumentModifiedPending is set and
+ bAutoCalcShellDisabled is not set, then SetDocumentModified is called. */
+class SC_DLLPUBLIC ScDocShellModificator
+{
+ ScDocShell& rDocShell;
+ ScRefreshTimerProtector aProtector;
+ sal_Bool bAutoCalcShellDisabled;
+ bool bIdleEnabled;
+
+ // not implemented
+ ScDocShellModificator( const ScDocShellModificator& );
+ ScDocShellModificator& operator=( const ScDocShellModificator& );
+
+public:
+ ScDocShellModificator( ScDocShell& );
+ ~ScDocShellModificator();
+ void SetDocumentModified();
+};
+
+
+
#endif
diff --git a/sc/source/ui/inc/docshell.hxx b/sc/source/ui/inc/docshell.hxx
deleted file mode 100644
index 841d40c..0000000
--- a/sc/source/ui/inc/docshell.hxx
+++ /dev/null
@@ -1,466 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef SC_DOCSHELL_HXX
-#define SC_DOCSHELL_HXX
-
-#include <sfx2/objsh.hxx>
-
-#include <sfx2/docfac.hxx>
-#include <sfx2/sfxmodelfactory.hxx>
-#include <sfx2/viewsh.hxx>
-
-#include "scdllapi.h"
-#include "scdll.hxx"
-#include "document.hxx"
-#include "appoptio.hxx"
-#include "formulaopt.hxx"
-#include "shellids.hxx"
-#include "refreshtimer.hxx"
-#include "optutil.hxx"
-
-#include <boost/unordered_map.hpp>
-#include <cppuhelper/implbase1.hxx>
-
-#include <config_telepathy.h>
-
-class ScEditEngineDefaulter;
-class SfxStyleSheetBasePool;
-class SfxStyleSheetHint;
-class INetURLObject;
-
-class ScViewData;
-class ScDocFunc;
-class ScDrawLayer;
-class ScTabViewShell;
-class ScSbxDocHelper;
-class ScAutoStyleList;
-class ScRange;
-class ScMarkData;
-class ScPaintLockData;
-class ScChangeAction;
-class VirtualDevice;
-class ScImportOptions;
-class ScDocShellModificator;
-class ScOptSolverSave;
-class ScSheetSaveData;
-class ScFlatBoolRowSegments;
-struct ScColWidthParam;
-#if ENABLE_TELEPATHY
-class ScCollaboration;
-#endif
-
-namespace sfx2 { class FileDialogHelper; }
-struct DocShell_Impl;
-
-typedef ::boost::unordered_map< sal_uLong, sal_uLong > ScChangeActionMergeMap;
-
-//==================================================================
-
-//enum ScDBFormat { SC_FORMAT_SDF, SC_FORMAT_DBF };
-
- // Extra flags for Repaint
-#define SC_PF_LINES 1
-#define SC_PF_TESTMERGE 2
-#define SC_PF_WHOLEROWS 4
-
-class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
-{
- ScDocument aDocument;
-
- String aDdeTextFmt;
-
- double nPrtToScreenFactor;
- DocShell_Impl* pImpl;
- ScDocFunc* 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;
- sal_uInt16 nDocumentLock;
- sal_Int16 nCanUpdate; // stores the UpdateDocMode from loading a document till update links
-
- ScDBData* pOldAutoDBRange;
-
- ScSbxDocHelper* pDocHelper;
-
- ScAutoStyleList* pAutoStyleList;
- ScPaintLockData* pPaintLockData;
- ScOptSolverSave* pSolverSaveData;
- ScSheetSaveData* pSheetSaveData;
-
- ScDocShellModificator* pModificator; // #109979#; is used to load XML (created in BeforeXMLLoading and destroyed in AfterXMLLoading)
-#if ENABLE_TELEPATHY
- ScCollaboration* mpCollaboration;
-#endif
-
- SC_DLLPRIVATE void InitItems();
- SC_DLLPRIVATE void DoEnterHandler();
- SC_DLLPRIVATE void InitOptions(bool bForLoading);
- SC_DLLPRIVATE void ResetDrawObjectShell();
-
- // SUNWS needs a forward declared friend, otherwise types and members
- // of the outer class are not accessible.
- class PrepareSaveGuard;
- friend class ScDocShell::PrepareSaveGuard;
- /** Do things that need to be done before saving to our own format and
- necessary clean ups in dtor. */
- class PrepareSaveGuard
- {
- public:
- explicit PrepareSaveGuard( ScDocShell & rDocShell );
- ~PrepareSaveGuard();
- private:
- ScDocShell & mrDocShell;
- };
-
- SC_DLLPRIVATE sal_Bool LoadXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
- SC_DLLPRIVATE sal_Bool SaveXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
- SC_DLLPRIVATE SCTAB GetSaveTab();
-
- SC_DLLPRIVATE bool SaveCurrentChart( SfxMedium& rMedium );
-
- SC_DLLPRIVATE sal_uLong DBaseImport( const String& rFullFileName, CharSet eCharSet,
- ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc );
- SC_DLLPRIVATE sal_uLong DBaseExport(
- const OUString& rFullFileName, CharSet eCharSet, bool& bHasMemo );
-
- SC_DLLPRIVATE static bool MoveFile( const INetURLObject& rSource, const INetURLObject& rDest );
- SC_DLLPRIVATE static bool KillFile( const INetURLObject& rURL );
- SC_DLLPRIVATE static bool IsDocument( const INetURLObject& rURL );
-
- SC_DLLPRIVATE void LockPaint_Impl(sal_Bool bDoc);
- SC_DLLPRIVATE void UnlockPaint_Impl(sal_Bool bDoc);
- SC_DLLPRIVATE void LockDocument_Impl(sal_uInt16 nNew);
- SC_DLLPRIVATE void UnlockDocument_Impl(sal_uInt16 nNew);
-
- SC_DLLPRIVATE void EnableSharedSettings( bool bEnable );
- SC_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > LoadSharedDocument();
-
- SC_DLLPRIVATE void UseSheetSaveEntries();
-
- SC_DLLPRIVATE ScDocFunc *CreateDocFunc();
-
-protected:
-
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
-public:
- TYPEINFO();
-
- SFX_DECL_INTERFACE(SCID_DOC_SHELL)
- SFX_DECL_OBJECTFACTORY();
-
- ScDocShell( const ScDocShell& rDocShell );
- ScDocShell( const sal_uInt64 i_nSfxCreationFlags = SFXMODEL_EMBEDDED_OBJECT );
- ~ScDocShell();
-
- using SotObject::GetInterface;
- using SfxShell::Activate; // with sal_Bool bMDI
- using SfxShell::Deactivate; // with sal_Bool bMDI
-
-#if ENABLE_TELEPATHY
- SC_DLLPRIVATE ScCollaboration* GetCollaboration();
-#endif
- virtual void Activate();
- virtual void Deactivate();
-
- virtual ::svl::IUndoManager*
- GetUndoManager();
-
- virtual void FillClass( SvGlobalName * pClassName,
- sal_uInt32 * pFormat,
- OUString * pAppName,
- OUString * pFullTypeName,
- OUString * pShortTypeName,
- sal_Int32 nFileFormat,
- sal_Bool bTemplate = false ) const;
-
- virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
- virtual sal_Bool Load( SfxMedium& rMedium );
- virtual sal_Bool LoadFrom( SfxMedium& rMedium );
- virtual sal_Bool ConvertFrom( SfxMedium &rMedium );
- virtual bool LoadExternal( SfxMedium& rMedium );
- virtual sal_Bool Save();
- virtual sal_Bool SaveAs( SfxMedium& rMedium );
- virtual sal_Bool ConvertTo( SfxMedium &rMedium );
- virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = false );
- virtual void PrepareReload();
- virtual sal_Bool IsInformationLost();
- virtual void LoadStyles( SfxObjectShell &rSource );
- virtual sal_Bool Insert( SfxObjectShell &rSource,
- sal_uInt16 nSourceIdx1, sal_uInt16 nSourceIdx2, sal_uInt16 nSourceIdx3,
- sal_uInt16 &nIdx1, sal_uInt16 &nIdx2, sal_uInt16 &nIdx3, sal_uInt16 &rIdxDeleted );
-
- virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); // SfxInPlaceObject
- virtual sal_Bool DoSaveCompleted( SfxMedium * pNewStor); // SfxObjectShell
- virtual sal_Bool QuerySlotExecutable( sal_uInt16 nSlotId );
-
- virtual void Draw( OutputDevice *, const JobSetup & rSetup,
- sal_uInt16 nAspect = ASPECT_CONTENT );
-
- virtual void SetVisArea( const Rectangle & rVisArea );
-
- using SfxObjectShell::GetVisArea;
- virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const;
-
- virtual Printer* GetDocumentPrinter();
-
- virtual void SetModified( sal_Bool = sal_True );
-
- void SetVisAreaOrSize( const Rectangle& rVisArea, sal_Bool bModifyStart );
-
- virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( Window *pParent,
- const SfxItemSet &rSet );
-
- void GetDocStat( ScDocStat& rDocStat );
-
- ScDocument* GetDocument() { return &aDocument; }
- ScDocFunc& GetDocFunc() { return *pDocFunc; }
- void SetDocFunc( ScDocFunc *pDF ) { pDocFunc = pDF; }
-
- SfxPrinter* GetPrinter( sal_Bool bCreateIfNotExist = sal_True );
- sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL );
-
- void UpdateFontList();
-
- String CreateObjectName( const String& rPrefix );
-
- ScDrawLayer* MakeDrawLayer();
-
- void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt );
-
- void GetSbxState( SfxItemSet &rSet );
- void GetDrawObjState( SfxItemSet &rSet );
-
- void Execute( SfxRequest& rReq );
- void GetState( SfxItemSet &rSet );
- void ExecutePageStyle ( SfxViewShell& rCaller, SfxRequest& rReq, SCTAB nCurTab );
- void GetStatePageStyle( SfxViewShell& rCaller, SfxItemSet& rSet, SCTAB nCurTab );
-
- void CompareDocument( ScDocument& rOtherDoc );
- void MergeDocument( ScDocument& rOtherDoc, bool bShared = false, bool bCheckDuplicates = false, sal_uLong nOffset = 0, ScChangeActionMergeMap* pMergeMap = NULL, bool bInverseMap = false );
- bool MergeSharedDocument( ScDocShell* pSharedDocShell );
-
- ScChangeAction* GetChangeAction( const ScAddress& rPos );
- void SetChangeComment( ScChangeAction* pAction, const String& rComment );
- void ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,sal_Bool bPrevNext=sal_True );
- /// Protect/unprotect ChangeTrack and return <TRUE/> if
- /// protection was successfully changed.
- /// If bJustQueryIfProtected==sal_True protection is not
- /// changed and <TRUE/> is returned if not protected or
- /// password was entered correctly.
- bool ExecuteChangeProtectionDialog( Window* _pParent, sal_Bool bJustQueryIfProtected = false );
-
- void SetPrintZoom( SCTAB nTab, sal_uInt16 nScale, sal_uInt16 nPages );
- bool AdjustPrintZoom( const ScRange& rRange );
-
- void LoadStylesArgs( ScDocShell& rSource, bool bReplace, bool bCellStyles, bool bPageStyles );
-
- void PageStyleModified( const OUString& rStyleName, sal_Bool bApi );
-
- void NotifyStyle( const SfxStyleSheetHint& rHint );
- void DoAutoStyle( const ScRange& rRange, const String& rStyle );
-
- Window* GetActiveDialogParent();
- void ErrorMessage( sal_uInt16 nGlobStrId );
- sal_Bool IsEditable() const;
-
- sal_Bool AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab );
- void UpdateAllRowHeights( const ScMarkData* pTabMark = NULL );
- void UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore = false );
-
- void RefreshPivotTables( const ScRange& rSource );
- void DoConsolidate( const ScConsolidateParam& rParam, sal_Bool bRecord = sal_True );
- void UseScenario( SCTAB nTab, const String& rName, sal_Bool bRecord = sal_True );
- SCTAB MakeScenario( SCTAB nTab, const String& rName, const String& rComment,
- const Color& rColor, sal_uInt16 nFlags,
- ScMarkData& rMark, sal_Bool bRecord = sal_True );
- void ModifyScenario( SCTAB nTab, const String& rName, const String& rComment,
- const Color& rColor, sal_uInt16 nFlags );
- sal_uLong TransferTab( ScDocShell& rSrcDocShell, SCTAB nSrcPos,
- SCTAB nDestPos, sal_Bool bInsertNew,
- sal_Bool bNotifyAndPaint );
-
- sal_Bool MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, sal_Bool bRecord );
-
- void DoRecalc( bool bApi );
- void DoHardRecalc( bool bApi );
-
- void UpdateOle( const ScViewData* pViewData, sal_Bool bSnapSize = false);
- sal_Bool IsOle();
-
- void DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
- ScDBData* GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGetDBSelection eSel );
- ScDBData* GetAnonymousDBData(const ScRange& rRange);
- ScDBData* GetOldAutoDBRange(); // has to be deleted by caller!
- void CancelAutoDBRange(); // called when dialog is cancelled
-
- virtual void ReconnectDdeLink(SfxObjectShell& rServer);
- void UpdateLinks();
- sal_Bool ReloadTabLinks();
-
- void SetFormulaOptions(const ScFormulaOptions& rOpt );
- virtual void CheckConfigOptions();
-
- void PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos );
-
- void PostPaint( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
- SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab, sal_uInt16 nPart,
- sal_uInt16 nExtFlags = 0 );
- void PostPaint( const ScRangeList& rRanges, sal_uInt16 nPart, sal_uInt16 nExtFlags = 0 );
-
- void PostPaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab );
- void PostPaintCell( const ScAddress& rPos );
- void PostPaintGridAll();
- void PostPaintExtras();
-
- bool IsPaintLocked() const { return pPaintLockData != NULL; }
-
- void PostDataChanged();
-
- void UpdatePaintExt( sal_uInt16& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
- SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab );
- void UpdatePaintExt( sal_uInt16& rExtFlags, const ScRange& rRange );
-
- void SetDocumentModified( sal_Bool bIsModified = sal_True );
- void SetDrawModified( sal_Bool bIsModified = sal_True );
-
- void LockPaint();
- void UnlockPaint();
- sal_uInt16 GetLockCount() const;
- void SetLockCount(sal_uInt16 nNew);
-
- void LockDocument();
- void UnlockDocument();
-
- DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
-
- virtual SfxStyleSheetBasePool* GetStyleSheetPool();
-
- void SetInplace( bool bInplace );
- bool IsEmpty() const;
- void SetEmpty(bool bSet);
-
- bool IsInUndo() const { return bIsInUndo; }
- void SetInUndo(bool bSet);
-
- void CalcOutputFactor();
- double GetOutputFactor() const;
- void GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
- SCTAB nCurTab,
- bool& rbHeader,
- bool& rbFooter );
-
- virtual long DdeGetData( const OUString& rItem, const OUString& rMimeType,
- ::com::sun::star::uno::Any & rValue );
- virtual long DdeSetData( const OUString& rItem, const OUString& rMimeType,
- const ::com::sun::star::uno::Any & rValue );
- virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem );
-
- const String& GetDdeTextFmt() const { return aDdeTextFmt; }
-
- SfxBindings* GetViewBindings();
-
- ScTabViewShell* GetBestViewShell( sal_Bool bOnlyVisible = sal_True );
- ScSbxDocHelper* GetDocHelperObject() { return pDocHelper; }
-
- void SetDocumentModifiedPending( bool bVal )
- { bDocumentModifiedPending = bVal; }
- bool IsDocumentModifiedPending() const
- { return bDocumentModifiedPending; }
-
- bool IsUpdateEnabled() const
- { return bUpdateEnabled; }
- void SetUpdateEnabled(bool bValue)
- { bUpdateEnabled = bValue; }
-
- OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice...
-
- static ScViewData* GetViewData();
- static SCTAB GetCurTab();
-
- static ScDocShell* GetShellByNum( sal_uInt16 nDocNo );
- static String GetOwnFilterName();
- static String GetHtmlFilterName();
- static String GetWebQueryFilterName();
- static String GetAsciiFilterName();
- static String GetLotusFilterName();
- static String GetDBaseFilterName();
- static String GetDifFilterName();
- static sal_Bool HasAutomaticTableName( const String& rFilter );
-
- DECL_LINK( RefreshDBDataHdl, ScRefreshTimer* );
-
- void BeforeXMLLoading();
- void AfterXMLLoading(sal_Bool bRet);
-
- virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates );
-
- const ScOptSolverSave* GetSolverSaveData() const { return pSolverSaveData; } // may be null
- void SetSolverSaveData( const ScOptSolverSave& rData );
- ScSheetSaveData* GetSheetSaveData();
-
- void ResetKeyBindings( ScOptionsUtil::KeyBindingType eType );
-
- // password protection for Calc (derived from SfxObjectShell)
- // see also: FID_CHG_RECORD, SID_CHG_PROTECT
- virtual bool IsChangeRecording() const;
- virtual bool HasChangeRecordProtection() const;
- virtual void SetChangeRecording( bool bActivate );
- virtual bool SetProtectionPassword( const String &rPassword );
- virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash );
-
-
- void SnapVisArea( Rectangle& rRect ) const;
-};
-
-/** Create before modifications of the document and then destroy.
- If noted in the ctor AutoCalcShellDisabled and IdleDisabled,
- switches them off and restores the dtor AutoCalcShellDisabled
- also before a ScDocShell SetDocumentModified.
- Call SetDocumentModified after instead of the ScDocShell.
- In the dtor, if ScDocShell bDocumentModifiedPending is set and
- bAutoCalcShellDisabled is not set, then SetDocumentModified is called. */
-class SC_DLLPUBLIC ScDocShellModificator
-{
- ScDocShell& rDocShell;
- ScRefreshTimerProtector aProtector;
- sal_Bool bAutoCalcShellDisabled;
- bool bIdleEnabled;
-
- // not implemented
- ScDocShellModificator( const ScDocShellModificator& );
- ScDocShellModificator& operator=( const ScDocShellModificator& );
-
-public:
- ScDocShellModificator( ScDocShell& );
- ~ScDocShellModificator();
- void SetDocumentModified();
-};
-
-void UpdateAcceptChangesDialog();
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8f9fa9d53f6205aecba0568c34306fa7ee8e7fa5
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Tue Jul 9 23:52:56 2013 +0200
fix Windows build
Change-Id: I505bb74b64b5c2db432d9f1d2c6754f188f8c314
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 8ab28b1..15e1b61 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -16,7 +16,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \
sc/qa/unit/ucalc_sharedformula \
))
-$(eval $(call gb_CppunitTest_use_library_objects,sc_ucalc,sc))
+$(eval $(call gb_CppunitTest_use_library_objects,sc_ucalc, \
+ sc \
+ scqahelper \
+))
ifeq ($(ENABLE_TELEPATHY),TRUE)
$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc,tubes))
@@ -52,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \
salhelper \
sax \
sb \
- scqahelper \
sfx \
sot \
svl \
@@ -63,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \
tk \
tl \
ucbhelper \
+ unotest \
utl \
vbahelper \
vcl \
More information about the Libreoffice-commits
mailing list