solenv/gbuild/platform/IOS_ARM_GCC.mk | 3 +++ sw/source/core/inc/pagefrm.hxx | 11 ----------- sw/source/core/layout/trvlfrm.cxx | 6 +----- 3 files changed, 4 insertions(+), 16 deletions(-)
New commits: commit c7f83feb90b7bde9e3609795a749ca3bf2c0d02c Author: Tor Lillqvist <t...@collabora.com> Date: Thu Oct 24 12:06:26 2013 +0300 Use static_cast instead of C-style cast Makes it more obvious to the code reader that nothing wrong is going on (or the compiler would have complained). Change-Id: I2ab420ffeb71f5c0b68e1b7db039cb9cde6af801 diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 80da515..1be599e 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -1800,7 +1800,7 @@ sal_uInt16 SwFrm::GetVirtPageNum() const return 0; sal_uInt16 nPhyPage = pPage->GetPhyPageNum(); - if ( !((SwRootFrm*)pPage->GetUpper())->IsVirtPageNum() ) + if ( !(static_cast<const SwRootFrm*>(pPage->GetUpper()))->IsVirtPageNum() ) return nPhyPage; //Search the nearest section using the virtual page number. commit 5d0051efb99c6cbd0dc4dd655a71e7435159f6bc Author: Tor Lillqvist <t...@collabora.com> Date: Thu Oct 24 11:33:52 2013 +0300 Bin a few pointless comments Change-Id: Ia8a47bcd07cf10302b5cf6f550627e5c7cd1d9f6 diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index f3ea616..773dac4 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -33,10 +33,7 @@ struct SwPosition; struct SwCrsrMoveState; class SwAttrSetChg; class Font; - -// #i28701# - replaced by class <SwSortedObjs> class SwSortedObjs; -// #i28701# class SwAnchoredObject; enum SwPageChg @@ -51,7 +48,6 @@ class SwPageFrm: public SwFtnBossFrm { friend class SwFrm; - // #i28701# - use <SwSortedObjs> SwSortedObjs *pSortedObjs; SwPageDesc *pDesc; //PageDesc der die Seite beschreibt. @@ -123,7 +119,6 @@ public: const SwSortedObjs *GetSortedObjs() const { return pSortedObjs; } SwSortedObjs *GetSortedObjs() { return pSortedObjs; } - // #i28701# - new methods to append/remove drawing objects void AppendDrawObjToPage( SwAnchoredObject& _rNewObj ); void RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj ); @@ -157,7 +152,6 @@ public: //Schickt an alle ContentFrames ein Prepare wg. geaenderter Registervorlage void PrepareRegisterChg(); - // #i50432# - adjust method description and synopsis. // Appends a fly frame - the given one or a new one - at the page frame. // Needed for <Modify> and <MakeFrms> // - return value not needed any more @@ -260,9 +254,6 @@ public: /** paint page border and shadow - #i9719# - implement paint of page border and shadow - @param _rPageRect input parameter - constant instance reference of the page rectangle. Generally, it's the frame area of the page, but for empty pages in print @@ -291,8 +282,6 @@ public: /** get bound rectangle of border and shadow for repaints - #i9719# - @param _rPageRect input parameter - constant instance reference of the page rectangle. Generally, it's the frame area of the page, but for empty pages in print diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 14eb645..80da515 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -49,13 +49,11 @@ #include <frmtool.hxx> #include <ndtxt.hxx> #include <dcontact.hxx> -// OD 2004-05-24 #i28701# #include <sortedobjs.hxx> #include <txatbase.hxx> #include <fmtfld.hxx> #include <fldbas.hxx> -// FLT_MAX #include <cfloat> #include <swselectionlist.hxx> @@ -1609,8 +1607,6 @@ Point SwRootFrm::GetPagePos( sal_uInt16 nPageNum ) const /** get page frame by phyiscal page number * - * OD 14.01.2003 #103492# - * * @return pointer to the page frame with the given physical page number */ SwPageFrm* SwRootFrm::GetPageByPageNum( sal_uInt16 _nPageNum ) const commit beda848f388685b0fcb60c590fb691029c23a26b Author: Tor Lillqvist <t...@collabora.com> Date: Thu Oct 24 01:54:32 2013 +0300 The icu, xml2 and libxslt libs moved Change-Id: I202ab418d2cf0d4f0f9d7786fec837dd76abd7b5 diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index fea5802..aac083b 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -123,6 +123,7 @@ define gb_LinkTarget__command_dynamiclink $(HYPHEN_LIB) \ $(MYTHES_LIBS) \ $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libmspub/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libmwaw/src/lib/.libs/*.a) \ @@ -131,6 +132,8 @@ define gb_LinkTarget__command_dynamiclink $(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libwp?/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/openssl/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/xml2/.libs/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/xslt/libxslt/.libs/*.a) \ $(T_LIBS) \ -o $(1)) endef _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits