[Libreoffice-commits] .: 2 commits - reportbuilder/Extension_reportbuilder.mk reportbuilder/util testtools/source

[David Tardon]

 reportbuilder/Extension_reportbuilder.mk   |    1 
 reportbuilder/util/manifest.xml            |   31 +++++++++++++++++++++++++++++
 testtools/source/bridgetest/bridgetest.cxx |   11 ----------
 3 files changed, 33 insertions(+), 10 deletions(-)

New commits:
commit 10a6cf99d3a44e0b2c5e984e0145b5163b9ed852
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jul 12 13:29:17 2012 +0200

    fdo#51278 make reportbuilder work again
    
    Change-Id: I46f970fa23a0afd54485efb58b7f4f757c7d7752

diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk
index 22cd0fb..649a961 100644
--- a/reportbuilder/Extension_reportbuilder.mk
+++ b/reportbuilder/Extension_reportbuilder.mk
@@ -77,6 +77,7 @@ $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice
 ))
 
 $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office/UI,\
+	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu) \
 	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \
 	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \
 ))
diff --git a/reportbuilder/util/manifest.xml b/reportbuilder/util/manifest.xml
index cf92064..30b9f6c 100644
--- a/reportbuilder/util/manifest.xml
+++ b/reportbuilder/util/manifest.xml
@@ -3,3 +3,34 @@
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components"
                       manifest:full-path="components.rdb"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/Accelerators.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/DataAccess.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/Embedding.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/ExtendedColorScheme.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/Paths.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/ReportDesign.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/UI/Controller.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/UI/ReportCommands.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Setup.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/TypeDetection/Filter.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/TypeDetection/Types.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+                      manifest:full-path="registry/schema/org/openoffice/Office/ReportDesign.xcs"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+                      manifest:full-path="registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+                      manifest:full-path="registry/schema/org/openoffice/Office/UI/ReportCommands.xcs"/>
+</manifest:manifest>
commit 15f85977d1a753d066b0cc5dd7385dada3bfd2ce
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jul 12 09:31:19 2012 +0200

    drop useless announcement
    
    Change-Id: I0e94f44c27bbcb9d1ab12ae4f3f00e89d5388d69

diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 940be00..85ffb95 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -1244,16 +1244,7 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
         throw;
     }
 
-    if( bRet )
-    {
-        printf( "\n\n ### test succeeded!\n" );
-    }
-    else
-    {
-        printf( "\n> ### test failed!\n" );
-    }
-
-    return 0;
+    return bRet ? 0 : 1;
 }
 
 // XServiceInfo