[Libreoffice-commits] .: 2 commits - sw/source
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Feb 6 08:36:24 PST 2011
sw/source/core/unocore/unocoll.cxx | 4 -
sw/source/core/unocore/unodraw.cxx | 6 +-
sw/source/filter/ww8/WW8TableInfo.hxx | 71 +++++++++++++++++-----------------
3 files changed, 41 insertions(+), 40 deletions(-)
New commits:
commit 14b70adc6b8da9accf5a873f6dffab9c5dea15fb
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Feb 6 08:36:07 2011 -0800
Add missing #include <vector>
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index da1eea1..2ba703a 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -25,7 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-
+
#ifndef WW8_TABLE_INFO_HXX
#define WW8_TABLE_INFO_HXX
#include <boost/unordered_map.hpp>
@@ -34,6 +34,7 @@
#include <set>
#include <functional>
#include <boost/shared_ptr.hpp>
+#include <vector>
#include <sal/types.h>
#include <swrect.hxx>
@@ -49,7 +50,7 @@ namespace ww8
using namespace ::std;
class WW8TableNodeInfo;
-typedef boost::shared_ptr<SwRect> SwRectPtr;
+typedef boost::shared_ptr<SwRect> SwRectPtr;
typedef ::std::vector<const SwTableBox *> TableBoxVector;
typedef boost::shared_ptr<TableBoxVector> TableBoxVectorPtr;
typedef ::std::vector<sal_uInt32> GridCols;
@@ -74,13 +75,13 @@ class WW8TableNodeInfoInner
const SwTableBox * mpTableBox;
const SwTable * mpTable;
SwRect maRect;
-
+
public:
typedef boost::shared_ptr<WW8TableNodeInfoInner> Pointer_t;
WW8TableNodeInfoInner(WW8TableNodeInfo * pParent);
~WW8TableNodeInfoInner();
-
+
void setDepth(sal_uInt32 nDepth);
void setCell(sal_uInt32 nCell);
void setRow(sal_uInt32 nRow);
@@ -93,7 +94,7 @@ public:
void setTableBox(const SwTableBox * pTableBox);
void setTable(const SwTable * pTable);
void setRect(const SwRect & rRect);
-
+
sal_uInt32 getDepth() const;
sal_uInt32 getCell() const;
sal_uInt32 getRow() const;
@@ -106,7 +107,7 @@ public:
const SwTableBox * getTableBox() const;
const SwTable * getTable() const;
const SwRect & getRect() const;
-
+
const SwNode * getNode() const;
TableBoxVectorPtr getTableBoxesOfRow();
@@ -125,9 +126,9 @@ class WW8TableInfo;
class WW8TableNodeInfo
{
public:
- typedef map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t,
+ typedef map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t,
greater<sal_uInt32> > Inners_t;
-
+
private:
WW8TableInfo * mpParent;
sal_uInt32 mnDepth;
@@ -141,7 +142,7 @@ public:
WW8TableNodeInfo(WW8TableInfo * pParent, const SwNode * pTxtNode);
virtual ~WW8TableNodeInfo();
-
+
void setDepth(sal_uInt32 nDepth);
void setEndOfLine(bool bEndOfLine);
void setEndOfCell(bool bEndOfCell);
@@ -156,7 +157,7 @@ public:
void setNext(WW8TableNodeInfo * pNext);
void setNextNode(const SwNode * pNode);
void setRect(const SwRect & rRect);
-
+
WW8TableInfo * getParent() const;
sal_uInt32 getDepth() const;
bool isEndOfLine() const;
@@ -172,7 +173,7 @@ public:
const Inners_t & getInners() const;
const WW8TableNodeInfoInner::Pointer_t getFirstInner() const;
const WW8TableNodeInfoInner::Pointer_t getInnerForDepth(sal_uInt32 nDepth) const;
-
+
sal_uInt32 getCell() const;
sal_uInt32 getRow() const;
@@ -180,16 +181,16 @@ public:
bool operator < (const WW8TableNodeInfo & rInfo) const;
};
-
+
struct hashNode
{
- size_t operator()(const SwNode * pNode) const
+ size_t operator()(const SwNode * pNode) const
{ return reinterpret_cast<size_t>(pNode); }
};
-
+
struct hashTable
{
- size_t operator()(const SwTable * pTable) const
+ size_t operator()(const SwTable * pTable) const
{ return reinterpret_cast<size_t>(pTable); }
};
@@ -210,7 +211,7 @@ public:
CellInfoMultiSet::const_iterator end() const;
void setTableBoxVector(TableBoxVectorPtr pTableBoxVector);
- void setWidths(WidthsPtr pGridCols);
+ void setWidths(WidthsPtr pGridCols);
void setRowSpans(RowSpansPtr pRowSpans);
TableBoxVectorPtr getTableBoxVector() const;
@@ -225,7 +226,7 @@ class WW8TableCellGrid
RowTops_t m_aRowTops;
Rows_t m_aRows;
-
+
WW8TableCellGridRow::Pointer_t getRow(long nTop, bool bCreate = true);
RowTops_t::const_iterator getRowTopsBegin() const;
RowTops_t::const_iterator getRowTopsEnd() const;
@@ -238,7 +239,7 @@ public:
WW8TableCellGrid();
~WW8TableCellGrid();
- void insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo,
+ void insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo,
unsigned long * pFmtFrmWidth = NULL);
void addShadowCells();
WW8TableNodeInfo * connectCells();
@@ -248,7 +249,7 @@ public:
TableBoxVectorPtr getTableBoxesOfRow(WW8TableNodeInfoInner * pNodeInfo);
WidthsPtr getWidthsOfRow(WW8TableNodeInfoInner * pNodeInfo);
RowSpansPtr getRowSpansOfRow(WW8TableNodeInfoInner * pNodeInfo);
-};
+};
class WW8TableInfo
{
@@ -260,21 +261,21 @@ class WW8TableInfo
CellGridMap_t mCellGridMap;
typedef boost::unordered_map<const SwTable *, const SwNode *, hashTable > FirstInTableMap_t;
- FirstInTableMap_t mFirstInTableMap;
+ FirstInTableMap_t mFirstInTableMap;
WW8TableNodeInfo *
- processTableLine(const SwTable * pTable,
+ processTableLine(const SwTable * pTable,
const SwTableLine * pTableLine,
- sal_uInt32 nRow,
+ sal_uInt32 nRow,
sal_uInt32 nDepth, WW8TableNodeInfo * pPrev);
WW8TableNodeInfo *
processTableBox(const SwTable * pTable,
const SwTableBox * pTableBox,
sal_uInt32 nRow,
- sal_uInt32 nCell,
+ sal_uInt32 nCell,
sal_uInt32 nDepth, bool bEndOfLine, WW8TableNodeInfo * pPrev);
-
+
WW8TableNodeInfo::Pointer_t
processTableBoxLines(const SwTableBox * pBox,
const SwTable * pTable,
@@ -282,25 +283,25 @@ class WW8TableInfo
sal_uInt32 nRow,
sal_uInt32 nCell,
sal_uInt32 nDepth);
-
+
WW8TableNodeInfo::Pointer_t
- insertTableNodeInfo(const SwNode * pNode,
- const SwTable * pTable,
+ insertTableNodeInfo(const SwNode * pNode,
+ const SwTable * pTable,
const SwTableBox * pTableBox,
sal_uInt32 nRow,
sal_uInt32 nCell,
sal_uInt32 nDepth,
SwRect * pRect = NULL);
- WW8TableCellGrid::Pointer_t getCellGridForTable(const SwTable * pTable,
+ WW8TableCellGrid::Pointer_t getCellGridForTable(const SwTable * pTable,
bool bCreate = true);
-
-public:
+
+public:
typedef boost::shared_ptr<WW8TableInfo> Pointer_t;
WW8TableInfo();
virtual ~WW8TableInfo();
-
+
void processSwTable(const SwTable * pTable);
WW8TableNodeInfo * processSwTableByLayout(const SwTable * pTable);
WW8TableNodeInfo::Pointer_t getTableNodeInfo(const SwNode * pNode);
@@ -309,7 +310,7 @@ public:
WW8TableNodeInfo * reorderByLayout(const SwTable * pTable);
};
-
+
class CellInfo
{
SwRect m_aRect;
@@ -320,7 +321,7 @@ public:
CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo);
CellInfo(const CellInfo & aRectAndTableInfo)
- : m_aRect(aRectAndTableInfo.m_aRect),
+ : m_aRect(aRectAndTableInfo.m_aRect),
m_pNodeInfo(aRectAndTableInfo.m_pNodeInfo),
m_nFmtFrmWidth(aRectAndTableInfo.m_nFmtFrmWidth)
{
@@ -337,7 +338,7 @@ public:
long width() const { return m_aRect.Width(); }
long height() const { return m_aRect.Height(); }
SwRect getRect() const { return m_aRect; }
- WW8TableNodeInfo * getTableNodeInfo() const
+ WW8TableNodeInfo * getTableNodeInfo() const
{ return m_pNodeInfo; }
unsigned long getFmtFrmWidth() const
{
commit 227b80295102055e5ac3a0b3f2755ab17828d2e1
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Feb 6 08:35:51 2011 -0800
Convert slist to list
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 073fe10..e508e75 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -69,7 +69,7 @@
#include <unochart.hxx>
#include <comphelper/makesequence.hxx>
#include <comphelper/sequence.hxx>
-#include <slist>
+#include <list>
#include <iterator>
#include <unosection.hxx>
@@ -1067,7 +1067,7 @@ namespace
: public SwSimpleEnumeration_Base
{
private:
- typedef ::std::slist< Any > frmcontainer_t;
+ typedef ::std::list< Any > frmcontainer_t;
frmcontainer_t m_aFrames;
protected:
virtual ~SwXFrameEnumeration() {};
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 5740568..0183fe6 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -85,7 +85,7 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <com/sun/star/drawing/PointSequence.hpp>
#include <vcl/svapp.hxx>
-#include <slist>
+#include <list>
#include <iterator>
using ::rtl::OUString;
@@ -414,7 +414,7 @@ namespace
: public SwSimpleEnumeration_Base
{
private:
- typedef ::std::slist< ::com::sun::star::uno::Any > shapescontainer_t;
+ typedef ::std::list< ::com::sun::star::uno::Any > shapescontainer_t;
shapescontainer_t m_aShapes;
protected:
virtual ~SwXShapesEnumeration() {};
More information about the Libreoffice-commits
mailing list