You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/15 01:22:51 UTC
svn commit: r1409611 [1/3] - in /incubator/ooo/branches/gbuild/main/sd: ./
prj/ source/filter/ source/ui/app/ source/ui/dlg/ source/ui/inc/
source/ui/slidesorter/shell/ xml/
Author: arist
Date: Thu Nov 15 00:22:49 2012
New Revision: 1409611
URL: http://svn.apache.org/viewvc?rev=1409611&view=rev
Log:
sd2gbuild_3_c2056c3a1538.patch
# HG changeset patch
# User Christian Lippka ORACLE <ch...@oracle.com>
# Date 1298626866 -3600
# Node ID c2056c3a1538f8e1d839c33b4a42b286a6aac64e
# Parent 47afd5c9066b0d31d913e5c71e05c64b74c62a36
sd2gbuild: migrated sd to gbuild
Added:
incubator/ooo/branches/gbuild/main/sd/AllLangResTarget_sd.mk
incubator/ooo/branches/gbuild/main/sd/JunitTest_sd_unoapi.mk
incubator/ooo/branches/gbuild/main/sd/Library_sd.mk
incubator/ooo/branches/gbuild/main/sd/Library_sdd.mk
incubator/ooo/branches/gbuild/main/sd/Library_sdfilt.mk
incubator/ooo/branches/gbuild/main/sd/Library_sdui.mk
incubator/ooo/branches/gbuild/main/sd/Makefile
incubator/ooo/branches/gbuild/main/sd/Module_sd.mk
incubator/ooo/branches/gbuild/main/sd/Package_misc.mk
incubator/ooo/branches/gbuild/main/sd/Package_uiconfig.mk
incubator/ooo/branches/gbuild/main/sd/Package_xml.mk
incubator/ooo/branches/gbuild/main/sd/prj/makefile.mk
incubator/ooo/branches/gbuild/main/sd/source/filter/sddetect.cxx
incubator/ooo/branches/gbuild/main/sd/xml/sd.xml
Modified:
incubator/ooo/branches/gbuild/main/sd/prj/build.lst
incubator/ooo/branches/gbuild/main/sd/prj/d.lst
incubator/ooo/branches/gbuild/main/sd/source/ui/app/popup.src
incubator/ooo/branches/gbuild/main/sd/source/ui/app/res_bmp.src
incubator/ooo/branches/gbuild/main/sd/source/ui/app/strings.src
incubator/ooo/branches/gbuild/main/sd/source/ui/dlg/ins_paste.cxx
incubator/ooo/branches/gbuild/main/sd/source/ui/dlg/sdabstdlg.cxx
incubator/ooo/branches/gbuild/main/sd/source/ui/inc/res_bmp.hrc
incubator/ooo/branches/gbuild/main/sd/source/ui/slidesorter/shell/SlideSorter.cxx
Added: incubator/ooo/branches/gbuild/main/sd/AllLangResTarget_sd.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/AllLangResTarget_sd.mk?rev=1409611&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/AllLangResTarget_sd.mk (added)
+++ incubator/ooo/branches/gbuild/main/sd/AllLangResTarget_sd.mk Thu Nov 15 00:22:49 2012
@@ -0,0 +1,95 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,sd))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sd,\
+ sd/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,sd/res))
+
+$(eval $(call gb_SrsTarget_set_include,sd/res,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(WORKDIR)/inc/sd \
+ -I$(SRCDIR)/sd/inc \
+ -I$(SRCDIR)/sd/source/ui/inc \
+ -I$(SRCDIR)/sd/source/ui/slidesorter/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,sd/res,\
+ sd/source/core/glob.src \
+ sd/source/filter/html/pubdlg.src \
+ sd/source/ui/accessibility/accessibility.src \
+ sd/source/ui/animations/CustomAnimation.src \
+ sd/source/ui/animations/CustomAnimationCreateDialog.src \
+ sd/source/ui/animations/CustomAnimationDialog.src \
+ sd/source/ui/animations/CustomAnimationPane.src \
+ sd/source/ui/animations/SlideTransitionPane.src \
+ sd/source/ui/annotations/annotations.src \
+ sd/source/ui/app/popup.src \
+ sd/source/ui/app/res_bmp.src \
+ sd/source/ui/app/strings.src \
+ sd/source/ui/dlg/animobjs.src \
+ sd/source/ui/dlg/brkdlg.src \
+ sd/source/ui/dlg/celltempl.src \
+ sd/source/ui/dlg/copydlg.src \
+ sd/source/ui/dlg/custsdlg.src \
+ sd/source/ui/dlg/dlgass.src \
+ sd/source/ui/dlg/dlgfield.src \
+ sd/source/ui/dlg/dlgolbul.src \
+ sd/source/ui/dlg/dlgpage.src \
+ sd/source/ui/dlg/dlgsnap.src \
+ sd/source/ui/dlg/dlg_char.src \
+ sd/source/ui/dlg/headerfooterdlg.src \
+ sd/source/ui/dlg/inspagob.src \
+ sd/source/ui/dlg/ins_paste.src \
+ sd/source/ui/dlg/LayerDialog.src \
+ sd/source/ui/dlg/layeroptionsdlg.src \
+ sd/source/ui/dlg/masterlayoutdlg.src \
+ sd/source/ui/dlg/morphdlg.src \
+ sd/source/ui/dlg/navigatr.src \
+ sd/source/ui/dlg/PaneDockingWindow.src \
+ sd/source/ui/dlg/paragr.src \
+ sd/source/ui/dlg/present.src \
+ sd/source/ui/dlg/prltempl.src \
+ sd/source/ui/dlg/prntopts.src \
+ sd/source/ui/dlg/sdpreslt.src \
+ sd/source/ui/dlg/tabtempl.src \
+ sd/source/ui/dlg/tpaction.src \
+ sd/source/ui/dlg/tpoption.src \
+ sd/source/ui/dlg/vectdlg.src \
+ sd/source/ui/notes/NotesChildWindow.src \
+ sd/source/ui/slideshow/slideshow.src \
+ sd/source/ui/slidesorter/view/SlsResource.src \
+ sd/source/ui/table/TableDesignPane.src \
+ sd/source/ui/view/DocumentRenderer.src \
+))
+
+#todo?
+# sd/util/hidother.src \
Added: incubator/ooo/branches/gbuild/main/sd/JunitTest_sd_unoapi.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/JunitTest_sd_unoapi.mk?rev=1409611&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/JunitTest_sd_unoapi.mk (added)
+++ incubator/ooo/branches/gbuild/main/sd/JunitTest_sd_unoapi.mk Thu Nov 15 00:22:49 2012
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_JunitTest_JunitTest,sd_unoapi))
+
+$(eval $(call gb_JunitTest_set_defs,sd_unoapi,\
+ $$(DEFS) \
+ -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sd/qa/unoapi/sd.sce \
+ -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sd/qa/unoapi/knownissues.xcl \
+))
+
+$(eval $(call gb_JunitTest_add_jars,sd_unoapi,\
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,sd_unoapi,\
+ sd/qa/unoapi/Test \
+))
+
+$(eval $(call gb_JunitTest_add_classes,sd_unoapi,\
+ org.openoffice.sd.qa.unoapi.Test \
+))
+
+# vim: set noet sd=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/sd/Library_sd.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/Library_sd.mk?rev=1409611&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/Library_sd.mk (added)
+++ incubator/ooo/branches/gbuild/main/sd/Library_sd.mk Thu Nov 15 00:22:49 2012
@@ -0,0 +1,535 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,sd))
+
+$(eval $(call gb_Library_add_sdi_headers,sd,sd/sdi/sdslots))
+$(eval $(call gb_Library_add_sdi_headers,sd,sd/sdi/sdgslots))
+
+$(eval $(call gb_Library_add_precompiled_header,sd,$(SRCDIR)/sd/inc/pch/precompiled_sd))
+
+$(eval $(call gb_Library_set_componentfile,sd,sd/util/sd))
+
+$(eval $(call gb_Library_add_api,sd,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,sd,\
+ -I$(SRCDIR)/sd/source/ui/inc \
+ -I$(SRCDIR)/sd/source/ui/inc/framework \
+ -I$(SRCDIR)/sd/source/ui/inc/taskpane \
+ -I$(SRCDIR)/sd/source/ui/inc/view \
+ -I$(SRCDIR)/sd/source/ui/inc/tools \
+ -I$(SRCDIR)/sd/source/ui/slidesorter/inc \
+ -I$(SRCDIR)/sd/inc \
+ -I$(SRCDIR)/sd/inc/helper \
+ -I$(SRCDIR)/sd/inc/undo \
+ -I$(SRCDIR)/sd/inc/pch \
+ -I$(WORKDIR)/SdiTarget/sd/sdi \
+ -I$(WORKDIR)/Misc/sd/ \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_defs,sd,\
+ -DSD_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sd,\
+ avmedia \
+ basegfx \
+ canvastools \
+ comphelper \
+ cppcanvas \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ i18nisolang1 \
+ sal \
+ sb \
+ sfx \
+ sot \
+ stl \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ tk \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sd,\
+ sd/source/ui/view/sdview \
+ sd/source/ui/view/sdview2 \
+ sd/source/ui/view/sdview3 \
+ sd/source/ui/view/sdview4 \
+ sd/source/ui/view/sdview5 \
+ sd/source/ui/view/viewshel \
+ sd/source/ui/view/viewshe2 \
+ sd/source/ui/view/viewshe3 \
+ sd/source/ui/view/sdwindow \
+ sd/source/ui/view/drviewsh \
+ sd/source/ui/view/drviews1 \
+ sd/source/ui/view/drviews2 \
+ sd/source/ui/view/drviews3 \
+ sd/source/ui/view/drviews4 \
+ sd/source/ui/view/drviews5 \
+ sd/source/ui/view/drviews6 \
+ sd/source/ui/view/drviews7 \
+ sd/source/ui/view/drviews8 \
+ sd/source/ui/view/drviews9 \
+ sd/source/ui/view/drviewsa \
+ sd/source/ui/view/drviewsb \
+ sd/source/ui/view/drviewsc \
+ sd/source/ui/view/drviewsd \
+ sd/source/ui/view/drviewse \
+ sd/source/ui/view/drviewsf \
+ sd/source/ui/view/drviewsg \
+ sd/source/ui/view/drviewsi \
+ sd/source/ui/view/drviewsj \
+ sd/source/ui/view/drvwshrg \
+ sd/source/ui/view/drawview \
+ sd/source/ui/view/grviewsh \
+ sd/source/ui/view/outlnvsh \
+ sd/source/ui/view/outlnvs2 \
+ sd/source/ui/view/presvish \
+ sd/source/ui/view/outlview \
+ sd/source/ui/view/tabcontr \
+ sd/source/ui/view/bmcache \
+ sd/source/ui/view/drbezob \
+ sd/source/ui/view/drtxtob \
+ sd/source/ui/view/drtxtob1 \
+ sd/source/ui/view/sdruler \
+ sd/source/ui/view/frmview \
+ sd/source/ui/view/clview \
+ sd/source/ui/view/zoomlist \
+ sd/source/ui/view/unmodpg \
+ sd/source/ui/view/DocumentRenderer \
+ sd/source/ui/view/FormShellManager \
+ sd/source/ui/view/GraphicObjectBar \
+ sd/source/ui/view/GraphicViewShellBase \
+ sd/source/ui/view/ImpressViewShellBase \
+ sd/source/ui/view/MediaObjectBar \
+ sd/source/ui/view/Outliner \
+ sd/source/ui/view/OutlinerIterator \
+ sd/source/ui/view/OutlineViewShellBase \
+ sd/source/ui/view/SlideSorterViewShellBase\
+ sd/source/ui/view/PresentationViewShellBase \
+ sd/source/ui/view/ToolBarManager \
+ sd/source/ui/view/UpdateLockManager \
+ sd/source/ui/view/ViewClipboard \
+ sd/source/ui/view/ViewShellBase \
+ sd/source/ui/view/ViewShellImplementation \
+ sd/source/ui/view/ViewShellManager \
+ sd/source/ui/view/ViewShellHint \
+ sd/source/ui/view/ViewTabBar \
+ sd/source/ui/view/WindowUpdater \
+ sd/source/ui/view/viewoverlaymanager \
+ sd/source/ui/app/sdmod \
+ sd/source/ui/app/sdmod1 \
+ sd/source/ui/app/sdmod2 \
+ sd/source/ui/app/sddll \
+ sd/source/ui/app/sddll1 \
+ sd/source/ui/app/sddll2 \
+ sd/source/ui/app/tbxww \
+ sd/source/ui/app/sdresid \
+ sd/source/ui/app/sdpopup \
+ sd/source/ui/app/tmplctrl \
+ sd/source/ui/app/sdxfer \
+ sd/source/ui/docshell/docshell \
+ sd/source/ui/docshell/docshel2 \
+ sd/source/ui/docshell/docshel3 \
+ sd/source/ui/docshell/docshel4 \
+ sd/source/ui/docshell/sdclient \
+ sd/source/ui/docshell/grdocsh \
+ sd/source/ui/dlg/dlgctrls \
+ sd/source/ui/dlg/diactrl \
+ sd/source/ui/dlg/gluectrl \
+ sd/source/ui/dlg/sdtreelb \
+ sd/source/ui/dlg/animobjs \
+ sd/source/ui/dlg/filedlg \
+ sd/source/ui/dlg/unchss \
+ sd/source/ui/dlg/assclass \
+ sd/source/ui/dlg/navigatr \
+ sd/source/ui/dlg/docprev \
+ sd/source/ui/dlg/ins_paste \
+ sd/source/ui/dlg/AnimationChildWindow \
+ sd/source/ui/dlg/LayerDialogChildWindow \
+ sd/source/ui/dlg/LayerDialogContent \
+ sd/source/ui/dlg/LayerTabBar \
+ sd/source/ui/dlg/NavigatorChildWindow \
+ sd/source/ui/dlg/SpellDialogChildWindow \
+ sd/source/ui/dlg/TemplateScanner \
+ sd/source/ui/dlg/sdabstdlg \
+ sd/source/ui/dlg/PaneChildWindows \
+ sd/source/ui/dlg/PaneDockingWindow \
+ sd/source/ui/dlg/PaneShells \
+ sd/source/core/stlsheet \
+ sd/source/core/stlfamily \
+ sd/source/core/stlpool \
+ sd/source/core/drawdoc \
+ sd/source/core/drawdoc2 \
+ sd/source/core/drawdoc3 \
+ sd/source/core/drawdoc4 \
+ sd/source/core/drawdoc_animations \
+ sd/source/core/sdpage \
+ sd/source/core/sdpage2 \
+ sd/source/core/sdattr \
+ sd/source/core/sdobjfac \
+ sd/source/core/anminfo \
+ sd/source/core/sdiocmpt \
+ sd/source/core/typemap \
+ sd/source/core/pglink \
+ sd/source/core/cusshow \
+ sd/source/core/PageListWatcher \
+ sd/source/core/sdpage_animations \
+ sd/source/core/CustomAnimationPreset \
+ sd/source/core/CustomAnimationEffect \
+ sd/source/core/TransitionPreset \
+ sd/source/core/undoanim \
+ sd/source/core/EffectMigration \
+ sd/source/core/CustomAnimationCloner \
+ sd/source/core/shapelist \
+ sd/source/core/undo/undomanager \
+ sd/source/core/undo/undofactory \
+ sd/source/core/undo/undoobjects \
+ sd/source/core/annotations/Annotation \
+ sd/source/core/annotations/AnnotationEnumeration \
+ sd/source/core/text/textapi \
+ sd/source/helper/simplereferencecomponent \
+ sd/source/filter/xml/sdtransform \
+ sd/source/filter/xml/sdxmlwrp \
+ sd/source/filter/cgm/sdcgmfilter \
+ sd/source/ui/table/tablefunction \
+ sd/source/ui/table/tableobjectbar \
+ sd/source/ui/table/TableDesignPane \
+ sd/source/ui/annotations/annotationwindow \
+ sd/source/ui/annotations/annotationtag \
+ sd/source/ui/annotations/annotationmanager \
+ sd/source/filter/grf/sdgrffilter \
+ sd/source/ui/controller/slidelayoutcontroller \
+ sd/source/filter/html/HtmlOptionsDialog \
+ sd/source/filter/html/sdhtmlfilter \
+ sd/source/filter/html/buttonset \
+ sd/source/filter/html/htmlex \
+ sd/source/filter/sdfilter \
+ sd/source/filter/sdpptwrp \
+ sd/source/ui/unoidl/DrawController \
+ sd/source/ui/unoidl/SdUnoSlideView \
+ sd/source/ui/unoidl/SdUnoOutlineView \
+ sd/source/ui/unoidl/SdUnoDrawView \
+ sd/source/ui/unoidl/unopool \
+ sd/source/ui/unoidl/UnoDocumentSettings \
+ sd/source/ui/unoidl/facreg \
+ sd/source/ui/unoidl/unomodel \
+ sd/source/ui/unoidl/unopage \
+ sd/source/ui/unoidl/unolayer \
+ sd/source/ui/unoidl/unocpres \
+ sd/source/ui/unoidl/unoobj \
+ sd/source/ui/unoidl/unosrch \
+ sd/source/ui/unoidl/unokywds \
+ sd/source/ui/unoidl/unopback \
+ sd/source/ui/unoidl/unodoc \
+ sd/source/ui/unoidl/unomodule \
+ sd/source/ui/unoidl/randomnode \
+ sd/source/ui/animations/CustomAnimationCreateDialog \
+ sd/source/ui/animations/CustomAnimationDialog \
+ sd/source/ui/animations/CustomAnimationPane \
+ sd/source/ui/animations/CustomAnimationList \
+ sd/source/ui/animations/DialogListBox \
+ sd/source/ui/animations/SlideTransitionPane \
+ sd/source/ui/animations/STLPropertySet \
+ sd/source/ui/animations/motionpathtag \
+ sd/source/ui/accessibility/AccessibleDocumentViewBase \
+ sd/source/ui/accessibility/AccessibleDrawDocumentView \
+ sd/source/ui/accessibility/AccessibleOutlineView \
+ sd/source/ui/accessibility/AccessiblePresentationShape \
+ sd/source/ui/accessibility/AccessiblePresentationGraphicShape \
+ sd/source/ui/accessibility/AccessiblePresentationOLEShape \
+ sd/source/ui/accessibility/AccessibleViewForwarder \
+ sd/source/ui/accessibility/AccessibleOutlineEditSource \
+ sd/source/ui/accessibility/AccessiblePageShape \
+ sd/source/ui/accessibility/AccessibleScrollPanel \
+ sd/source/ui/accessibility/AccessibleSlideSorterView \
+ sd/source/ui/accessibility/AccessibleSlideSorterObject \
+ sd/source/ui/accessibility/AccessibleTreeNode \
+ sd/source/ui/accessibility/SdShapeTypes \
+ sd/source/ui/toolpanel/ControlContainer \
+ sd/source/ui/toolpanel/ScrollPanel \
+ sd/source/ui/toolpanel/SubToolPanel \
+ sd/source/ui/toolpanel/TitleBar \
+ sd/source/ui/toolpanel/TitledControl \
+ sd/source/ui/toolpanel/TaskPaneControlFactory \
+ sd/source/ui/toolpanel/TaskPaneFocusManager \
+ sd/source/ui/toolpanel/TaskPaneShellManager \
+ sd/source/ui/toolpanel/TaskPaneTreeNode \
+ sd/source/ui/toolpanel/ToolPanel \
+ sd/source/ui/toolpanel/ToolPanelViewShell \
+ sd/source/ui/toolpanel/ToolPanelFactory \
+ sd/source/ui/toolpanel/ToolPanelUIElement \
+ sd/source/ui/toolpanel/LayoutMenu \
+ sd/source/ui/toolpanel/TestMenu \
+ sd/source/ui/toolpanel/TestPanel \
+ sd/source/ui/toolpanel/SlideSorterCacheDisplay \
+ sd/source/ui/tools/AsynchronousCall \
+ sd/source/ui/tools/ConfigurationAccess \
+ sd/source/ui/tools/IconCache \
+ sd/source/ui/tools/IdleDetection \
+ sd/source/ui/tools/EventMultiplexer \
+ sd/source/ui/tools/PreviewRenderer \
+ sd/source/ui/tools/PropertySet \
+ sd/source/ui/tools/SdGlobalResourceContainer \
+ sd/source/ui/tools/SlotStateListener \
+ sd/source/ui/tools/TimerBasedTaskExecution \
+ sd/source/ui/toolpanel/controls/AllMasterPagesSelector \
+ sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector \
+ sd/source/ui/toolpanel/controls/DocumentHelper \
+ sd/source/ui/toolpanel/controls/MasterPageObserver \
+ sd/source/ui/toolpanel/controls/MasterPagesPanel \
+ sd/source/ui/toolpanel/controls/MasterPagesSelector \
+ sd/source/ui/toolpanel/controls/MasterPageContainer \
+ sd/source/ui/toolpanel/controls/MasterPageContainerFiller \
+ sd/source/ui/toolpanel/controls/MasterPageContainerProviders \
+ sd/source/ui/toolpanel/controls/MasterPageContainerQueue \
+ sd/source/ui/toolpanel/controls/MasterPageDescriptor \
+ sd/source/ui/toolpanel/controls/PreviewValueSet \
+ sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages \
+ sd/source/ui/toolpanel/controls/RecentMasterPagesSelector \
+ sd/source/ui/toolpanel/controls/CustomAnimationPanel \
+ sd/source/ui/toolpanel/controls/SlideTransitionPanel \
+ sd/source/ui/toolpanel/controls/TableDesignPanel \
+ sd/source/ui/func/fuformatpaintbrush \
+ sd/source/ui/func/fuhhconv \
+ sd/source/ui/func/undoheaderfooter \
+ sd/source/ui/func/undolayer \
+ sd/source/ui/func/fupoor \
+ sd/source/ui/func/fudraw \
+ sd/source/ui/func/fuzoom \
+ sd/source/ui/func/fusel \
+ sd/source/ui/func/fuconstr \
+ sd/source/ui/func/fuconrec \
+ sd/source/ui/func/fuconuno \
+ sd/source/ui/func/fuconbez \
+ sd/source/ui/func/fuediglu \
+ sd/source/ui/func/fusldlg \
+ sd/source/ui/func/fuscale \
+ sd/source/ui/func/futransf \
+ sd/source/ui/func/fuline \
+ sd/source/ui/func/sdundo \
+ sd/source/ui/func/sdundogr \
+ sd/source/ui/func/fuoaprms \
+ sd/source/ui/func/unoaprms \
+ sd/source/ui/func/fuarea \
+ sd/source/ui/func/fuchar \
+ sd/source/ui/func/fuconarc \
+ sd/source/ui/func/fuparagr \
+ sd/source/ui/func/fubullet \
+ sd/source/ui/func/futempl \
+ sd/source/ui/func/fuoutl \
+ sd/source/ui/func/fuoltext \
+ sd/source/ui/func/smarttag \
+ sd/source/ui/func/fuinsert \
+ sd/source/ui/func/fupage \
+ sd/source/ui/func/undopage \
+ sd/source/ui/func/fuprlout \
+ sd/source/ui/func/fuprobjs \
+ sd/source/ui/func/fulinend \
+ sd/source/ui/func/fusnapln \
+ sd/source/ui/func/fuolbull \
+ sd/source/ui/func/fucopy \
+ sd/source/ui/func/fulink \
+ sd/source/ui/func/futhes \
+ sd/source/ui/func/fusearch \
+ sd/source/ui/func/fuinsfil \
+ sd/source/ui/func/futxtatt \
+ sd/source/ui/func/fumeasur \
+ sd/source/ui/func/fuconnct \
+ sd/source/ui/func/unprlout \
+ sd/source/ui/func/fudspord \
+ sd/source/ui/func/unmovss \
+ sd/source/ui/func/fucon3d \
+ sd/source/ui/func/fumorph \
+ sd/source/ui/func/fuexpand \
+ sd/source/ui/func/fusumry \
+ sd/source/ui/func/fucushow \
+ sd/source/ui/func/fuvect \
+ sd/source/ui/func/bulmaper \
+ sd/source/ui/func/undoback \
+ sd/source/ui/func/fuconcs \
+ sd/source/ui/slidesorter/shell/SlideSorter \
+ sd/source/ui/slidesorter/shell/SlideSorterService \
+ sd/source/ui/slidesorter/shell/SlideSorterViewShell \
+ sd/source/ui/slidesorter/model/SlsPageDescriptor \
+ sd/source/ui/slidesorter/model/SlsPageEnumeration \
+ sd/source/ui/slidesorter/model/SlsPageEnumerationProvider \
+ sd/source/ui/slidesorter/model/SlsVisualState \
+ sd/source/ui/slidesorter/model/SlideSorterModel \
+ sd/source/ui/slidesorter/view/SlideSorterView \
+ sd/source/ui/slidesorter/view/SlsButtonBar \
+ sd/source/ui/slidesorter/view/SlsFontProvider \
+ sd/source/ui/slidesorter/view/SlsFramePainter \
+ sd/source/ui/slidesorter/view/SlsInsertAnimator \
+ sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay \
+ sd/source/ui/slidesorter/view/SlsLayeredDevice \
+ sd/source/ui/slidesorter/view/SlsLayouter \
+ sd/source/ui/slidesorter/view/SlsPageObjectLayouter \
+ sd/source/ui/slidesorter/view/SlsPageObjectPainter \
+ sd/source/ui/slidesorter/view/SlsTheme \
+ sd/source/ui/slidesorter/view/SlsToolTip \
+ sd/source/ui/slidesorter/view/SlsViewCacheContext \
+ sd/source/ui/slidesorter/controller/SlideSorterController \
+ sd/source/ui/slidesorter/controller/SlsAnimator \
+ sd/source/ui/slidesorter/controller/SlsAnimationFunction \
+ sd/source/ui/slidesorter/controller/SlsClipboard \
+ sd/source/ui/slidesorter/controller/SlsCurrentSlideManager \
+ sd/source/ui/slidesorter/controller/SlsDragAndDropContext \
+ sd/source/ui/slidesorter/controller/SlsFocusManager \
+ sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler \
+ sd/source/ui/slidesorter/controller/SlsListener \
+ sd/source/ui/slidesorter/controller/SlsPageSelector \
+ sd/source/ui/slidesorter/controller/SlsProperties \
+ sd/source/ui/slidesorter/controller/SlsScrollBarManager \
+ sd/source/ui/slidesorter/controller/SlsSelectionCommand \
+ sd/source/ui/slidesorter/controller/SlsSelectionFunction \
+ sd/source/ui/slidesorter/controller/SlsSelectionManager \
+ sd/source/ui/slidesorter/controller/SlsSelectionObserver \
+ sd/source/ui/slidesorter/controller/SlsSlotManager \
+ sd/source/ui/slidesorter/controller/SlsTransferableData \
+ sd/source/ui/slidesorter/controller/SlsVisibleAreaManager \
+ sd/source/ui/slidesorter/cache/SlsBitmapCache \
+ sd/source/ui/slidesorter/cache/SlsBitmapCompressor \
+ sd/source/ui/slidesorter/cache/SlsBitmapFactory \
+ sd/source/ui/slidesorter/cache/SlsCacheCompactor \
+ sd/source/ui/slidesorter/cache/SlsCacheConfiguration \
+ sd/source/ui/slidesorter/cache/SlsGenericPageCache \
+ sd/source/ui/slidesorter/cache/SlsPageCache \
+ sd/source/ui/slidesorter/cache/SlsPageCacheManager \
+ sd/source/ui/slidesorter/cache/SlsQueueProcessor \
+ sd/source/ui/slidesorter/cache/SlsRequestFactory \
+ sd/source/ui/slidesorter/cache/SlsRequestQueue \
+ sd/source/ui/slideshow/slideshow \
+ sd/source/ui/slideshow/showwin \
+ sd/source/ui/slideshow/slideshowimpl \
+ sd/source/ui/slideshow/slideshowviewimpl \
+ sd/source/ui/slideshow/PaneHider \
+ sd/source/ui/slideshow/SlideShowRestarter \
+ sd/source/ui/framework/configuration/ChangeRequestQueue \
+ sd/source/ui/framework/configuration/ChangeRequestQueueProcessor \
+ sd/source/ui/framework/configuration/Configuration \
+ sd/source/ui/framework/configuration/ConfigurationClassifier \
+ sd/source/ui/framework/configuration/ConfigurationController \
+ sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster \
+ sd/source/ui/framework/configuration/ConfigurationControllerResourceManager \
+ sd/source/ui/framework/configuration/ConfigurationTracer \
+ sd/source/ui/framework/configuration/ConfigurationUpdater \
+ sd/source/ui/framework/configuration/GenericConfigurationChangeRequest \
+ sd/source/ui/framework/configuration/ResourceId \
+ sd/source/ui/framework/configuration/ResourceFactoryManager \
+ sd/source/ui/framework/configuration/UpdateRequest \
+ sd/source/ui/framework/factories/BasicPaneFactory \
+ sd/source/ui/framework/factories/BasicToolBarFactory \
+ sd/source/ui/framework/factories/BasicViewFactory \
+ sd/source/ui/framework/factories/ChildWindowPane \
+ sd/source/ui/framework/factories/FrameWindowPane \
+ sd/source/ui/framework/factories/FullScreenPane \
+ sd/source/ui/framework/factories/Pane \
+ sd/source/ui/framework/factories/PresentationFactory \
+ sd/source/ui/framework/factories/TaskPanelFactory \
+ sd/source/ui/framework/factories/ViewShellWrapper \
+ sd/source/ui/framework/module/CenterViewFocusModule \
+ sd/source/ui/framework/module/DrawModule \
+ sd/source/ui/framework/module/ImpressModule \
+ sd/source/ui/framework/module/ModuleController \
+ sd/source/ui/framework/module/PresentationModule \
+ sd/source/ui/framework/module/ReadOnlyModeObserver \
+ sd/source/ui/framework/module/ResourceManager \
+ sd/source/ui/framework/module/ShellStackGuard \
+ sd/source/ui/framework/module/SlideSorterModule \
+ sd/source/ui/framework/module/ToolPanelModule \
+ sd/source/ui/framework/module/ToolBarModule \
+ sd/source/ui/framework/module/ViewTabBarModule \
+ sd/source/ui/framework/tools/FrameworkHelper \
+ sd/source/ui/presenter/CanvasUpdateRequester \
+ sd/source/ui/presenter/PresenterCanvas \
+ sd/source/ui/presenter/PresenterHelper \
+ sd/source/ui/presenter/PresenterPreviewCache \
+ sd/source/ui/presenter/PresenterTextView \
+ sd/source/ui/presenter/SlideRenderer \
+))
+
+# the following source file can't be compiled with optimization by some compilers (crash or endless loop):
+# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
+# the latter is currently not supported by gbuild and needs a fix here later
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_cxxobjects,sd,\
+ sd/source/ui/app/optsitem \
+ sd/source/ui/func/futext \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,sd,\
+ sd/source/ui/app/optsitem \
+ sd/source/ui/func/futext \
+))
+endif
+
+ifeq ($(COM),GCC)
+$(eval $(call gb_Library_add_cxxobjects,sd,\
+ sd/source/ui/unoidl/unowcntr \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,sd,\
+ sd/source/ui/unoidl/unowcntr \
+))
+endif
+
+$(eval $(call gb_SdiTarget_SdiTarget,sd/sdi/sdslots,sd/sdi/sdslots))
+$(eval $(call gb_SdiTarget_SdiTarget,sd/sdi/sdslots,sd/sdi/sdgslots))
+
+$(eval $(call gb_SdiTarget_set_include,sd/sdi/sdslots,\
+ -I$(SRCDIR)/sd/inc \
+ -I$(SRCDIR)/sd/sdi \
+ -I$(OUTDIR)/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_SdiTarget_set_include,sd/sdi/sdgslots,\
+ -I$(SRCDIR)/sd/inc \
+ -I$(SRCDIR)/sd/sdi \
+ -I$(OUTDIR)/inc \
+ $$(INCLUDE) \
+))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/sd/Library_sdd.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/Library_sdd.mk?rev=1409611&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/Library_sdd.mk (added)
+++ incubator/ooo/branches/gbuild/main/sd/Library_sdd.mk Thu Nov 15 00:22:49 2012
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,sdd))
+
+$(eval $(call gb_Library_set_componentfile,sdd,sd/util/sdd))
+
+$(eval $(call gb_Library_add_api,sdd,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,sdd,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/sd/inc \
+ -I$(SRCDIR)/sd/inc/pch \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sdd,\
+ sfx \
+ svl \
+ svt \
+ sot \
+ tl \
+ vcl \
+ cppu \
+ cppuhelper \
+ ucbhelper \
+ sal \
+ comphelper \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sdd,\
+ sd/source/filter/sddetect \
+))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/sd/Library_sdfilt.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/Library_sdfilt.mk?rev=1409611&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/Library_sdfilt.mk (added)
+++ incubator/ooo/branches/gbuild/main/sd/Library_sdfilt.mk Thu Nov 15 00:22:49 2012
@@ -0,0 +1,89 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,sdfilt))
+
+$(eval $(call gb_Library_add_api,sdfilt,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,sdfilt,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/sd/inc \
+ -I$(SRCDIR)/sd/inc/pch \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sdfilt,\
+ editeng \
+ svxcore \
+ sd \
+ sfx \
+ svl \
+ svt \
+ stl \
+ sot \
+ tl \
+ vcl \
+ msfilter \
+ cppu \
+ cppuhelper \
+ ucbhelper \
+ i18nisolang1 \
+ sal \
+ comphelper \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sdfilt,\
+ sd/source/filter/ppt/propread \
+ sd/source/filter/ppt/pptin \
+ sd/source/filter/ppt/pptinanimations \
+ sd/source/filter/ppt/pptatom \
+ sd/source/filter/ppt/ppt97animations \
+ sd/source/filter/eppt/eppt \
+ sd/source/filter/eppt/escherex \
+ sd/source/filter/eppt/pptexanimations \
+ sd/source/filter/eppt/pptexsoundcollection \
+))
+
+# the following source file can't be compiled with optimization by some compilers (crash or endless loop):
+# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
+# the latter is currently not supported by gbuild and needs a fix here later
+ifeq ($(COM),GCC)
+$(eval $(call gb_Library_add_cxxobjects,sdfilt,\
+ sd/source/filter/eppt/epptso \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,sdfilt,\
+ sd/source/filter/eppt/epptso \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/sd/Library_sdui.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/Library_sdui.mk?rev=1409611&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/Library_sdui.mk (added)
+++ incubator/ooo/branches/gbuild/main/sd/Library_sdui.mk Thu Nov 15 00:22:49 2012
@@ -0,0 +1,108 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,sdui))
+
+$(eval $(call gb_Library_add_api,sdui,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,sdui,\
+ -I$(SRCDIR)/sd/source/ui/inc \
+ -I$(SRCDIR)/sd/source/ui/inc/framework \
+ -I$(SRCDIR)/sd/source/ui/inc/taskpane \
+ -I$(SRCDIR)/sd/source/ui/inc/view \
+ -I$(SRCDIR)/sd/source/ui/inc/tools \
+ -I$(SRCDIR)/sd/source/ui/slidesorter/inc \
+ -I$(SRCDIR)/sd/inc \
+ -I$(SRCDIR)/sd/inc/helper \
+ -I$(SRCDIR)/sd/inc/undo \
+ -I$(SRCDIR)/sd/inc/pch \
+ -I$(WORKDIR)/SdiTarget/sd/sdi \
+ -I$(WORKDIR)/Misc/sd/ \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sdui,\
+ sd \
+ editeng \
+ svxcore \
+ svx \
+ sfx \
+ basegfx \
+ sot \
+ stl \
+ svl \
+ svt \
+ utl \
+ vcl \
+ tl \
+ i18nisolang1 \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sdui,\
+sd/source/ui/dlg/masterlayoutdlg \
+sd/source/ui/dlg/headerfooterdlg \
+sd/source/ui/dlg/sduiexp \
+sd/source/ui/dlg/sddlgfact \
+sd/source/ui/dlg/brkdlg \
+sd/source/ui/dlg/copydlg \
+sd/source/ui/dlg/custsdlg \
+sd/source/ui/dlg/dlgchar \
+sd/source/ui/dlg/dlgass \
+sd/source/ui/dlg/dlgassim \
+sd/source/ui/dlg/dlgfield \
+sd/source/ui/dlg/dlgpage \
+sd/source/ui/dlg/dlgsnap \
+sd/source/ui/dlg/ins_paste \
+sd/source/ui/dlg/inspagob \
+sd/source/ui/dlg/morphdlg \
+sd/source/ui/dlg/dlgolbul \
+sd/source/ui/dlg/paragr \
+sd/source/ui/dlg/present \
+sd/source/ui/dlg/prltempl \
+sd/source/ui/dlg/sdpreslt \
+sd/source/ui/dlg/tabtempl \
+sd/source/ui/dlg/tpaction \
+sd/source/ui/dlg/tpoption \
+sd/source/ui/dlg/vectdlg \
+sd/source/ui/dlg/prntopts \
+sd/source/ui/dlg/layeroptionsdlg \
+sd/source/ui/func/bulmaper \
+sd/source/filter/html/htmlattr \
+sd/source/filter/html/buttonset \
+sd/source/filter/html/pubdlg \
+))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/sd/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/Makefile?rev=1409611&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/Makefile (added)
+++ incubator/ooo/branches/gbuild/main/sd/Makefile Thu Nov 15 00:22:49 2012
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/sd/Module_sd.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/Module_sd.mk?rev=1409611&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/Module_sd.mk (added)
+++ incubator/ooo/branches/gbuild/main/sd/Module_sd.mk Thu Nov 15 00:22:49 2012
@@ -0,0 +1,39 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,sd))
+
+$(eval $(call gb_Module_add_targets,sd,\
+ AllLangResTarget_sd \
+ Library_sd \
+ Library_sdui \
+ Library_sdd \
+ Library_sdfilt \
+ Package_misc \
+ Package_uiconfig \
+ Package_xml \
+))
Added: incubator/ooo/branches/gbuild/main/sd/Package_misc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/Package_misc.mk?rev=1409611&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/Package_misc.mk (added)
+++ incubator/ooo/branches/gbuild/main/sd/Package_misc.mk Thu Nov 15 00:22:49 2012
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,sd_misc,$(SRCDIR)/sd/misc))
+# TODO:
+#COPY sd/unxlngx6.pro/misc/swslots_sid.hid unxlngx6.pro/bin/hid/swslots_sid.hid
Added: incubator/ooo/branches/gbuild/main/sd/Package_uiconfig.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/Package_uiconfig.mk?rev=1409611&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/Package_uiconfig.mk (added)
+++ incubator/ooo/branches/gbuild/main/sd/Package_uiconfig.mk Thu Nov 15 00:22:49 2012
@@ -0,0 +1,128 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,sd_uiconfig,$(SRCDIR)/sd/uiconfig))
+
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/menubar/menubar.xml,simpress/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/3dobjectsbar.xml,simpress/toolbar/3dobjectsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/alignmentbar.xml,simpress/toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/arrowsbar.xml,simpress/toolbar/arrowsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/arrowshapes.xml,simpress/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/basicshapes.xml,simpress/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/bezierobjectbar.xml,simpress/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/calloutshapes.xml,simpress/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/choosemodebar.xml,simpress/toolbar/choosemodebar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/colorbar.xml,simpress/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/commentsbar.xml,simpress/toolbar/commentsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/commontaskbar.xml,simpress/toolbar/commontaskbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/connectorsbar.xml,simpress/toolbar/connectorsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/drawingobjectbar.xml,simpress/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/ellipsesbar.xml,simpress/toolbar/ellipsesbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/extrusionobjectbar.xml,simpress/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/findbar.xml,simpress/toolbar/findbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/flowchartshapes.xml,simpress/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/fontworkobjectbar.xml,simpress/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/fontworkshapetype.xml,simpress/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formcontrols.xml,simpress/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formdesign.xml,simpress/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formsfilterbar.xml,simpress/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formsnavigationbar.xml,simpress/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formtextobjectbar.xml,simpress/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/fullscreenbar.xml,simpress/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/gluepointsobjectbar.xml,simpress/toolbar/gluepointsobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/graffilterbar.xml,simpress/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/graphicobjectbar.xml,simpress/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/insertbar.xml,simpress/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/linesbar.xml,simpress/toolbar/linesbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/masterviewtoolbar.xml,simpress/toolbar/masterviewtoolbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/mediaobjectbar.xml,simpress/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/moreformcontrols.xml,simpress/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/optimizetablebar.xml,simpress/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/optionsbar.xml,simpress/toolbar/optionsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/outlinetoolbar.xml,simpress/toolbar/outlinetoolbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/positionbar.xml,simpress/toolbar/positionbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/rectanglesbar.xml,simpress/toolbar/rectanglesbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/slideviewobjectbar.xml,simpress/toolbar/slideviewobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/slideviewtoolbar.xml,simpress/toolbar/slideviewtoolbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/standardbar.xml,simpress/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/starshapes.xml,simpress/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/symbolshapes.xml,simpress/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/tableobjectbar.xml,simpress/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/textbar.xml,simpress/toolbar/textbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/textobjectbar.xml,simpress/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/toolbar.xml,simpress/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/viewerbar.xml,simpress/toolbar/viewerbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/zoombar.xml,simpress/toolbar/zoombar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/statusbar/statusbar.xml,simpress/statusbar/statusbar.xml))
+
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/menubar/menubar.xml,sdraw/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/3dobjectsbar.xml,sdraw/toolbar/3dobjectsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/commentsbar.xml,sdraw/toolbar/commentsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formcontrols.xml,sdraw/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/insertbar.xml,sdraw/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/standardbar.xml,sdraw/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/alignmentbar.xml,sdraw/toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/connectorsbar.xml,sdraw/toolbar/connectorsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formdesign.xml,sdraw/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/linesbar.xml,sdraw/toolbar/linesbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/starshapes.xml,sdraw/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/arrowsbar.xml,sdraw/toolbar/arrowsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/drawingobjectbar.xml,sdraw/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formsfilterbar.xml,sdraw/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/masterviewtoolbar.xml,sdraw/toolbar/masterviewtoolbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/symbolshapes.xml,sdraw/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/arrowshapes.xml,sdraw/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/ellipsesbar.xml,sdraw/toolbar/ellipsesbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formsnavigationbar.xml,sdraw/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/mediaobjectbar.xml,sdraw/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/tableobjectbar.xml,sdraw/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/basicshapes.xml,sdraw/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/extrusionobjectbar.xml,sdraw/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formtextobjectbar.xml,sdraw/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/moreformcontrols.xml,sdraw/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/textbar.xml,sdraw/toolbar/textbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/bezierobjectbar.xml,sdraw/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/findbar.xml,sdraw/toolbar/findbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/fullscreenbar.xml,sdraw/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/optimizetablebar.xml,sdraw/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/textobjectbar.xml,sdraw/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/calloutshapes.xml,sdraw/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/flowchartshapes.xml,sdraw/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/gluepointsobjectbar.xml,sdraw/toolbar/gluepointsobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/optionsbar.xml,sdraw/toolbar/optionsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/toolbar.xml,sdraw/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/choosemodebar.xml,sdraw/toolbar/choosemodebar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/fontworkobjectbar.xml,sdraw/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/graffilterbar.xml,sdraw/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/positionbar.xml,sdraw/toolbar/positionbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/viewerbar.xml,sdraw/toolbar/viewerbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/colorbar.xml,sdraw/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/fontworkshapetype.xml,sdraw/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/graphicobjectbar.xml,sdraw/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/rectanglesbar.xml,sdraw/toolbar/rectanglesbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/zoombar.xml,sdraw/toolbar/zoombar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/statusbar/statusbar.xml,sdraw/statusbar/statusbar.xml))
Added: incubator/ooo/branches/gbuild/main/sd/Package_xml.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/Package_xml.mk?rev=1409611&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/Package_xml.mk (added)
+++ incubator/ooo/branches/gbuild/main/sd/Package_xml.mk Thu Nov 15 00:22:49 2012
@@ -0,0 +1,34 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,sd_xml,$(SRCDIR)/sd/xml))
+
+$(eval $(call gb_Package_add_file,sd_xml,xml/sd.xml,sd.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/effects.xml,effects.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/transitions.xml,transitions.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/transitions-ogl.xml,transitions-ogl.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xsl/effect.xsl,effect.xsl))
Modified: incubator/ooo/branches/gbuild/main/sd/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/prj/build.lst?rev=1409611&r1=1409610&r2=1409611&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/sd/prj/build.lst Thu Nov 15 00:22:49 2012
@@ -1,48 +1,2 @@
sd sd : filter L10N:l10n animations svx sfx2 stoc canvas LIBXSLT:libxslt NULL
-sd sd usr1 - all sd_mkout NULL
-sd sd\inc nmake - all sd_inc NULL
-sd sd\prj get - all sd_prj NULL
-sd sd\source\ui\inc get - all sd_sinc NULL
-sd sd\res get - all sd_res NULL
-sd sd\res\imagelst get - all sd_resil NULL
-sd sd\sdi nmake - all sd_sdi NULL
-sd sd\source\helper nmake - all sd_helper sd_inc NULL
-sd sd\source\ui\func nmake - all sd_func sd_sdi sd_inc NULL
-sd sd\source\ui\view nmake - all sd_view sd_sdi sd_inc NULL
-sd sd\source\ui\app nmake - all sd_app sd_sdi sd_inc NULL
-sd sd\source\ui\dlg nmake - all sd_dlg sd_sdi sd_inc NULL
-sd sd\source\core nmake - all sd_core sd_sdi sd_inc NULL
-sd sd\source\core\undo nmake - all sd_undo sd_core sd_inc NULL
-sd sd\source\core\text nmake - all sd_text sd_inc NULL
-sd sd\source\core\annotations nmake - all sd_annotations sd_inc NULL
-sd sd\source\ui\docshell nmake - all sd_docsh sd_sdi sd_inc NULL
-sd sd\source\ui\unoidl nmake - all sd_unid sd_sdi sd_inc NULL
-sd sd\source\ui\accessibility nmake - all sd_accessibility sd_inc NULL
-sd sd\source\ui\toolpanel nmake - all sd_toolpanel sd_sdi sd_inc NULL
-sd sd\source\ui\toolpanel\controls nmake - all sd_toolpanel_controls sd_sdi sd_inc NULL
-sd sd\source\ui\tools nmake - all sd_tools sd_inc NULL
-sd sd\source\ui\slidesorter\shell nmake - all sd_slsshell sd_sdi sd_inc NULL
-sd sd\source\ui\slidesorter\model nmake - all sd_slsmodel sd_inc NULL
-sd sd\source\ui\slidesorter\view nmake - all sd_slsview sd_inc NULL
-sd sd\source\ui\slidesorter\controller nmake - all sd_slscontroller sd_sdi sd_inc NULL
-sd sd\source\ui\slidesorter\cache nmake - all sd_slscache sd_inc NULL
-sd sd\source\ui\controller nmake - all sd_controller sd_inc NULL
-sd sd\source\ui\notes nmake - all sd_notes sd_inc NULL
-sd sd\source\ui\table nmake - all sd_table sd_sdi sd_inc NULL
-sd sd\source\filter\ppt nmake - all sd_ppt sd_inc NULL
-sd sd\source\filter nmake - all sd_filt sd_sdi sd_ppt sd_inc NULL
-sd sd\source\filter\cgm nmake - all sd_cgm sd_inc NULL
-sd sd\source\filter\eppt nmake - all sd_eppt sd_inc NULL
-sd sd\source\filter\grf nmake - all sd_grf sd_inc NULL
-sd sd\source\filter\xml nmake - all sd_xml sd_inc NULL
-sd sd\source\filter\html nmake - all sd_html sd_inc NULL
-sd sd\source\ui\animations nmake - all sd_animations sd_inc NULL
-sd sd\source\ui\slideshow nmake - all sd_slideshow sd_sdi sd_inc NULL
-sd sd\source\ui\presenter nmake - all sd_presenter sd_inc NULL
-sd sd\source\ui\framework\configuration nmake - all sd_framework_configuration sd_inc NULL
-sd sd\source\ui\framework\module nmake - all sd_framework_module sd_inc NULL
-sd sd\source\ui\framework\factories nmake - all sd_framework_factories sd_inc NULL
-sd sd\source\ui\framework\tools nmake - all sd_framework_tools sd_inc NULL
-sd sd\source\ui\annotations nmake - all sd_uiannotations sd_inc NULL
-sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_controller sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL
-sd sd\qa\unoapi nmake - all sd_qa_unoapi NULL
+sd sd\prj nmake - all sd_prj NULL
\ No newline at end of file
Modified: incubator/ooo/branches/gbuild/main/sd/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/prj/d.lst?rev=1409611&r1=1409610&r2=1409611&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/sd/prj/d.lst Thu Nov 15 00:22:49 2012
@@ -48,12 +48,6 @@ mkdir: %_DEST%\inc%_EXT%\sd
..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
-..\uiconfig\sdraw\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\menubar\*.xml
-..\uiconfig\simpress\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\menubar\*.xml
-..\uiconfig\sdraw\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\toolbar\*.xml
-..\uiconfig\simpress\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\toolbar\*.xml
-..\uiconfig\sdraw\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar\*.xml
-..\uiconfig\simpress\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar\*.xml
..\%__SRC%\misc\sd.component %_DEST%\xml%_EXT%\sd.component
..\%__SRC%\misc\sdd.component %_DEST%\xml%_EXT%\sdd.component
Added: incubator/ooo/branches/gbuild/main/sd/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/prj/makefile.mk?rev=1409611&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/prj/makefile.mk (added)
+++ incubator/ooo/branches/gbuild/main/sd/prj/makefile.mk Thu Nov 15 00:22:49 2012
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Added: incubator/ooo/branches/gbuild/main/sd/source/filter/sddetect.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/source/filter/sddetect.cxx?rev=1409611&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/source/filter/sddetect.cxx (added)
+++ incubator/ooo/branches/gbuild/main/sd/source/filter/sddetect.cxx Thu Nov 15 00:22:49 2012
@@ -0,0 +1,602 @@
+/*************************************************************************
+*
+* 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.
+*
+************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sd.hxx"
+
+#include <com/sun/star/document/XExtendedFilterDetection.hpp>
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/ucb/InteractiveAppException.hpp>
+#include <com/sun/star/ucb/XContent.hpp>
+#include <com/sun/star/packages/zip/ZipIOException.hpp>
+
+#include <vos/mutex.hxx>
+
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/factory.hxx>
+#include <ucbhelper/simpleinteractionrequest.hxx>
+
+#include <comphelper/processfactory.hxx>
+
+#include <tools/urlobj.hxx>
+
+#include <framework/interaction.hxx>
+
+#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+
+#include <svtools/filter.hxx>
+#include <svtools/sfxecode.hxx>
+#include <svtools/ehdl.hxx>
+#include <svtools/FilterConfigItem.hxx>
+
+#include <sot/storinfo.hxx>
+#include <sot/storage.hxx>
+
+#include <unotools/moduleoptions.hxx>
+
+#include <sfx2/app.hxx>
+#include <sfx2/sfxsids.hrc>
+#include <sfx2/request.hxx>
+#include <sfx2/docfile.hxx>
+#include <sfx2/fcontnr.hxx>
+#include <sfx2/brokenpackageint.hxx>
+
+#include "strmname.h"
+
+using ::rtl::OUString;
+
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::embed;
+using namespace ::com::sun::star::task;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::ucb;
+
+class SdFilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, XServiceInfo >
+{
+public:
+ SdFilterDetect( const Reference < XMultiServiceFactory >& xFactory );
+ virtual ~SdFilterDetect();
+
+ virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException);
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException);
+
+ static Sequence< OUString > impl_getStaticSupportedServiceNames();
+ static OUString impl_getStaticImplementationName();
+ static Reference< XInterface > SAL_CALL impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( Exception );
+ virtual OUString SAL_CALL detect( Sequence< PropertyValue >& lDescriptor ) throw( RuntimeException );
+};
+
+SdFilterDetect::SdFilterDetect( const Reference < XMultiServiceFactory >& )
+{
+}
+
+SdFilterDetect::~SdFilterDetect()
+{
+}
+
+OUString SAL_CALL SdFilterDetect::detect( Sequence< PropertyValue >& lDescriptor ) throw( RuntimeException )
+{
+ Reference< XInputStream > xStream;
+ Reference< XContent > xContent;
+ Reference< XInteractionHandler > xInteraction;
+ String aURL;
+ OUString sTemp;
+ String aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection)
+ String aPreselectedFilterName; // a name describing the filter to use (from MediaDescriptor, usually from UI action)
+
+ OUString aDocumentTitle; // interesting only if set in this method
+
+ // opening as template is done when a parameter tells to do so and a template filter can be detected
+ // (otherwise no valid filter would be found) or if the detected filter is a template filter and
+ // there is no parameter that forbids to open as template
+ sal_Bool bOpenAsTemplate = sal_False;
+ sal_Bool bWasReadOnly = sal_False, bReadOnly = sal_False;
+
+ sal_Bool bRepairPackage = sal_False;
+ sal_Bool bRepairAllowed = sal_False;
+
+ // now some parameters that can already be in the array, but may be overwritten or new inserted here
+ // remember their indices in the case new values must be added to the array
+ sal_Int32 nPropertyCount = lDescriptor.getLength();
+ sal_Int32 nIndexOfFilterName = -1;
+ sal_Int32 nIndexOfInputStream = -1;
+ sal_Int32 nIndexOfContent = -1;
+ sal_Int32 nIndexOfReadOnlyFlag = -1;
+ sal_Int32 nIndexOfTemplateFlag = -1;
+ sal_Int32 nIndexOfDocumentTitle = -1;
+
+ for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
+ {
+ // extract properties
+ if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) )
+ {
+ lDescriptor[nProperty].Value >>= sTemp;
+ aURL = sTemp;
+ }
+ else if( !aURL.Len() && lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("FileName")) )
+ {
+ lDescriptor[nProperty].Value >>= sTemp;
+ aURL = sTemp;
+ }
+ else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName")) )
+ {
+ lDescriptor[nProperty].Value >>= sTemp;
+ aTypeName = sTemp;
+ }
+ else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName")) )
+ {
+ lDescriptor[nProperty].Value >>= sTemp;
+ aPreselectedFilterName = sTemp;
+
+ // if the preselected filter name is not correct, it must be erased after detection
+ // remember index of property to get access to it later
+ nIndexOfFilterName = nProperty;
+ }
+ else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")) )
+ nIndexOfInputStream = nProperty;
+ else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")) )
+ nIndexOfReadOnlyFlag = nProperty;
+ else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("UCBContent")) )
+ nIndexOfContent = nProperty;
+ else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate")) )
+ {
+ lDescriptor[nProperty].Value >>= bOpenAsTemplate;
+ nIndexOfTemplateFlag = nProperty;
+ }
+ else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")) )
+ lDescriptor[nProperty].Value >>= xInteraction;
+ else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("RepairPackage")) )
+ lDescriptor[nProperty].Value >>= bRepairPackage;
+ else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle")) )
+ nIndexOfDocumentTitle = nProperty;
+ }
+
+ // can't check the type for external filters, so set the "dont" flag accordingly
+ ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ //SfxFilterFlags nMust = SFX_FILTER_IMPORT, nDont = SFX_FILTER_NOTINSTALLED;
+
+ SfxApplication* pApp = SFX_APP();
+ SfxAllItemSet *pSet = new SfxAllItemSet( pApp->GetPool() );
+ TransformParameters( SID_OPENDOC, lDescriptor, *pSet );
+ SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, SID_DOC_READONLY, sal_False );
+
+ bWasReadOnly = pItem && pItem->GetValue();
+
+ const SfxFilter* pFilter = 0;
+ String aFilterName;
+ String aPrefix = String::CreateFromAscii( "private:factory/" );
+ if( aURL.Match( aPrefix ) == aPrefix.Len() )
+ {
+ if( SvtModuleOptions().IsImpress() )
+ {
+ String aPattern( aPrefix );
+ aPattern += String::CreateFromAscii("simpress");
+ if ( aURL.Match( aPattern ) >= aPattern.Len() )
+ pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
+ }
+
+ if( !pFilter && SvtModuleOptions().IsDraw() )
+ {
+ String aPattern( aPrefix );
+ aPattern += String::CreateFromAscii("sdraw");
+ if ( aURL.Match( aPattern ) >= aPattern.Len() )
+ pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
+ }
+ }
+ else
+ {
+ // ctor of SfxMedium uses owner transition of ItemSet
+ SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, sal_False, NULL, pSet );
+ aMedium.UseInteractionHandler( sal_True );
+ if ( aPreselectedFilterName.Len() )
+ pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName );
+ else if( aTypeName.Len() )
+ {
+ SfxFilterMatcher aMatch;
+ pFilter = aMatch.GetFilter4EA( aTypeName );
+ }
+
+ if ( aMedium.GetErrorCode() == ERRCODE_NONE )
+ {
+ // remember input stream and content and put them into the descriptor later
+ // should be done here since later the medium can switch to a version
+ xStream = aMedium.GetInputStream();
+ xContent = aMedium.GetContent();
+ bReadOnly = aMedium.IsReadOnly();
+ sal_Bool bIsStorage = aMedium.IsStorage();
+
+ if (aMedium.GetError() == SVSTREAM_OK)
+ {
+ if ( bIsStorage )
+ {
+ // PowerPoint needs to be detected via StreamName, all other storage based formats are our own and can
+ // be detected by the ClipboardId, so except for the PPT filter all filters must have a ClipboardId set
+ Reference< XStorage > xStorage( aMedium.GetStorage( sal_False ) );
+
+ //TODO/LATER: move error handling to central place! (maybe even complete own filters)
+ if ( aMedium.GetLastStorageCreationState() != ERRCODE_NONE )
+ {
+ // error during storage creation means _here_ that the medium
+ // is broken, but we can not handle it in medium since unpossibility
+ // to create a storage does not _always_ means that the medium is broken
+ aMedium.SetError( aMedium.GetLastStorageCreationState(), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ if ( xInteraction.is() )
+ {
+ OUString empty;
+ try
+ {
+ InteractiveAppException xException( empty,
+ Reference< XInterface >(),
+ InteractionClassification_ERROR,
+ aMedium.GetError() );
+
+ Reference< XInteractionRequest > xRequest(
+ new ucbhelper::SimpleInteractionRequest( makeAny( xException ),
+ ucbhelper::CONTINUATION_APPROVE ) );
+ xInteraction->handle( xRequest );
+ }
+ catch ( Exception & ) {};
+ }
+ }
+ else
+ {
+ if ( pFilter && !pFilter->GetFormat() )
+ // preselected Filter has no ClipboardId -> doesn't match (see comment above)
+ pFilter = 0;
+
+ // the storage must be checked even if filter is already found, since it is deep type detection
+ // the storage can be corrupted and it will be detected here
+ try
+ {
+ String sFilterName;
+ if ( pFilter )
+ sFilterName = pFilter->GetName();
+ aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pFilter ? pFilter->IsOwnTemplateFormat() : sal_False, &sFilterName );
+ }
+ catch( WrappedTargetException& aWrap )
+ {
+ com::sun::star::packages::zip::ZipIOException aZipException;
+ if ( ( aWrap.TargetException >>= aZipException ) && aTypeName.Len() )
+ {
+ if ( xInteraction.is() )
+ {
+ // the package is broken one
+ aDocumentTitle = aMedium.GetURLObject().getName(
+ INetURLObject::LAST_SEGMENT,
+ true,
+ INetURLObject::DECODE_WITH_CHARSET );
+
+ if ( !bRepairPackage )
+ {
+ // ask the user whether he wants to try to repair
+ RequestPackageReparation aRequest( aDocumentTitle );
+ xInteraction->handle( aRequest.GetRequest() );
+ bRepairAllowed = aRequest.isApproved();
+ }
+
+ if ( !bRepairAllowed )
+ {
+ // repair either not allowed or not successful
+ NotifyBrokenPackage aNotifyRequest( aDocumentTitle );
+ xInteraction->handle( aNotifyRequest.GetRequest() );
+ }
+ }
+
+ if ( !bRepairAllowed )
+ {
+ aTypeName.Erase();
+ pFilter = 0;
+ }
+ }
+ }
+ catch( RuntimeException& )
+ {
+ throw;
+ }
+ catch( Exception& )
+ {
+ aTypeName.Erase();
+ pFilter = 0;
+ }
+
+ if ( !pFilter && aTypeName.Len() )
+ {
+ //TODO/LATER: using this method impress is always preferred if no flat detecion has been made
+ // this should been discussed!
+ if ( SvtModuleOptions().IsImpress() )
+ pFilter = SfxFilterMatcher( String::CreateFromAscii("simpress") ).GetFilter4EA( aTypeName );
+ else if ( SvtModuleOptions().IsDraw() )
+ pFilter = SfxFilterMatcher( String::CreateFromAscii("sdraw") ).GetFilter4EA( aTypeName );
+ }
+ }
+ }
+ else
+ {
+ SvStream* pStm = aMedium.GetInStream();
+ if ( !pStm )
+ {
+ pFilter = 0;
+ }
+ else
+ {
+ SotStorageRef aStorage = new SotStorage ( pStm, sal_False );
+ if ( !aStorage->GetError() )
+ {
+ String aStreamName = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "PowerPoint Document" ) );
+ if ( aStorage->IsStream( aStreamName ) && SvtModuleOptions().IsImpress() )
+ {
+ String aFileName(aMedium.GetName());
+ aFileName.ToUpperAscii();
+
+ if( aFileName.SearchAscii( ".POT" ) == STRING_NOTFOUND )
+ pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97);
+ else
+ pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97Template );
+ }
+ }
+ else
+ {
+ // Vektorgraphik?
+ pStm->Seek( STREAM_SEEK_TO_BEGIN );
+
+ const String aFileName( aMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
+ GraphicDescriptor aDesc( *pStm, &aFileName );
+ GraphicFilter* pGrfFilter = GraphicFilter::GetGraphicFilter();
+ if( !aDesc.Detect( sal_False ) )
+ {
+ pFilter = 0;
+ if( SvtModuleOptions().IsImpress() )
+ {
+ INetURLObject aCheckURL( aFileName );
+ if( aCheckURL.getExtension().equalsIgnoreAsciiCaseAscii( "cgm" ) )
+ {
+ sal_uInt8 n8;
+ pStm->Seek( STREAM_SEEK_TO_BEGIN );
+ *pStm >> n8;
+ if ( ( n8 & 0xf0 ) == 0 ) // we are supporting binary cgm format only, so
+ { // this is a small test to exclude cgm text
+ const String aName = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "CGM - Computer Graphics Metafile" ) );
+ SfxFilterMatcher aMatch( String::CreateFromAscii("simpress") );
+ pFilter = aMatch.GetFilter4FilterName( aName );
+ }
+ }
+ }
+ }
+ else
+ {
+ String aShortName( aDesc.GetImportFormatShortName( aDesc.GetFileFormat() ) );
+ const String aName( pGrfFilter->GetImportFormatTypeName( pGrfFilter->GetImportFormatNumberForShortName( aShortName ) ) );
+
+ if ( pFilter && aShortName.EqualsIgnoreCaseAscii( "PCD" ) ) // there is a multiple pcd selection possible
+ {
+ sal_Int32 nBase = 2; // default Base0
+ String aFilterTypeName( pFilter->GetRealTypeName() );
+ if ( aFilterTypeName.CompareToAscii( "pcd_Photo_CD_Base4" ) == COMPARE_EQUAL )
+ nBase = 1;
+ else if ( aFilterTypeName.CompareToAscii( "pcd_Photo_CD_Base16" ) == COMPARE_EQUAL )
+ nBase = 0;
+ String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Import/PCD" ) );
+ FilterConfigItem aFilterConfigItem( aFilterConfigPath );
+ aFilterConfigItem.WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Resolution" ) ), nBase );
+ }
+
+ SfxFilterMatcher aMatch( String::CreateFromAscii("sdraw") );
+ pFilter = aMatch.GetFilter4FilterName( aName );
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ if ( nIndexOfInputStream == -1 && xStream.is() )
+ {
+ // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice
+ lDescriptor.realloc( nPropertyCount + 1 );
+ lDescriptor[nPropertyCount].Name = OUString::createFromAscii("InputStream");
+ lDescriptor[nPropertyCount].Value <<= xStream;
+ nPropertyCount++;
+ }
+
+ if ( nIndexOfContent == -1 && xContent.is() )
+ {
+ // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice
+ lDescriptor.realloc( nPropertyCount + 1 );
+ lDescriptor[nPropertyCount].Name = OUString::createFromAscii("UCBContent");
+ lDescriptor[nPropertyCount].Value <<= xContent;
+ nPropertyCount++;
+ }
+
+ if ( bReadOnly != bWasReadOnly )
+ {
+ if ( nIndexOfReadOnlyFlag == -1 )
+ {
+ lDescriptor.realloc( nPropertyCount + 1 );
+ lDescriptor[nPropertyCount].Name = OUString::createFromAscii("ReadOnly");
+ lDescriptor[nPropertyCount].Value <<= bReadOnly;
+ nPropertyCount++;
+ }
+ else
+ lDescriptor[nIndexOfReadOnlyFlag].Value <<= bReadOnly;
+ }
+
+ if ( !bRepairPackage && bRepairAllowed )
+ {
+ lDescriptor.realloc( nPropertyCount + 1 );
+ lDescriptor[nPropertyCount].Name = OUString::createFromAscii("RepairPackage");
+ lDescriptor[nPropertyCount].Value <<= bRepairAllowed;
+ nPropertyCount++;
+
+ bOpenAsTemplate = sal_True;
+
+ // TODO/LATER: set progress bar that should be used
+ }
+
+ if ( bOpenAsTemplate )
+ {
+ if ( nIndexOfTemplateFlag == -1 )
+ {
+ lDescriptor.realloc( nPropertyCount + 1 );
+ lDescriptor[nPropertyCount].Name = OUString::createFromAscii("AsTemplate");
+ lDescriptor[nPropertyCount].Value <<= bOpenAsTemplate;
+ nPropertyCount++;
+ }
+ else
+ lDescriptor[nIndexOfTemplateFlag].Value <<= bOpenAsTemplate;
+ }
+
+ if ( aDocumentTitle.getLength() )
+ {
+ // the title was set here
+ if ( nIndexOfDocumentTitle == -1 )
+ {
+ lDescriptor.realloc( nPropertyCount + 1 );
+ lDescriptor[nPropertyCount].Name = OUString::createFromAscii("DocumentTitle");
+ lDescriptor[nPropertyCount].Value <<= aDocumentTitle;
+ nPropertyCount++;
+ }
+ else
+ lDescriptor[nIndexOfDocumentTitle].Value <<= aDocumentTitle;
+ }
+
+ if ( pFilter )
+ aTypeName = pFilter->GetTypeName();
+ else
+ aTypeName.Erase();
+
+ return aTypeName;
+}
+
+/* XServiceInfo */
+OUString SAL_CALL SdFilterDetect::getImplementationName() throw( RuntimeException )
+{
+ return impl_getStaticImplementationName();
+}
+
+/* XServiceInfo */
+sal_Bool SAL_CALL SdFilterDetect::supportsService( const OUString& sServiceName ) throw( RuntimeException )
+{
+ Sequence< OUString > seqServiceNames = getSupportedServiceNames();
+ const OUString* pArray = seqServiceNames.getConstArray();
+ for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
+ {
+ if ( pArray[nCounter] == sServiceName )
+ {
+ return sal_True ;
+ }
+ }
+ return sal_False ;
+}
+
+/* XServiceInfo */
+Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() throw( RuntimeException )
+{
+ return impl_getStaticSupportedServiceNames();
+}
+
+/* Helper for XServiceInfo */
+Sequence< OUString > SdFilterDetect::impl_getStaticSupportedServiceNames()
+{
+ ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+ Sequence< OUString > seqServiceNames( 1 );
+ seqServiceNames.getArray() [0] = OUString::createFromAscii( "com.sun.star.frame.ExtendedTypeDetection" );
+ return seqServiceNames ;
+}
+
+/* Helper for XServiceInfo */
+OUString SdFilterDetect::impl_getStaticImplementationName()
+{
+ return OUString::createFromAscii( "com.sun.star.comp.draw.FormatDetector" );
+}
+
+/* Helper for registry */
+Reference< XInterface > SAL_CALL SdFilterDetect::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( Exception )
+{
+ return Reference< XInterface >( *new SdFilterDetect( xServiceManager ) );
+}
+
+extern "C" {
+
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+ const sal_Char** ppEnvironmentTypeName,
+ uno_Environment** )
+ {
+ *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
+ }
+
+ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+ const sal_Char* pImplementationName,
+ void* pServiceManager,
+ void* )
+ {
+ // Set default return value for this operation - if it failed.
+ void* pReturn = NULL ;
+
+ if (
+ ( pImplementationName != NULL ) &&
+ ( pServiceManager != NULL )
+ )
+ {
+ // Define variables which are used in following macros.
+ Reference< XSingleServiceFactory > xFactory ;
+ Reference< XMultiServiceFactory > xServiceManager( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
+
+ if( SdFilterDetect::impl_getStaticImplementationName().equalsAscii( pImplementationName ) )
+ {
+ xFactory = ::cppu::createSingleFactory( xServiceManager,
+ SdFilterDetect::impl_getStaticImplementationName(),
+ SdFilterDetect::impl_createInstance,
+ SdFilterDetect::impl_getStaticSupportedServiceNames() );
+ }
+
+ // Factory is valid - service was found.
+ if ( xFactory.is() )
+ {
+ xFactory->acquire();
+ pReturn = xFactory.get();
+ }
+ }
+
+ // Return with result of this operation.
+ return pReturn ;
+ }
+} // extern "C"
+