diff options
| -rw-r--r-- | svl/inc/svl/svstdarr.hxx | 3 | ||||
| -rw-r--r-- | svx/source/dialog/fntctrl.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/inc/scriptinfo.hxx | 8 | ||||
| -rw-r--r-- | sw/source/core/layout/layhelp.hxx | 9 | ||||
| -rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/swhtml.hxx | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx index c213b6c45c9f..6b2a69cd8515 100644 --- a/svl/inc/svl/svstdarr.hxx +++ b/svl/inc/svl/svstdarr.hxx @@ -28,12 +28,9 @@ ***********************************************************************/ #include "svl/svldllapi.h" -#include <deque> #include <tools/string.hxx> typedef String* StringPtr; -typedef std::deque< xub_StrLen > SvXub_StrLens; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 247e199a1709..004a88dde4a3 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/i18n/ScriptType.hpp> #include <vector> +#include <deque> #include <svtools/colorcfg.hxx> #include <svtools/sampletext.hxx> @@ -51,7 +52,6 @@ #include <svl/itempool.hxx> #include <svl/stritem.hxx> // SfxStringItem #include <svl/languageoptions.hxx> -#include <svl/svstdarr.hxx> #include <editeng/colritem.hxx> #include <editeng/fontitem.hxx> @@ -146,7 +146,7 @@ class FontPrevWin_Impl Reference < XBreakIterator > xBreak; std::vector<sal_uIntPtr> aTextWidth; - SvXub_StrLens aScriptChg; + std::deque<xub_StrLen> aScriptChg; std::vector<sal_uInt16> aScriptType; SvxFont aCJKFont; SvxFont aCTLFont; diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx index b58dbb2ad83a..d4738cadcf2d 100644 --- a/sw/source/core/inc/scriptinfo.hxx +++ b/sw/source/core/inc/scriptinfo.hxx @@ -25,11 +25,12 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _SCRIPTINFO_HXX -#define _SCRIPTINFO_HXX -#include <svl/svstdarr.hxx> +#ifndef SW_SCRIPTINFO_HXX +#define SW_SCRIPTINFO_HXX + #include <list> +#include <deque> #include "swscanner.hxx" class SwTxtNode; @@ -37,6 +38,7 @@ class Point; class MultiSelection; class String; typedef std::list< xub_StrLen > PositionList; +typedef std::deque< xub_StrLen > SvXub_StrLens; #define SPACING_PRECISION_FACTOR 100 diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx index afaf6feb9903..85611fc95c51 100644 --- a/sw/source/core/layout/layhelp.hxx +++ b/sw/source/core/layout/layhelp.hxx @@ -25,12 +25,13 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _LAYHELP_HXX -#define _LAYHELP_HXX -#include <svl/svstdarr.hxx> +#ifndef SW_LAYHELP_HXX +#define SW_LAYHELP_HXX + #include <swrect.hxx> #include <vector> +#include <deque> class SwDoc; class SwFrm; @@ -60,7 +61,7 @@ typedef boost::ptr_vector<SwFlyCache> SwPageFlyCache; class SwLayCacheImpl : public std::vector<sal_uLong> { - SvXub_StrLens aOffset; + std::deque<xub_StrLen> aOffset; std::vector<sal_uInt16> aType; SwPageFlyCache aFlyCache; sal_Bool bUseFlyCache; diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 42816109099f..dcd4b3bed122 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -1141,7 +1141,7 @@ class HTMLEndPosLst { _HTMLEndLst aStartLst; // nach Anfangs-Psoitionen sortierte Liste _HTMLEndLst aEndLst; // nach End-Psotionen sortierte Liste - SvXub_StrLens aScriptChgLst; // positions where script changes + std::deque<xub_StrLen> aScriptChgLst; // positions where script changes // 0 is not contained in this list, // but the text length // the script that is valif up to the position diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 30a7713f7dc4..f83e929fbee1 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -387,7 +387,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient _HTMLAttrTable aAttrTab; // "offene" Attribute _HTMLAttrContexts aContexts;// der aktuelle Attribut/Token-Kontext SwHTMLFrmFmts aMoveFlyFrms;// Fly-Frames, the anchor is moved - SvXub_StrLens aMoveFlyCnts;// and the Content-Positions + std::deque<xub_StrLen> aMoveFlyCnts;// and the Content-Positions SwApplet_Impl *pAppletImpl; // das aktuelle Applet |