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/10/05 20:23:26 UTC
svn commit: r1394707 [4/4] - in /incubator/ooo/branches/buildsys:
ext_libraries/apr-util/ ext_libraries/serf/win/ main/ main/UnoControls/prj/
main/accessibility/prj/ main/animations/prj/ main/basctl/source/dlged/
main/basebmp/inc/basebmp/ main/basic/pr...
Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/winmingw.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/winmingw.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/winmingw.mk Fri Oct 5 18:23:17 2012
@@ -165,6 +165,8 @@ endif
gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+
ifeq ($(gb_DEBUGLEVEL),2)
gb_COMPILEROPTFLAGS := -O0
else
@@ -208,6 +210,17 @@ $(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR
$(1)))))
endef
+# convert parametters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
+$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
+$(1)))))
+endef
+
# CObject class
ifeq ($(gb_FULLDEPS),$(true))
@@ -399,7 +412,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(NATIVERES) " > $${RESPONSEFILE} && \
$(gb_LINK) \
$(gb_Library_TARGETTYPEFLAGS) \
- $(LDFLAGS) \
+ $(T_LDFLAGS) \
--enable-auto-image-base \
-e _DllMainCRTStartup@12 \
$(gb_MINGWLIBDIR)/dllcrt2.o \
@@ -467,8 +480,8 @@ gb_Library_PLAINLIBS_NONE += \
user32 \
uuid \
uwinapi \
+ winmm \
winspool \
- z \
cppunit
gb_Library_LAYER := \
@@ -525,7 +538,7 @@ $(call gb_LinkTarget_set_auxtargets,$(2)
$(call gb_Library_get_target,$(1)) \
$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3))
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3))
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
endef
@@ -676,5 +689,19 @@ gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
+gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
+gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare.exe
+gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
+gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
+gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/templates/Executable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/templates/Executable.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/templates/Executable.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/templates/Executable.mk Fri Oct 5 18:23:17 2012
@@ -41,4 +41,7 @@ $(eval $(call gb_Executable_add_exceptio
$(eval $(call gb_Executable_set_targettype_gui,EXEC,\
))
+$(eval $(call gb_Executable_set_targettype_gui,EXEC,\
+))
+
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/buildsys/main/solenv/inc/target.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/inc/target.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/inc/target.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/inc/target.mk Fri Oct 5 18:23:17 2012
@@ -50,7 +50,7 @@ INCEXT*=.
INCPRE*=.
INCPOST*=.
.IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
-UNOINCLUDES=$(SOLARINCDIR)/offuh
+UNOINCLUDES=$(SOLARINCDIR)/udkapi -I$(SOLARINCDIR)/offapi -I$(SOLARINCDIR)/oovbaapi
.ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
SOLARINC+=$(JDKINCS)
# make sure INCLUDE isn't set
Modified: incubator/ooo/branches/buildsys/main/sot/Library_sot.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sot/Library_sot.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sot/Library_sot.mk (original)
+++ incubator/ooo/branches/buildsys/main/sot/Library_sot.mk Fri Oct 5 18:23:17 2012
@@ -32,7 +32,11 @@ $(eval $(call gb_Library_set_componentfi
$(eval $(call gb_Library_set_include,sot,\
-I$(SRCDIR)/sot/inc/pch \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,sot,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_add_defs,sot,\
Modified: incubator/ooo/branches/buildsys/main/svl/Library_fsstorage.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svl/Library_fsstorage.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svl/Library_fsstorage.mk (original)
+++ incubator/ooo/branches/buildsys/main/svl/Library_fsstorage.mk Fri Oct 5 18:23:17 2012
@@ -33,10 +33,14 @@ $(eval $(call gb_Library_set_include,fss
-I$(SRCDIR)/svl/inc/svl \
-I$(SRCDIR)/svl/source/inc \
-I$(SRCDIR)/svl/inc/pch \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_Library_add_api,fsstorage,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,fsstorage,\
comphelper \
cppu \
Modified: incubator/ooo/branches/buildsys/main/svl/Library_passwordcontainer.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svl/Library_passwordcontainer.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svl/Library_passwordcontainer.mk (original)
+++ incubator/ooo/branches/buildsys/main/svl/Library_passwordcontainer.mk Fri Oct 5 18:23:17 2012
@@ -33,10 +33,14 @@ $(eval $(call gb_Library_set_include,pas
-I$(SRCDIR)/svl/inc/svl \
-I$(SRCDIR)/svl/source/inc \
-I$(SRCDIR)/svl/inc/pch \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_Library_add_api,passwordcontainer,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
cppu \
cppuhelper \
Modified: incubator/ooo/branches/buildsys/main/svl/Library_svl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svl/Library_svl.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svl/Library_svl.mk (original)
+++ incubator/ooo/branches/buildsys/main/svl/Library_svl.mk Fri Oct 5 18:23:17 2012
@@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,svl
$$(SOLARINC) \
-I$(SRCDIR)/svl/source/inc \
-I$(SRCDIR)/svl/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,svl,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_add_defs,svl,\
Modified: incubator/ooo/branches/buildsys/main/svl/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svl/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svl/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/svl/prj/build.lst Fri Oct 5 18:23:17 2012
@@ -1,2 +1,2 @@
-sl svl : L10N:l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot LIBXSLT:libxslt NULL
+sl svl : L10N:l10n rsc offapi ucbhelper unotools cppu cppuhelper comphelper sal sot LIBXSLT:libxslt NULL
sl svl\prj nmake - all svl_prj NULL
Modified: incubator/ooo/branches/buildsys/main/svtools/Executable_bmp.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svtools/Executable_bmp.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svtools/Executable_bmp.mk (original)
+++ incubator/ooo/branches/buildsys/main/svtools/Executable_bmp.mk Fri Oct 5 18:23:17 2012
@@ -32,7 +32,11 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/svtools/inc/svtools \
-I$(SRCDIR)/svtools/source/inc \
-I$(SRCDIR)/svtools/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Executable_add_api,bmp,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Executable_add_linked_libs,bmp,\
Modified: incubator/ooo/branches/buildsys/main/svtools/Executable_bmpsum.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svtools/Executable_bmpsum.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svtools/Executable_bmpsum.mk (original)
+++ incubator/ooo/branches/buildsys/main/svtools/Executable_bmpsum.mk Fri Oct 5 18:23:17 2012
@@ -26,12 +26,16 @@ $(eval $(call gb_Executable_Executable,b
$(eval $(call gb_Executable_set_include,bmpsum,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/ \
- -I$(OUTDIR)/inc/offuh/ \
-I$(SRCDIR)/svtools/inc/ \
-I$(SRCDIR)/svtools/inc/pch/ \
-I$(SRCDIR)/svtools/inc/svtools/ \
))
+$(eval $(call gb_Executable_add_api,bmpsum,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Executable_add_linked_libs,bmpsum,\
sal \
stl \
Modified: incubator/ooo/branches/buildsys/main/svtools/Executable_g2g.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svtools/Executable_g2g.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svtools/Executable_g2g.mk (original)
+++ incubator/ooo/branches/buildsys/main/svtools/Executable_g2g.mk Fri Oct 5 18:23:17 2012
@@ -26,12 +26,16 @@ $(eval $(call gb_Executable_Executable,g
$(eval $(call gb_Executable_set_include,g2g,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/ \
- -I$(OUTDIR)/inc/offuh/ \
-I$(SRCDIR)/svtools/inc/ \
-I$(SRCDIR)/svtools/inc/pch/ \
-I$(SRCDIR)/svtools/inc/svtools/ \
))
+$(eval $(call gb_Executable_add_api,g2g,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Executable_add_linked_libs,g2g,\
jvmfwk \
sal \
Modified: incubator/ooo/branches/buildsys/main/svtools/Library_hatchwindowfactory.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svtools/Library_hatchwindowfactory.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svtools/Library_hatchwindowfactory.mk (original)
+++ incubator/ooo/branches/buildsys/main/svtools/Library_hatchwindowfactory.mk Fri Oct 5 18:23:17 2012
@@ -32,10 +32,14 @@ $(eval $(call gb_Library_set_include,hat
-I$(SRCDIR)/svtools/inc/pch/ \
-I$(OUTDIR)/inc/ \
-I$(SRCDIR)/svtools/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_Library_add_api,hatchwindowfactory,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
cppu \
cppuhelper \
Modified: incubator/ooo/branches/buildsys/main/svtools/Library_svt.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svtools/Library_svt.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svtools/Library_svt.mk (original)
+++ incubator/ooo/branches/buildsys/main/svtools/Library_svt.mk Fri Oct 5 18:23:17 2012
@@ -29,6 +29,11 @@ $(eval $(call gb_Library_add_precompiled
$(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
+$(eval $(call gb_Library_add_api,svt,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,svt,\
-I$(OUTDIR)/inc/external/jpeg \
$$(INCLUDE) \
@@ -39,7 +44,6 @@ $(eval $(call gb_Library_set_include,svt
-I$(SRCDIR)/svtools/inc/svtools \
-I$(SRCDIR)/svtools/source/inc \
-I$(SRCDIR)/svtools/inc/pch \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_defs,svt,\
Modified: incubator/ooo/branches/buildsys/main/svtools/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svtools/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svtools/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/svtools/prj/build.lst Fri Oct 5 18:23:17 2012
@@ -1,2 +1,2 @@
-st svtools : L10N:l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk LIBXSLT:libxslt NULL
+st svtools : L10N:l10n svl offapi toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk LIBXSLT:libxslt NULL
st svtools\prj nmake - all st_prj NULL
Modified: incubator/ooo/branches/buildsys/main/svtools/source/uno/contextmenuhelper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svtools/source/uno/contextmenuhelper.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svtools/source/uno/contextmenuhelper.cxx (original)
+++ incubator/ooo/branches/buildsys/main/svtools/source/uno/contextmenuhelper.cxx Fri Oct 5 18:23:17 2012
@@ -45,7 +45,7 @@
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/image.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/awt/vclxmenu.hxx>
Modified: incubator/ooo/branches/buildsys/main/svtools/source/uno/statusbarcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svtools/source/uno/statusbarcontroller.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svtools/source/uno/statusbarcontroller.cxx (original)
+++ incubator/ooo/branches/buildsys/main/svtools/source/uno/statusbarcontroller.cxx Fri Oct 5 18:23:17 2012
@@ -35,7 +35,7 @@
#include <vcl/status.hxx>
#include <svtools/imgdef.hxx>
#include <svtools/miscopt.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
using namespace ::cppu;
using namespace ::com::sun::star::awt;
Modified: incubator/ooo/branches/buildsys/main/svtools/source/uno/toolboxcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svtools/source/uno/toolboxcontroller.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svtools/source/uno/toolboxcontroller.cxx (original)
+++ incubator/ooo/branches/buildsys/main/svtools/source/uno/toolboxcontroller.cxx Fri Oct 5 18:23:17 2012
@@ -33,7 +33,7 @@
#include <vcl/svapp.hxx>
#include <svtools/imgdef.hxx>
#include <svtools/miscopt.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/toolbox.hxx>
//shizhobo
#include <com/sun/star/beans/PropertyAttribute.hpp>
Modified: incubator/ooo/branches/buildsys/main/svx/AllLangResTarget_svx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/AllLangResTarget_svx.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/AllLangResTarget_svx.mk (original)
+++ incubator/ooo/branches/buildsys/main/svx/AllLangResTarget_svx.mk Fri Oct 5 18:23:17 2012
@@ -142,5 +142,16 @@ $(OUTDIR)/inc/svx/globlmn.hrc_clean :
$(call gb_AllLangResTarget_get_target,svx) : $(OUTDIR)/inc/svx/globlmn.hrc
+$(OUTDIR)/inc/svx/globlmn.hrc : $(WORKDIR)/inc/svx/globlmn.hrc
+ echo copying $@
+ -mkdir -p $(OUTDIR)/inc/svx
+ cp $(WORKDIR)/inc/svx/globlmn.hrc $(OUTDIR)/inc/svx/globlmn.hrc
+
+.PHONY : $(OUTDIR)/inc/svx/globlmn.hrc_clean
+$(OUTDIR)/inc/svx/globlmn.hrc_clean :
+ rm -f $(OUTDIR)/inc/svx/globlmn.hrc
+
+$(call gb_AllLangResTarget_get_target,svx) : $(OUTDIR)/inc/svx/globlmn.hrc
+
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/buildsys/main/svx/Library_svx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/Library_svx.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/Library_svx.mk (original)
+++ incubator/ooo/branches/buildsys/main/svx/Library_svx.mk Fri Oct 5 18:23:17 2012
@@ -30,7 +30,11 @@ $(eval $(call gb_Library_set_include,svx
-I$(SRCDIR)/svx/source/inc \
-I$(SRCDIR)/svx/inc/pch \
$$(SOLARINC) \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,svx,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_add_defs,svx,\
@@ -67,6 +71,8 @@ $(eval $(call gb_Library_add_linked_libs
$(call gb_Library_use_external,svx,icuuc)
+$(call gb_Library_use_external,svx,icuuc)
+
$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/accessibility/AccessibleControlShape \
svx/source/accessibility/AccessibleEmptyEditSource \
Modified: incubator/ooo/branches/buildsys/main/svx/Library_svxcore.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/Library_svxcore.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/Library_svxcore.mk (original)
+++ incubator/ooo/branches/buildsys/main/svx/Library_svxcore.mk Fri Oct 5 18:23:17 2012
@@ -32,12 +32,16 @@ $(eval $(call gb_Library_add_package_hea
svx_sdi \
))
+$(eval $(call gb_Library_add_api,svxcore,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,svxcore,\
-I$(SRCDIR)/svx/inc \
-I$(SRCDIR)/svx/inc/pch \
-I$(SRCDIR)/svx/source/inc \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(WORKDIR)/SdiTarget/svx/sdi \
))
@@ -82,6 +86,8 @@ $(eval $(call gb_Library_add_linked_libs
$(call gb_Library_use_external,svxcore,icuuc)
+$(call gb_Library_use_external,svxcore,icuuc)
+
$(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/core/coreservices \
svx/source/customshapes/EnhancedCustomShape2d \
Modified: incubator/ooo/branches/buildsys/main/svx/Library_textconversiondlgs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/Library_textconversiondlgs.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/Library_textconversiondlgs.mk (original)
+++ incubator/ooo/branches/buildsys/main/svx/Library_textconversiondlgs.mk Fri Oct 5 18:23:17 2012
@@ -29,7 +29,11 @@ $(eval $(call gb_Library_set_include,tex
-I$(SRCDIR)/svx/inc \
-I$(SRCDIR)/svx/inc/pch \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,textconversiondlgs,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
Modified: incubator/ooo/branches/buildsys/main/svx/source/dialog/docrecovery.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/source/dialog/docrecovery.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/source/dialog/docrecovery.cxx (original)
+++ incubator/ooo/branches/buildsys/main/svx/source/dialog/docrecovery.cxx Fri Oct 5 18:23:17 2012
@@ -41,7 +41,7 @@
#include <vcl/scrbar.hxx>
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#endif
//#include "com/sun/star/lang/XMultiServiceFactory.hpp"
Modified: incubator/ooo/branches/buildsys/main/svx/source/dialog/srchdlg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/source/dialog/srchdlg.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/source/dialog/srchdlg.cxx (original)
+++ incubator/ooo/branches/buildsys/main/svx/source/dialog/srchdlg.cxx Fri Oct 5 18:23:17 2012
@@ -49,7 +49,7 @@
#include <svl/intitem.hxx>
#include <sfx2/app.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#define _SVX_SRCHDLG_CXX
#include "svx/srchdlg.hxx"
Modified: incubator/ooo/branches/buildsys/main/svx/source/form/fmPropBrw.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/source/form/fmPropBrw.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/source/form/fmPropBrw.cxx (original)
+++ incubator/ooo/branches/buildsys/main/svx/source/form/fmPropBrw.cxx Fri Oct 5 18:23:17 2012
@@ -64,7 +64,7 @@
#include <sfx2/objitem.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewfrm.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/shl.hxx>
Modified: incubator/ooo/branches/buildsys/main/svx/source/form/fmtools.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/source/form/fmtools.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/source/form/fmtools.cxx (original)
+++ incubator/ooo/branches/buildsys/main/svx/source/form/fmtools.cxx Fri Oct 5 18:23:17 2012
@@ -86,7 +86,7 @@
#include <sfx2/bindings.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
#include <tools/string.hxx>
#include <vcl/stdtext.hxx>
Modified: incubator/ooo/branches/buildsys/main/svx/source/unodraw/unoshap2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/source/unodraw/unoshap2.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/source/unodraw/unoshap2.cxx (original)
+++ incubator/ooo/branches/buildsys/main/svx/source/unodraw/unoshap2.cxx Fri Oct 5 18:23:17 2012
@@ -1627,7 +1627,7 @@ uno::Sequence< OUString > SAL_CALL SvxSh
#include <sfx2/fcontnr.hxx>
#endif
-#include "toolkit/unohlp.hxx"
+#include "toolkit/helper/vclunohelper.hxx"
//----------------------------------------------------------------------
SvxGraphicObject::SvxGraphicObject( SdrObject* pObj ) throw()
Modified: incubator/ooo/branches/buildsys/main/svx/source/unodraw/unoshape.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/source/unodraw/unoshape.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/source/unodraw/unoshape.cxx (original)
+++ incubator/ooo/branches/buildsys/main/svx/source/unodraw/unoshape.cxx Fri Oct 5 18:23:17 2012
@@ -41,7 +41,7 @@
#include <comphelper/extract.hxx>
#include "svx/shapepropertynotifier.hxx"
#include <comphelper/serviceinfohelper.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/serviceinfohelper.hxx>
#include <rtl/uuid.h>
#include <rtl/memory.h>
Modified: incubator/ooo/branches/buildsys/main/svx/workben/msview/msview.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/workben/msview/msview.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/workben/msview/msview.cxx (original)
+++ incubator/ooo/branches/buildsys/main/svx/workben/msview/msview.cxx Fri Oct 5 18:23:17 2012
@@ -50,7 +50,7 @@
#include <svtools/svmedit.hxx>
#include <sfx2/filedlghelper.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <tools/stream.hxx>
#include <tools/resmgr.hxx>
Modified: incubator/ooo/branches/buildsys/main/sw/Library_msword.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/Library_msword.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/Library_msword.mk (original)
+++ incubator/ooo/branches/buildsys/main/sw/Library_msword.mk Fri Oct 5 18:23:17 2012
@@ -67,6 +67,8 @@ $(eval $(call gb_Library_add_linked_libs
$(call gb_Library_use_external,msword,icuuc)
+$(call gb_Library_use_external,msword,icuuc)
+
$(eval $(call gb_Library_add_exception_objects,msword,\
sw/source/filter/rtf/rtffld \
sw/source/filter/rtf/rtffly \
Modified: incubator/ooo/branches/buildsys/main/sw/Library_sw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/Library_sw.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/Library_sw.mk (original)
+++ incubator/ooo/branches/buildsys/main/sw/Library_sw.mk Fri Oct 5 18:23:17 2012
@@ -81,6 +81,8 @@ $(eval $(call gb_Library_add_linked_libs
$(call gb_Library_use_external,sw,icuuc)
+$(call gb_Library_use_external,sw,icuuc)
+
$(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/SwNumberTree/SwNodeNum \
sw/source/core/SwNumberTree/SwNumberTree \
Modified: incubator/ooo/branches/buildsys/main/sw/Library_swd.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/Library_swd.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/Library_swd.mk (original)
+++ incubator/ooo/branches/buildsys/main/sw/Library_swd.mk Fri Oct 5 18:23:17 2012
@@ -34,7 +34,15 @@ $(eval $(call gb_Library_set_include,swd
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/filter/inc \
-I$(SRCDIR)/sw/source/ui/inc \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,swd,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_defs,swd,\
+ -DSWD_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_add_defs,swd,\
Modified: incubator/ooo/branches/buildsys/main/sw/Library_vbaswobj.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/Library_vbaswobj.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/Library_vbaswobj.mk (original)
+++ incubator/ooo/branches/buildsys/main/sw/Library_vbaswobj.mk Fri Oct 5 18:23:17 2012
@@ -33,10 +33,15 @@ $(eval $(call gb_Library_set_include,vba
-I$(SRCDIR)/sw/inc \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/ \
))
+$(eval $(call gb_Library_add_api,vbaswobj,\
+ udkapi \
+ offapi \
+ oovbaapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,vbaswobj,\
comphelper \
cppu \
Modified: incubator/ooo/branches/buildsys/main/sw/inc/pch/precompiled_sw.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/inc/pch/precompiled_sw.hxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/inc/pch/precompiled_sw.hxx (original)
+++ incubator/ooo/branches/buildsys/main/sw/inc/pch/precompiled_sw.hxx Fri Oct 5 18:23:17 2012
@@ -835,7 +835,6 @@
#include "sys/types.h"
#include "toolkit/helper/vclunohelper.hxx"
-#include "toolkit/unohlp.hxx"
#include "tools/bigint.hxx"
#include "tools/cachestr.hxx"
Modified: incubator/ooo/branches/buildsys/main/sw/source/ui/dbui/dbtablepreviewdialog.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/source/ui/dbui/dbtablepreviewdialog.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/source/ui/dbui/dbtablepreviewdialog.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sw/source/ui/dbui/dbtablepreviewdialog.cxx Fri Oct 5 18:23:17 2012
@@ -36,7 +36,7 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#endif
#include <dbui.hrc>
Modified: incubator/ooo/branches/buildsys/main/sw/source/ui/envelp/mailmrge.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/source/ui/envelp/mailmrge.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/source/ui/envelp/mailmrge.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sw/source/ui/envelp/mailmrge.cxx Fri Oct 5 18:23:17 2012
@@ -59,7 +59,7 @@
#include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/sdb/XResultSetAccess.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/form/runtime/XFormController.hpp>
#include <cppuhelper/implbase1.hxx>
Modified: incubator/ooo/branches/buildsys/main/sw/source/ui/uiview/view.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/source/ui/uiview/view.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/source/ui/uiview/view.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sw/source/ui/uiview/view.cxx Fri Oct 5 18:23:17 2012
@@ -95,7 +95,7 @@
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/scanner/ScannerContext.hpp>
#include <com/sun/star/scanner/XScannerManager.hpp>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <rtl/ustrbuf.hxx>
#include <xmloff/xmluconv.hxx>
Modified: incubator/ooo/branches/buildsys/main/testautomation/graphics/optional/includes/impress/i_us_present.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/testautomation/graphics/optional/includes/impress/i_us_present.inc?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/testautomation/graphics/optional/includes/impress/i_us_present.inc (original)
+++ incubator/ooo/branches/buildsys/main/testautomation/graphics/optional/includes/impress/i_us_present.inc Fri Oct 5 18:23:17 2012
@@ -65,7 +65,7 @@ testcase i_us_presentation
printlog "set background to picture(Gallery)"
Kontext "Gallery"
-
+ printlog "Checking if gallery is closed..."
if Gallery.Exists(2) then
warnlog "The Gallery was already visible. Check earlier ran tests for inconsistency."
sleep (2)
Modified: incubator/ooo/branches/buildsys/main/toolkit/Library_tk.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/toolkit/Library_tk.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/toolkit/Library_tk.mk (original)
+++ incubator/ooo/branches/buildsys/main/toolkit/Library_tk.mk Fri Oct 5 18:23:17 2012
@@ -34,13 +34,17 @@ $(eval $(call gb_Library_set_include,tk,
-I$(SRCDIR)/toolkit/inc \
-I$(SRCDIR)/toolkit/inc/pch \
-I$(SRCDIR)/toolkit/source \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_defs,tk,\
-DTOOLKIT_DLLIMPLEMENTATION \
))
+$(eval $(call gb_Library_add_api,tk,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,tk,\
comphelper \
cppu \
Modified: incubator/ooo/branches/buildsys/main/toolkit/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/toolkit/Package_inc.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/toolkit/Package_inc.mk (original)
+++ incubator/ooo/branches/buildsys/main/toolkit/Package_inc.mk Fri Oct 5 18:23:17 2012
@@ -60,4 +60,3 @@ $(eval $(call gb_Package_add_file,toolki
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unopropertyarrayhelper.hxx,toolkit/helper/unopropertyarrayhelper.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unowrapper.hxx,toolkit/helper/unowrapper.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/vclunohelper.hxx,toolkit/helper/vclunohelper.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/unohlp.hxx,toolkit/helper/vclunohelper.hxx))
Modified: incubator/ooo/branches/buildsys/main/tools/Library_tl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/tools/Library_tl.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/tools/Library_tl.mk (original)
+++ incubator/ooo/branches/buildsys/main/tools/Library_tl.mk Fri Oct 5 18:23:17 2012
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,tl,
-I$(SRCDIR)/tools/inc/pch \
-I$(SRCDIR)/solenv/inc \
-I$(SRCDIR)/solenv/inc/Xp31 \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
))
@@ -42,6 +41,11 @@ $(eval $(call gb_Library_add_defs,tl,\
-DVCL \
))
+$(eval $(call gb_Library_add_api,tl,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,tl,\
basegfx \
comphelper \
Modified: incubator/ooo/branches/buildsys/main/tools/StaticLibrary_ooopathutils.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/tools/StaticLibrary_ooopathutils.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/tools/StaticLibrary_ooopathutils.mk (original)
+++ incubator/ooo/branches/buildsys/main/tools/StaticLibrary_ooopathutils.mk Fri Oct 5 18:23:17 2012
@@ -35,7 +35,7 @@ $(eval $(call gb_StaticLibrary_add_excep
# Instead of this evil linking of an object from $(OUTDIR)
define StaticLibrary_ooopathutils_hack
$(call gb_StaticLibrary_get_target,ooopathutils) : $(OUTDIR)/lib/$(1)
-$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils)))
+$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils),$(1)))
$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,tools/source/misc/pathutils)
$$(call gb_Deliver_deliver,$$<,$$@)
Modified: incubator/ooo/branches/buildsys/main/tools/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/tools/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/tools/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/tools/prj/build.lst Fri Oct 5 18:23:17 2012
@@ -1,2 +1,2 @@
-tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
+tl tools : cppu external offapi vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
tl tools\prj nmake - all tl_prj NULL
Modified: incubator/ooo/branches/buildsys/main/udkapi/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/udkapi/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/udkapi/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/udkapi/prj/build.lst Fri Oct 5 18:23:17 2012
@@ -1,30 +1,3 @@
-ua udkapi : idlc NULL
+ua udkapi : idlc codemaker NULL
ua udkapi usr1 - all ua_mkout NULL
-ua udkapi\com\sun\star\beans nmake - all ua_bean NULL
-ua udkapi\com\sun\star\bridge nmake - all ua_brid NULL
-ua udkapi\com\sun\star\bridge\oleautomation nmake - all ua_auto ua_brid NULL
-ua udkapi\com\sun\star\connection nmake - all ua_connect NULL
-ua udkapi\com\sun\star\container nmake - all ua_cont NULL
-ua udkapi\com\sun\star\io nmake - all ua_io NULL
-ua udkapi\com\sun\star\java nmake - all ua_java NULL
-ua udkapi\com\sun\star\lang nmake - all ua_lang NULL
-ua udkapi\com\sun\star\loader nmake - all ua_load NULL
-ua udkapi\com\sun\star\reflection nmake - all ua_refl NULL
-ua udkapi\com\sun\star\registry nmake - all ua_regis NULL
-ua udkapi\com\sun\star\script nmake - all ua_scrpt NULL
-ua udkapi\com\sun\star\test nmake - all ua_test NULL
-ua udkapi\com\sun\star\test\performance nmake - all ua_tstperform NULL
-ua udkapi\com\sun\star\test\bridge nmake - all ua_tstbridge NULL
-ua udkapi\com\sun\star\corba\iop nmake - all ua_iop NULL
-ua udkapi\com\sun\star\corba\giop nmake - all ua_giop NULL
-ua udkapi\com\sun\star\corba\iiop nmake - all ua_iiop NULL
-ua udkapi\com\sun\star\corba nmake - all ua_corba NULL
-ua udkapi\com\sun\star\uno nmake - all ua_uno NULL
-ua udkapi\com\sun\star\security nmake - all ua_sec ua_uno NULL
-ua udkapi\com\sun\star\util nmake - all ua_uutil ua_lang ua_uno NULL
-ua udkapi\com\sun\star\util\logging nmake - all ua_log NULL
-ua udkapi\com\sun\star\task nmake - all ua_task ua_uno NULL
-ua udkapi\com\sun\star\uri nmake - all ua_uri ua_uno NULL
-ua udkapi\com\sun\star nmake - all ua_star NULL
-ua udkapi\util nmake - all ua_util ua_bean ua_brid ua_auto ua_connect ua_cont ua_corba ua_giop ua_iiop ua_io ua_iop ua_java ua_lang ua_load ua_refl ua_regis ua_scrpt ua_test ua_tstbridge ua_tstperform ua_sec ua_uno ua_uutil ua_log ua_task ua_uri ua_star NULL
-
+ua udkapi\prj nmake - all ua_prj NULL
Modified: incubator/ooo/branches/buildsys/main/udkapi/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/udkapi/prj/d.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/udkapi/prj/d.lst (original)
+++ incubator/ooo/branches/buildsys/main/udkapi/prj/d.lst Fri Oct 5 18:23:17 2012
@@ -1,55 +0,0 @@
-mkdir: %COMMON_DEST%\idl%_EXT%\com
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\beans
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge\oleautomation
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\connection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\container
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\io
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\java
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\lang
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\reflection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\registry
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\loader
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test\performance
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test\bridge
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\uno
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util\logging
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\uri
-mkdir: %_DEST%\bin%_EXT%\ure
-
-..\%__SRC%\misc\udkapi.autodoc %_DEST%\idl%_EXT%\udkapi.autodoc
-..\%__SRC%\ucr\udkapi.db %_DEST%\bin%_EXT%\udkapi.rdb
-..\%__SRC%\ucr\udkapi.db %_DEST%\bin%_EXT%\ure\types.rdb
-..\%__SRC%\ucrdoc\udkapi_doc.db %_DEST%\bin%_EXT%\udkapi_doc.rdb
-
-..\com\sun\star\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star
-..\com\sun\star\beans\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\beans
-..\com\sun\star\bridge\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge
-..\com\sun\star\bridge\oleautomation\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge\oleautomation
-..\com\sun\star\connection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\connection
-..\com\sun\star\container\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\container
-..\com\sun\star\io\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\io
-..\com\sun\star\java\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\java
-..\com\sun\star\lang\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\lang
-..\com\sun\star\reflection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\reflection
-..\com\sun\star\registry\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\registry
-..\com\sun\star\loader\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\loader
-..\com\sun\star\script\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-..\com\sun\star\test\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test
-..\com\sun\star\test\performance\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test\performance
-..\com\sun\star\test\bridge\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test\bridge
-..\com\sun\star\uno\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\uno
-..\com\sun\star\util\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-..\com\sun\star\util\logging\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util\logging
-..\com\sun\star\security\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-..\com\sun\star\task\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-..\com\sun\star\uri\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\uri
-
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
Modified: incubator/ooo/branches/buildsys/main/unoxml/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/unoxml/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/unoxml/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/unoxml/prj/build.lst Fri Oct 5 18:23:17 2012
@@ -1,2 +1,2 @@
-ux unoxml : offuh cppuhelper LIBXML2:libxml2 LIBXSLT:libxslt REDLAND:redland sax comphelper ucbhelper NULL
+ux unoxml : offapi cppuhelper LIBXML2:libxml2 LIBXSLT:libxslt REDLAND:redland sax comphelper ucbhelper NULL
ux unoxml\prj nmake - all ux_prj NULL
Modified: incubator/ooo/branches/buildsys/main/vbahelper/Library_msforms.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vbahelper/Library_msforms.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vbahelper/Library_msforms.mk (original)
+++ incubator/ooo/branches/buildsys/main/vbahelper/Library_msforms.mk Fri Oct 5 18:23:17 2012
@@ -37,7 +37,12 @@ $(eval $(call gb_Library_set_componentfi
# add any additional include paths for this library here
$(eval $(call gb_Library_set_include,msforms,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,msforms,\
+ udkapi \
+ offapi \
+ oovbaapi \
))
# add libraries to be linked to LIB; again these names need to be given as
Modified: incubator/ooo/branches/buildsys/main/vbahelper/Library_vbahelper.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vbahelper/Library_vbahelper.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vbahelper/Library_vbahelper.mk (original)
+++ incubator/ooo/branches/buildsys/main/vbahelper/Library_vbahelper.mk Fri Oct 5 18:23:17 2012
@@ -35,13 +35,18 @@ $(eval $(call gb_Library_add_package_hea
# add any additional include paths for this library here
$(eval $(call gb_Library_set_include,vbahelper,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_defs,vbahelper,\
-DVBAHELPER_DLLIMPLEMENTATION \
))
+$(eval $(call gb_Library_add_api,vbahelper,\
+ udkapi \
+ offapi \
+ oovbaapi \
+))
+
# add libraries to be linked to vbahelper; again these names need to be given as
# specified in Repository.mk
$(eval $(call gb_Library_add_linked_libs,vbahelper,\
Modified: incubator/ooo/branches/buildsys/main/vbahelper/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vbahelper/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vbahelper/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/vbahelper/prj/build.lst Fri Oct 5 18:23:17 2012
@@ -1,3 +1,3 @@
-vba vbahelper : oovbaapi offuh basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal unotools LIBXSLT:libxslt NULL
+vba vbahelper : oovbaapi offapi basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal unotools LIBXSLT:libxslt NULL
vba vbahelper usr1 - all vba_mkout NULL
vba vbahelper\prj nmake - all vba_prj NULL
Modified: incubator/ooo/branches/buildsys/main/vcl/Library_desktop_detector.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/Library_desktop_detector.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/Library_desktop_detector.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/Library_desktop_detector.mk Fri Oct 5 18:23:17 2012
@@ -27,12 +27,16 @@ $(eval $(call gb_Library_Library,desktop
$(eval $(call gb_Library_add_precompiled_header,desktop_detector,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
+$(eval $(call gb_Library_add_api,desktop_detector,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,desktop_detector,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
))
@@ -70,6 +74,11 @@ $(call gb_Library_use_externals,desktop_
icuuc \
)
+$(call gb_Library_use_externals,desktop_detector,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,desktop_detector,\
vcl/unx/generic/desktopdetect/desktopdetector \
))
Modified: incubator/ooo/branches/buildsys/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/Library_vcl.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/Library_vcl.mk Fri Oct 5 18:23:17 2012
@@ -40,19 +40,23 @@ $(eval $(call gb_Library_add_api,vcl,\
offapi \
))
+$(eval $(call gb_Library_add_api,vcl,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,vcl,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
- $$(FREETYPE_CFLAGS) \
))
ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vcl,\
+ $$(INCLUDE) \
+ $$(FREETYPE_CFLAGS) \
))
endif
@@ -86,6 +90,11 @@ $(call gb_Library_use_externals,vcl,\
icuuc \
)
+$(call gb_Library_use_externals,vcl,\
+ icule \
+ icuuc \
+)
+
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_add_linked_libs,vcl,\
freetype \
Modified: incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gen.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gen.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gen.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gen.mk Fri Oct 5 18:23:17 2012
@@ -23,12 +23,16 @@
$(eval $(call gb_Library_Library,vclplug_gen))
+$(eval $(call gb_Library_add_api,vclplug_gen,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,vclplug_gen,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
))
@@ -62,6 +66,11 @@ $(call gb_Library_use_externals,vclplug_
icuuc \
)
+$(call gb_Library_use_externals,vclplug_gen,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/generic/app/i18n_cb \
vcl/unx/generic/app/i18n_ic \
Modified: incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gtk.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gtk.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gtk.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gtk.mk Fri Oct 5 18:23:17 2012
@@ -23,12 +23,16 @@
$(eval $(call gb_Library_Library,vclplug_gtk))
+$(eval $(call gb_Library_add_api,vclplug_gtk,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,vclplug_gtk,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
))
@@ -91,6 +95,11 @@ $(call gb_Library_use_externals,vclplug_
icuuc \
)
+$(call gb_Library_use_externals,vclplug_gtk,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
vcl/unx/gtk/a11y/atkaction \
vcl/unx/gtk/a11y/atkbridge \
Modified: incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde.mk Fri Oct 5 18:23:17 2012
@@ -23,12 +23,16 @@
$(eval $(call gb_Library_Library,vclplug_kde))
+$(eval $(call gb_Library_add_api,vclplug_kde,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,vclplug_kde,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
))
@@ -75,6 +79,11 @@ $(call gb_Library_use_externals,vclplug_
icuuc \
)
+$(call gb_Library_use_externals,vclplug_kde,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
vcl/unx/kde/kdedata \
vcl/unx/kde/salnativewidgets-kde \
Modified: incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde4.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde4.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde4.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde4.mk Fri Oct 5 18:23:17 2012
@@ -23,12 +23,16 @@
$(eval $(call gb_Library_Library,vclplug_kde4))
+$(eval $(call gb_Library_add_api,vclplug_kde4,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,vclplug_kde4,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
))
@@ -75,6 +79,11 @@ $(call gb_Library_use_externals,vclplug_
icuuc \
)
+$(call gb_Library_use_externals,vclplug_kde4,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
vcl/unx/kde4/KDEData \
vcl/unx/kde4/KDESalDisplay \
Modified: incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_svp.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_svp.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_svp.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_svp.mk Fri Oct 5 18:23:17 2012
@@ -23,12 +23,16 @@
$(eval $(call gb_Library_Library,vclplug_svp))
+$(eval $(call gb_Library_add_api,vclplug_svp,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,vclplug_svp,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
))
@@ -67,6 +71,11 @@ $(call gb_Library_use_externals,vclplug_
icuuc \
)
+$(call gb_Library_use_externals,vclplug_svp,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
vcl/unx/generic/printergfx/bitmap_gfx \
vcl/unx/generic/printergfx/common_gfx \
Modified: incubator/ooo/branches/buildsys/main/vcl/StaticLibrary_vclmain.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/StaticLibrary_vclmain.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/StaticLibrary_vclmain.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/StaticLibrary_vclmain.mk Fri Oct 5 18:23:17 2012
@@ -23,12 +23,16 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
+$(eval $(call gb_StaticLibrary_add_api,vclmain,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_StaticLibrary_set_include,vclmain,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
))
@@ -42,7 +46,7 @@ $(eval $(call gb_StaticLibrary_add_excep
# Instead of this evil linking of an object from $(OUTDIR)
define StaticLibrary_salmain_hack
$(call gb_StaticLibrary_get_target,vclmain) : $(OUTDIR)/lib/$(1)
-$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,vcl/source/salmain/salmain)))
+$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,vcl/source/salmain/salmain),$(1)))
$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,vcl/source/salmain/salmain)
$$(call gb_Deliver_deliver,$$<,$$@)
Modified: incubator/ooo/branches/buildsys/main/vcl/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/prj/build.lst?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/vcl/prj/build.lst Fri Oct 5 18:23:17 2012
@@ -1,4 +1,4 @@
-vc vcl : L10N:l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc SO:print_header cpputools shell svl LIBXSLT:libxslt NULL
+vc vcl : L10N:l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools l10ntools icc SO:print_header cpputools shell svl LIBXSLT:libxslt NULL
vc vcl usr1 - all vc_mkout NULL
vc vcl\prj nmake - all vc_prj NULL
Modified: incubator/ooo/branches/buildsys/main/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/qa/cppunittests/doctok/testdoctok.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/qa/cppunittests/doctok/testdoctok.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/qa/cppunittests/doctok/testdoctok.cxx Fri Oct 5 18:23:17 2012
@@ -21,229 +21,176 @@
// autogenerated file with codegen.pl
-#include <testshl/simpleheader.hxx>
-
+#include <sal/cppunit.h>
#include <osl/process.h>
-#include <ucbhelper/contentbroker.hxx>
#include <cppuhelper/bootstrap.hxx>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <ucbhelper/contentbroker.hxx>
#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/container/XNameContainer.hpp>
+#include <iostream>
-#include <doctok/exceptions.hxx>
#include <doctok/WW8Document.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
-
-#include <iostream>
namespace testdoctok
{
- using namespace ::std;
- using namespace ::com::sun::star;
- using namespace doctok;
+using namespace ::std;
+using namespace ::com::sun::star;
+using namespace ::writerfilter::doctok;
+
+uno::Reference<io::XInputStream> xStream;
+uno::Reference<uno::XComponentContext> xContext;
+WW8Document::Pointer_t pDocument;
+uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess;
- uno::Reference<io::XInputStream> xStream;
- uno::Reference<uno::XComponentContext> xContext;
- WW8Document::Pointer_t pDocument;
- uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess;
+class test : public CppUnit::TestFixture
+{
- class test : public CppUnit::TestFixture
+public:
+ // initialise your test code values here.
+ void setUp()
{
+ }
- public:
- // initialise your test code values here.
- void setUp()
- {
- }
-
- void tearDown()
- {
- }
-
- void testInitUno()
- {
- bool bResult = false;
+ void tearDown()
+ {
+ }
- // initialise UCB-Broker
- uno::Reference<uno::XComponentContext>
- xComponentContext
- (::cppu::defaultBootstrap_InitialComponentContext());
- OSL_ASSERT( xComponentContext.is() );
-
- xContext = xComponentContext;
-
- uno::Reference<lang::XMultiComponentFactory>
- xFactory(xComponentContext->getServiceManager() );
- OSL_ASSERT(xFactory.is());
-
- uno::Sequence<uno::Any> aUcbInitSequence(2);
- aUcbInitSequence[0] <<=
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
- aUcbInitSequence[1] <<=
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
-
- uno::Reference<lang::XMultiServiceFactory>
- xServiceFactory(xFactory, uno::UNO_QUERY);
- OSL_ASSERT( xServiceFactory.is() );
+ void testInitUno()
+ {
+ bool bResult = false;
- if (xServiceFactory.is())
- {
- sal_Bool bRet =
- ::ucb::ContentBroker::initialize(xServiceFactory,
- aUcbInitSequence);
+ // initialise UCB-Broker
+ uno::Reference<uno::XComponentContext>
+ xComponentContext
+ (::cppu::defaultBootstrap_InitialComponentContext());
+ OSL_ASSERT( xComponentContext.is() );
+
+ xContext = xComponentContext;
+
+ uno::Reference<lang::XMultiComponentFactory>
+ xFactory(xComponentContext->getServiceManager() );
+ OSL_ASSERT(xFactory.is());
+
+ uno::Sequence<uno::Any> aUcbInitSequence(2);
+ aUcbInitSequence[0] <<=
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
+ aUcbInitSequence[1] <<=
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
+
+ uno::Reference<lang::XMultiServiceFactory>
+ xServiceFactory(xFactory, uno::UNO_QUERY);
+ OSL_ASSERT( xServiceFactory.is() );
+
+ if (xServiceFactory.is())
+ {
+ sal_Bool bRet =
+ ::ucbhelper::ContentBroker::initialize(xServiceFactory,
+ aUcbInitSequence);
+
+ OSL_ASSERT(bRet);
+ if (bRet)
+ {
+ uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >
+ xNameContainer(xFactory->createInstanceWithContext
+ (::rtl::OUString::createFromAscii
+ ("com.sun.star.ucb.SimpleFileAccess" ),
+ xComponentContext), uno::UNO_QUERY );
- OSL_ASSERT(bRet);
- if (bRet)
+ if (xNameContainer.is())
{
- uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >
- xNameContainer(xFactory->createInstanceWithContext
- (::rtl::OUString::createFromAscii
- ("com.sun.star.ucb.SimpleFileAccess" ),
- xComponentContext), uno::UNO_QUERY );
-
- if (xNameContainer.is())
- {
- xSimpleFileAccess = xNameContainer;
+ xSimpleFileAccess = xNameContainer;
- bResult = true;
- }
+ bResult = true;
}
}
-
- CPPUNIT_ASSERT_MESSAGE("UNO initialization failed",
- bResult);
}
- // insert your test code here.
- void testOpenFile()
+ CPPUNIT_ASSERT_MESSAGE("UNO initialization failed",
+ bResult);
+ }
+
+ // insert your test code here.
+ void testOpenFile()
+ {
+ try
{
- try
- {
- rtl_uString *dir=NULL;
- osl_getProcessWorkingDir(&dir);
- rtl_uString *fname=NULL;
- //rtl_uString_newFromAscii(&fname, "/OpenDocument-v1.doc");
- rtl_uString_newFromAscii(&fname, "/test.doc");
- //rtl_uString_newFromAscii(&fname, "/numbers.doc");
- rtl_uString *absfile=NULL;
- rtl_uString_newConcat(&absfile, dir, fname);
+ rtl_uString *dir=NULL;
+ osl_getProcessWorkingDir(&dir);
+ rtl_uString *fname=NULL;
+ //rtl_uString_newFromAscii(&fname, "/OpenDocument-v1.doc");
+ rtl_uString_newFromAscii(&fname, "/test.doc");
+ //rtl_uString_newFromAscii(&fname, "/numbers.doc");
+ rtl_uString *absfile=NULL;
+ rtl_uString_newConcat(&absfile, dir, fname);
- rtl::OUString sInputFileURL( absfile );
+ rtl::OUString sInputFileURL( absfile );
- for (sal_uInt32 n = 0; n < sInputFileURL.getLength(); ++n)
- {
- sal_uChar nC = sInputFileURL[n];
+ for (sal_Int32 n = 0; n < sInputFileURL.getLength(); ++n)
+ {
+ sal_uChar nC = sInputFileURL[n];
- if (nC < 0xff && isprint(nC))
- clog << static_cast<char>(nC);
- else
- clog << ".";
- }
+ if (nC < 0xff && isprint(nC))
+ clog << static_cast<char>(nC);
+ else
+ clog << ".";
+ }
- clog << endl;
+ clog << endl;
- xStream = xSimpleFileAccess->openFileRead(sInputFileURL);
+ xStream = xSimpleFileAccess->openFileRead(sInputFileURL);
- WW8Stream::Pointer_t pStream =
- WW8DocumentFactory::createStream(xContext, xStream);
+ WW8Stream::Pointer_t pStream =
+ WW8DocumentFactory::createStream(xContext, xStream);
- pDocument = WW8DocumentFactory::createDocument(pStream);
- }
- catch (doctok::Exception e)
- {
- clog << "Exception!!" << endl;
- }
-
- CPPUNIT_ASSERT_MESSAGE("creating document failed",
- pDocument != NULL);
-
-#if 1
+ pDocument.reset(WW8DocumentFactory::createDocument(pStream));
}
-
- void testTraversal()
+ catch (writerfilter::Exception e)
{
-#endif
- sal_uInt32 nResult = 0;
-
- try
- {
- WW8DocumentIterator::Pointer_t pIt = pDocument->begin();
- WW8DocumentIterator::Pointer_t pItEnd = pDocument->end();
-
- while (! pIt->equal(*pItEnd))
- {
- pIt->dump(clog);
-
- clog << endl;
-
- WW8PropertySet::Pointer_t pAttrs = pIt->getProperties();
-
- if (pAttrs != NULL)
- {
- pAttrs->dump(clog);
- }
-
- pIt->getText().dump(clog);
- ++(*pIt);
- ++nResult;
- }
- }
- catch (doctok::Exception e)
- {
- clog << "Exception!!" << endl;
- }
-
- char sBuffer[256];
- snprintf(sBuffer, 255, "%d", nResult);
- clog << "Iterator steps:" << sBuffer << endl;
-
- CPPUNIT_ASSERT_MESSAGE("traversing document failed",
- nResult > 0);
+ clog << "Exception!!" << endl;
}
- void testEvents()
+ CPPUNIT_ASSERT_MESSAGE("creating document failed",
+ pDocument != NULL);
+ }
+
+ void testEvents()
+ {
+ try
{
- try
- {
- Stream::Pointer_t pStream = doctok::createStreamHandler();
+ ::writerfilter::Stream::Pointer_t pStream = ::writerfilter::createStreamHandler();
- pDocument->resolve(*pStream);
- }
- catch (doctok::Exception e)
- {
- clog << "Exception!!" << endl;
- }
+ pDocument->resolve(*pStream);
}
-
- void testEnd()
+ catch (writerfilter::Exception e)
{
- ::ucb::ContentBroker::deinitialize();
+ clog << "Exception!!" << endl;
}
+ }
- // Change the following lines only, if you add, remove or rename
- // member functions of the current class,
- // because these macros are need by auto register mechanism.
-
- CPPUNIT_TEST_SUITE(test);
- CPPUNIT_TEST(testInitUno);
- CPPUNIT_TEST(testOpenFile);
- //CPPUNIT_TEST(testTraversal);
- CPPUNIT_TEST(testEvents);
- CPPUNIT_TEST(testEnd);
- CPPUNIT_TEST_SUITE_END();
- }; // class test
+ void testEnd()
+ {
+ ::ucbhelper::ContentBroker::deinitialize();
+ }
+
+ // Change the following lines only, if you add, remove or rename
+ // member functions of the current class,
+ // because these macros are need by auto register mechanism.
+
+ CPPUNIT_TEST_SUITE(test);
+ CPPUNIT_TEST(testInitUno);
+ CPPUNIT_TEST(testOpenFile);
+ CPPUNIT_TEST(testEvents);
+ CPPUNIT_TEST(testEnd);
+ CPPUNIT_TEST_SUITE_END();
+}; // class test
- // -----------------------------------------------------------------------------
- CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(testdoctok::test, "doctok");
+// -----------------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(testdoctok::test, "doctok");
} // namespace doctok
// -----------------------------------------------------------------------------
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx Fri Oct 5 18:23:17 2012
@@ -671,6 +671,78 @@ void lcl_CorrectIndents(PropertySequence
}
+void lcl_CorrectIndents(PropertySequence & aPropSeq)
+{
+ try
+ {
+ uno::Any aAny;
+
+ sal_Int32 nLeftMargin = 0;
+
+#ifdef DEBUG
+ ::std::string aStr(aPropSeq.toString());
+#endif
+
+ aAny = aPropSeq.get(PROP_PARA_LEFT_MARGIN);
+ if (aAny.hasValue())
+ aAny >>= nLeftMargin;
+
+ aAny = aPropSeq.get(PROP_LEFT_BORDER_DISTANCE);
+
+ if (aAny.hasValue())
+ {
+ sal_Int32 nLeftBorderDistance = 0;
+ aAny >>= nLeftBorderDistance;
+ nLeftMargin -= nLeftBorderDistance;
+ aPropSeq.set(PROP_PARA_LEFT_MARGIN, nLeftMargin);
+ }
+
+ aAny = aPropSeq.get(PROP_LEFT_BORDER);
+
+ if (aAny.hasValue())
+ {
+ table::BorderLine aBorderLine;
+ aAny >>= aBorderLine;
+ nLeftMargin -= aBorderLine.OuterLineWidth;
+ aPropSeq.set(PROP_PARA_LEFT_MARGIN, nLeftMargin);
+ }
+
+ sal_Int32 nRightMargin = 0;
+ aAny = aPropSeq.get(PROP_PARA_RIGHT_MARGIN);
+ if (aAny.hasValue())
+ aAny >>= nRightMargin;
+
+ aAny = aPropSeq.get(PROP_RIGHT_BORDER_DISTANCE);
+
+ if (aAny.hasValue())
+ {
+ sal_Int32 nRightBorderDistance = 0;
+ aAny >>= nRightBorderDistance;
+ nRightMargin -= nRightBorderDistance;
+ aPropSeq.set(PROP_PARA_RIGHT_MARGIN, nRightMargin);
+ }
+
+ aAny = aPropSeq.get(PROP_RIGHT_BORDER);
+
+ if (aAny.hasValue())
+ {
+ table::BorderLine aBorderLine;
+ aAny >>= aBorderLine;
+ nRightMargin -= aBorderLine.OuterLineWidth;
+ aPropSeq.set(PROP_PARA_RIGHT_MARGIN, nRightMargin);
+ }
+ }
+ catch (const uno::Exception& rEx)
+ {
+ (void) rEx;
+ }
+ catch (const dmapper::Exception & rEx)
+ {
+ (void) rEx;
+ }
+
+}
+
/*-- 04.01.2008 10:59:19---------------------------------------------------
-----------------------------------------------------------------------*/
@@ -1014,6 +1086,8 @@ void DomainMapper_Impl::finishParagraph(
lcl_CorrectIndents(*pPropSeq);
+ lcl_CorrectIndents(*pPropSeq);
+
uno::Reference< text::XTextRange > xTextRange =
xTextAppend->finishParagraph( pPropSeq->getSequence() );
getTableManager( ).handle(xTextRange);
@@ -1024,6 +1098,7 @@ void DomainMapper_Impl::finishParagraph(
uno::Reference< text::XTextContent > xObj = m_aAnchoredStack.top( );
try
{
+ (void) e;
#if DEBUG
rtl::OUString sText( xTextRange->getString( ) );
#endif
@@ -2354,8 +2429,9 @@ bool lcl_FindInCommand(
}
m_xTextField = uno::Reference< text::XTextField >( xFieldInterface, uno::UNO_QUERY );
}
- catch( uno::Exception& )
+ catch( uno::Exception& e)
{
+ (void) e;
}
}
*/
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/FormControlHelper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/FormControlHelper.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/FormControlHelper.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/FormControlHelper.cxx Fri Oct 5 18:23:17 2012
@@ -146,6 +146,7 @@ FormControlHelper::FormControlHelper(Fie
FormControlHelper::~FormControlHelper()
{
+ (void) rException;
}
bool FormControlHelper::createCheckbox(uno::Reference<text::XTextRange> xTextRange,
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/PropertyIds.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/PropertyIds.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/PropertyIds.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/PropertyIds.cxx Fri Oct 5 18:23:17 2012
@@ -393,7 +393,7 @@ int PropertySequence::getOrCreateIndex(P
return nIndex;
}
-void PropertySequence::set(PropertyIds aPropId, const uno::Any & rValue)
+int PropertySequence::getOrCreateIndex(PropertyIds aPropId)
{
sal_Int32 nIndex = getOrCreateIndex(aPropId);
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/PropertyIds.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/PropertyIds.hxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/PropertyIds.hxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/PropertyIds.hxx Fri Oct 5 18:23:17 2012
@@ -321,6 +321,8 @@ class PropertySequence
int getOrCreateIndex(PropertyIds aId);
+ int getOrCreateIndex(PropertyIds aId);
+
public:
typedef boost::shared_ptr<PropertySequence> Pointer_t;
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/ThemeTable.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/ThemeTable.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/ThemeTable.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/ThemeTable.cxx Fri Oct 5 18:23:17 2012
@@ -29,6 +29,9 @@
#ifdef DEBUG_DMAPPER_THEME_TABLE
#include <resourcemodel/QNameToString.hxx>
#endif
+#ifdef DEBUG_DMAPPER_THEME_TABLE
+#include <resourcemodel/QNameToString.hxx>
+#endif
#include "dmapperLoggers.hxx"
namespace writerfilter {
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8DocumentImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8DocumentImpl.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8DocumentImpl.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8DocumentImpl.cxx Fri Oct 5 18:23:17 2012
@@ -151,6 +151,7 @@ string WW8DocumentIteratorImpl::toString
WW8Document::~WW8Document()
{
+ (void) e;
}
#ifdef DEBUG
@@ -174,6 +175,7 @@ public:
WW8DocumentImpl::~WW8DocumentImpl()
{
+ (void) e;
}
WW8DocumentImpl::WW8DocumentImpl(WW8Stream::Pointer_t rpStream)
@@ -1135,7 +1137,6 @@ writerfilter::Reference<Stream>::Pointer
aCpAndFcEnd = getHeaderCpAndFc(nPos + nEquals);
}
-#endif
if (aCpAndFcStart < aCpAndFcEnd)
pResult = writerfilter::Reference<Stream>::Pointer_t
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx Fri Oct 5 18:23:17 2012
@@ -200,6 +200,7 @@ WW8BinaryObjReference::WW8BinaryObjRefer
(WW8StructBase & rParent, sal_uInt32 nOffset, sal_uInt32 nCount)
: WW8StructBase(rParent, nOffset, nCount)
{
+ (void) e;
}
WW8BinaryObjReference::WW8BinaryObjReference
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx Fri Oct 5 18:23:17 2012
@@ -796,6 +796,7 @@ void OOXMLFastContextHandler::softHyphen
#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("contexthandler.softHyphen");
#endif
+
if (isForwardEvents())
mpStream->utext((const sal_uInt8*)sSoftHyphen, 1);
}
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx Fri Oct 5 18:23:17 2012
@@ -31,6 +31,10 @@
#include "ooxmlLoggers.hxx"
#endif
+#ifdef DEBUG_TOKEN
+#include "ooxmlLoggers.hxx"
+#endif
+
namespace writerfilter {
namespace ooxml
{
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLStreamImpl.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLStreamImpl.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLStreamImpl.cxx Fri Oct 5 18:23:17 2012
@@ -126,6 +126,42 @@ const ::rtl::OUString & OOXMLStreamImpl:
return s.copy(nIndex);
}
+::rtl::OUString lcl_normalizeTarget(const ::rtl::OUString & s)
+{
+ const int nStringsToCut = 2;
+ const ::rtl::OUString aStringToCut[] = {
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("./")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"))
+ };
+
+ bool bDone = false;
+ sal_Int32 nIndex = 0;
+ while (!bDone)
+ {
+ for (int n = 0; n <= nStringsToCut; n++)
+ {
+ if (n == nStringsToCut)
+ {
+ bDone = true;
+ }
+ else
+ {
+ sal_Int32 nNewIndex = s.indexOf(aStringToCut[n], nIndex);
+
+ if (nIndex == nNewIndex)
+ {
+ sal_Int32 nLength = aStringToCut[n].getLength();
+ nIndex += nLength;
+
+ break;
+ }
+ }
+ }
+ }
+
+ return s.copy(nIndex);
+}
+
bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess>
xRelationshipAccess,
StreamType_t nStreamType,
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/TagLogger.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/TagLogger.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/TagLogger.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/TagLogger.cxx Fri Oct 5 18:23:17 2012
@@ -242,6 +242,77 @@ string XMLTag::toTree(const string & sIn
return sResult;
}
+string XMLTag::toTree(const string & sIndent) const
+{
+ if (mChars.length() > 0)
+ return sIndent + mChars;
+
+ string sResult;
+
+ {
+ size_t nSize = sIndent.size();
+ if (nSize > 1)
+ {
+ sResult += sIndent.substr(0, nSize - 2) + "+-\\" + mTag;
+ }
+ else
+ {
+ sResult += "\\" + mTag;
+ }
+ }
+
+ XMLAttributes_t::const_iterator aIt = mAttrs.begin();
+ while (aIt != mAttrs.end())
+ {
+ if (aIt == mAttrs.begin())
+ {
+ sResult += "(";
+ }
+ else
+ {
+ sResult += sIndent + ", ";
+ }
+
+ sResult += aIt->mName;
+ sResult += "=";
+ sResult += aIt->mValue;
+
+ aIt++;
+
+ if (aIt == mAttrs.end())
+ {
+ sResult += ")";
+ }
+ }
+
+ sResult += "\n";
+
+ if (mTags.size() > 0)
+ {
+ XMLTags_t::const_iterator aItTags = mTags.begin();
+ size_t nSize = mTags.size();
+ while (aItTags != mTags.end())
+ {
+ if ((*aItTags).get() != NULL)
+ {
+ if (nSize == 1)
+ {
+ sResult += (*aItTags)->toTree(sIndent + " ");
+ }
+ else
+ {
+ sResult += (*aItTags)->toTree(sIndent + "| ");
+ }
+ }
+
+ aItTags++;
+ nSize--;
+ }
+ }
+
+ return sResult;
+}
+
ostream & XMLTag::output(ostream & o, const string & sIndent) const
{
bool bHasContent = mChars.size() > 0 || mTags.size() > 0;
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/resourcemodel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/resourcemodel.cxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/resourcemodel.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/resourcemodel.cxx Fri Oct 5 18:23:17 2012
@@ -53,6 +53,7 @@ Stream::Pointer_t createStreamHandler()
void dump(OutputWithDepth<string> & /*o*/, const char * /*name*/,
writerfilter::Reference<Properties>::Pointer_t /*props*/)
{
+ output.addItem("<exception>Out Of Bounds</exception>");
}
void dump(OutputWithDepth<string> & o, const char * name, sal_uInt32 n)
@@ -69,11 +70,13 @@ void dump(OutputWithDepth<string> & o, c
void dump(OutputWithDepth<string> & /*o*/, const char * /*name*/,
const rtl::OUString & /*str*/)
{
+ output.addItem("<exception>Out Of Bounds</exception>");
}
void dump(OutputWithDepth<string> & /*o*/, const char * /*name*/,
writerfilter::Reference<BinaryObj>::Pointer_t /*binary*/)
{
+ output.addItem("<exception/>");
}
string gInfo = "";
Modified: incubator/ooo/branches/buildsys/main/xmloff/Library_xo.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmloff/Library_xo.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmloff/Library_xo.mk (original)
+++ incubator/ooo/branches/buildsys/main/xmloff/Library_xo.mk Fri Oct 5 18:23:17 2012
@@ -35,13 +35,17 @@ $(eval $(call gb_Library_set_include,xo,
-I$(SRCDIR)/xmloff/inc \
-I$(SRCDIR)/xmloff/source/inc \
-I$(SRCDIR)/xmloff/inc/pch \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_defs,xo,\
-DXMLOFF_DLLIMPLEMENTATION \
))
+$(eval $(call gb_Library_add_api,xo,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,xo,\
basegfx \
comphelper \
Modified: incubator/ooo/branches/buildsys/main/xmloff/Library_xof.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmloff/Library_xof.mk?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmloff/Library_xof.mk (original)
+++ incubator/ooo/branches/buildsys/main/xmloff/Library_xof.mk Fri Oct 5 18:23:17 2012
@@ -30,7 +30,11 @@ $(eval $(call gb_Library_set_include,xof
-I$(SRCDIR)/xmloff/inc \
-I$(SRCDIR)/xmloff/source/inc \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,xof,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_add_linked_libs,xof,\
Modified: incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xml_helper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xml_helper.hxx?rev=1394707&r1=1394706&r2=1394707&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xml_helper.hxx (original)
+++ incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xml_helper.hxx Fri Oct 5 18:23:17 2012
@@ -19,6 +19,7 @@
*
*************************************************************/
+#include "xmlscript/xcrdllapi.h"
#ifndef _XMLSCRIPT_XML_HELPER_HXX_
#define _XMLSCRIPT_XML_HELPER_HXX_