sd/inc/CustomAnimationEffect.hxx | 1 -
sd/inc/cusshow.hxx | 1 -
sd/inc/sdabstdlg.hxx | 1 -
sd/source/ui/inc/TemplateScanner.hxx | 1 -
sd/source/ui/inc/taskpane/TitleBar.hxx | 1 -
sd/source/ui/inc/taskpane/TitledControl.hxx | 1 -
sd/source/ui/inc/tmplctrl.hxx | 1 -
sd/source/ui/sidebar/MasterPageContainer.hxx | 1 -
sw/source/core/doc/docfmt.cxx | 10 +++++++++-
unotools/source/config/lingucfg.cxx | 1 -
unotools/source/config/syslocaleoptions.cxx | 1 -
11 files changed, 9 insertions(+), 11 deletions(-)
New commits:
commit fe9cce9453ca0e1aac77834af8160f0d11887a55
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Sep 21 12:28:48 2013 +0100
CID#1000697 out of bounds access
Change-Id: I59f80463aa13e3c28695112165343f93366cfec4
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index a9d9f04..7d4a809 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -585,7 +585,15 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const
SfxItemSet& rChgSet,
return false;
}
- SwNumFmt aNumFmt =
pNumRule->Get(static_cast<sal_uInt16>(pTxtNd->GetActualListLevel()));
+ int nLevel = pTxtNd->GetActualListLevel();
+
+ if (nLevel < 0)
+ nLevel = 0;
+
+ if (nLevel >= MAXLEVEL)
+ nLevel = MAXLEVEL - 1;
+
+ SwNumFmt aNumFmt = pNumRule->Get(static_cast<sal_uInt16>(nLevel));
SwCharFmt * pCharFmt =
pDoc->FindCharFmtByName(aNumFmt.GetCharFmtName());
commit 74441e736edfd20621af71de22b2e92cbc4f7f3c
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Sep 21 12:28:16 2013 +0100
drop various tools/string.hxx include
Change-Id: If4271c97025a56922c4f0b143cc3af214218a153
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 3931d62..6237945 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/animations/XAudio.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/util/XChangesListener.hpp>
-#include <tools/string.hxx>
#include <boost/shared_ptr.hpp>
diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index 8129364..c80cb1d 100644
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
@@ -22,7 +22,6 @@
#include <vector>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include <cppuhelper/weakref.hxx>
#include "sddllapi.h"
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index e63aa0d..68142c8 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -24,7 +24,6 @@
#include <rtl/ref.hxx>
#include <rtl/string.hxx>
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <sfx2/sfxdlg.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/NamedValue.hpp>
diff --git a/sd/source/ui/inc/TemplateScanner.hxx
b/sd/source/ui/inc/TemplateScanner.hxx
index 2bc3ace..a93d1b9 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -23,7 +23,6 @@
#include "tools/AsynchronousTask.hxx"
#include "sddllapi.h"
#include <ucbhelper/content.hxx>
-#include <tools/string.hxx>
#include "com/sun/star/uno/Reference.hxx"
#include <vector>
diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx
b/sd/source/ui/inc/taskpane/TitleBar.hxx
index f00ba4a..c518b7e 100644
--- a/sd/source/ui/inc/taskpane/TitleBar.hxx
+++ b/sd/source/ui/inc/taskpane/TitleBar.hxx
@@ -22,7 +22,6 @@
#include "taskpane/TaskPaneTreeNode.hxx"
#include <vcl/image.hxx>
-#include <tools/string.hxx>
#include <vcl/window.hxx>
#include <memory>
diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx
b/sd/source/ui/inc/taskpane/TitledControl.hxx
index 4cd6896..f8d1f8f 100644
--- a/sd/source/ui/inc/taskpane/TitledControl.hxx
+++ b/sd/source/ui/inc/taskpane/TitledControl.hxx
@@ -24,7 +24,6 @@
#include "taskpane/ControlContainer.hxx"
#include "TitleBar.hxx"
#include <com/sun/star/drawing/framework/XResourceId.hpp>
-#include <tools/string.hxx>
#include <tools/gen.hxx>
#include <vcl/window.hxx>
#include <memory>
diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx
index 20a79a4..e7bda12 100644
--- a/sd/source/ui/inc/tmplctrl.hxx
+++ b/sd/source/ui/inc/tmplctrl.hxx
@@ -20,7 +20,6 @@
#define _SD_TMPLCTRL_HXX
#include <sfx2/stbitem.hxx>
-#include <tools/string.hxx>
class SdTemplateControl : public SfxStatusBarControl
{
diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx
b/sd/source/ui/sidebar/MasterPageContainer.hxx
index 762b52c..007dced 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.hxx
@@ -23,7 +23,6 @@
#include "MasterPageContainerProviders.hxx"
#include <osl/mutex.hxx>
-#include <tools/string.hxx>
#include <vcl/image.hxx>
#include <memory>
#include "PreviewRenderer.hxx"
diff --git a/unotools/source/config/lingucfg.cxx
b/unotools/source/config/lingucfg.cxx
index ebed68e..8f1e767 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -31,7 +31,6 @@
#include <i18nlangtag/mslangid.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <tools/debug.hxx>
-#include <tools/string.hxx>
#include <unotools/lingucfg.hxx>
#include <unotools/linguprops.hxx>
#include <sal/macros.h>
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index a02834b..7e13611 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -22,7 +22,6 @@
#include <rtl/instance.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <i18nlangtag/languagetag.hxx>
-#include <tools/string.hxx>
#include <tools/debug.hxx>
#include <unotools/syslocaleoptions.hxx>
#include <unotools/configmgr.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
