Modified: openoffice/trunk/main/canvas/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/canvas/prj/build.lst (original)
+++ openoffice/trunk/main/canvas/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,10 +1,2 @@
-cv     canvas  :       javaunohelper comphelper cppuhelper offuh unoil tools 
svtools vcl basegfx CAIRO:cairo LIBXSLT:libxslt NULL
-cv     canvas                                                                  
                 usr1   -       all     cv_mkout NULL
-cv     canvas\inc                                                              
                 nmake  -       all     cv_inc NULL
-cv     canvas\source\tools                                                     
         nmake  -       all cv_tools cv_inc NULL
-cv     canvas\source\vcl                                                       
         nmake  -       all     cv_vcl cv_tools cv_inc NULL
-cv     canvas\source\simplecanvas                                              
 nmake  -       all     cv_simplecanvas cv_tools cv_inc NULL
-cv     canvas\source\cairo                                                     
         nmake  -       all     cv_cairo cv_tools cv_inc NULL
-cv     canvas\source\directx                                                   
 nmake  -       w       cv_directx cv_tools cv_inc NULL
-cv     canvas\source\null                                                      
         nmake  -       all     cv_null cv_tools cv_inc NULL
-cv     canvas\source\factory                                                   
 nmake  -       all cv_factory cv_inc NULL
+cv     canvas  :       javaunohelper comphelper cppuhelper offapi unoil tools 
svtools vcl basegfx CAIRO:cairo LIBXSLT:libxslt NULL
+cv     canvas\prj                                                              
                 nmake  -       all     cv_prj NULL

Modified: openoffice/trunk/main/canvas/prj/d.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/prj/d.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/canvas/prj/d.lst (original)
+++ openoffice/trunk/main/canvas/prj/d.lst Sun Aug  7 19:24:03 2016
@@ -1,34 +0,0 @@
-..\%__SRC%\bin\canvasto*.dll %_DEST%\bin%_EXT%\canvasto*.dll
-..\%__SRC%\bin\cairocan*.dll %_DEST%\bin%_EXT%\cairocan*.dll
-..\%__SRC%\bin\directx*.dll  %_DEST%\bin%_EXT%\directx*.dll
-..\%__SRC%\bin\gdiplus*.dll  %_DEST%\bin%_EXT%\gdiplus*.dll
-..\%__SRC%\bin\vclcanva*.dll %_DEST%\bin%_EXT%\vclcanva*.dll
-..\%__SRC%\bin\nullcanv*.dll %_DEST%\bin%_EXT%\nullcanv*.dll
-..\%__SRC%\bin\simpleca*.dll %_DEST%\bin%_EXT%\simpleca*.dll
-..\%__SRC%\bin\canvasfa*.dll %_DEST%\bin%_EXT%\canvasfa*.dll
-..\%__SRC%\lib\icanvastools.lib %_DEST%\lib%_EXT%\icanvastools.lib
-..\%__SRC%\lib\canvastools.lib %_DEST%\lib%_EXT%\canvastools.lib
-..\%__SRC%\lib\libcanvastools*.so %_DEST%\lib%_EXT%\
-..\%__SRC%\lib\cairocanvas.uno.so %_DEST%\lib%_EXT%\cairocanvas.uno.so
-..\%__SRC%\lib\vclcanvas.uno.so %_DEST%\lib%_EXT%\vclcanvas.uno.so
-..\%__SRC%\lib\nullcanvas.uno.so %_DEST%\lib%_EXT%\nullcanvas.uno.so
-..\%__SRC%\lib\simplecanvas.uno.so %_DEST%\lib%_EXT%\simplecanvas.uno.so
-..\%__SRC%\lib\canvasfactory.uno.so %_DEST%\lib%_EXT%\canvasfactory.uno.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\class\javacanvas.uno.jar %_DEST%\bin%_EXT%\javacanvas.uno.jar
-..\%__SRC%\misc\cairocanvas.component %_DEST%\xml%_EXT%\cairocanvas.component
-
-mkdir: %_DEST%\inc%_EXT%\canvas\base
-..\inc\canvas\base\*.hxx %_DEST%\inc%_EXT%\canvas\base\*.hxx
-
-mkdir: %_DEST%\inc%_EXT%\canvas\rendering
-..\inc\canvas\rendering\*.hxx %_DEST%\inc%_EXT%\canvas\rendering\*.hxx
-
-mkdir: %_DEST%\inc%_EXT%\canvas
-..\inc\canvas\*.hxx %_DEST%\inc%_EXT%\canvas\*.hxx
-..\%__SRC%\misc\canvasfactory.component 
%_DEST%\xml%_EXT%\canvasfactory.component
-..\%__SRC%\misc\directx5canvas.component 
%_DEST%\xml%_EXT%\directx5canvas.component
-..\%__SRC%\misc\directx9canvas.component 
%_DEST%\xml%_EXT%\directx9canvas.component
-..\%__SRC%\misc\gdipluscanvas.component 
%_DEST%\xml%_EXT%\gdipluscanvas.component
-..\%__SRC%\misc\simplecanvas.component %_DEST%\xml%_EXT%\simplecanvas.component
-..\%__SRC%\misc\vclcanvas.component %_DEST%\xml%_EXT%\vclcanvas.component

Modified: openoffice/trunk/main/canvas/source/factory/cf_service.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/source/factory/cf_service.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/canvas/source/factory/cf_service.cxx (original)
+++ openoffice/trunk/main/canvas/source/factory/cf_service.cxx Sun Aug  7 
19:24:03 2016
@@ -522,13 +522,13 @@ const ::cppu::ImplementationEntry s_entr
 
 extern "C" {
 
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     sal_Char const * pImplName,
     lang::XMultiServiceFactory * pServiceManager,
     registry::XRegistryKey * pRegistryKey )

Modified: openoffice/trunk/main/chart2/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/chart2/prj/build.lst (original)
+++ openoffice/trunk/main/chart2/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,4 +1,4 @@
-ch     chart2  :    offapi offuh L10N:l10n comphelper cppu cppuhelper sal 
svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL
+ch     chart2  :    offapi offapi L10N:l10n comphelper cppu cppuhelper sal 
svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL
 ch     chart2                                                                  
        usr1    -       all     ch_mkout NULL
 ch     chart2\inc                                                              
        nmake   -       all     ch_inc NULL
 ch     chart2\source\inc                                                       
get             -       all     ch_source_inc NULL

Modified: openoffice/trunk/main/codemaker/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/codemaker/prj/build.lst (original)
+++ openoffice/trunk/main/codemaker/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,4 +1,4 @@
-cm     codemaker       :       udkapi NULL
+cm     codemaker       :       registry NULL
 cm     codemaker                                                               
usr1    -       all     cm_mkout NULL
 cm     codemaker\inc                                                   nmake   
-       all     cm_inc NULL
 cm     codemaker\prj                                                   get     
        -       all     cm_prj NULL

Modified: openoffice/trunk/main/comphelper/GoogleTest_comphelper_string.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/comphelper/GoogleTest_comphelper_string.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/comphelper/GoogleTest_comphelper_string.mk (original)
+++ openoffice/trunk/main/comphelper/GoogleTest_comphelper_string.mk Sun Aug  7 
19:24:03 2016
@@ -40,12 +40,11 @@ $(eval $(call gb_GoogleTest_set_include,
        $$(INCLUDE) \
        -I$(SRCDIR)/formula/inc \
        -I$(SRCDIR)/comphelper/inc/pch \
-       -I$(OUTDIR)/inc/offuh \
        -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_GoogleTest_set_ldflags,comphelper_string,\
-    $$(LDFLAGS) \
+$(eval $(call gb_GoogleTest_add_api,comphelper_string,\
+       udkapi \
 ))
 
 # vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/comphelper/GoogleTest_comphelper_weakbag.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/comphelper/GoogleTest_comphelper_weakbag.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/comphelper/GoogleTest_comphelper_weakbag.mk (original)
+++ openoffice/trunk/main/comphelper/GoogleTest_comphelper_weakbag.mk Sun Aug  
7 19:24:03 2016
@@ -39,12 +39,11 @@ $(eval $(call gb_GoogleTest_set_include,
        $$(INCLUDE) \
        -I$(SRCDIR)/formula/inc \
        -I$(SRCDIR)/comphelper/inc/pch \
-       -I$(OUTDIR)/inc/offuh \
        -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_GoogleTest_set_ldflags,comphelper_weakbag,\
-    $$(LDFLAGS) \
+$(eval $(call gb_GoogleTest_add_api,comphelper_weakbag,\
+       udkapi \
 ))
 
 # vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/comphelper/JunitTest_comphelper_complex.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/comphelper/JunitTest_comphelper_complex.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/comphelper/JunitTest_comphelper_complex.mk (original)
+++ openoffice/trunk/main/comphelper/JunitTest_comphelper_complex.mk Sun Aug  7 
19:24:03 2016
@@ -21,7 +21,7 @@
 
 
 
-$(eval $(call gb_JunitTest_JunitTest,comphelper_complex))
+$(eval $(call gb_JunitTest_JunitTest,comphelper_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\
        comphelper/qa/complex/comphelper/Map \

Modified: openoffice/trunk/main/comphelper/Library_comphelp.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/comphelper/Library_comphelp.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/comphelper/Library_comphelp.mk (original)
+++ openoffice/trunk/main/comphelper/Library_comphelp.mk Sun Aug  7 19:24:03 
2016
@@ -33,11 +33,9 @@ $(eval $(call gb_Library_set_include,com
        -I$(SRCDIR)/comphelper/inc/pch \
        -I$(SRCDIR)/comphelper/source/inc \
        $$(INCLUDE) \
-       -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,comphelper,\
-       $$(DEFS) \
+$(eval $(call gb_Library_add_defs,comphelper,\
        -DCOMPHELPER_DLLIMPLEMENTATION \
 ))
 
@@ -51,6 +49,11 @@ $(eval $(call gb_Library_add_linked_libs
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_api,comphelper,\
+       udkapi \
+       offapi \
+))
+
 $(eval $(call gb_Library_add_exception_objects,comphelper,\
        comphelper/source/compare/AnyCompareFactory \
        comphelper/source/container/IndexedPropertyValuesContainer \

Modified: openoffice/trunk/main/comphelper/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/comphelper/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/comphelper/prj/build.lst (original)
+++ openoffice/trunk/main/comphelper/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,2 +1,2 @@
-ch comphelper : cppuhelper ucbhelper offuh vos salhelper LIBXSLT:libxslt NULL
+ch comphelper : cppuhelper ucbhelper offapi vos salhelper LIBXSLT:libxslt NULL
 ch comphelper\prj nmake - all ch_all NULL

Modified: openoffice/trunk/main/configmgr/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/configmgr/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/configmgr/prj/build.lst (original)
+++ openoffice/trunk/main/configmgr/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,4 +1,4 @@
-cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offuh 
sal salhelper stlport xmlreader NULL
+cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offapi 
sal salhelper stlport xmlreader NULL
 cg configmgr\inc nmake - all cg_inc NULL
 cg configmgr\source nmake - all cg_source cg_inc NULL
 cg configmgr\qa\unoapi nmake - all cg_qa_unoapi NULL

Modified: openoffice/trunk/main/configure.ac
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Sun Aug  7 19:24:03 2016
@@ -2600,107 +2600,6 @@ AC_LANG_POP([C++])
 EXCEPTIONS="$exceptions_type"
 AC_SUBST(EXCEPTIONS)
 
-dnl **************************************************************
-dnl Testing for required  Solaris and SunStudio compiler patches...
-dnl **************************************************************
-dnl Check whether the OS is SunOS.
-if test "$_os" = "SunOS"; then
-   _temp=`showrev -p | $AWK -F" " '{ print $2 }'` 
-   if test "$_os_release" = "7"; then
-      dnl ***************
-      dnl patch 106327-06
-      dnl ***************
-      AC_MSG_CHECKING([for patch 106327-06 or greater])
-      _patch=`echo $_temp | $AWK '/106327-06/ { print "found" }'`
-      _patch="false"
-      for i in $_temp
-      do
-         _patch_major=`echo $i | $AWK -F"-" '{ print $1 }'`
-         if test "$_patch_major" = "106327"; then
-            _patch_rev=`echo $i | $AWK -F"-" '{ print $2 }'`
-            if test "$_patch_rev" -ge "6"; then
-               _patch="found"
-            fi
-        fi
-      done
-      if test "$_patch" = "found"; then
-         AC_MSG_RESULT([found])
-      else
-         AC_MSG_WARN([patch 106327-06 not found, please install compiler patch 
106327-06 or greater])
-         echo "patch 106327-06 not found, please install compiler patch 
106327-06 or greater" >> warn
-      fi
-      dnl ***************
-      dnl patch 106950-11
-      dnl ***************
-      AC_MSG_CHECKING([for patch 106950-11 or greater])
-      _patch=`echo $_temp | $AWK '/106950-11/ { print "found" }'`
-      _patch="false"
-      for i in $_temp
-      do
-         _patch_major=`echo $i | $AWK -F"-" '{ print $1 }'`
-         if test "$_patch_major" = "106950"; then
-            _patch_rev=`echo $i | $AWK -F"-" '{ print $2 }'`
-            if test "$_patch_rev" -ge "11"; then
-               _patch="found"
-            fi
-         fi
-      done
-      if test "$_patch" = "found"; then
-         AC_MSG_RESULT([found])
-      else
-         AC_MSG_WARN([patch 106950-11 not found, please install linker patch 
106950-11 or greater])
-         echo "patch 106950-11 not found, please install linker patch 
106950-11 or greater" >> warn
-      fi
-   else
-      if test "$_os_release" = "6"; then
-         dnl ***************
-         dnl patch 105591-09
-         dnl ***************
-         AC_MSG_CHECKING([for patch 105591-09 or greater])
-         _patch=`echo $_temp | $AWK '/105591-09/ { print "found" }'`
-         _patch="false"
-         for i in $_temp
-         do
-            _patch_major=`echo $i | $AWK -F"-" '{ print $1 }'`
-            if test "$_patch_major" = "105591"; then
-               _patch_rev=`echo $i | $AWK -F"-" '{ print $2 }'`
-               if test "$_patch_rev" -ge "9"; then
-                  _patch="found"
-               fi
-           fi
-         done
-         if test "$_patch" = "found"; then
-            AC_MSG_RESULT([found])
-         else
-            AC_MSG_WARN([patch 105591-09 not found, please install compiler 
patch 105591-09 or greater])
-            echo "patch 105591-09 not found, please install compiler patch 
105591-09 or greater" >> warn
-         fi
-         dnl ***************
-         dnl patch 107733-08
-         dnl ***************
-         AC_MSG_CHECKING([for patch 107733-08 or greater])
-         _patch=`echo $_temp | $AWK '/107733-08/ { print "found" }'`
-         _patch="false"
-         for i in $_temp
-         do
-            _patch_major=`echo $i | $AWK -F"-" '{ print $1 }'`
-            if test "$_patch_major" = "107733"; then
-               _patch_rev=`echo $i | $AWK -F"-" '{ print $2 }'`
-               if test "$_patch_rev" -ge "8"; then
-                  _patch="found"
-               fi
-           fi
-         done
-         if test "$_patch" = "found"; then
-            AC_MSG_RESULT([found])
-         else
-            AC_MSG_WARN([patch 107733-06 not found, please install linker 
patch 107733-08 or greater])
-            echo "patch 107733-06 not found, please install linker patch 
107733-08 or greater" >> warn
-         fi
-      fi
-   fi
-fi
-
 dnl ===================================================================
 dnl Checks for what the default STL should be
 dnl ===================================================================
@@ -3667,7 +3566,7 @@ if test "z$enable_odk" = "z" -o "$enable
          AC_MSG_RESULT(yes)
       fi
       if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
-         if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e 
s/c++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo 
$WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/)); fi
+         if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e 
s/c++/strip/`"; then MINGWSTRIP=false; else MINGWSTRIP=$(basename $(echo 
$WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/)); fi
       else
          AC_CHECK_TOOL(MINGWSTRIP, `echo $WITH_MINGWIN | $SED -e s/g++/strip/ 
| $SED -e s/c++/strip/`, false)
       fi
@@ -5675,6 +5574,9 @@ dnl ====================================
 if test -z "$ZIP" -o -z "$UNZIP"; then
     AC_MSG_ERROR([Zip/Unzip are required to build, please install or use 
--with-zip-home],,)
 fi
+if "$ZIP" -FS < /dev/null 2>&1 | $EGREP "no such option: S" > /dev/null; then
+    AC_MSG_ERROR([Zip version 3.0 or newer is required to build, please 
install or use --with-zip-home],,)
+fi
 
 dnl ===================================================================
 dnl Zip must be a specific type for different build types.

Modified: openoffice/trunk/main/connectivity/source/cpool/Zregistration.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/cpool/Zregistration.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/cpool/Zregistration.cxx (original)
+++ openoffice/trunk/main/connectivity/source/cpool/Zregistration.cxx Sun Aug  
7 19:24:03 2016
@@ -40,13 +40,13 @@ extern "C"
 {
 
 
//---------------------------------------------------------------------------------------
-       void SAL_CALL component_getImplementationEnvironment(const sal_Char** 
_ppEnvTypeName, uno_Environment** /*_ppEnv*/)
+       SAL_DLLPUBLIC_EXPORT void SAL_CALL 
component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, 
uno_Environment** /*_ppEnv*/)
 {
        *_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
 
//---------------------------------------------------------------------------------------
-void* SAL_CALL component_getFactory(const sal_Char* _pImplName, 
::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* 
/*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* 
_pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, 
void* /*_pRegistryKey*/)
 {
        void* pRet = NULL;
 

Modified: openoffice/trunk/main/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppcanvas/inc/cppcanvas/basegfxfactory.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/cppcanvas/inc/cppcanvas/basegfxfactory.hxx (original)
+++ openoffice/trunk/main/cppcanvas/inc/cppcanvas/basegfxfactory.hxx Sun Aug  7 
19:24:03 2016
@@ -34,6 +34,7 @@
 #include <cppcanvas/sprite.hxx>
 #include <basegfx/vector/b2isize.hxx>
 
+#include <cppcanvas/cppcanvasdllapi.h>
 
 namespace basegfx
 {
@@ -58,7 +59,7 @@ namespace cppcanvas
         only be drawn on exactly that canvas. You have to regenerate
         them for different canvases.
      */
-    class BaseGfxFactory
+    class CPPCANVAS_DLLPUBLIC BaseGfxFactory
     {
     public:
         static BaseGfxFactory& getInstance();

Modified: openoffice/trunk/main/cppcanvas/inc/cppcanvas/vclfactory.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppcanvas/inc/cppcanvas/vclfactory.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/cppcanvas/inc/cppcanvas/vclfactory.hxx (original)
+++ openoffice/trunk/main/cppcanvas/inc/cppcanvas/vclfactory.hxx Sun Aug  7 
19:24:03 2016
@@ -33,6 +33,7 @@
 #include <cppcanvas/text.hxx>
 #include <cppcanvas/sprite.hxx>
 
+#include <cppcanvas/cppcanvasdllapi.h>
 
 class Window;
 class Bitmap;
@@ -66,7 +67,7 @@ namespace cppcanvas
         only be drawn on exactly that canvas. You have to regenerate
         them for different canvases.
      */
-    class VCLFactory
+    class CPPCANVAS_DLLPUBLIC VCLFactory
     {
     public:
         static VCLFactory& getInstance();

Modified: openoffice/trunk/main/cppcanvas/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppcanvas/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/cppcanvas/prj/build.lst (original)
+++ openoffice/trunk/main/cppcanvas/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,7 +1,2 @@
-cx     cppcanvas       :       comphelper cppuhelper offuh tools vcl basegfx 
canvas NULL
-cx     cppcanvas                                                       usr1    
-       all     cx_mkout NULL
-cx     cppcanvas\inc                                           nmake   -       
all     cx_inc NULL
-cx     cppcanvas\source\tools                          nmake   -       all     
cx_tools cx_inc NULL
-cx     cppcanvas\source\wrapper                        nmake   -       all 
cx_wrapper cx_inc NULL
-cx     cppcanvas\source\mtfrenderer            nmake   -       all     
cx_mtfrenderer cx_inc NULL
-cx     cppcanvas\util                                          nmake   -       
all     cx_util cx_tools cx_wrapper cx_mtfrenderer NULL
+cx     cppcanvas       :       comphelper cppuhelper offapi tools vcl basegfx 
canvas NULL
+cx     cppcanvas\prj                                           nmake   -       
all     cx_prj NULL

Modified: openoffice/trunk/main/cppcanvas/prj/d.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppcanvas/prj/d.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/cppcanvas/prj/d.lst (original)
+++ openoffice/trunk/main/cppcanvas/prj/d.lst Sun Aug  7 19:24:03 2016
@@ -1,20 +0,0 @@
-..\%__SRC%\bin\cppcanv*.dll %_DEST%\bin%_EXT%\cppcanv*.dll
-..\%__SRC%\lib\icppcanvas.lib %_DEST%\lib%_EXT%\icppcanvas.lib
-..\%__SRC%\lib\cppcanvas.lib %_DEST%\lib%_EXT%\cppcanvas.lib
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-
-mkdir: %_DEST%\inc%_EXT%\cppcanvas
-..\inc\cppcanvas\bitmap.hxx %_DEST%\inc%_EXT%\cppcanvas\bitmap.hxx
-..\inc\cppcanvas\bitmapcanvas.hxx %_DEST%\inc%_EXT%\cppcanvas\bitmapcanvas.hxx
-..\inc\cppcanvas\canvas.hxx %_DEST%\inc%_EXT%\cppcanvas\canvas.hxx
-..\inc\cppcanvas\canvasgraphic.hxx 
%_DEST%\inc%_EXT%\cppcanvas\canvasgraphic.hxx
-..\inc\cppcanvas\color.hxx %_DEST%\inc%_EXT%\cppcanvas\color.hxx
-..\inc\cppcanvas\customsprite.hxx %_DEST%\inc%_EXT%\cppcanvas\customsprite.hxx
-..\inc\cppcanvas\font.hxx %_DEST%\inc%_EXT%\cppcanvas\font.hxx
-..\inc\cppcanvas\polypolygon.hxx %_DEST%\inc%_EXT%\cppcanvas\polypolygon.hxx
-..\inc\cppcanvas\renderer.hxx %_DEST%\inc%_EXT%\cppcanvas\renderer.hxx
-..\inc\cppcanvas\sprite.hxx %_DEST%\inc%_EXT%\cppcanvas\sprite.hxx
-..\inc\cppcanvas\spritecanvas.hxx %_DEST%\inc%_EXT%\cppcanvas\spritecanvas.hxx
-..\inc\cppcanvas\text.hxx %_DEST%\inc%_EXT%\cppcanvas\text.hxx
-..\inc\cppcanvas\vclfactory.hxx %_DEST%\inc%_EXT%\cppcanvas\vclfactory.hxx
-..\inc\cppcanvas\basegfxfactory.hxx 
%_DEST%\inc%_EXT%\cppcanvas\basegfxfactory.hxx

Modified: openoffice/trunk/main/cppu/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/cppu/prj/build.lst (original)
+++ openoffice/trunk/main/cppu/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,4 +1,4 @@
-cu     cppu    :       sal salhelper offuh BOOST:boost NULL
+cu     cppu    :       sal salhelper offapi BOOST:boost NULL
 cu     cppu                                                    usr1    -       
all     cu_mkout NULL
 cu     cppu\inc                                                nmake   -       
all     cu_inc NULL
 cu     cppu\source\uno                                 nmake   -       all     
cu_uno cu_inc NULL

Modified: openoffice/trunk/main/cppuhelper/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/prj/build.lst (original)
+++ openoffice/trunk/main/cppuhelper/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,4 +1,4 @@
-ch     cppuhelper      :       BOOST:boost LIBXSLT:libxslt codemaker cppu 
offuh NULL
+ch     cppuhelper      :       BOOST:boost LIBXSLT:libxslt codemaker cppu 
offapi NULL
 ch     cppuhelper                                                              
usr1    -       all     ch_mkout NULL
 ch     cppuhelper\inc                                                  nmake   
-       all     ch_include NULL
 ch     cppuhelper\source                                               nmake   
-       all     ch_source ch_unotypes ch_include NULL

Modified: openoffice/trunk/main/cpputools/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cpputools/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/cpputools/prj/build.lst (original)
+++ openoffice/trunk/main/cpputools/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,4 +1,4 @@
-pt     cpputools       :       cppuhelper offuh LIBXML2:libxml2 NULL
+pt     cpputools       :       cppuhelper offapi LIBXML2:libxml2 NULL
 pt     cpputools                                                               
usr1    -       all     pt_mkout NULL
 pt     cpputools\prj                                                   get     
        -       all     pt_prj NULL
 pt     cpputools\source\registercomponent              nmake   -       all     
pt_regcomp NULL

Modified: openoffice/trunk/main/cui/source/customize/cfg.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/customize/cfg.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/cui/source/customize/cfg.cxx (original)
+++ openoffice/trunk/main/cui/source/customize/cfg.cxx Sun Aug  7 19:24:03 2016
@@ -57,7 +57,7 @@
 #include <svl/stritem.hxx>
 #include <svtools/miscopt.hxx>
 #include <tools/diagnose_ex.h>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <algorithm>
 //add

Modified: openoffice/trunk/main/cui/source/dialogs/hlmarkwn.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/dialogs/hlmarkwn.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/cui/source/dialogs/hlmarkwn.cxx (original)
+++ openoffice/trunk/main/cui/source/dialogs/hlmarkwn.cxx Sun Aug  7 19:24:03 
2016
@@ -40,7 +40,7 @@
 #include <com/sun/star/document/XLinkTargetSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <cuires.hrc>
 #include "hlmarkwn.hrc"

Modified: openoffice/trunk/main/dbaccess/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/prj/build.lst (original)
+++ openoffice/trunk/main/dbaccess/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,33 +1,2 @@
 ba      dbaccess        :       L10N:l10n BOOST:boost connectivity svx stoc 
qadevOOo xmlscript LIBXSLT:libxslt NULL
-ba     dbaccess                                                                
usr1    -       all     ba_mkout NULL
-ba     dbaccess\inc                                                    nmake   
-       all     ba_inc NULL
-ba     dbaccess\source\ui\inc                                  nmake   -       
all     ba_uiinc ba_inc NULL
-ba     dbaccess\source\core\api                                nmake   -       
all     ba_capi ba_inc NULL
-ba     dbaccess\source\core\dataaccess                 nmake   -       all     
ba_cdaccess ba_inc NULL
-ba     dbaccess\source\core\recovery           nmake   -       all     
ba_crecovery ba_inc NULL
-ba     dbaccess\source\core\misc                               nmake   -       
all     ba_cmisc ba_inc NULL
-ba     dbaccess\source\core\resource                   nmake   -       all     
ba_cres ba_inc NULL
-ba     dbaccess\source\filter\xml                              nmake   -       
all     ba_ffilter ba_shared ba_util ba_inc NULL
-ba     dbaccess\source\shared                                  nmake   -       
all     ba_shared ba_cres ba_inc NULL
-ba  dbaccess\source\sdbtools\connection     nmake   -   all ba_conntools 
ba_inc NULL
-ba  dbaccess\source\sdbtools\misc           nmake   -   all ba_misctools 
ba_inc NULL
-ba  dbaccess\source\sdbtools\resource       nmake   -   all ba_miscres ba_inc 
NULL
-ba  dbaccess\source\ext\macromigration      nmake   -   all ba_extmm ba_inc 
NULL
-ba  dbaccess\source\ext\adabas                         nmake   -   all 
ba_ext_adabasui ba_inc NULL
-ba     dbaccess\source\ui\app                                  nmake   -       
all     ba_uiapp ba_uiinc ba_inc NULL
-ba     dbaccess\source\ui\browser                              nmake   -       
all     ba_uibrowser ba_uiinc ba_inc NULL
-ba     dbaccess\source\ui\dlg                                  nmake   -       
all     ba_uidlg ba_uiinc ba_inc NULL
-ba     dbaccess\source\ui\control                              nmake   -       
all     ba_uicontrol ba_uiinc ba_inc NULL
-ba     dbaccess\source\ui\misc                                 nmake   -       
all     ba_uimisc ba_inc NULL
-ba     dbaccess\source\ui\querydesign                  nmake   -       all     
ba_uiquery ba_uiinc ba_inc NULL
-ba     dbaccess\source\ui\relationdesign               nmake   -       all     
ba_uirelationdesign ba_uiinc ba_inc NULL
-ba     dbaccess\source\ui\tabledesign                  nmake   -       all     
ba_uitabledesign ba_uiinc ba_inc NULL
-ba     dbaccess\source\ui\uno                                  nmake   -       
all     ba_uiuno ba_inc NULL
-ba     dbaccess\source\ui\imagelists                   nmake   -       all     
ba_uiimglst ba_inc NULL
-ba  dbaccess\util                           nmake   -   all ba_util 
ba_uiimglst ba_capi ba_cdaccess ba_cmisc ba_crecovery ba_shared ba_uibrowser 
ba_uiapp ba_uicontrol ba_uidlg ba_uimisc ba_uiquery ba_uitabledesign 
ba_uirelationdesign ba_uiuno ba_conntools ba_misctools ba_miscres 
ba_ext_adabasui NULL
-ba  dbaccess\win32\source\odbcconfig        nmake   -   w ba_odbcconfig ba_inc 
NULL
-ba dbaccess\qa\unoapi nmake - all ba_q_unoapi NULL
-
-# complex tests doesn't work
-# ba dbaccess\qa\complex\dbaccess           nmake   -   all ba_qa_complex NULL
-
+ba     dbaccess\prj nmake - all ba_prj   NULL

Modified: openoffice/trunk/main/dbaccess/prj/d.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/prj/d.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/prj/d.lst (original)
+++ openoffice/trunk/main/dbaccess/prj/d.lst Sun Aug  7 19:24:03 2016
@@ -1,60 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbapp
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbbrowser
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbtdata
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbquery
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbrelation
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbtable
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbapp\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbapp\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbapp\statusbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbbrowser\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbbrowser\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbtdata\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbtdata\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbquery\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbquery\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbrelation\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbrelation\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbtable\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbtable\toolbar
-
-mkdir: %_DEST%\inc%_EXT%\dbaccess
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
-..\%__SRC%\lib\idbu* %_DEST%\lib%_EXT%\idbu*
-..\%__SRC%\lib\db?.lib %_DEST%\lib%_EXT%\db?.lib
-*.xml %_DEST%\xml%_EXT%\*.xml
-
-touch: ..\%__SRC%\misc\dbaccess.hid %_DEST%\bin%_EXT%\dba.hid
-
-..\uiconfig\dbapp\menubar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\dbapp\menubar\*.xml
-..\uiconfig\dbtdata\menubar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\dbtdata\menubar\*.xml
-..\uiconfig\dbquery\menubar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\dbquery\menubar\*.xml
-..\uiconfig\dbrelation\menubar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\dbrelation\menubar\*.xml
-..\uiconfig\dbtable\menubar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\dbtable\menubar\*.xml
-..\uiconfig\dbapp\toolbar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\dbapp\toolbar\*.xml
-..\uiconfig\dbapp\statusbar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\dbapp\statusbar\*.xml
-..\uiconfig\dbbrowser\menubar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\dbbrowser\menubar\*.xml
-..\uiconfig\dbbrowser\toolbar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\dbbrowser\toolbar\*.xml
-..\uiconfig\dbtdata\toolbar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\dbtdata\toolbar\*.xml
-..\uiconfig\dbquery\toolbar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\dbquery\toolbar\*.xml
-..\uiconfig\dbrelation\toolbar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\dbrelation\toolbar\*.xml
-..\uiconfig\dbtable\toolbar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\dbtable\toolbar\*.xml
-..\inc\*.hxx %_DEST%\inc%_EXT%\dbaccess\*.hxx
-..\inc\*.h %_DEST%\inc%_EXT%\dbaccess\*.h
-
-..\%__SRC%\misc\adabasui.component %_DEST%\xml%_EXT%\adabasui.component
-..\%__SRC%\misc\dba.component %_DEST%\xml%_EXT%\dba.component
-..\%__SRC%\misc\dbaxml.component %_DEST%\xml%_EXT%\dbaxml.component
-..\%__SRC%\misc\dbmm.component %_DEST%\xml%_EXT%\dbmm.component
-..\%__SRC%\misc\dbu.component %_DEST%\xml%_EXT%\dbu.component
-..\%__SRC%\misc\sdbt.component %_DEST%\xml%_EXT%\sdbt.component

Modified: openoffice/trunk/main/dbaccess/qa/unoapi/Test.java
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/qa/unoapi/Test.java?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/qa/unoapi/Test.java (original)
+++ openoffice/trunk/main/dbaccess/qa/unoapi/Test.java Sun Aug  7 19:24:03 2016
@@ -25,6 +25,7 @@ package org.openoffice.dbaccess.qa.unoap
 
 import org.openoffice.Runner;
 import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
 import static org.junit.Assert.*;
 
 public final class Test {
@@ -41,9 +42,11 @@ public final class Test {
     @org.junit.Test public void test() {
         assertTrue(
             Runner.run(
-                "-sce", "dbaccess.sce", "-xcl", "knownissues.xcl", "-ini",
-                "dbaccess.props", "-tdoc", "testdocuments", "-cs",
-                connection.getDescription()));
+                "-sce", Argument.get("sce"),
+                "-xcl", Argument.get("xcl"),
+                "-ini", Argument.get("ini"),
+                "-tdoc", Argument.get("tdoc"),
+                "-cs", connection.getDescription()));
     }
 
     private final OfficeConnection connection = new OfficeConnection();

Modified: openoffice/trunk/main/dbaccess/source/core/api/BookmarkSet.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/core/api/BookmarkSet.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/core/api/BookmarkSet.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/core/api/BookmarkSet.cxx Sun Aug  7 
19:24:03 2016
@@ -23,21 +23,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
-#ifndef DBACCESS_CORE_API_BOOKMARKSET_HXX
 #include "BookmarkSet.hxx"
-#endif
-#ifndef _DBA_CORE_RESOURCE_HXX_
 #include "core_resource.hxx"
-#endif
-#ifndef _DBA_CORE_RESOURCE_HRC_
 #include "core_resource.hrc"
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSETUPDATE_HPP_
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#endif
-#ifndef _DBHELPER_DBEXCEPTION_HXX_
 #include <connectivity/dbexception.hxx>
-#endif
 #include <rtl/logfile.hxx>
 
 #include <limits>

Modified: openoffice/trunk/main/dbaccess/source/core/api/CacheSet.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/core/api/CacheSet.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/core/api/CacheSet.hxx (original)
+++ openoffice/trunk/main/dbaccess/source/core/api/CacheSet.hxx Sun Aug  7 
19:24:03 2016
@@ -23,39 +23,18 @@
 #ifndef DBACCESS_CORE_API_CACHESET_HXX
 #define DBACCESS_CORE_API_CACHESET_HXX
 
-#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
 #include <com/sun/star/sdbc/XRow.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATA_HPP_
+#include <com/sun/star/sdbc/XRowUpdate.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_
 #include <com/sun/star/sdbc/XConnection.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XROWLOCATE_HPP_
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XDELETEROWS_HPP_
 #include <com/sun/star/sdbcx/XDeleteRows.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_COMPAREBOOKMARK_HPP_
 #include <com/sun/star/sdbcx/CompareBookmark.hpp>
-#endif
-#ifndef DBACCESS_CORE_API_ROWSETROW_HXX
 #include "RowSetRow.hxx"
-#endif
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
 #include <cppuhelper/implbase1.hxx>
-#endif
 
 #include <list>
 namespace rtl

Modified: 
openoffice/trunk/main/dbaccess/source/core/dataaccess/SharedConnection.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/core/dataaccess/SharedConnection.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/core/dataaccess/SharedConnection.hxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/core/dataaccess/SharedConnection.hxx 
Sun Aug  7 19:24:03 2016
@@ -157,9 +157,6 @@ namespace dbaccess
         virtual ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap(  ) 
throw(::com::sun::star::sdbc::SQLException, 
::com::sun::star::uno::RuntimeException);
        };
        
-#ifdef IMPLEMENT_GET_IMPLEMENTATION_ID
-       IMPLEMENT_GET_IMPLEMENTATION_ID( OSharedConnection );
-#endif
 //........................................................................
 }      // namespace dbaccess
 //........................................................................

Modified: openoffice/trunk/main/dbaccess/source/core/dataaccess/connection.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/core/dataaccess/connection.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/core/dataaccess/connection.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/core/dataaccess/connection.cxx Sun 
Aug  7 19:24:03 2016
@@ -54,6 +54,7 @@
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <rtl/logfile.hxx>
+#include "SharedConnection.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -79,6 +80,9 @@ using ::com::sun::star::sdb::tools::XDat
 namespace dbaccess
 {
 //........................................................................
+#ifdef IMPLEMENT_GET_IMPLEMENTATION_ID
+       IMPLEMENT_GET_IMPLEMENTATION_ID( OSharedConnection );
+#endif
 
 //==========================================================================
 // XServiceInfo

Modified: openoffice/trunk/main/dbaccess/source/ext/adabas/AdabasNewDb.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ext/adabas/AdabasNewDb.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ext/adabas/AdabasNewDb.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ext/adabas/AdabasNewDb.cxx Sun Aug  7 
19:24:03 2016
@@ -71,7 +71,7 @@
 #include <unotools/pathoptions.hxx>
 #endif
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
 #include <com/sun/star/beans/PropertyValue.hpp>

Modified: 
openoffice/trunk/main/dbaccess/source/ext/macromigration/dbmm_module.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ext/macromigration/dbmm_module.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ext/macromigration/dbmm_module.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/ext/macromigration/dbmm_module.cxx 
Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbmm.hxx"
 
 #include "dbmm_module.hxx"
 

Modified: 
openoffice/trunk/main/dbaccess/source/ext/macromigration/dbmm_services.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ext/macromigration/dbmm_services.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ext/macromigration/dbmm_services.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/ext/macromigration/dbmm_services.cxx 
Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbmm.hxx"
 
 #include "dbmm_module.hxx"
 

Modified: 
openoffice/trunk/main/dbaccess/source/ext/macromigration/dbmm_types.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ext/macromigration/dbmm_types.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ext/macromigration/dbmm_types.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/ext/macromigration/dbmm_types.cxx Sun 
Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbmm.hxx"
 
 #include "dbmm_types.hxx"
 

Modified: 
openoffice/trunk/main/dbaccess/source/ext/macromigration/docinteraction.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ext/macromigration/docinteraction.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ext/macromigration/docinteraction.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/ext/macromigration/docinteraction.cxx 
Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbmm.hxx"
 
 #include "docinteraction.hxx"
 

Modified: 
openoffice/trunk/main/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ext/macromigration/macromigrationdialog.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- 
openoffice/trunk/main/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
 (original)
+++ 
openoffice/trunk/main/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
 Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbmm.hxx"
 
 #include "dbmm_global.hrc"
 #include "dbmm_module.hxx"

Modified: 
openoffice/trunk/main/dbaccess/source/ext/macromigration/macromigrationpages.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ext/macromigration/macromigrationpages.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- 
openoffice/trunk/main/dbaccess/source/ext/macromigration/macromigrationpages.cxx
 (original)
+++ 
openoffice/trunk/main/dbaccess/source/ext/macromigration/macromigrationpages.cxx
 Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbmm.hxx"
 
 #include "dbaccess_helpid.hrc"
 #include "dbmm_module.hxx"

Modified: 
openoffice/trunk/main/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ext/macromigration/macromigrationwizard.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- 
openoffice/trunk/main/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
 (original)
+++ 
openoffice/trunk/main/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
 Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbmm.hxx"
 
 #include "dbmm_module.hxx"
 #include "dbmm_global.hrc"

Modified: 
openoffice/trunk/main/dbaccess/source/ext/macromigration/migrationengine.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ext/macromigration/migrationengine.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- 
openoffice/trunk/main/dbaccess/source/ext/macromigration/migrationengine.cxx 
(original)
+++ 
openoffice/trunk/main/dbaccess/source/ext/macromigration/migrationengine.cxx 
Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbmm.hxx"
 
 #include "dbmm_global.hrc"
 #include "dbmm_module.hxx"

Modified: 
openoffice/trunk/main/dbaccess/source/ext/macromigration/migrationlog.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ext/macromigration/migrationlog.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ext/macromigration/migrationlog.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/ext/macromigration/migrationlog.cxx 
Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbmm.hxx"
 
 #include "dbmm_module.hxx"
 #include "dbmm_global.hrc"

Modified: 
openoffice/trunk/main/dbaccess/source/ext/macromigration/progresscapture.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ext/macromigration/progresscapture.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- 
openoffice/trunk/main/dbaccess/source/ext/macromigration/progresscapture.cxx 
(original)
+++ 
openoffice/trunk/main/dbaccess/source/ext/macromigration/progresscapture.cxx 
Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbmm.hxx"
 
 #include "progresscapture.hxx"
 #include "migrationprogress.hxx"

Modified: 
openoffice/trunk/main/dbaccess/source/ext/macromigration/progressmixer.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ext/macromigration/progressmixer.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ext/macromigration/progressmixer.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/ext/macromigration/progressmixer.cxx 
Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbmm.hxx"
 
 #include "progressmixer.hxx"
 

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/dbloader2.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/dbloader2.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/dbloader2.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/dbloader2.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 
 #include "flt_reghelper.hxx"
 #include "xmlstrings.hrc"

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlAutoStyle.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlAutoStyle.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlAutoStyle.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlAutoStyle.cxx Sun Aug  
7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLAUTOSTYLE_HXX 
 #include "xmlAutoStyle.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlColumn.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlColumn.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlColumn.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlColumn.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLCOLUMN_HXX
 #include "xmlColumn.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlComponent.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlComponent.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlComponent.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlComponent.cxx Sun Aug  
7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLCOMPONENT_HXX
 #include "xmlComponent.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlConnectionData.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlConnectionData.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlConnectionData.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlConnectionData.cxx Sun 
Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLCONNECTIONDATA_HXX_INCLUDED
 #include "xmlConnectionData.hxx"
 #endif

Modified: 
openoffice/trunk/main/dbaccess/source/filter/xml/xmlConnectionResource.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlConnectionResource.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlConnectionResource.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlConnectionResource.cxx 
Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED
 #include "xmlConnectionResource.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSource.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSource.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSource.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSource.cxx Sun Aug  
7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLDATASOURCE_HXX
 #include "xmlDataSource.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx Sun 
Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLDATASOURCEINFO_HXX
 #include "xmlDataSourceInfo.hxx"
 #endif

Modified: 
openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx 
Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLDATASOURCESETTING_HXX
 #include "xmlDataSourceSetting.hxx"
 #endif

Modified: 
openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx 
Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLDATASOURCESETTINGS_HXX
 #include "xmlDataSourceSettings.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlDatabase.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlDatabase.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlDatabase.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlDatabase.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #include "xmlDatabase.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>

Modified: 
openoffice/trunk/main/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx 
Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED
 #include "xmlDatabaseDescription.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlDocuments.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlDocuments.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlDocuments.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlDocuments.cxx Sun Aug  
7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLDOCUMENTS_HXX
 #include "xmlDocuments.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlExport.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlExport.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlExport.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlExport.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 
 #include "xmlExport.hxx"
 #include "xmlAutoStyle.hxx"

Modified: 
openoffice/trunk/main/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx 
Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED
 #include "xmlFileBasedDatabase.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlHelper.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlHelper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlHelper.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlHelper.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLHELPER_HXX
 #include "xmlHelper.hxx"
 #endif

Modified: 
openoffice/trunk/main/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx 
Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLHIERARCHYCOLLECTION_HXX
 #include "xmlHierarchyCollection.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlLogin.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlLogin.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlLogin.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlLogin.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLLOGIN_HXX
 #include "xmlLogin.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlQuery.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlQuery.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlQuery.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlQuery.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLQUERY_HXX
 #include "xmlQuery.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlServerDatabase.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlServerDatabase.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlServerDatabase.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlServerDatabase.cxx Sun 
Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLSERVERDATABASE_HXX_INCLUDED
 #include "xmlServerDatabase.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlStyleImport.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlStyleImport.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlStyleImport.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlStyleImport.cxx Sun Aug 
 7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 
 #ifndef DBA_XMLSTYLEIMPORT_HXX
 #include "xmlStyleImport.hxx"

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlTable.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlTable.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlTable.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlTable.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLTABLE_HXX
 #include "xmlTable.hxx"
 #endif

Modified: 
openoffice/trunk/main/dbaccess/source/filter/xml/xmlTableFilterList.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlTableFilterList.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlTableFilterList.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlTableFilterList.cxx Sun 
Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLTABLEFILTERLIST_HXX
 #include "xmlTableFilterList.hxx"
 #endif

Modified: 
openoffice/trunk/main/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx 
Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #ifndef DBA_XMLTABLEFILTERPATTERN_HXX
 #include "xmlTableFilterPattern.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlfilter.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlfilter.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlfilter.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlfilter.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
  
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 
 #ifndef _COM_SUN_STAR_PACKAGES_ZIP_ZIPIOEXCEPTION_HPP_
 #include <com/sun/star/packages/zip/ZipIOException.hpp>

Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlservices.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlservices.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlservices.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlservices.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 
 #include <cppuhelper/factory.hxx>
 #include <osl/diagnose.h>
@@ -65,7 +65,7 @@ extern "C" void SAL_CALL createRegistryI
 
 
//---------------------------------------------------------------------------------------
 
-extern "C" DBACCESS_DLLPUBLIC void component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL 
component_getImplementationEnvironment(
                                const sal_Char  **ppEnvTypeName,
                                uno_Environment **
                        )
@@ -76,7 +76,7 @@ extern "C" DBACCESS_DLLPUBLIC void compo
 
 
//---------------------------------------------------------------------------------------
 
-extern "C" DBACCESS_DLLPUBLIC void* component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                                        const sal_Char* pImplementationName,
                                        void* pServiceManager,
                                        void* /*pRegistryKey*/)

Modified: openoffice/trunk/main/dbaccess/source/sdbtools/misc/sdbt_services.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/sdbtools/misc/sdbt_services.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/sdbtools/misc/sdbt_services.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/sdbtools/misc/sdbt_services.cxx Sun 
Aug  7 19:24:03 2016
@@ -52,7 +52,7 @@ extern "C" void SAL_CALL sdbt_initialize
 
 
//---------------------------------------------------------------------------------------
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL 
component_getImplementationEnvironment(
                                const sal_Char  **ppEnvTypeName,
                                uno_Environment **
                        )
@@ -62,7 +62,7 @@ extern "C" void SAL_CALL component_getIm
 }
 
 
//---------------------------------------------------------------------------------------
-extern "C" void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                                        const sal_Char* pImplementationName,
                                        void* pServiceManager,
                                        void* /*pRegistryKey*/)

Modified: openoffice/trunk/main/dbaccess/source/shared/dbu_reghelper.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/shared/dbu_reghelper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/shared/dbu_reghelper.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/shared/dbu_reghelper.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #include "dbu_reghelper.hxx"
 

Modified: openoffice/trunk/main/dbaccess/source/shared/dbustrings.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/shared/dbustrings.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/shared/dbustrings.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/shared/dbustrings.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 #include "dbustrings.hrc"
 
 namespace dbaui

Modified: openoffice/trunk/main/dbaccess/source/shared/flt_reghelper.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/shared/flt_reghelper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/shared/flt_reghelper.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/shared/flt_reghelper.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 
 #ifndef _FLT_REGHELPER_HXX_
 #include "flt_reghelper.hxx"

Modified: openoffice/trunk/main/dbaccess/source/shared/xmlstrings.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/shared/xmlstrings.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/shared/xmlstrings.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/shared/xmlstrings.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
 #include "xmlstrings.hrc"
 
 namespace dbaxml

Modified: openoffice/trunk/main/dbaccess/source/ui/app/AppController.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/app/AppController.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/app/AppController.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/app/AppController.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #include "AppController.hxx"
 #include "dbustrings.hrc"

Modified: openoffice/trunk/main/dbaccess/source/ui/app/AppControllerDnD.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/app/AppControllerDnD.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/app/AppControllerDnD.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/app/AppControllerDnD.cxx Sun Aug  
7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #ifndef DBAUI_APPCONTROLLER_HXX
 #include "AppController.hxx"

Modified: openoffice/trunk/main/dbaccess/source/ui/app/AppControllerGen.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/app/AppControllerGen.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/app/AppControllerGen.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/app/AppControllerGen.cxx Sun Aug  
7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #include "AppController.hxx"
 #include "AppDetailView.hxx"
@@ -68,7 +68,7 @@
 #include <connectivity/dbexception.hxx>
 #include <sfx2/mailmodelapi.hxx>
 #include <svx/dbaexchange.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <unotools/bootstrap.hxx>

Modified: openoffice/trunk/main/dbaccess/source/ui/app/AppDetailPageHelper.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/app/AppDetailPageHelper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/app/AppDetailPageHelper.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/ui/app/AppDetailPageHelper.cxx Sun 
Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 #ifndef DBAUI_APPDETAILPAGEHELPER_HXX
 #include "AppDetailPageHelper.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/ui/app/AppDetailView.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/app/AppDetailView.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/app/AppDetailView.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/app/AppDetailView.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 #ifndef DBAUI_APPDETAILVIEW_HXX
 #include "AppDetailView.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/ui/app/AppIconControl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/app/AppIconControl.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/app/AppIconControl.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/app/AppIconControl.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 #ifndef DBAUI_APPICONCONTROL_HXX
 #include "AppIconControl.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/ui/app/AppSwapWindow.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/app/AppSwapWindow.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/app/AppSwapWindow.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/app/AppSwapWindow.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 #ifndef DBAUI_APPSWAPWINDOW_HXX
 #include "AppSwapWindow.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/ui/app/AppTitleWindow.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/app/AppTitleWindow.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/app/AppTitleWindow.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/app/AppTitleWindow.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 #ifndef DBAUI_TITLE_WINDOW_HXX
 #include "AppTitleWindow.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/ui/app/AppView.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/app/AppView.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/app/AppView.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/app/AppView.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 #ifndef DBAUI_APPVIEW_HXX
 #include "AppView.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/ui/app/closeveto.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/app/closeveto.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/app/closeveto.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/app/closeveto.cxx Sun Aug  7 
19:24:03 2016
@@ -21,7 +21,7 @@
 
 
 
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #include "closeveto.hxx"
 

Modified: openoffice/trunk/main/dbaccess/source/ui/app/subcomponentmanager.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/app/subcomponentmanager.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/app/subcomponentmanager.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/ui/app/subcomponentmanager.cxx Sun 
Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-
+#include "precompiled_dbui.hxx"
 #include "subcomponentmanager.hxx"
 #include "AppController.hxx"
 #include "dbustrings.hrc"

Modified: openoffice/trunk/main/dbaccess/source/ui/browser/AsyncronousLink.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/AsyncronousLink.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/browser/AsyncronousLink.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/ui/browser/AsyncronousLink.cxx Sun 
Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 #ifndef DBAUI_ASYNCRONOUSLINK_HXX
 #include "AsyncronousLink.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/ui/browser/brwctrlr.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/brwctrlr.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/browser/brwctrlr.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/browser/brwctrlr.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 
 

Modified: openoffice/trunk/main/dbaccess/source/ui/browser/brwview.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/brwview.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/browser/brwview.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/browser/brwview.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #ifndef _SBA_BWRCTRLR_HXX
 #include "brwctrlr.hxx"

Modified: openoffice/trunk/main/dbaccess/source/ui/browser/dataview.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/dataview.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/browser/dataview.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/browser/dataview.cxx Sun Aug  7 
19:24:03 2016
@@ -22,13 +22,13 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #ifndef DBAUI_DATAVIEW_HXX
 #include "dataview.hxx"
 #endif
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef _COMPHELPER_TYPES_HXX_
 #include <comphelper/types.hxx>

Modified: openoffice/trunk/main/dbaccess/source/ui/browser/dbexchange.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/dbexchange.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/browser/dbexchange.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/browser/dbexchange.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #include "dbexchange.hxx"
 #include <sot/formats.hxx>

Modified: openoffice/trunk/main/dbaccess/source/ui/browser/dbloader.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/dbloader.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/browser/dbloader.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/browser/dbloader.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #include "dbu_reghelper.hxx"
 #include "dbustrings.hrc"

Modified: openoffice/trunk/main/dbaccess/source/ui/browser/dbtreemodel.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/dbtreemodel.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/browser/dbtreemodel.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/browser/dbtreemodel.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #ifndef DBAUI_DBTREEMODEL_HXX
 #include "dbtreemodel.hxx"

Modified: openoffice/trunk/main/dbaccess/source/ui/browser/dbtreeview.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/dbtreeview.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/browser/dbtreeview.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/browser/dbtreeview.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #ifndef DBACCESS_UI_DBTREEVIEW_HXX
 #include "dbtreeview.hxx"

Modified: openoffice/trunk/main/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/dsEntriesNoExp.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/browser/dsEntriesNoExp.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/ui/browser/dsEntriesNoExp.cxx Sun Aug 
 7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #ifndef _SBA_UNODATBR_HXX_
 #include "unodatbr.hxx"

Modified: openoffice/trunk/main/dbaccess/source/ui/browser/dsbrowserDnD.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/dsbrowserDnD.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/browser/dsbrowserDnD.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/browser/dsbrowserDnD.cxx Sun Aug  
7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #include "dbexchange.hxx"
 #include "dbtreelistbox.hxx"

Modified: openoffice/trunk/main/dbaccess/source/ui/browser/exsrcbrw.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/exsrcbrw.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/browser/exsrcbrw.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/browser/exsrcbrw.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #ifndef _SBA_EXTCTRLR_HXX
 #include "exsrcbrw.hxx"

Modified: openoffice/trunk/main/dbaccess/source/ui/browser/formadapter.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/formadapter.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/browser/formadapter.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/browser/formadapter.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #ifndef _SBA_FORMADAPTER_HXX
 #include "formadapter.hxx"

Modified: openoffice/trunk/main/dbaccess/source/ui/browser/genericcontroller.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/genericcontroller.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/browser/genericcontroller.cxx 
(original)
+++ openoffice/trunk/main/dbaccess/source/ui/browser/genericcontroller.cxx Sun 
Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 #ifndef DBAUI_GENERICCONTROLLER_HXX
 #include "genericcontroller.hxx"
 #endif

Modified: openoffice/trunk/main/dbaccess/source/ui/browser/sbagrid.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/sbagrid.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/browser/sbagrid.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/browser/sbagrid.cxx Sun Aug  7 
19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
 
 #ifndef DBACCESS_SBA_GRID_HRC
 #include "sbagrid.hrc"



Reply via email to