You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/08/07 19:24:15 UTC

svn commit: r1755455 [10/18] - in /openoffice/trunk: ./ ext_libraries/apr-util/ ext_libraries/gtest/win/ ext_libraries/ratscan/scan/ ext_libraries/serf/win/ main/ main/UnoControls/prj/ main/accessibility/prj/ main/animations/prj/ main/basctl/source/dlg...

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlColumn.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlColumn.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlColumn.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlColumn.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 
 #ifndef RPT_XMLCOLUMN_HXX
 #include "xmlColumn.hxx"

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlComponent.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlComponent.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlComponent.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlComponent.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlComponent.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlCondPrtExpr.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlControlProperty.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlControlProperty.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlControlProperty.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlControlProperty.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlControlProperty.hxx"
 #include <xmloff/xmluconv.hxx>
 #include "xmlfilter.hxx"

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlExport.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlExport.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlExport.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlExport.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
  
 #include "xmlExport.hxx"
 #include "xmlAutoStyle.hxx"

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 
 #include "xmlExportDocumentHandler.hxx"
 #include <com/sun/star/sdb/CommandType.hpp>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlFixedContent.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlFixedContent.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlFixedContent.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlFixedContent.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlFixedContent.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlFormatCondition.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlFormatCondition.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlFormatCondition.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlFormatCondition.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlFormatCondition.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlFormattedField.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlFormattedField.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlFormattedField.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlFormattedField.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlFormattedField.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlFunction.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlFunction.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlFunction.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlFunction.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlFunction.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlGroup.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlGroup.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlGroup.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlGroup.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlGroup.hxx"
 #include "xmlSection.hxx"
 #include "xmlFunction.hxx"

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlHelper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlHelper.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlHelper.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlHelper.hxx"
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlImage.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlImage.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlImage.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlImage.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlImage.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 
 #include "xmlImportDocumentHandler.hxx"
 #include <com/sun/star/sdb/CommandType.hpp>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlMasterFields.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlMasterFields.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlMasterFields.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlMasterFields.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlMasterFields.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlPropertyHandler.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlPropertyHandler.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlPropertyHandler.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 
 #include "xmlPropertyHandler.hxx"
 #include "xmlfilter.hxx"

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlReport.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlReport.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlReport.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlReport.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlReport.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlReportElement.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlReportElement.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlReportElement.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlReportElement.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlReportElement.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlReportElementBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlReportElementBase.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlReportElementBase.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlReportElementBase.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlReportElementBase.hxx"
 #include "xmlfilter.hxx"
 #include "xmlControlProperty.hxx"

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlRow.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlRow.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlRow.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlRow.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 
 #ifndef RPT_XMLCOLUMN_HXX
 #include "xmlColumn.hxx"

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlSection.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlSection.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlSection.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlSection.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlSection.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlStyleImport.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlStyleImport.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlStyleImport.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlStyleImport.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlStyleImport.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlSubDocument.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlSubDocument.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlSubDocument.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlSubDocument.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlSubDocument.hxx"
 #include "xmlCell.hxx"
 #include "xmlfilter.hxx"

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlTable.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlTable.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlTable.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlTable.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlTable.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlfilter.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlfilter.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlfilter.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlfilter.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>

Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlservices.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlservices.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlservices.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlservices.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include <cppuhelper/factory.hxx>
 #include <osl/diagnose.h>
 #include <cppuhelper/implementationentry.hxx>
@@ -76,14 +76,14 @@ cppu::ImplementationEntry entries[] = {
 };
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     char const ** envTypeName, uno_Environment **)
 {
     *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;

Modified: openoffice/trunk/main/reportdesign/source/shared/uistrings.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/shared/uistrings.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/shared/uistrings.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/shared/uistrings.cxx Sun Aug  7 19:24:03 2016
@@ -20,12 +20,13 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include "uistrings.hrc"
 
 namespace rptui
 {
+
 #include "stringconstants.cxx"
 	IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTNAME			, "ReportName");
 	IMPLEMENT_CONSTASCII_USTRING(CFG_REPORTDESIGNER				, "SunReportBuilder");

Modified: openoffice/trunk/main/reportdesign/source/shared/xmlstrings.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/shared/xmlstrings.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/shared/xmlstrings.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/shared/xmlstrings.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 
 #include "xmlstrings.hrc"
 
@@ -30,7 +30,7 @@ namespace rptxml
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_SETTINGSIMPORTER			, "com.sun.star.comp.Report.XMLOasisSettingsImporter");
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_STYLESIMPORTER			    , "com.sun.star.comp.Report.XMLOasisStylesImporter");
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTENTIMPORTER			, "com.sun.star.comp.Report.XMLOasisContentImporter");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMPORTFILTER   			, "com.sun.star.comp.document.ImportFilter");
+IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMPORTFILTER   			, "com.sun.star.document.ImportFilter");
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_METAIMPORTER			    , "com.sun.star.comp.Report.XMLOasisMetaImporter");
 
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERLEFT   			    , "BorderLeft");

Modified: openoffice/trunk/main/reportdesign/source/ui/dlg/AddField.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/dlg/AddField.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/dlg/AddField.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/dlg/AddField.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "AddField.hxx"
 #include "UITools.hxx"
 #include <svx/dbaexchange.hxx>

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

Modified: openoffice/trunk/main/reportdesign/source/ui/dlg/Condition.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/dlg/Condition.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/dlg/Condition.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/dlg/Condition.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include "Condition.hxx"
 #include "UITools.hxx"

Modified: openoffice/trunk/main/reportdesign/source/ui/dlg/DateTime.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/dlg/DateTime.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/dlg/DateTime.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/dlg/DateTime.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "DateTime.hxx"
 #ifndef RPTUI_DATETIME_HRC
 #include "DateTime.hrc"

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

Modified: openoffice/trunk/main/reportdesign/source/ui/dlg/GroupExchange.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/dlg/GroupExchange.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/dlg/GroupExchange.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/dlg/GroupExchange.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "GroupExchange.hxx"
 #include <sot/formats.hxx>
 #include <sot/storage.hxx>

Modified: openoffice/trunk/main/reportdesign/source/ui/dlg/GroupsSorting.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/dlg/GroupsSorting.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/dlg/GroupsSorting.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/dlg/GroupsSorting.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "GroupsSorting.hxx"
 #include "GroupsSorting.hrc"
 #include <connectivity/dbtools.hxx>

Modified: openoffice/trunk/main/reportdesign/source/ui/dlg/Navigator.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/dlg/Navigator.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/dlg/Navigator.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/dlg/Navigator.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include "Navigator.hxx"
 

Modified: openoffice/trunk/main/reportdesign/source/ui/dlg/PageNumber.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/dlg/PageNumber.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/dlg/PageNumber.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/dlg/PageNumber.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "PageNumber.hxx"
 #ifndef RPTUI_PAGENUMBER_HRC
 #include "PageNumber.hrc"

Modified: openoffice/trunk/main/reportdesign/source/ui/dlg/dlgpage.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/dlg/dlgpage.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/dlg/dlgpage.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/dlg/dlgpage.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 
 #include <svx/dialogs.hrc>

Modified: openoffice/trunk/main/reportdesign/source/ui/inspection/DataProviderHandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/inspection/DataProviderHandler.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/inspection/DataProviderHandler.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/inspection/DataProviderHandler.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "DataProviderHandler.hxx"
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <comphelper/namedvaluecollection.hxx>

Modified: openoffice/trunk/main/reportdesign/source/ui/inspection/DefaultInspection.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/inspection/DefaultInspection.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/inspection/DefaultInspection.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/inspection/DefaultInspection.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "DefaultInspection.hxx"
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>

Modified: openoffice/trunk/main/reportdesign/source/ui/inspection/GeometryHandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/inspection/GeometryHandler.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/inspection/GeometryHandler.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/inspection/GeometryHandler.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "GeometryHandler.hxx"
 
 #include <comphelper/sequence.hxx>

Modified: openoffice/trunk/main/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/inspection/ReportComponentHandler.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/inspection/ReportComponentHandler.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/inspection/ReportComponentHandler.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "ReportComponentHandler.hxx"
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <comphelper/sequence.hxx>

Modified: openoffice/trunk/main/reportdesign/source/ui/inspection/metadata.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/inspection/metadata.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/inspection/metadata.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/inspection/metadata.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "metadata.hxx"
 #include <svtools/localresaccess.hxx>
 #include "com/sun/star/inspection/XPropertyHandler.hpp"

Modified: openoffice/trunk/main/reportdesign/source/ui/misc/ColorListener.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/misc/ColorListener.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/misc/ColorListener.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/misc/ColorListener.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "ColorListener.hxx"
 #include <svl/smplhint.hxx>
 #ifndef REPORTDESIGN_SHARED_UISTRINGS_HRC

Modified: openoffice/trunk/main/reportdesign/source/ui/misc/FunctionHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/misc/FunctionHelper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/misc/FunctionHelper.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/misc/FunctionHelper.cxx Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "FunctionHelper.hxx"
 #include <tools/debug.hxx>
 

Modified: openoffice/trunk/main/reportdesign/source/ui/misc/RptUndo.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/misc/RptUndo.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/misc/RptUndo.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/misc/RptUndo.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include "RptUndo.hxx"
 #include "uistrings.hrc"

Modified: openoffice/trunk/main/reportdesign/source/ui/misc/UITools.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/misc/UITools.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/misc/UITools.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/misc/UITools.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 
 #include <toolkit/helper/convert.hxx>

Modified: openoffice/trunk/main/reportdesign/source/ui/misc/rptuiservices.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/misc/rptuiservices.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/misc/rptuiservices.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/misc/rptuiservices.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include <cppuhelper/factory.hxx>
 #include <osl/diagnose.h>
 #include <cppuhelper/implementationentry.hxx>

Modified: openoffice/trunk/main/reportdesign/source/ui/misc/statusbarcontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/misc/statusbarcontroller.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/misc/statusbarcontroller.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/misc/statusbarcontroller.cxx Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "statusbarcontroller.hxx"
 
 #include <svx/zoomsliderctrl.hxx>

Modified: openoffice/trunk/main/reportdesign/source/ui/misc/toolboxcontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/misc/toolboxcontroller.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/misc/toolboxcontroller.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/misc/toolboxcontroller.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "toolboxcontroller.hxx"
 #include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>

Modified: openoffice/trunk/main/reportdesign/source/ui/report/DesignView.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/DesignView.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/DesignView.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/DesignView.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include "DesignView.hxx"
 #include <tools/debug.hxx>

Modified: openoffice/trunk/main/reportdesign/source/ui/report/EndMarker.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/EndMarker.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/EndMarker.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/EndMarker.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "EndMarker.hxx"
 #include "ColorChanger.hxx"
 #include "SectionWindow.hxx"

Modified: openoffice/trunk/main/reportdesign/source/ui/report/FixedTextColor.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/FixedTextColor.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/FixedTextColor.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/FixedTextColor.cxx Sun Aug  7 19:24:03 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include <FixedTextColor.hxx>
 #include <com/sun/star/report/XFixedText.hpp>

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

Modified: openoffice/trunk/main/reportdesign/source/ui/report/ReportController.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/ReportController.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/ReportController.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/ReportController.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #define RPTUI_ID_LRSPACE	1
 #define RPTUI_ID_ULSPACE	2

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

Modified: openoffice/trunk/main/reportdesign/source/ui/report/ReportRuler.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/ReportRuler.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/ReportRuler.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/ReportRuler.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "ReportRuler.hxx"
 #include "ReportSection.hxx"
 #include "ReportWindow.hxx"

Modified: openoffice/trunk/main/reportdesign/source/ui/report/ReportSection.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/ReportSection.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/ReportSection.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/ReportSection.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "ReportSection.hxx"
 #include "ReportWindow.hxx"
 #include "DesignView.hxx"

Modified: openoffice/trunk/main/reportdesign/source/ui/report/ReportWindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/ReportWindow.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/ReportWindow.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/ReportWindow.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "ReportWindow.hxx"
 #include "ReportSection.hxx"
 #include "SectionView.hxx"

Modified: openoffice/trunk/main/reportdesign/source/ui/report/ScrollHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/ScrollHelper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/ScrollHelper.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/ScrollHelper.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "ScrollHelper.hxx"
 #include "DesignView.hxx"
 #include "ReportController.hxx"

Modified: openoffice/trunk/main/reportdesign/source/ui/report/SectionView.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/SectionView.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/SectionView.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/SectionView.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "SectionView.hxx"
 #include "DesignView.hxx"
 #include <RptPage.hxx>

Modified: openoffice/trunk/main/reportdesign/source/ui/report/SectionWindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/SectionWindow.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/SectionWindow.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/SectionWindow.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "SectionWindow.hxx"
 #include "ReportWindow.hxx"
 #include "ReportRuler.hxx"

Modified: openoffice/trunk/main/reportdesign/source/ui/report/StartMarker.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/StartMarker.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/StartMarker.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/StartMarker.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "StartMarker.hxx"
 #include <vcl/image.hxx>
 #include <vcl/svapp.hxx>

Modified: openoffice/trunk/main/reportdesign/source/ui/report/ViewsWindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/ViewsWindow.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/ViewsWindow.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/ViewsWindow.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include "ViewsWindow.hxx"
 #include "ScrollHelper.hxx"

Modified: openoffice/trunk/main/reportdesign/source/ui/report/dlgedclip.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/dlgedclip.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/dlgedclip.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/dlgedclip.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "dlgedclip.hxx"
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/datatransfer/XMimeContentType.hpp>

Modified: openoffice/trunk/main/reportdesign/source/ui/report/dlgedfac.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/dlgedfac.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/dlgedfac.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/dlgedfac.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "dlgedfac.hxx"
 #ifndef REPORTDESIGN_SHARED_UISTRINGS_HRC
 #include "uistrings.hrc"

Modified: openoffice/trunk/main/reportdesign/source/ui/report/dlgedfunc.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/dlgedfunc.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/dlgedfunc.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/dlgedfunc.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include <vcl/scrbar.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/seleng.hxx>

Modified: openoffice/trunk/main/reportdesign/source/ui/report/propbrw.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/report/propbrw.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/report/propbrw.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/report/propbrw.cxx Sun Aug  7 19:24:03 2016
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "propbrw.hxx"
 #include "RptObject.hxx"
 #include "ReportController.hxx"
@@ -45,7 +45,7 @@
 #include <svx/svditer.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <comphelper/property.hxx>
 #include <comphelper/namecontainer.hxx>

Modified: openoffice/trunk/main/reportdesign/util/rptxml.component
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/util/rptxml.component?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/util/rptxml.component (original)
+++ openoffice/trunk/main/reportdesign/util/rptxml.component Sun Aug  7 19:24:03 2016
@@ -25,16 +25,16 @@
 <component loader="com.sun.star.loader.SharedLibrary"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Report.XMLOasisContentImporter">
-    <service name="com.sun.star.comp.document.ImportFilter"/>
+    <service name="com.sun.star.document.ImportFilter"/>
   </implementation>
   <implementation name="com.sun.star.comp.Report.XMLOasisMetaImporter">
-    <service name="com.sun.star.comp.document.ImportFilter"/>
+    <service name="com.sun.star.document.ImportFilter"/>
   </implementation>
   <implementation name="com.sun.star.comp.Report.XMLOasisSettingsImporter">
-    <service name="com.sun.star.comp.document.ImportFilter"/>
+    <service name="com.sun.star.document.ImportFilter"/>
   </implementation>
   <implementation name="com.sun.star.comp.Report.XMLOasisStylesImporter">
-    <service name="com.sun.star.comp.document.ImportFilter"/>
+    <service name="com.sun.star.document.ImportFilter"/>
   </implementation>
   <implementation name="com.sun.star.comp.report.ExportDocumentHandler">
     <service name="com.sun.star.report.ExportDocumentHandler"/>
@@ -46,7 +46,7 @@
     <service name="com.sun.star.report.ImportDocumentHandler"/>
   </implementation>
   <implementation name="com.sun.star.comp.report.OReportFilter">
-    <service name="com.sun.star.comp.document.ImportFilter"/>
+    <service name="com.sun.star.document.ImportFilter"/>
   </implementation>
   <implementation name="com.sun.star.comp.report.ORptTypeDetection">
     <service name="com.sun.star.document.ExtendedTypeDetection"/>

Modified: openoffice/trunk/main/sax/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sax/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sax/prj/build.lst (original)
+++ openoffice/trunk/main/sax/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,6 +1,3 @@
 ax	sax	:	offapi cppuhelper EXPAT:expat comphelper LIBXSLT:libxslt NULL
-ax	sax										usr1	-	all	ax_mkout NULL
-ax	sax\source\expatwrap					nmake	-	all	ax_expatwrap NULL
-ax	sax\source\tools						nmake	-	all ax_tools  NULL
-ax  sax\source\fastparser					nmake	-	all ax_fastparser ax_expatwrap ax_tools NULL
-ax  sax\qa\gtest							nmake	-	all ax_qa_gtest ax_tools NULL
+ax	sax\prj									nmake	-	all	ax_prj NULL
+

Modified: openoffice/trunk/main/sax/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sax/prj/d.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sax/prj/d.lst (original)
+++ openoffice/trunk/main/sax/prj/d.lst Sun Aug  7 19:24:03 2016
@@ -1,16 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\misc\fastsax.component %_DEST%\xml%_EXT%\fastsax.component
-..\%__SRC%\misc\sax.component %_DEST%\xml%_EXT%\sax.component
-..\%__SRC%\misc\sax.inbuild.component %_DEST%\xml%_EXT%\sax.inbuild.component
-
-mkdir: %_DEST%\inc%_EXT%\sax
-mkdir: %_DEST%\inc%_EXT%\sax\tools
-..\inc\sax\dllapi.h %_DEST%\inc%_EXT%\sax\dllapi.h
-..\inc\sax\fshelper.hxx %_DEST%\inc%_EXT%\sax\fshelper.hxx
-..\inc\sax\fastattribs.hxx %_DEST%\inc%_EXT%\sax\fastattribs.hxx
-..\inc\sax\tools\converter.hxx %_DEST%\inc%_EXT%\sax\tools\converter.hxx
-
-dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"

Modified: openoffice/trunk/main/sax/source/expatwrap/attrlistimpl.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sax/source/expatwrap/attrlistimpl.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sax/source/expatwrap/attrlistimpl.hxx (original)
+++ openoffice/trunk/main/sax/source/expatwrap/attrlistimpl.hxx Sun Aug  7 19:24:03 2016
@@ -25,10 +25,7 @@
 #define _SAX_ATTRLISTIMPL_HXX
 
 #include "sal/config.h"
-//#include "sax/saxdllapi.h"
-
 #include <cppuhelper/implbase2.hxx>
-
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>

Modified: openoffice/trunk/main/sax/source/expatwrap/sax_expat.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sax/source/expatwrap/sax_expat.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sax/source/expatwrap/sax_expat.cxx (original)
+++ openoffice/trunk/main/sax/source/expatwrap/sax_expat.cxx Sun Aug  7 19:24:03 2016
@@ -1024,13 +1024,13 @@ using namespace sax_expatwrap;
 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(
 	const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
 	void * pRet = 0;

Modified: openoffice/trunk/main/sax/source/fastparser/facreg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sax/source/fastparser/facreg.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sax/source/fastparser/facreg.cxx (original)
+++ openoffice/trunk/main/sax/source/fastparser/facreg.cxx Sun Aug  7 19:24:03 2016
@@ -55,13 +55,13 @@ Reference< XInterface > SAL_CALL FastSax
 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( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
 	void * pRet = 0;
 

Modified: openoffice/trunk/main/sc/inc/pch/precompiled_sc.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/pch/precompiled_sc.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sc/inc/pch/precompiled_sc.hxx (original)
+++ openoffice/trunk/main/sc/inc/pch/precompiled_sc.hxx Sun Aug  7 19:24:03 2016
@@ -60,79 +60,79 @@
 #include <cwchar>
 #include <float.h>
 #include <functional>
-#include <offuh/com/sun/star/awt/Point.hdl>
-#include <offuh/com/sun/star/awt/Point.hpp>
-#include <offuh/com/sun/star/awt/Size.hdl>
-#include <offuh/com/sun/star/awt/Size.hpp>
-#include <offuh/com/sun/star/beans/PropertyVetoException.hdl>
-#include <offuh/com/sun/star/beans/PropertyVetoException.hpp>
-#include <offuh/com/sun/star/container/ElementExistException.hdl>
-#include <offuh/com/sun/star/container/ElementExistException.hpp>
-#include <offuh/com/sun/star/container/NoSuchElementException.hpp>
-#include <offuh/com/sun/star/container/XElementAccess.hdl>
-#include <offuh/com/sun/star/container/XElementAccess.hpp>
-#include <offuh/com/sun/star/container/XNameAccess.hpp>
-#include <offuh/com/sun/star/datatransfer/DataFlavor.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DragGestureEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DragSourceDragEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DragSourceDragEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DragSourceDropEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DragSourceEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDragEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragGestureListener.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSource.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSource.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSourceContext.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSourceListener.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDropTargetListener.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#include <offuh/com/sun/star/datatransfer/UnsupportedFlavorException.hdl>
-#include <offuh/com/sun/star/datatransfer/XTransferable.hpp>
-#include <offuh/com/sun/star/drawing/XShape.hpp>
-#include <offuh/com/sun/star/embed/InvalidStorageException.hpp>
-#include <offuh/com/sun/star/embed/StorageWrappedTargetException.hdl>
-#include <offuh/com/sun/star/embed/StorageWrappedTargetException.hpp>
-#include <offuh/com/sun/star/embed/XStorage.hdl>
-#include <offuh/com/sun/star/embed/XStorage.hpp>
-#include <offuh/com/sun/star/io/BufferSizeExceededException.hpp>
-#include <offuh/com/sun/star/io/IOException.hdl>
-#include <offuh/com/sun/star/io/NotConnectedException.hdl>
-#include <offuh/com/sun/star/io/NotConnectedException.hpp>
-#include <offuh/com/sun/star/io/XInputStream.hdl>
-#include <offuh/com/sun/star/io/XInputStream.hpp>
-#include <offuh/com/sun/star/io/XOutputStream.hdl>
-#include <offuh/com/sun/star/io/XOutputStream.hpp>
-#include <offuh/com/sun/star/io/XStream.hdl>
-#include <offuh/com/sun/star/lang/EventObject.hdl>
-#include <offuh/com/sun/star/lang/IllegalArgumentException.hpp>
-#include <offuh/com/sun/star/lang/WrappedTargetException.hdl>
-#include <offuh/com/sun/star/lang/WrappedTargetException.hpp>
-#include <offuh/com/sun/star/lang/XComponent.hpp>
-#include <offuh/com/sun/star/lang/XEventListener.hpp>
-#include <offuh/com/sun/star/packages/NoEncryptionException.hdl>
-#include <offuh/com/sun/star/packages/NoEncryptionException.hpp>
-#include <offuh/com/sun/star/packages/WrongPasswordException.hdl>
-#include <offuh/com/sun/star/packages/WrongPasswordException.hpp>
-#include <offuh/com/sun/star/uno/Exception.hdl>
-#include <offuh/com/sun/star/uno/Exception.hpp>
-#include <offuh/com/sun/star/uno/RuntimeException.hdl>
-#include <offuh/com/sun/star/uno/RuntimeException.hpp>
-#include <offuh/com/sun/star/uno/XAdapter.hdl>
-#include <offuh/com/sun/star/uno/XAdapter.hpp>
-#include <offuh/com/sun/star/uno/XInterface.hdl>
-#include <offuh/com/sun/star/uno/XReference.hdl>
-#include <offuh/com/sun/star/uno/XReference.hpp>
-#include <offuh/com/sun/star/uno/XWeak.hpp>
+#include <com/sun/star/awt/Point.hdl>
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Size.hdl>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/beans/PropertyVetoException.hdl>
+#include <com/sun/star/beans/PropertyVetoException.hpp>
+#include <com/sun/star/container/ElementExistException.hdl>
+#include <com/sun/star/container/ElementExistException.hpp>
+#include <com/sun/star/container/NoSuchElementException.hpp>
+#include <com/sun/star/container/XElementAccess.hdl>
+#include <com/sun/star/container/XElementAccess.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/datatransfer/DataFlavor.hdl>
+#include <com/sun/star/datatransfer/dnd/DragGestureEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DragSourceDragEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DragSourceDragEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DragSourceDropEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DragSourceEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DropTargetEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hdl>
+#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragSource.hdl>
+#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hdl>
+#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hdl>
+#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hdl>
+#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
+#include <com/sun/star/datatransfer/UnsupportedFlavorException.hdl>
+#include <com/sun/star/datatransfer/XTransferable.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/embed/InvalidStorageException.hpp>
+#include <com/sun/star/embed/StorageWrappedTargetException.hdl>
+#include <com/sun/star/embed/StorageWrappedTargetException.hpp>
+#include <com/sun/star/embed/XStorage.hdl>
+#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/io/BufferSizeExceededException.hpp>
+#include <com/sun/star/io/IOException.hdl>
+#include <com/sun/star/io/NotConnectedException.hdl>
+#include <com/sun/star/io/NotConnectedException.hpp>
+#include <com/sun/star/io/XInputStream.hdl>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XOutputStream.hdl>
+#include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/io/XStream.hdl>
+#include <com/sun/star/lang/EventObject.hdl>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/lang/WrappedTargetException.hdl>
+#include <com/sun/star/lang/WrappedTargetException.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/packages/NoEncryptionException.hdl>
+#include <com/sun/star/packages/NoEncryptionException.hpp>
+#include <com/sun/star/packages/WrongPasswordException.hdl>
+#include <com/sun/star/packages/WrongPasswordException.hpp>
+#include <com/sun/star/uno/Exception.hdl>
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/RuntimeException.hdl>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/XAdapter.hdl>
+#include <com/sun/star/uno/XAdapter.hpp>
+#include <com/sun/star/uno/XInterface.hdl>
+#include <com/sun/star/uno/XReference.hdl>
+#include <com/sun/star/uno/XReference.hpp>
+#include <com/sun/star/uno/XWeak.hpp>
 #include <osl/endian.h>
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>

Modified: openoffice/trunk/main/sc/source/filter/excel/xlstyle.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/filter/excel/xlstyle.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/filter/excel/xlstyle.cxx (original)
+++ openoffice/trunk/main/sc/source/filter/excel/xlstyle.cxx Sun Aug  7 19:24:03 2016
@@ -32,7 +32,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/font.hxx>
 #include <rtl/tencinfo.h>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <editeng/svxfont.hxx>
 #include "global.hxx"
 #include "xlroot.hxx"

Modified: openoffice/trunk/main/sc/source/ui/unoobj/targuno.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/unoobj/targuno.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/unoobj/targuno.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/unoobj/targuno.cxx Sun Aug  7 19:24:03 2016
@@ -29,7 +29,7 @@
 #include <vcl/image.hxx>
 #include <vcl/virdev.hxx>
 //#include <toolkit/unoiface.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/smplhint.hxx>
 #include <vcl/svapp.hxx>

Modified: openoffice/trunk/main/sc/source/ui/vba/vbaeventshelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/vba/vbaeventshelper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/vba/vbaeventshelper.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/vba/vbaeventshelper.cxx Sun Aug  7 19:24:03 2016
@@ -37,8 +37,8 @@
 #include <com/sun/star/util/XChangesNotifier.hpp>
 
 #include <cppuhelper/implbase4.hxx>
-#include <toolkit/unohlp.hxx>
 #include <unotools/eventcfg.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vbahelper/helperdecl.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>

Modified: openoffice/trunk/main/sccomp/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sccomp/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sccomp/prj/build.lst (original)
+++ openoffice/trunk/main/sccomp/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,4 +1,4 @@
-scc	sccomp	:    L10N:l10n offuh comphelper COINMP:coinmp tools rsc LIBXSLT:libxslt NULL
+scc	sccomp	:    L10N:l10n offapi comphelper COINMP:coinmp tools rsc LIBXSLT:libxslt NULL
 scc	sccomp									usr1	-	all	scc_mkout NULL
 scc	sccomp\prj								get		-	all	scc_prj NULL
 scc	sccomp\source\solver					nmake	-	all	scc_solver NULL

Modified: openoffice/trunk/main/scp2/source/base/file_base.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/base/file_base.scp?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/base/file_base.scp (original)
+++ openoffice/trunk/main/scp2/source/base/file_base.scp Sun Aug  7 19:24:03 2016
@@ -50,8 +50,8 @@ STD_RES_FILE( gid_File_Res_Abp, abp)
 STD_LIB_FILE( gid_File_Lib_Dbp, dbp)
 STD_RES_FILE( gid_File_Res_Dbp, dbp)
 
-STD_LIB_FILE( gid_File_Lib_Dbu, dbu )
-STD_RES_FILE( gid_File_Res_Dbu, dbu)
+STD_LIB_FILE( gid_File_Lib_Dbu, dbui)
+STD_RES_FILE( gid_File_Res_Dbu, dbui)
 
 STD_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
 STD_RES_FILE( gid_File_Res_Adabasui, adabasui)

Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Sun Aug  7 19:24:03 2016
@@ -1226,16 +1226,16 @@ File gid_File_Lib_Res
     Dir = SCP2_OOO_BIN_DIR;
 End
 
-File gid_File_Lib_Sax_Uno
+File gid_File_Lib_Expwrap_Uno
     TXT_FILE_BODY;
     Styles = (PACKED,DONT_OVERWRITE);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT2(sax.uno,UNXSUFFIX));
+    Name = STRING(CONCAT2(expwrap.uno,UNXSUFFIX));
   #elif defined(OS2)
-    Name = "sax_uno.dll";
+    Name = "expwrap_uno.dll";
   #else
-    Name = "sax.uno.dll";
+    Name = "expwrap.uno.dll";
   #endif
 End
 
@@ -1483,11 +1483,11 @@ File gid_File_Lib_Ucbhelper
     Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
   #ifdef UNX
-    Name = STRING(CONCAT3(libucbhelper4,COMID,UNXSUFFIX));
+    Name = STRING(CONCAT3(libucbhelper,COMID,UNXSUFFIX));
   #elif defined OS2
-    Name = "ucbh4.dll";
+    Name = "ucbh.dll";
   #else
-    Name = STRING(CONCAT3(ucbhelper4,COMID,.dll));
+    Name = STRING(CONCAT3(ucbhelper,COMID,.dll));
   #endif
 End
 

Modified: openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp Sun Aug  7 19:24:03 2016
@@ -332,7 +332,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Package2,
 	gid_File_Lib_Deployment,
 	gid_File_Lib_DeploymentGui,
-	gid_File_Lib_Sax_Uno,
+	gid_File_Lib_Expwrap_Uno,
 	gid_File_Lib_Fastsax_Uno,
 	gid_File_Lib_Slideshow,
     gid_File_Lib_PresentationMinimizer

Modified: openoffice/trunk/main/sd/inc/pch/precompiled_sd.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/inc/pch/precompiled_sd.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sd/inc/pch/precompiled_sd.hxx (original)
+++ openoffice/trunk/main/sd/inc/pch/precompiled_sd.hxx Sun Aug  7 19:24:03 2016
@@ -785,7 +785,6 @@
 
 #include "toolkit/awt/vclxdevice.hxx"
 #include "toolkit/helper/vclunohelper.hxx"
-#include "toolkit/unohlp.hxx"
 
 #include "tools/bigint.hxx"
 #include "tools/color.hxx"

Modified: openoffice/trunk/main/sd/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sd/prj/build.lst (original)
+++ openoffice/trunk/main/sd/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,47 +1,2 @@
 sd      sd      :    filter L10N:l10n animations svx sfx2 stoc canvas LIBXSLT:libxslt NULL
-sd	sd										usr1	-	all	sd_mkout NULL
-sd	sd\inc									nmake		-	all	sd_inc NULL
-sd	sd\prj									get		-	all	sd_prj NULL
-sd	sd\source\ui\inc						get		-	all	sd_sinc NULL
-sd	sd\res									get		-	all	sd_res NULL
-sd	sd\res\imagelst							get		-	all	sd_resil NULL
-sd	sd\sdi									nmake	-	all	sd_sdi NULL
-sd	sd\source\helper						nmake	-	all sd_helper sd_inc NULL
-sd	sd\source\ui\func						nmake	-	all	sd_func sd_sdi sd_inc NULL
-sd	sd\source\ui\view						nmake	-	all	sd_view sd_sdi sd_inc NULL
-sd	sd\source\ui\app						nmake	-	all	sd_app sd_sdi sd_inc NULL
-sd	sd\source\ui\dlg						nmake	-	all	sd_dlg sd_sdi sd_inc NULL
-sd	sd\source\core							nmake	-	all	sd_core sd_sdi sd_inc NULL
-sd	sd\source\core\undo						nmake	-	all	sd_undo sd_core sd_inc NULL
-sd	sd\source\core\text						nmake	-	all sd_text sd_inc NULL
-sd	sd\source\core\annotations				nmake	-	all sd_annotations sd_inc NULL
-sd	sd\source\ui\docshell					nmake	-	all	sd_docsh sd_sdi sd_inc NULL
-sd	sd\source\ui\unoidl						nmake	-	all	sd_unid sd_sdi sd_inc NULL
-sd	sd\source\ui\accessibility				nmake	-	all	sd_accessibility sd_inc NULL
-sd	sd\source\ui\tools      				nmake	-	all	sd_tools sd_inc NULL
-sd	sd\source\ui\sidebar         			nmake	-	all	sd_sidebar sd_sdi sd_inc NULL
-sd	sd\source\ui\slidesorter\shell			nmake	-	all	sd_slsshell sd_sdi sd_inc NULL
-sd	sd\source\ui\slidesorter\model			nmake	-	all	sd_slsmodel sd_inc NULL
-sd	sd\source\ui\slidesorter\view			nmake	-	all	sd_slsview sd_inc NULL
-sd	sd\source\ui\slidesorter\controller		nmake	-	all	sd_slscontroller sd_sdi sd_inc NULL
-sd	sd\source\ui\slidesorter\cache			nmake	-	all	sd_slscache sd_inc NULL
-sd	sd\source\ui\controller					nmake	-	all	sd_controller sd_inc NULL
-sd	sd\source\ui\notes						nmake	-	all	sd_notes sd_inc NULL
-sd	sd\source\ui\table						nmake	-	all	sd_table sd_sdi sd_inc NULL
-sd	sd\source\filter\ppt					nmake	-	all	sd_ppt sd_inc NULL
-sd	sd\source\filter						nmake	-	all	sd_filt sd_sdi sd_ppt sd_inc NULL
-sd	sd\source\filter\cgm					nmake	-	all	sd_cgm sd_inc NULL
-sd	sd\source\filter\eppt					nmake	-	all	sd_eppt sd_inc NULL
-sd	sd\source\filter\grf					nmake	-	all	sd_grf sd_inc NULL
-sd	sd\source\filter\xml					nmake	-	all	sd_xml sd_inc NULL
-sd	sd\source\filter\html					nmake	-	all	sd_html sd_inc NULL
-sd	sd\source\ui\animations					nmake	-	all sd_animations sd_inc NULL
-sd	sd\source\ui\slideshow					nmake	-	all sd_slideshow sd_sdi sd_inc NULL
-sd	sd\source\ui\presenter       	        nmake	-	all sd_presenter sd_inc NULL
-sd	sd\source\ui\framework\configuration	nmake	-	all sd_framework_configuration sd_inc NULL
-sd	sd\source\ui\framework\module       	nmake	-	all sd_framework_module sd_inc NULL
-sd	sd\source\ui\framework\factories       	nmake	-	all sd_framework_factories sd_inc NULL
-sd	sd\source\ui\framework\tools           	nmake	-	all sd_framework_tools sd_inc NULL
-sd	sd\source\ui\annotations				nmake	-	all sd_uiannotations sd_inc NULL
-sd	sd\util									nmake	-	all	sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_controller sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations sd_sidebar NULL
-sd sd\qa\unoapi nmake - all sd_qa_unoapi NULL
+sd sd\prj nmake - all sd_prj   NULL

Modified: openoffice/trunk/main/sd/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/prj/d.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sd/prj/d.lst (original)
+++ openoffice/trunk/main/sd/prj/d.lst Sun Aug  7 19:24:03 2016
@@ -1,59 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%COMMON_OUTDIR%\srs\core_srs.hid %COMMON_DEST%\res%_EXT%\sdcore_srs.hid
-
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\lib\sdi.lib %_DEST%\lib%_EXT%\sdi.lib
-..\%__SRC%\slb\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\bin\sd?????.dll %_DEST%\bin%_EXT%\sd?????.dll
-..\%__SRC%\bin\sd??????.dll %_DEST%\bin%_EXT%\sd??????.dll
-..\%__SRC%\bin\sd*.res %_DEST%\bin%_EXT%\sd*.res
-..\%__SRC%\bin\sd???????.dll %_DEST%\bin%_EXT%\sd???????.dll
-..\%__SRC%\bin\emp?????.* %_DEST%\bin%_EXT%\emp?????.*
-
-mkdir: %_DEST%\pck%_EXT%
-..\res\webview\common.inc %_DEST%\pck%_EXT%\common.inc
-..\res\webview\common.pl %_DEST%\pck%_EXT%\common.pl
-..\res\webview\edit.asp %_DEST%\pck%_EXT%\edit.asp
-..\res\webview\edit.pl %_DEST%\pck%_EXT%\edit.pl
-..\res\webview\editpic.asp %_DEST%\pck%_EXT%\editpic.asp
-..\res\webview\editpic.pl %_DEST%\pck%_EXT%\editpic.pl
-..\res\webview\index.pl %_DEST%\pck%_EXT%\index.pl
-..\res\webview\poll.asp %_DEST%\pck%_EXT%\poll.asp
-..\res\webview\poll.pl %_DEST%\pck%_EXT%\poll.pl
-..\res\webview\savepic.asp %_DEST%\pck%_EXT%\savepic.asp
-..\res\webview\savepic.pl %_DEST%\pck%_EXT%\savepic.pl
-..\res\webview\show.asp %_DEST%\pck%_EXT%\show.asp
-..\res\webview\show.pl %_DEST%\pck%_EXT%\show.pl
-..\res\webview\webview.asp %_DEST%\pck%_EXT%\webcast.asp
-..\res\webview\webview.pl %_DEST%\pck%_EXT%\webcast.pl
-
-..\res\buttons\*.zip %_DEST%\pck%_EXT%\*.zip
-
-mkdir: %_DEST%\inc%_EXT%\sd
-..\inc\sddll.hxx %_DEST%\inc%_EXT%\sd\sddll.hxx
-
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
-
-..\uiconfig\sdraw\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\menubar\*.xml
-..\uiconfig\simpress\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\menubar\*.xml
-..\uiconfig\sdraw\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\toolbar\*.xml
-..\uiconfig\simpress\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\toolbar\*.xml
-..\uiconfig\sdraw\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar\*.xml
-..\uiconfig\simpress\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar\*.xml
-
-..\%__SRC%\misc\sd.component %_DEST%\xml%_EXT%\sd.component
-..\%__SRC%\misc\sdd.component %_DEST%\xml%_EXT%\sdd.component

Modified: openoffice/trunk/main/sd/source/filter/eppt/epptso.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/filter/eppt/epptso.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/filter/eppt/epptso.cxx (original)
+++ openoffice/trunk/main/sd/source/filter/eppt/epptso.cxx Sun Aug  7 19:24:03 2016
@@ -90,7 +90,7 @@
 #include <ucbhelper/contentbroker.hxx>
 #endif
 #ifndef _TOOLKIT_UNOHLP_HXX
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <rtl/crc.h>
 #include <sot/clsids.hxx>