Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
	comphelper/source/misc/servicedecl.cxx
	i18npool/source/breakiterator/breakiteratorImpl.cxx
	l10ntools/scripts/localize.pl
	svl/source/items/itemset.cxx
	svl/source/memtools/svarray.cxx
	svl/source/numbers/zformat.cxx
	svtools/source/brwbox/brwbox1.cxx
	tools/source/stream/strmwnt.cxx
	vcl/inc/vcl/graphite_adaptors.hxx
	vcl/inc/vcl/graphite_layout.hxx
	vcl/inc/vcl/graphite_serverfont.hxx
	vcl/source/control/imgctrl.cxx
	vcl/source/gdi/outdev.cxx
	vcl/source/gdi/outdev3.cxx
	vcl/source/glyphs/gcach_ftyp.cxx
	vcl/source/glyphs/graphite_adaptors.cxx
	vcl/source/glyphs/graphite_layout.cxx
	vcl/source/window/winproc.cxx
	vcl/unx/source/fontmanager/fontconfig.cxx

1 files changed, 71 insertions, 0 deletions

diff --git a/sot/inc/sot/agg.hxx b/sot/inc/sot/agg.hxx
new file mode 100644
index 000000000000..ff5b282160ae
--- /dev/null
+++ b/sot/inc/sot/agg.hxx
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _SOT_AGG_HXX
+#define _SOT_AGG_HXX
+
+#include <tools/ownlist.hxx>
+
+/************** class SvAggregate ***************************************/
+/************************************************************************/
+class SotFactory;
+class SotObject;
+struct SvAggregate
+{
+    union
+    {
+        SotFactory * pFact;
+        SotObject * pObj;
+    };
+    sal_Bool    bFactory;
+    sal_Bool    bMainObj; // sal_True, das Objekt, welches das casting steuert
+
+    SvAggregate()
+        : pFact( NULL )
+        , bFactory( sal_False )
+        , bMainObj( sal_False ) {}
+    SvAggregate( SotObject * pObjP, sal_Bool bMainP )
+        : pObj( pObjP )
+        , bFactory( sal_False )
+        , bMainObj( bMainP ) {}
+    SvAggregate( SotFactory * pFactP )
+        : pFact( pFactP )
+        , bFactory( sal_True )
+        , bMainObj( sal_False ) {}
+};
+
+/************** class SvAggregateMemberList *****************************/
+/************************************************************************/
+class SvAggregateMemberList
+{
+     PRV_SV_DECL_OWNER_LIST(SvAggregateMemberList,SvAggregate)
+};
+
+#endif // _AGG_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */