summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-08-08 20:32:25 +0200
committerMichael Stahl <mstahl@redhat.com>2012-08-08 20:32:25 +0200
commitcb9a39e6e40ceb264702018b590837077d27874f (patch)
treef5416700beae778c89978848c7f28009f4e12a95
parentRevert "callcatcher: strip Container down" (diff)
downloadbinfilter-cb9a39e6e40ceb264702018b590837077d27874f.tar.gz
binfilter-cb9a39e6e40ceb264702018b590837077d27874f.zip
use binfilter's Container copy
Change-Id: Iccb94f37e47e244b200a0d50c6e4f9203e283635
-rw-r--r--binfilter/inc/bf_starmath/dynary.hxx4
-rw-r--r--binfilter/inc/bf_svtools/cntnrsrt.hxx2
-rw-r--r--binfilter/inc/bf_svx/svdetc.hxx2
-rw-r--r--binfilter/inc/bf_svx/svdglue.hxx2
-rw-r--r--binfilter/inc/bf_svx/svdhdl.hxx2
-rw-r--r--binfilter/inc/bf_svx/svdhlpln.hxx2
-rw-r--r--binfilter/inc/bf_svx/svdlayer.hxx2
-rw-r--r--binfilter/inc/bf_svx/svdmark.hxx2
-rw-r--r--binfilter/inc/bf_svx/svdundo.hxx2
9 files changed, 10 insertions, 10 deletions
diff --git a/binfilter/inc/bf_starmath/dynary.hxx b/binfilter/inc/bf_starmath/dynary.hxx
index 6850de814..5e6e60b3c 100644
--- a/binfilter/inc/bf_starmath/dynary.hxx
+++ b/binfilter/inc/bf_starmath/dynary.hxx
@@ -21,7 +21,7 @@
#define _DYNARY_HXX
#include <tools/solar.h>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
// ------------
// - DynArray -
@@ -29,7 +29,7 @@
#define DYNARRAY_ENTRY_NOTFOUND CONTAINER_ENTRY_NOTFOUND
-class DynArray : private Container
+class DynArray : private binfilter::Container
{
public:
using Container::SetSize;
diff --git a/binfilter/inc/bf_svtools/cntnrsrt.hxx b/binfilter/inc/bf_svtools/cntnrsrt.hxx
index 42b30e2ab..932e4bd5c 100644
--- a/binfilter/inc/bf_svtools/cntnrsrt.hxx
+++ b/binfilter/inc/bf_svtools/cntnrsrt.hxx
@@ -21,7 +21,7 @@
#include <bf_svtools/bf_solar.h>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
namespace binfilter {
diff --git a/binfilter/inc/bf_svx/svdetc.hxx b/binfilter/inc/bf_svx/svdetc.hxx
index 4aa214a46..6ba05df12 100644
--- a/binfilter/inc/bf_svx/svdetc.hxx
+++ b/binfilter/inc/bf_svx/svdetc.hxx
@@ -24,7 +24,7 @@
#include <bf_tools/string.hxx>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
#include <vcl/outdev.hxx>
diff --git a/binfilter/inc/bf_svx/svdglue.hxx b/binfilter/inc/bf_svx/svdglue.hxx
index 7c7159bda..b46372c76 100644
--- a/binfilter/inc/bf_svx/svdglue.hxx
+++ b/binfilter/inc/bf_svx/svdglue.hxx
@@ -28,7 +28,7 @@ class SvStream;
namespace binfilter {
class SdrObject;
}//end of namespace binfilter
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
#include <tools/gen.hxx>
namespace binfilter {
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/binfilter/inc/bf_svx/svdhdl.hxx b/binfilter/inc/bf_svx/svdhdl.hxx
index 5a9a0724e..ebef0e957 100644
--- a/binfilter/inc/bf_svx/svdhdl.hxx
+++ b/binfilter/inc/bf_svx/svdhdl.hxx
@@ -26,7 +26,7 @@
#include <vcl/pointr.hxx>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
#include <bf_svx/svdoedge.hxx>
diff --git a/binfilter/inc/bf_svx/svdhlpln.hxx b/binfilter/inc/bf_svx/svdhlpln.hxx
index 690ae77d3..c61d2461c 100644
--- a/binfilter/inc/bf_svx/svdhlpln.hxx
+++ b/binfilter/inc/bf_svx/svdhlpln.hxx
@@ -25,7 +25,7 @@
#include <tools/gen.hxx>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
class OutputDevice;
namespace binfilter {
diff --git a/binfilter/inc/bf_svx/svdlayer.hxx b/binfilter/inc/bf_svx/svdlayer.hxx
index 7693a3cc9..ea2bba5d4 100644
--- a/binfilter/inc/bf_svx/svdlayer.hxx
+++ b/binfilter/inc/bf_svx/svdlayer.hxx
@@ -23,7 +23,7 @@
#include <bf_svtools/bf_solar.h>
#include <bf_tools/string.hxx>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
#include <tools/stream.hxx>
#include <bf_svx/svdsob.hxx>
#include <bf_svx/svdtypes.hxx> // fuer typedef SdrLayerID
diff --git a/binfilter/inc/bf_svx/svdmark.hxx b/binfilter/inc/bf_svx/svdmark.hxx
index 200f07659..21e5376e5 100644
--- a/binfilter/inc/bf_svx/svdmark.hxx
+++ b/binfilter/inc/bf_svx/svdmark.hxx
@@ -22,7 +22,7 @@
#include <bf_svtools/bf_solar.h>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
#include <bf_tools/string.hxx>
class Rectangle;
diff --git a/binfilter/inc/bf_svx/svdundo.hxx b/binfilter/inc/bf_svx/svdundo.hxx
index b9c5de709..3f56e408d 100644
--- a/binfilter/inc/bf_svx/svdundo.hxx
+++ b/binfilter/inc/bf_svx/svdundo.hxx
@@ -22,7 +22,7 @@
#include <bf_svtools/bf_solar.h>
#include <bf_svtools/undo.hxx>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
#include <tools/gen.hxx>
#include <bf_svx/svdtypes.hxx> // fuer enum RepeatFuncts
#include <tools/debug.hxx>