Merge branch 'master' into feature/gsoc2011_wizards

Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx

1 files changed, 73 insertions, 0 deletions

diff --git a/sd/inc/sduiks.hrc b/sd/inc/sduiks.hrc
new file mode 100644
index 000000000000..6904cc2999d1
--- /dev/null
+++ b/sd/inc/sduiks.hrc
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * 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 _SDUIKS_HRC
+#define _SDUIKS_HRC
+
+#include <usr/uiks.hrc>
+
+#define SD_UIK_SHAPE_FACTORY                UIK_DRAWING(00)
+#define SD_UIK_POLYGON_FACTORY              UIK_DRAWING(01)
+#define SD_UIK_3D_SHAPE_FACTORY             UIK_DRAWING(02)
+#define SD_UIK_TEXT_FACTORY                 UIK_DRAWING(03)
+#define SD_UIK_SNAP_FACTORY                 UIK_DRAWING(04)
+
+#define SD_UIK_DRAW_PAGES                   UIK_DRAWING(10)
+#define SD_UIK_DRAW_PAGE_MANIPULATOR        UIK_DRAWING(11)
+
+#define SD_UIK_SHAPE                        UIK_DRAWING(20)
+#define SD_UIK_CONNECTOR                    UIK_DRAWING(21)
+#define SD_UIK_CONNECTABLE                  UIK_DRAWING(22)
+#define SD_UIK_SHAPE_3D                     UIK_DRAWING(23)
+#define SD_UIK_SHAPE_GROUP                  UIK_DRAWING(24)
+#define SD_UIK_SHAPE_MIRRORER               UIK_DRAWING(25)
+#define SD_UIK_SHAPE_ALIGNER                UIK_DRAWING(26)
+#define SD_UIK_SHAPE_ARRANGER               UIK_DRAWING(27)
+#define SD_UIK_SHAPE_CONVERTER              UIK_DRAWING(28)
+#define SD_UIK_ANIMATOR                     UIK_DRAWING(29)
+
+#define SD_UIK_DRAW_PAGE                    UIK_DRAWING(30)
+#define SD_UIK_SHAPES                       UIK_DRAWING(31)
+#define SD_UIK_GROUP                        UIK_DRAWING(32)
+#define SD_UIK_COMBINE                      UIK_DRAWING(33)
+#define SD_UIK_CONNECT                      UIK_DRAWING(34)
+#define SD_UIK_CONNECT                      UIK_DRAWING(35)
+
+#define SD_UIK_PRESENTATION                 UIK_DRAWING(40)
+#define SD_UIK_PRESENTATION_NAVIGATION      UIK_DRAWING(41)
+#define SD_UIK_CUSTOM_PRESENTATION          UIK_DRAWING(42)
+#define SD_UIK_CUSTOM_PRESENTATIONS         UIK_DRAWING(43)
+#define SD_UIK_CUSTOM_PRESENTATIONS         UIK_DRAWING(44)
+
+#define SD_UIK_ZOOM                         UIK_DRAWING(50)
+#define SD_UIK_DRAW_VIEW                    UIK_DRAWING(51)
+#define SD_UIK_OUTLINE_VIEW                 UIK_DRAWING(52)
+#define SD_UIK_SLIDE_VIEW                   UIK_DRAWING(53)
+#define SD_UIK_SLIDE_VIEW                   UIK_DRAWING(53)
+
+#define SD_UIK_PRESENTATION_STYLES          UIK_DRAWING(60)
+
+#endif