diff options
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/IDocumentLayoutAccess.hxx | 6 | ||||
| -rw-r--r-- | sw/inc/doc.hxx | 14 | ||||
| -rw-r--r-- | sw/inc/viewopt.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/viewsh.hxx | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx index 005385f749b2..fc9bb5c689ba 100644 --- a/sw/inc/IDocumentLayoutAccess.hxx +++ b/sw/inc/IDocumentLayoutAccess.hxx @@ -38,14 +38,14 @@ public: /** Returns the layout set at the document. */ virtual const ViewShell* GetCurrentViewShell() const = 0; - virtual ViewShell* GetCurrentViewShell() = 0; //swmod 071107//swmod 071225 + virtual ViewShell* GetCurrentViewShell() = 0; virtual const SwRootFrm* GetCurrentLayout() const = 0; - virtual SwRootFrm* GetCurrentLayout() = 0; //swmod 080218 + virtual SwRootFrm* GetCurrentLayout() = 0; virtual bool HasLayout() const = 0; /** !!!The old layout must be deleted!!! */ - virtual void SetCurrentViewShell( ViewShell* pNew ) = 0; //swmod 071107//swmod 071225 + virtual void SetCurrentViewShell( ViewShell* pNew ) = 0; /** */ diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 42379e40d686..3dc2f6f9d176 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -314,7 +314,7 @@ class SW_DLLPUBLIC SwDoc : SwTOXTypes *mpTOXTypes; ///< Tables/indices SwDefTOXBase_Impl * mpDefTOXBases; ///< defaults of SwTOXBase's - ViewShell *mpCurrentView; ///< SwDoc should get a new member mpCurrentView//swmod 071225 + ViewShell *mpCurrentView; ///< SwDoc should get a new member mpCurrentView SdrModel *mpDrawModel; ///< StarView Drawing SwDocUpdtFld *mpUpdtFlds; ///< Struct for updating fields @@ -946,17 +946,17 @@ public: /** IDocumentLayoutAccess */ - virtual void SetCurrentViewShell( ViewShell* pNew );//swmod 071225 + virtual void SetCurrentViewShell( ViewShell* pNew ); virtual SwLayouter* GetLayouter(); virtual const SwLayouter* GetLayouter() const; virtual void SetLayouter( SwLayouter* pNew ); virtual SwFrmFmt* MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet ); virtual void DelLayoutFmt( SwFrmFmt *pFmt ); virtual SwFrmFmt* CopyLayoutFmt( const SwFrmFmt& rSrc, const SwFmtAnchor& rNewAnchor, bool bSetTxtFlyAtt, bool bMakeFrms ); - virtual const ViewShell *GetCurrentViewShell() const; //swmod 080219 - virtual ViewShell *GetCurrentViewShell(); ///< swmod 080219 It must be able to communicate to a ViewShell.This is going to be removerd later. + virtual const ViewShell *GetCurrentViewShell() const; + virtual ViewShell *GetCurrentViewShell(); ///< It must be able to communicate to a ViewShell.This is going to be removerd later. virtual const SwRootFrm *GetCurrentLayout() const; - virtual SwRootFrm *GetCurrentLayout();//swmod 080219 + virtual SwRootFrm *GetCurrentLayout(); virtual bool HasLayout() const; void ClearSwLayouterEntries(); @@ -1156,7 +1156,7 @@ public: OUString GetUniqueOLEName() const; OUString GetUniqueFrameName() const; - std::set<SwRootFrm*> GetAllLayouts();//swmod 080225 + std::set<SwRootFrm*> GetAllLayouts(); void SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName ); const SwFlyFrmFmt* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const; @@ -1877,7 +1877,7 @@ public: /** update all modified OLE-Objects. The modification is called over the StarOne - Interface */ void SetOLEObjModified() - { if( GetCurrentViewShell() ) maOLEModifiedTimer.Start(); } //swmod 071107//swmod 071225 + { if( GetCurrentViewShell() ) maOLEModifiedTimer.Start(); } // -------------------- Uno - Interfaces --------------------------- const SwUnoCrsrTbl& GetUnoCrsrTbl() const { return *mpUnoCrsrTbl; } diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 93683e282c5a..89f2ef86c259 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -152,7 +152,7 @@ protected: sal_Bool bIsPagePreview : 1; // The preview mustn't print field/footnote/... shadings. sal_Bool bSelectionInReadonly : 1; // Determines whether selection is switched on in readonly documents. sal_Bool mbFormView : 1; - sal_Bool mbBrowseMode : 1; // swmod 080130. + sal_Bool mbBrowseMode : 1; sal_Bool mbBookView : 1; // View mode for page preview. sal_Bool mbViewLayoutBookMode : 1; // Book view mode for edit view. sal_Bool bShowPlaceHolderFields : 1; // Only used in printing! diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index a106b9657afb..312e56370f9f 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -26,7 +26,7 @@ #include <swtypes.hxx> #include <ring.hxx> #include <swrect.hxx> -#include <boost/shared_ptr.hpp> // swmod 080115 +#include <boost/shared_ptr.hpp> #include <stack> #include <vcl/mapmod.hxx> #include <vcl/print.hxx> @@ -92,7 +92,7 @@ enum FrameControlType // Define for flags needed in ctor or layers below. // Currently the Preview flag is needed for DrawPage. #define VSHELLFLAG_ISPREVIEW ((long)0x1) -#define VSHELLFLAG_SHARELAYOUT ((long)0x2)//swmod 080125 flag +#define VSHELLFLAG_SHARELAYOUT ((long)0x2) typedef boost::shared_ptr<SwRootFrm> SwRootFrmPtr; class SW_DLLPUBLIC ViewShell : public Ring @@ -273,7 +273,7 @@ public: // Invalidate first visible page for all Shells in ring. void SetFirstVisPageInvalid(); - SwRootFrm *GetLayout() const;// swmod 080116 + SwRootFrm *GetLayout() const; sal_Bool IsNewLayout() const; // Has Layout been loaded or created? Size GetDocSize() const; // Get document size. |