Commits

Anonymous committed 5d17f44

swbookmarkfixes01: minor fixes for PageDescManager

  • Participants
  • Parent commits 380ab45

Comments (0)

Files changed (5)

File sw/inc/pagedesc.hxx

 
 	SW_DLLPRIVATE void ResetAllAttr( sal_Bool bLeft );
 
-	SW_DLLPRIVATE SwPageDesc(const String& rName, SwDoc* const pDoc, SvxFrameDirectionItem aFrameDirection);
-	SW_DLLPRIVATE SwPageDesc(const String&, SwFrmFmt*, SwDoc* const, SvxFrameDirection aFrameDir);
+	SW_DLLPRIVATE SwPageDesc(const String& rName, SwDoc* const pDoc, SvxFrameDirection aFrameDirection);
+	SW_DLLPRIVATE SwPageDesc(const String&, SwFrmFmt*, SwDoc* const);
 
 public:
     // copy the complete PageDesc -- even with different docs and "deep"
     // optionally copying of PoolFmtId, -HlpId can be prevented
     void CopyFrom(const SwPageDesc* pSrc, bool bCopyPoolIds=true);
     bool HasInvalidPageFormat() const;
-    void ResetTotDefaultPageFormat();
+    void ResetToDefaultPageFormat();
 	const String &GetName() const { return aDescName; }
 		  void 	  SetName( const String& rNewName ) { aDescName = rNewName; }
 

File sw/prj/build.lst

 sw      sw\util                             nmake   -       all     sw_util sw_core sw_flt sw_sdi sw_ui NULL
 sw sw\qa\unoapi nmake - all sw_qa_unoapi NULL
 sw sw\qa\core\bigpointerarray nmake - all sw_qa_core_bigpointerarray sw_bast sw_inc NULL
+sw sw\qa\core\PageDescManager nmake - all sw_qa_core_PageDescManager sw_inc NULL

File sw/qa/core/PageDescManager/PageDescManagerTest.cxx

         const SwPageDesc* GetFollow() const { return NULL; };
         void Dispose() {};
         bool HasInvalidPageFormat() const { return true; };
-        void ResetTotDefaultPageFormat() {};
+        void ResetToDefaultPageFormat() {};
         USHORT GetPoolFmtId() const { return m_nFmtId; };
         void SetPoolFmtId(USHORT nFmtId) { m_nFmtId = nFmtId; };
         void SetPoolHelpId(USHORT nHid) { m_nHid = nHid; };

File sw/source/core/doc/PageDescManager.cxx

         void operator()(SwPageDesc* pPageDesc)
         {
             if(pPageDesc->HasInvalidPageFormat())
-                pPageDesc->ResetTotDefaultPageFormat();
+                pPageDesc->ResetToDefaultPageFormat();
         };
     };
 }

File sw/source/core/layout/pagedesc.cxx

     bLandscape( FALSE ),
     aFtnInfo()
 {
-        ResetTotDefaultPageFormat();
+        ResetToDefaultPageFormat();
         GetMaster().SetFmtAttr(SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR));
         GetLeft().SetFmtAttr(SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR));
 }
     }
 }
 
-void SwPageDesc::ResetTotDefaultPageFormat()
+void SwPageDesc::ResetToDefaultPageFormat()
 {
     SwFmtFrmSize aFrmSize( ATT_FIX_SIZE );
     const Size aPhysSize = SvxPaperInfo::GetDefaultPaperSize();