[Libreoffice-commits] core.git: desktop/test

2022-02-15 Thread Samuel Mehrbrodt (via logerrit)
 desktop/test/deployment/crashextension/Addons.xcu |   24 +++---
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 459373a2fe7c7a5d04b3dd4d64f70d3f18525d33
Author: Samuel Mehrbrodt 
AuthorDate: Mon Feb 14 22:03:15 2022 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Tue Feb 15 09:08:37 2022 +0100

Fix xml namespace

Follow-up to 82f8a96065194913a6f452bd8fe0ac2ad26a4be0

Change-Id: I3f347b162dd6c094557e9b13e24aa8290ecc1d40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129947
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/desktop/test/deployment/crashextension/Addons.xcu 
b/desktop/test/deployment/crashextension/Addons.xcu
index 114518a4c414..019a068e72aa 100644
--- a/desktop/test/deployment/crashextension/Addons.xcu
+++ b/desktop/test/deployment/crashextension/Addons.xcu
@@ -26,30 +26,30 @@
   
 
   
-  
-
-  
-
+  
+
+  
+
   standardbar
 
-
+
   .uno:HelpIndex
 
-
+
   AddAfter
 
-
+
   AddLast
 
-
+
   
 
-
-  
-
+
+  
+
   
vnd.org.libreoffice.test.desktop.deployment.crashextension:
 
-
+
   Crash LibreOffice
 
   


[Libreoffice-commits] core.git: desktop/test

2021-03-08 Thread Stephan Bergmann (via logerrit)
 desktop/test/deployment/active/active_native.cxx   |7 ---
 desktop/test/deployment/passive/passive_native.cxx |7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit e208ce965817fb3314634f9087a9989e047b12a5
Author: Stephan Bergmann 
AuthorDate: Mon Mar 8 09:46:58 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Mar 8 15:46:29 2021 +0100

Fix build of Extension_test-{active,passive}

Partial reverts of 1553d3787cbe0cdababf31382bf3376a3640d8cf "use for-range 
on
Sequence in d*" and e37e990650694d7d3a44a38a6bf23751bb33da67 "tdf#88205 
Adapt
uses of css::uno::Sequence to use initializer_list ctor", plus
loplugin:redundantstatic.

Change-Id: Icf934bd21b0649d8fe9e88a453b6fc4d821ab6d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112156
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/desktop/test/deployment/active/active_native.cxx 
b/desktop/test/deployment/active/active_native.cxx
index 662ff2c16742..753f0da77312 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -107,7 +107,8 @@ rtl::OUString Provider::static_getImplementationName() {
 
 css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
 {
-return css::uno::Sequence< rtl::OUString 
>{"com.sun.star.test.deployment.active_native"};
+rtl::OUString name("com.sun.star.test.deployment.active_native");
+return css::uno::Sequence< rtl::OUString >(&name, 1);
 }
 
 css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
@@ -135,7 +136,7 @@ Provider::queryDispatches(
 {
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > s(
 Requests.getLength());
-for (sal_Int32 i = 0; i < s.(); ++i) {
+for (sal_Int32 i = 0; i < s.getLength(); ++i) {
 s[i] = queryDispatch(
 Requests[i].FeatureURL, Requests[i].FrameName,
 Requests[i].SearchFlags);
@@ -221,7 +222,7 @@ void Dispatch::dispatch(
 xComponent->dispose();
 }
 
-static cppu::ImplementationEntry const services[] = {
+cppu::ImplementationEntry const services[] = {
 { &Provider::static_create, &Provider::static_getImplementationName,
   &Provider::static_getSupportedServiceNames,
   &cppu::createSingleComponentFactory, nullptr, 0 },
diff --git a/desktop/test/deployment/passive/passive_native.cxx 
b/desktop/test/deployment/passive/passive_native.cxx
index 6af233a72d56..9bfbcb7b160f 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -104,7 +104,8 @@ rtl::OUString Provider::static_getImplementationName() {
 
 css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
 {
-return css::uno::Sequence< rtl::OUString 
>{"com.sun.star.test.deployment.passive_native"};
+rtl::OUString name("com.sun.star.test.deployment.passive_native");
+return css::uno::Sequence< rtl::OUString >(&name, 1);
 }
 
 css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
@@ -132,7 +133,7 @@ Provider::queryDispatches(
 {
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > s(
 Requests.getLength());
-for (sal_Int32 i = 0; i < s.(); ++i) {
+for (sal_Int32 i = 0; i < s.getLength(); ++i) {
 s[i] = queryDispatch(
 Requests[i].FeatureURL, Requests[i].FrameName,
 Requests[i].SearchFlags);
@@ -218,7 +219,7 @@ void Dispatch::dispatch(
 xComponent->dispose();
 }
 
-static cppu::ImplementationEntry const services[] = {
+cppu::ImplementationEntry const services[] = {
 { &Provider::static_create, &Provider::static_getImplementationName,
   &Provider::static_getSupportedServiceNames,
   &cppu::createSingleComponentFactory, nullptr, 0 },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: desktop/test framework/source

2020-12-20 Thread homeboy445 (via logerrit)
 desktop/test/deployment/active/active_native.cxx|3 +--
 desktop/test/deployment/passive/passive_native.cxx  |3 +--
 framework/source/fwe/classes/rootactiontriggercontainer.cxx |3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit e37e990650694d7d3a44a38a6bf23751bb33da67
Author: homeboy445 
AuthorDate: Mon Dec 14 18:46:26 2020 +0530
Commit: Stephan Bergmann 
CommitDate: Sun Dec 20 16:14:19 2020 +0100

tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor

Change-Id: Ib40fc069105cbf93c617055a7c6fe466570f0b32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107844
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/desktop/test/deployment/active/active_native.cxx 
b/desktop/test/deployment/active/active_native.cxx
index b024b5e4ff40..662ff2c16742 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -107,8 +107,7 @@ rtl::OUString Provider::static_getImplementationName() {
 
 css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
 {
-rtl::OUString name("com.sun.star.test.deployment.active_native");
-return css::uno::Sequence< rtl::OUString >(&name, 1);
+return css::uno::Sequence< rtl::OUString 
>{"com.sun.star.test.deployment.active_native"};
 }
 
 css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
diff --git a/desktop/test/deployment/passive/passive_native.cxx 
b/desktop/test/deployment/passive/passive_native.cxx
index 7b95fff8b537..6af233a72d56 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -104,8 +104,7 @@ rtl::OUString Provider::static_getImplementationName() {
 
 css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
 {
-rtl::OUString name("com.sun.star.test.deployment.passive_native");
-return css::uno::Sequence< rtl::OUString >(&name, 1);
+return css::uno::Sequence< rtl::OUString 
>{"com.sun.star.test.deployment.passive_native"};
 }
 
 css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx 
b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 8ce69fde740a..4181011db25a 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -206,8 +206,7 @@ sal_Bool SAL_CALL 
RootActionTriggerContainer::supportsService( const OUString& S
 
 Sequence< OUString > SAL_CALL 
RootActionTriggerContainer::getSupportedServiceNames()
 {
-Sequence< OUString > seqServiceNames { SERVICENAME_ACTIONTRIGGERCONTAINER 
};
-return seqServiceNames;
+return { SERVICENAME_ACTIONTRIGGERCONTAINER };
 }
 
 // XUnoTunnel
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: desktop/test

2020-01-10 Thread Stephan Bergmann (via logerrit)
 desktop/test/deployment/active/active_native.cxx   |3 ++-
 desktop/test/deployment/passive/passive_native.cxx |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit df5e6229b9ea3f881b5d66b418f1e63b892c80d3
Author: Stephan Bergmann 
AuthorDate: Fri Jan 10 19:07:53 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Jan 10 21:59:18 2020 +0100

Fix Extension_test-{active,passive}

...after b1d8262dad9939ffbf38f288d0ec60727e3742fb "tdf#88205 Adapt uses of
css::uno::Sequence to use initializer_list ctor".  Not only are these files
!LIBO_INTERNAL_ONLY, but that commit had also introduced a spurious U+00A0 
NO-
BREAK SPACE into desktop/test/deployment/active/active_native.cxx.

Change-Id: I433c267dade0af3c4af963aef97d282067aea62e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86570
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/desktop/test/deployment/active/active_native.cxx 
b/desktop/test/deployment/active/active_native.cxx
index 40ac55caa736..0f12544b6a6b 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -107,7 +107,8 @@ rtl::OUString Provider::static_getImplementationName() {
 
 css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
 {
-return { "com.sun.star.test.deployment.active_native" };
+rtl::OUString name("com.sun.star.test.deployment.active_native");
+return css::uno::Sequence< rtl::OUString >(&name, 1);
 }
 
 css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
diff --git a/desktop/test/deployment/passive/passive_native.cxx 
b/desktop/test/deployment/passive/passive_native.cxx
index 4a631726aa1f..83b955a00313 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -104,7 +104,8 @@ rtl::OUString Provider::static_getImplementationName() {
 
 css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
 {
-return { "com.sun.star.test.deployment.passive_native" };
+rtl::OUString name("com.sun.star.test.deployment.passive_native");
+return css::uno::Sequence< rtl::OUString >(&name, 1);
 }
 
 css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: desktop/test filter/source framework/source onlineupdate/source reportbuilder/java sc/inc

2019-08-12 Thread Andrea Gelmini (via logerrit)
 desktop/test/deployment/locationtest/LocationTest.java |   
 4 +-
 desktop/test/deployment/update/updateinfocreation/build/TestExtension.java |   
 4 +-
 filter/source/config/cache/filtercache.cxx |   
 4 +-
 framework/source/inc/accelerators/presethandler.hxx|   
 2 -
 onlineupdate/source/service/serviceinstall.cxx |   
 2 -
 onlineupdate/source/service/workmonitor.cxx|   
 2 -
 onlineupdate/source/update/updater/updater.cxx |   
16 +-
 reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java  |   
 4 +-
 sc/inc/chgtrack.hxx|   
 2 -
 sc/inc/document.hxx|   
 2 -
 sc/inc/drwlayer.hxx|   
 2 -
 sc/inc/orcusxml.hxx|   
 2 -
 sc/inc/scfuncs.hrc |   
 2 -
 sc/inc/sheetevents.hxx |   
 2 -
 14 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit 9aa90b50c8906226bc480c1d228d3c6c1abd064f
Author: Andrea Gelmini 
AuthorDate: Sat Aug 10 23:36:05 2019 +0200
Commit: Julien Nabet 
CommitDate: Mon Aug 12 10:03:23 2019 +0200

Fix typos

Change-Id: I94d0e85c731801b8b0ec844ae2a8f268b2f1022e
Reviewed-on: https://gerrit.libreoffice.org/77256
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/desktop/test/deployment/locationtest/LocationTest.java 
b/desktop/test/deployment/locationtest/LocationTest.java
index a2d99170d678..ca70b5a1e9f4 100644
--- a/desktop/test/deployment/locationtest/LocationTest.java
+++ b/desktop/test/deployment/locationtest/LocationTest.java
@@ -148,8 +148,8 @@ public class LocationTest {
  */
 public void initialize( Object[] object )
 throws com.sun.star.uno.Exception {
-/* The component describes what arguments its expected and in which
- * order!At this point you can read the objects and can initialize
+/* The component describes what arguments are expected and in which
+ * order! At this point you can read the objects and initialize
  * your component using these objects.
  */
 }
diff --git 
a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java 
b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java
index 84908f0180c3..8d48a30c8178 100644
--- a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java
+++ b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java
@@ -147,8 +147,8 @@ public class TestExtension {
  */
 public void initialize( Object[] object )
 throws com.sun.star.uno.Exception {
-/* The component describes what arguments its expected and in which
- * order!At this point you can read the objects and can initialize
+/* The component describes what arguments are expected and in which
+ * order! At this point you can read the objects and initialize
  * your component using these objects.
  */
 }
diff --git a/filter/source/config/cache/filtercache.cxx 
b/filter/source/config/cache/filtercache.cxx
index 8b620cacf438..aef53ed3db60 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -2049,8 +2049,8 @@ void FilterCache::impl_interpretDataVal4Filter(const 
OUString& sValue,
 void FilterCache::impl_readOldFormat()
 {
 // Attention: Opening/Reading of this old configuration format has to be 
handled gracefully.
-// Its optional and should not disturb our normal work!
-// E.g. we must check, if the package exists ...
+// It's optional and should not disturb our normal work!
+// E.g. we must check, if the package exists...
 try
 {
 css::uno::Reference< css::uno::XInterface > xInt = 
impl_openConfig(E_PROVIDER_OLD);
diff --git a/framework/source/inc/accelerators/presethandler.hxx 
b/framework/source/inc/accelerators/presethandler.hxx
index 509908a2546d..072011b1de06 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -338,7 +338,7 @@ class PresetHandler
 
 @param  sPath
 the configuration path, which should be opened.
-Its further used as out parameter too, so we can return 
the localized
+It's further used as out parameter too, so we can return 
the localized
 path!
 
 @param  eMode
diff --git a/onlineupdate/source/service/serviceinstall.cxx 
b/onlineupdate/source/service/serviceinstall.cxx
index edff2e3c27

[Libreoffice-commits] core.git: desktop/test

2019-05-17 Thread Andrea Gelmini (via logerrit)
 desktop/test/deployment/update/defect/update/info2.update.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ad3c5210fe308e71a8be246c8968a0f3535cb6e4
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:26:06 2019 +
Commit: Julien Nabet 
CommitDate: Sat May 18 08:29:00 2019 +0200

Fix typo

Change-Id: I052de7eabad2b406b258404efd75293b6b49625d
Reviewed-on: https://gerrit.libreoffice.org/72504
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/desktop/test/deployment/update/defect/update/info2.update.xml 
b/desktop/test/deployment/update/defect/update/info2.update.xml
index 1446608022f0..7e26b0b179ba 100644
--- a/desktop/test/deployment/update/defect/update/info2.update.xml
+++ b/desktop/test/deployment/update/defect/update/info2.update.xml
@@ -1 +1 @@
-This is a invalid update information file!!!
+This is an invalid update information file!!!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/test

2019-05-13 Thread Andrea Gelmini (via logerrit)
 desktop/test/deployment/executable_content/readme.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9eacac96006a59c4c28cb32808b1c00a2c92eb7f
Author: Andrea Gelmini 
AuthorDate: Mon May 13 22:01:36 2019 +
Commit: Julien Nabet 
CommitDate: Tue May 14 07:08:29 2019 +0200

Fix typos

Change-Id: I94019a8e77749f7e719eee8a1b872df6589283df
Reviewed-on: https://gerrit.libreoffice.org/72258
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/desktop/test/deployment/executable_content/readme.txt 
b/desktop/test/deployment/executable_content/readme.txt
index ad3c01097e14..2c336de723bb 100644
--- a/desktop/test/deployment/executable_content/readme.txt
+++ b/desktop/test/deployment/executable_content/readme.txt
@@ -9,4 +9,4 @@ solaris,
 linux
 
 Each directory contains a hello executable. On linux one should execute it in 
a 
-shell with an build environment, so that the c++ runtime is found.
+shell with a build environment, so that the C++ runtime is found.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/test

2019-05-13 Thread Andrea Gelmini (via logerrit)
 desktop/test/deployment/update/license/readme.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0581c2f30fed420a696897e8a80ad7e2d96e33d5
Author: Andrea Gelmini 
AuthorDate: Mon May 13 19:43:34 2019 +
Commit: Julien Nabet 
CommitDate: Tue May 14 07:07:44 2019 +0200

Fix typo

Change-Id: I2b2680dfcac400d582124ad84399e41891afb695
Reviewed-on: https://gerrit.libreoffice.org/72259
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/desktop/test/deployment/update/license/readme.txt 
b/desktop/test/deployment/update/license/readme.txt
index 8c2a4d4f0412..6040da04c4d1 100644
--- a/desktop/test/deployment/update/license/readme.txt
+++ b/desktop/test/deployment/update/license/readme.txt
@@ -1,4 +1,4 @@
-The extensions contain a license which is displayed during installation. If a 
the license is displayed during a update can be determined by the attribute
+The extensions contain a license which is displayed during installation. If 
the license is displayed during an update can be determined by the attribute
 /description/registration/simple-license/@suppress-on-update
 
 The default value is false, which means that the attribute is not set, then 
the license is displayed during an update.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/test

2018-12-14 Thread Libreoffice Gerrit user
 desktop/test/deployment/active/active_native.cxx   |   40 ++---
 desktop/test/deployment/passive/passive_native.cxx |   40 ++---
 2 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit f0851f982230d3fa19e0647ea18214b2c7b9fb90
Author: Stephan Bergmann 
AuthorDate: Fri Dec 14 16:05:36 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Dec 14 17:34:17 2018 +0100

Fix Extension_test-{active,passive}

...by reverting part of 6f50961e69406a17d6ec998956a6b33208b1001b "remove 
more
rtl::OUString and OString prefixes"

Change-Id: I50d37f437bb6f760c0d3990faaf71084913520f0
Reviewed-on: https://gerrit.libreoffice.org/65169
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/desktop/test/deployment/active/active_native.cxx 
b/desktop/test/deployment/active/active_native.cxx
index c72ad4b91508..0f12544b6a6b 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -69,9 +69,9 @@ public:
 css::uno::Reference< css::uno::XComponentContext > const & xContext)
 { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
 
-static OUString SAL_CALL static_getImplementationName();
+static rtl::OUString SAL_CALL static_getImplementationName();
 
-static css::uno::Sequence< OUString > SAL_CALL
+static css::uno::Sequence< rtl::OUString > SAL_CALL
 static_getSupportedServiceNames();
 
 private:
@@ -81,18 +81,18 @@ private:
 
 virtual ~Provider() {}
 
-virtual OUString SAL_CALL getImplementationName() override
+virtual rtl::OUString SAL_CALL getImplementationName() override
 { return static_getImplementationName(); }
 
-virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) 
override
+virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & 
ServiceName) override
 { return cppu::supportsService(this, ServiceName); }
 
-virtual css::uno::Sequence< OUString > SAL_CALL
+virtual css::uno::Sequence< rtl::OUString > SAL_CALL
 getSupportedServiceNames() override
 { return static_getSupportedServiceNames(); }
 
 virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL 
queryDispatch(
-css::util::URL const &, OUString const &, sal_Int32) override;
+css::util::URL const &, rtl::OUString const &, sal_Int32) override;
 
 virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
 SAL_CALL queryDispatches(
@@ -101,18 +101,18 @@ private:
 css::uno::Reference< css::uno::XComponentContext > context_;
 };
 
-OUString Provider::static_getImplementationName() {
-return OUString("com.sun.star.comp.test.deployment.active_native");
+rtl::OUString Provider::static_getImplementationName() {
+return rtl::OUString("com.sun.star.comp.test.deployment.active_native");
 }
 
-css::uno::Sequence< OUString > Provider::static_getSupportedServiceNames()
+css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
 {
-OUString name("com.sun.star.test.deployment.active_native");
-return css::uno::Sequence< OUString >(&name, 1);
+rtl::OUString name("com.sun.star.test.deployment.active_native");
+return css::uno::Sequence< rtl::OUString >(&name, 1);
 }
 
 css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
-css::util::URL const &, OUString const &, sal_Int32)
+css::util::URL const &, rtl::OUString const &, sal_Int32)
 {
 css::uno::Reference< css::frame::XDispatch > dispatch;
 if (!(context_->getValueByName(
@@ -156,11 +156,11 @@ public:
 css::uno::Reference< css::uno::XComponentContext > const & xContext)
 { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
 
-static OUString SAL_CALL static_getImplementationName();
+static rtl::OUString SAL_CALL static_getImplementationName();
 
-static css::uno::Sequence< OUString > SAL_CALL
+static css::uno::Sequence< rtl::OUString > SAL_CALL
 static_getSupportedServiceNames()
-{ return css::uno::Sequence< OUString >(); }
+{ return css::uno::Sequence< rtl::OUString >(); }
 
 private:
 explicit Dispatch(
@@ -169,13 +169,13 @@ private:
 
 virtual ~Dispatch() {}
 
-virtual OUString SAL_CALL getImplementationName() override
+virtual rtl::OUString SAL_CALL getImplementationName() override
 { return static_getImplementationName(); }
 
-virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) 
override
+virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & 
ServiceName) override
 { return cppu::supportsService(this, ServiceName); }
 
-virtual css::uno::Sequence< OUString > SAL_CALL
+virtual css::uno::Sequence< rtl::OUString > SAL_CALL
 getSupportedServiceNames() override
 { return static_getSupportedServiceNames(); }
 
@@ -196,8 +196,8 @@ private:
 css::uno::Reference< css::uno::XComponentContext > cont

[Libreoffice-commits] core.git: desktop/test

2018-02-13 Thread Stephan Bergmann
 desktop/test/deployment/active/active_native.cxx   |6 +++---
 desktop/test/deployment/passive/passive_native.cxx |4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3c9c9c54e1c428007088533ad831f9b3c02e3ddc
Author: Stephan Bergmann 
Date:   Tue Feb 13 14:41:47 2018 +0100

loplugin:salcall (Extension_test-{active,passive})

Change-Id: I4cb850a4ceb44dfe2807afe38f3fa131e6590932

diff --git a/desktop/test/deployment/active/active_native.cxx 
b/desktop/test/deployment/active/active_native.cxx
index 0c1154bcc441..cf8226ab34bd 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -234,21 +234,21 @@ static cppu::ImplementationEntry const services[] = {
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * component_getFactory(
 char const * pImplName, void * pServiceManager, void * pRegistryKey)
 {
 return cppu::component_getFactoryHelper(
 pImplName, pServiceManager, pRegistryKey, services);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT void
 component_getImplementationEnvironment(
 char const ** ppEnvTypeName, uno_Environment **)
 {
 *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool component_writeInfo(
 void * pServiceManager, void * pRegistryKey)
 {
 if (!component_writeInfoHelper(pServiceManager, pRegistryKey, services)) {
diff --git a/desktop/test/deployment/passive/passive_native.cxx 
b/desktop/test/deployment/passive/passive_native.cxx
index 272d5cfbad6f..aadd8793ab90 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -231,14 +231,14 @@ static cppu::ImplementationEntry const services[] = {
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * component_getFactory(
 char const * pImplName, void * pServiceManager, void * pRegistryKey)
 {
 return cppu::component_getFactoryHelper(
 pImplName, pServiceManager, pRegistryKey, services);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT void
 component_getImplementationEnvironment(
 char const ** ppEnvTypeName, uno_Environment **)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: desktop/test

2018-02-13 Thread Stephan Bergmann
 desktop/test/deployment/active/active_native.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 495ad1e211a43b45f35620408707b404cc3a2058
Author: Stephan Bergmann 
Date:   Tue Feb 13 14:39:04 2018 +0100

Fix !LIBO_INTERNAL_ONLY code (Extension_test-active)

...by reverting the broken part of 2c05d758b2b62c9df413e2514fb3cd233d0f3ec7 
"add
<< operator for css::uno::Exception"

Change-Id: I1b625dad2050b7549338f148c016a515e42adeb6

diff --git a/desktop/test/deployment/active/active_native.cxx 
b/desktop/test/deployment/active/active_native.cxx
index 3a2af3f9c2dc..0c1154bcc441 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -267,7 +267,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL 
component_writeInfo(
 } catch (const css::uno::Exception & e) {
 SAL_INFO(
 "desktop.test",
-"active_native component_writeInfo: " << e);
+"active_native component_writeInfo exception: " << e.Message);
 return false;
 }
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: desktop/test

2016-11-16 Thread Stephan Bergmann
 desktop/test/deployment/passive/Addons.xcu |   71 ++---
 1 file changed, 36 insertions(+), 35 deletions(-)

New commits:
commit ed5a8df72ac2d14aa2f5d1f87543fcfff9ad9d7d
Author: Stephan Bergmann 
Date:   Wed Nov 16 17:01:06 2016 +0100

Demonstrate that (extension) .xcu can contain  with nested s

This sprang from an IRC conversation with uniscript about allowing .xcd in
extensions, so that an extension with (localization) data for many packages
would not need one .xcu file per package, but rather only a single file.  
That
is possible with a single .xcu file using the  syntax, as shown here. 
 (I
had thought that originally only registrymodifications.xcu supported the 

syntax, but can't find any traces of that; so looks like an extension with 
an
.xcu file using  syntax should be supported by OOo and derivates 
"since
ages".)

Change-Id: I1101793e6b14ba9c1e7647edab76927d4d31a81c

diff --git a/desktop/test/deployment/passive/Addons.xcu 
b/desktop/test/deployment/passive/Addons.xcu
index 3ef3b62..efb3648 100644
--- a/desktop/test/deployment/passive/Addons.xcu
+++ b/desktop/test/deployment/passive/Addons.xcu
@@ -17,42 +17,43 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-http://openoffice.org/2001/registry";
-o:package="org.openoffice.Office" o:name="Addons">
-  
-
-  
-
-  passive
-
-
-  
-
-  
vnd.org.openoffice.test.desktop.deployment.passive_native:
-
-
-  native
-
-  
-  
-
-  
vnd.org.openoffice.test.desktop.deployment.passive_java:
-
-
-  java
-
-  
-  
-
-  
vnd.org.openoffice.test.desktop.deployment.passive_python:
-
-
-  python
-
+http://openoffice.org/2001/registry";>
+  
+
+  
+
+  
+passive
+  
+  
+
+  
+
vnd.org.openoffice.test.desktop.deployment.passive_native:
+  
+  
+native
+  
+
+
+  
+
vnd.org.openoffice.test.desktop.deployment.passive_java:
+  
+  
+java
+  
+
+
+  
+
vnd.org.openoffice.test.desktop.deployment.passive_python:
+  
+  
+python
+  
+
   
 
   
 
-  
-
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: desktop/test

2015-11-13 Thread Stephan Bergmann
 desktop/test/deployment/active/active_native.cxx   |6 +++---
 desktop/test/deployment/passive/passive_native.cxx |6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 5a137c4a3da04d079c236984f72cff8701abdf8a
Author: Stephan Bergmann 
Date:   Fri Nov 13 15:36:39 2015 +0100

loplugin:nullptr

Change-Id: I001d3cefea8083e0f0d1a965b26ce867f384aea0

diff --git a/desktop/test/deployment/active/active_native.cxx 
b/desktop/test/deployment/active/active_native.cxx
index 06da72a..5baf91c 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -234,11 +234,11 @@ void Dispatch::dispatch(
 static cppu::ImplementationEntry const services[] = {
 { &Provider::static_create, &Provider::static_getImplementationName,
   &Provider::static_getSupportedServiceNames,
-  &cppu::createSingleComponentFactory, 0, 0 },
+  &cppu::createSingleComponentFactory, nullptr, 0 },
 { &Dispatch::static_create, &Dispatch::static_getImplementationName,
   &Dispatch::static_getSupportedServiceNames,
-  &cppu::createSingleComponentFactory, 0, 0 },
-{ 0, 0, 0, 0, 0, 0 }
+  &cppu::createSingleComponentFactory, nullptr, 0 },
+{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
 };
 
 }
diff --git a/desktop/test/deployment/passive/passive_native.cxx 
b/desktop/test/deployment/passive/passive_native.cxx
index 70b11cc..4197054 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -231,11 +231,11 @@ void Dispatch::dispatch(
 static cppu::ImplementationEntry const services[] = {
 { &Provider::static_create, &Provider::static_getImplementationName,
   &Provider::static_getSupportedServiceNames,
-  &cppu::createSingleComponentFactory, 0, 0 },
+  &cppu::createSingleComponentFactory, nullptr, 0 },
 { &Dispatch::static_create, &Dispatch::static_getImplementationName,
   &Dispatch::static_getSupportedServiceNames,
-  &cppu::createSingleComponentFactory, 0, 0 },
-{ 0, 0, 0, 0, 0, 0 }
+  &cppu::createSingleComponentFactory, nullptr, 0 },
+{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
 };
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: desktop/test ure/source

2015-09-15 Thread Stephan Bergmann
 desktop/test/deployment/active/active_native.cxx   |6 +++---
 desktop/test/deployment/passive/passive_native.cxx |6 +++---
 ure/source/uretest/cppmain.cc  |4 ++--
 ure/source/uretest/cppserver.cc|4 ++--
 ure/source/uretest/cpptest.cc  |4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 63c707ad358942d9a469d59a008d89dbf1c7341d
Author: Stephan Bergmann 
Date:   Tue Sep 15 11:10:15 2015 +0200

Revert cppuhelper/implbase.hxx usage in non-LIBO_INTERNAL_ONLY code, again

Change-Id: I8c40f4ea79941e7ca5438ff9756f62988719cebc

diff --git a/desktop/test/deployment/active/active_native.cxx 
b/desktop/test/deployment/active/active_native.cxx
index ee36e84..06da72a 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -46,7 +46,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -59,7 +59,7 @@
 namespace {
 
 class Provider:
-public cppu::WeakImplHelper<
+public cppu::WeakImplHelper2<
 css::lang::XServiceInfo, css::frame::XDispatchProvider >,
 private boost::noncopyable
 {
@@ -150,7 +150,7 @@ Provider::queryDispatches(
 }
 
 class Dispatch:
-public cppu::WeakImplHelper<
+public cppu::WeakImplHelper2<
 css::lang::XServiceInfo, css::frame::XDispatch >,
 private boost::noncopyable
 {
diff --git a/desktop/test/deployment/passive/passive_native.cxx 
b/desktop/test/deployment/passive/passive_native.cxx
index 6cbff69..70b11cc 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -45,7 +45,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -56,7 +56,7 @@
 namespace {
 
 class Provider:
-public cppu::WeakImplHelper<
+public cppu::WeakImplHelper2<
 css::lang::XServiceInfo, css::frame::XDispatchProvider >,
 private boost::noncopyable
 {
@@ -147,7 +147,7 @@ Provider::queryDispatches(
 }
 
 class Dispatch:
-public cppu::WeakImplHelper<
+public cppu::WeakImplHelper2<
 css::lang::XServiceInfo, css::frame::XDispatch >,
 private boost::noncopyable
 {
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index 6efcf64..ab38ef9 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -55,7 +55,7 @@
 #include "com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.hpp"
 #include "com/sun/star/util/theMacroExpander.hpp"
 #include "cppuhelper/factory.hxx"
-#include 
+#include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/interfacecontainer.hxx"
 #include "cppuhelper/unourl.hxx"
@@ -77,7 +77,7 @@
 
 namespace {
 
-class Service: public ::cppu::WeakImplHelper< css::lang::XMain > {
+class Service: public ::cppu::WeakImplHelper1< css::lang::XMain > {
 public:
 explicit Service(
 css::uno::Reference< css::uno::XComponentContext > const & context):
diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc
index 09a02ff..69b33c3 100644
--- a/ure/source/uretest/cppserver.cc
+++ b/ure/source/uretest/cppserver.cc
@@ -27,7 +27,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "cppuhelper/factory.hxx"
-#include 
+#include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
 #include "rtl/ustring.h"
@@ -40,7 +40,7 @@
 
 namespace {
 
-class Service: public ::cppu::WeakImplHelper< ::test::types::XServer > {
+class Service: public ::cppu::WeakImplHelper1< ::test::types::XServer > {
 public:
 Service() {}
 
diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc
index db8dd3b..d1f112d 100644
--- a/ure/source/uretest/cpptest.cc
+++ b/ure/source/uretest/cpptest.cc
@@ -25,7 +25,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "cppuhelper/factory.hxx"
-#include 
+#include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
 #include "rtl/ustring.h"
@@ -38,7 +38,7 @@
 
 namespace {
 
-class Service: public cppu::WeakImplHelper< test::types::XTest > {
+class Service: public cppu::WeakImplHelper1< test::types::XTest > {
 public:
 Service() {}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: desktop/test

2015-09-14 Thread Stephan Bergmann
 desktop/test/deployment/active/active_native.cxx   |4 ++--
 desktop/test/deployment/passive/passive_native.cxx |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8cdf71a97cd53e9e1035017febf226765cf0697d
Author: Stephan Bergmann 
Date:   Mon Sep 14 14:02:20 2015 +0200

Extensions are not built against LIBO_INTERNAL_ONLY

Change-Id: I5a41b9f92678586da14fbb89f469fb11e06485a5

diff --git a/desktop/test/deployment/active/active_native.cxx 
b/desktop/test/deployment/active/active_native.cxx
index db9c4dd..06da72a 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -59,7 +59,7 @@
 namespace {
 
 class Provider:
-public cppu::WeakImplHelper<
+public cppu::WeakImplHelper2<
 css::lang::XServiceInfo, css::frame::XDispatchProvider >,
 private boost::noncopyable
 {
@@ -150,7 +150,7 @@ Provider::queryDispatches(
 }
 
 class Dispatch:
-public cppu::WeakImplHelper<
+public cppu::WeakImplHelper2<
 css::lang::XServiceInfo, css::frame::XDispatch >,
 private boost::noncopyable
 {
diff --git a/desktop/test/deployment/passive/passive_native.cxx 
b/desktop/test/deployment/passive/passive_native.cxx
index 6cbff69..70b11cc 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -45,7 +45,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -56,7 +56,7 @@
 namespace {
 
 class Provider:
-public cppu::WeakImplHelper<
+public cppu::WeakImplHelper2<
 css::lang::XServiceInfo, css::frame::XDispatchProvider >,
 private boost::noncopyable
 {
@@ -147,7 +147,7 @@ Provider::queryDispatches(
 }
 
 class Dispatch:
-public cppu::WeakImplHelper<
+public cppu::WeakImplHelper2<
 css::lang::XServiceInfo, css::frame::XDispatch >,
 private boost::noncopyable
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: desktop/test

2015-07-10 Thread Heiher
 desktop/test/deployment/update/platform/linux_mips64_eb.oxt |binary
 desktop/test/deployment/update/platform/linux_mips64_el.oxt |binary
 desktop/test/deployment/update/platform/readme.txt  |2 ++
 3 files changed, 2 insertions(+)

New commits:
commit 618198222a66306028834d3f6e898f73368bc103
Author: Heiher 
Date:   Tue Jul 7 17:00:34 2015 +0800

desktop: update: Add support for mips64.

Change-Id: I48c6d717e30491171936e34210e8c60b1c7f9487
Reviewed-on: https://gerrit.libreoffice.org/16909
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/desktop/test/deployment/update/platform/linux_mips64_eb.oxt 
b/desktop/test/deployment/update/platform/linux_mips64_eb.oxt
new file mode 100644
index 000..5441216
Binary files /dev/null and 
b/desktop/test/deployment/update/platform/linux_mips64_eb.oxt differ
diff --git a/desktop/test/deployment/update/platform/linux_mips64_el.oxt 
b/desktop/test/deployment/update/platform/linux_mips64_el.oxt
new file mode 100644
index 000..1749909
Binary files /dev/null and 
b/desktop/test/deployment/update/platform/linux_mips64_el.oxt differ
diff --git a/desktop/test/deployment/update/platform/readme.txt 
b/desktop/test/deployment/update/platform/readme.txt
index 2ab102a..30c028f 100644
--- a/desktop/test/deployment/update/platform/readme.txt
+++ b/desktop/test/deployment/update/platform/readme.txt
@@ -7,7 +7,9 @@ linux_arm_eabi.oxt: linux_arm_eabi
 linux_arm_oabi.oxt: linux_arm_oabi
 linux_ia64.oxt: linux_ia64
 linux_mips_eb.oxt: linux_mips_eb
+linux_mips64_eb.oxt: linux_mips64_eb
 linux_mips_el.oxt: linux_mips_el
+linux_mips64_el.oxt: linux_mips64_el
 linux_powerpc64.oxt: linux_powerpc64
 linux_powerpc.oxt: linux_powerpc
 linux_s390.oxt: linux_s390
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: desktop/test

2015-02-03 Thread Stephan Bergmann
 desktop/test/deployment/active/active_native.cxx   |   40 ++---
 desktop/test/deployment/passive/passive_native.cxx |   40 ++---
 2 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit dd6424c9f9647947a24dfe968fdb4126ee19dc10
Author: Stephan Bergmann 
Date:   Tue Feb 3 14:10:21 2015 +0100

Fix Extension_test-{active,passive}

Change-Id: Ibfa00b98bde90e1a84e19637179be83449b7743d

diff --git a/desktop/test/deployment/active/active_native.cxx 
b/desktop/test/deployment/active/active_native.cxx
index b65cff5..c88e191 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -68,9 +68,9 @@ public:
 css::uno::Reference< css::uno::XComponentContext > const & xContext)
 { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
 
-static OUString SAL_CALL static_getImplementationName();
+static rtl::OUString SAL_CALL static_getImplementationName();
 
-static css::uno::Sequence< OUString > SAL_CALL
+static css::uno::Sequence< rtl::OUString > SAL_CALL
 static_getSupportedServiceNames();
 
 private:
@@ -80,20 +80,20 @@ private:
 
 virtual ~Provider() {}
 
-virtual OUString SAL_CALL getImplementationName()
+virtual rtl::OUString SAL_CALL getImplementationName()
 throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return static_getImplementationName(); }
 
-virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
+virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & 
ServiceName)
 throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return cppu::supportsService(this, ServiceName); }
 
-virtual css::uno::Sequence< OUString > SAL_CALL
+virtual css::uno::Sequence< rtl::OUString > SAL_CALL
 getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return static_getSupportedServiceNames(); }
 
 virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL 
queryDispatch(
-css::util::URL const &, OUString const &, sal_Int32)
+css::util::URL const &, rtl::OUString const &, sal_Int32)
 throw (css::uno::RuntimeException) SAL_OVERRIDE;
 
 virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
@@ -104,18 +104,18 @@ private:
 css::uno::Reference< css::uno::XComponentContext > context_;
 };
 
-OUString Provider::static_getImplementationName() {
-return OUString("com.sun.star.comp.test.deployment.active_native");
+rtl::OUString Provider::static_getImplementationName() {
+return rtl::OUString("com.sun.star.comp.test.deployment.active_native");
 }
 
-css::uno::Sequence< OUString > Provider::static_getSupportedServiceNames()
+css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
 {
-OUString name("com.sun.star.test.deployment.active_native");
-return css::uno::Sequence< OUString >(&name, 1);
+rtl::OUString name("com.sun.star.test.deployment.active_native");
+return css::uno::Sequence< rtl::OUString >(&name, 1);
 }
 
 css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
-css::util::URL const &, OUString const &, sal_Int32)
+css::util::URL const &, rtl::OUString const &, sal_Int32)
 throw (css::uno::RuntimeException)
 {
 css::uno::Reference< css::frame::XDispatch > dispatch;
@@ -159,11 +159,11 @@ public:
 css::uno::Reference< css::uno::XComponentContext > const & xContext)
 { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
 
-static OUString SAL_CALL static_getImplementationName();
+static rtl::OUString SAL_CALL static_getImplementationName();
 
-static css::uno::Sequence< OUString > SAL_CALL
+static css::uno::Sequence< rtl::OUString > SAL_CALL
 static_getSupportedServiceNames()
-{ return css::uno::Sequence< OUString >(); }
+{ return css::uno::Sequence< rtl::OUString >(); }
 
 private:
 Dispatch(
@@ -172,15 +172,15 @@ private:
 
 virtual ~Dispatch() {}
 
-virtual OUString SAL_CALL getImplementationName()
+virtual rtl::OUString SAL_CALL getImplementationName()
 throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return static_getImplementationName(); }
 
-virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
+virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & 
ServiceName)
 throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return cppu::supportsService(this, ServiceName); }
 
-virtual css::uno::Sequence< OUString > SAL_CALL
+virtual css::uno::Sequence< rtl::OUString > SAL_CALL
 getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return static_getSupportedServiceNames(); }
 
@@ -204,8 +204,8 @@ private:
 css::uno::Reference< css::uno::XComponentContext > context_;
 };
 
-OUString Dispatch::static_getImplementationName() {
-return OUString(
+rtl::OUStri

[Libreoffice-commits] core.git: desktop/test odk/examples xmerge/source

2014-12-12 Thread Noel Grandin
 
desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
 |2 +-
 odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java   
 |2 +-
 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
|2 +-
 odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java 
 |2 +-
 odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java   
 |2 +-
 odk/examples/java/Inspector/InspectorAddon.java
 |2 +-
 odk/examples/java/Inspector/ProtocolHandlerAddon.java  
 |2 +-
 odk/examples/java/MinimalComponent/MinimalComponent.java   
 |2 +-
 odk/examples/java/ToDo/ToDo.java   
 |2 +-
 xmerge/source/bridge/java/XMergeBridge.java
 |2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 7320714922b2d68f668283747faf1b98e7d2b15b
Author: Noel Grandin 
Date:   Fri Dec 12 13:37:47 2014 +0200

java: fix non-public UNO implementation classes

which I messed up in commit 70f56bc22fe952c
"java: reduce scope, make member classes private"

Change-Id: I817b2a571e2124f551ccd5c0d8e1099d89f0ec46

diff --git 
a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
 
b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
index abd49d5..17c6244 100644
--- 
a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
+++ 
b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
@@ -43,7 +43,7 @@ import com.sun.star.util.XChangesBatch;
  */
 public class OptionsEventHandler {
 
-private static class _OptionsEventHandler extends WeakBase
+public static class _OptionsEventHandler extends WeakBase
 implements XServiceInfo, XContainerWindowEventHandler {
 
 static private final String __serviceName =
diff --git 
a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java 
b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
index 083347c..253ca60 100644
--- 
a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
+++ 
b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
@@ -65,7 +65,7 @@ import com.sun.star.test.XTestDialogHandler;
 // ComponentBase, see implementation of TestComponentA.
 public class DialogComponent {
 
-private static class _DialogComponent
+public static class _DialogComponent
 implements XTypeProvider, XServiceInfo, XTestDialogHandler, 
XDialogEventHandler {
 
 private static final String __serviceName= 
"com.sun.star.test.TestDialogHandler";
diff --git 
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
 
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
index 7930f85..bf3cea5 100644
--- 
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
+++ 
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
@@ -67,7 +67,7 @@ import com.sun.star.document.XFilter;
 
 public class AsciiReplaceFilter
 {
-private static class _AsciiReplaceFilter extends WeakBase
+public static class _AsciiReplaceFilter extends WeakBase
 implements  XInitialization ,
 XServiceInfo,
 XNamed  ,
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java 
b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
index a3a2e09..e6d6830 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
+++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
@@ -108,7 +108,7 @@ class ExampleAddInThread extends Thread
 
 public class ExampleAddIn
 {
-static private class _ExampleAddIn extends 
com.sun.star.lib.uno.helper.WeakBase
+static public class _ExampleAddIn extends 
com.sun.star.lib.uno.helper.WeakBase
implements org.openoffice.sheet.addin.XExampleAddIn,
   com.sun.star.sheet.XAddIn,
   com.sun.star.lang.XServiceName,
diff --git 
a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java 
b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
index 445b75d..bea38f1 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
+

[Libreoffice-commits] core.git: desktop/test

2014-09-19 Thread Stephan Bergmann
 desktop/test/deployment/active/active_native.cxx   |   22 ++---
 desktop/test/deployment/passive/passive_native.cxx |   22 ++---
 2 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit 474cd8ebc4a48f30fad3fd748aa363dbd0755477
Author: Stephan Bergmann 
Date:   Fri Sep 19 09:08:19 2014 +0200

loplugin:saloverride

Change-Id: I82f052cd62ea1561c3f77231cd285901ff1d6a80

diff --git a/desktop/test/deployment/active/active_native.cxx 
b/desktop/test/deployment/active/active_native.cxx
index bb2757de..b65cff5 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -81,25 +81,25 @@ private:
 virtual ~Provider() {}
 
 virtual OUString SAL_CALL getImplementationName()
-throw (css::uno::RuntimeException)
+throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return static_getImplementationName(); }
 
 virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-throw (css::uno::RuntimeException)
+throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return cppu::supportsService(this, ServiceName); }
 
 virtual css::uno::Sequence< OUString > SAL_CALL
-getSupportedServiceNames() throw (css::uno::RuntimeException)
+getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return static_getSupportedServiceNames(); }
 
 virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL 
queryDispatch(
 css::util::URL const &, OUString const &, sal_Int32)
-throw (css::uno::RuntimeException);
+throw (css::uno::RuntimeException) SAL_OVERRIDE;
 
 virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
 SAL_CALL queryDispatches(
 css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests)
-throw (css::uno::RuntimeException);
+throw (css::uno::RuntimeException) SAL_OVERRIDE;
 
 css::uno::Reference< css::uno::XComponentContext > context_;
 };
@@ -173,32 +173,32 @@ private:
 virtual ~Dispatch() {}
 
 virtual OUString SAL_CALL getImplementationName()
-throw (css::uno::RuntimeException)
+throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return static_getImplementationName(); }
 
 virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-throw (css::uno::RuntimeException)
+throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return cppu::supportsService(this, ServiceName); }
 
 virtual css::uno::Sequence< OUString > SAL_CALL
-getSupportedServiceNames() throw (css::uno::RuntimeException)
+getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return static_getSupportedServiceNames(); }
 
 virtual void SAL_CALL dispatch(
 css::util::URL const &,
 css::uno::Sequence< css::beans::PropertyValue > const &)
-throw (css::uno::RuntimeException);
+throw (css::uno::RuntimeException) SAL_OVERRIDE;
 
 virtual void SAL_CALL addStatusListener(
 css::uno::Reference< css::frame::XStatusListener > const &,
 css::util::URL const &)
-throw (css::uno::RuntimeException)
+throw (css::uno::RuntimeException) SAL_OVERRIDE
 {}
 
 virtual void SAL_CALL removeStatusListener(
 css::uno::Reference< css::frame::XStatusListener > const &,
 css::util::URL const &)
-throw (css::uno::RuntimeException)
+throw (css::uno::RuntimeException) SAL_OVERRIDE
 {}
 
 css::uno::Reference< css::uno::XComponentContext > context_;
diff --git a/desktop/test/deployment/passive/passive_native.cxx 
b/desktop/test/deployment/passive/passive_native.cxx
index 38708e7..2e64bcc 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -78,25 +78,25 @@ private:
 virtual ~Provider() {}
 
 virtual OUString SAL_CALL getImplementationName()
-throw (css::uno::RuntimeException)
+throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return static_getImplementationName(); }
 
 virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-throw (css::uno::RuntimeException)
+throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return cppu::supportsService(this, ServiceName); }
 
 virtual css::uno::Sequence< OUString > SAL_CALL
-getSupportedServiceNames() throw (css::uno::RuntimeException)
+getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE
 { return static_getSupportedServiceNames(); }
 
 virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL 
queryDispatch(
 css::util::URL const &, OUString const &, sal_Int32)
-throw (css::uno::RuntimeException);
+throw (css::uno::RuntimeException) SAL_OVERRIDE;
 
 virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
 SAL

[Libreoffice-commits] core.git: desktop/test include/toolkit odk/examples offapi/com offapi/type_reference offapi/UnoApi_offapi.mk qadevOOo/tests swext/mediawiki sw/source toolkit/source UnoControls/i

2013-07-11 Thread Ariel Constenla-Haile
 UnoControls/inc/basecontrol.hxx
 |1 
 UnoControls/source/inc/progressmonitor.hxx 
 |1 
 desktop/test/deployment/active/Dispatch.java   
 |3 
 desktop/test/deployment/active/active_native.cxx   
 |2 
 desktop/test/deployment/active/active_python.py
 |3 
 
desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java 
|3 
 desktop/test/deployment/passive/passive_native.cxx 
 |2 
 desktop/test/deployment/passive/passive_python.py  
 |3 
 include/toolkit/awt/vclxtoolkit.hxx
 |2 
 odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java   
 |4 
 odk/examples/DevelopersGuide/GUI/MessageBox.java   
 |5 
 odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx  
 |3 
 odk/examples/java/Inspector/Inspector.java 
 |3 
 offapi/UnoApi_offapi.mk
 |3 
 offapi/com/sun/star/awt/MessageBoxButtons.idl  
 |6 -
 offapi/com/sun/star/awt/MessageBoxCommand.idl  
 |   55 -
 offapi/com/sun/star/awt/MessageBoxResults.idl  
 |   58 ++
 offapi/com/sun/star/awt/MessageBoxType.idl 
 |   50 
 offapi/com/sun/star/awt/XMessageBox.idl
 |   35 +-
 offapi/com/sun/star/awt/XMessageBoxFactory.idl 
 |   53 +++--
 offapi/type_reference/offapi.rdb   
 |binary
 qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java   
 |2 
 sw/source/ui/envelp/labimp.hxx 
 |1 
 swext/mediawiki/src/com/sun/star/wiki/Helper.java  
 |7 -
 swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
 |4 
 toolkit/source/awt/vclxtoolkit.cxx 
 |   48 +++-
 26 files changed, 208 insertions(+), 149 deletions(-)

New commits:
commit 805c6101b3427cc98b53f1c48f22f705206c384d
Author: Ariel Constenla-Haile 
Date:   Mon Dec 24 08:07:25 2012 +

Resolves: #i121544# - Clean-up MessageBox API

(cherry picked from commit 27cfcb1e9d103b3e49c1263b1fa59fee8b187b21)

Conflicts:
desktop/test/deployment/active/active_native.cxx
desktop/test/deployment/passive/Dispatch.java
desktop/test/deployment/passive/passive_native.cxx
odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
odk/examples/DevelopersGuide/GUI/MessageBox.java
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
odk/examples/java/Inspector/Inspector.java
offapi/com/sun/star/awt/MessageBoxButtons.idl
offapi/com/sun/star/awt/MessageBoxResults.idl
offapi/com/sun/star/awt/XMessageBox.idl
offapi/com/sun/star/awt/XMessageBoxFactory.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/types.rdb
sdext/source/minimizer/unodialog.cxx
toolkit/inc/toolkit/awt/vclxtoolkit.hxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/layout/core/root.cxx

Change-Id: I170b494fb96362bb25ba8d0f2518d4e46934dd67

Related: #i121544# - Clean-up MessageBox API (post fix)

(cherry picked from commit c9f7a06e7798bcd5253844c49d210ea9345bd4b8)

Conflicts:
sw/inc/pch/precompiled_sw.hxx

Change-Id: Ib8b1e7aaac769feff5206fcdd238c487a6130dd1

Related: #i121544# - Fix header guards

Found by: Tsutomu Uchino

(cherry picked from commit 82194a19ff4f29c8451c8e6ab6fe4f1b9d08df27)

Conflicts:
offapi/com/sun/star/awt/MessageBoxType.idl

Change-Id: Ide8ba697fbc80395d2f30a068a0820a6afa3332f

diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 0aa633d..2ae330f 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -75,7 +75,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/UnoControls/source/inc/progressmonitor.hxx 
b/UnoControls/source/inc/progressmonitor.hxx
index 163dc09..48bc2b9 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -55,7 +55,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/desktop/test/deployment/active/Dispatch.java 
b/desktop/test/deployment/active/Dispatch.java
index 08a7933..f50cdea 100644
--- a/desktop/test/depl

[Libreoffice-commits] core.git: desktop/test dictionaries helpcontent2

2013-04-02 Thread Zolnai Tamás
 desktop/test/deployment/update/website_update/update/web6/description.xml |
2 +-
 desktop/test/deployment/update/website_update/update/web7/description.xml |
2 +-
 dictionaries  |
2 +-
 helpcontent2  |
2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8ff5d1d5e5e5270e22009266d2ec9debb88196f0
Author: Zolnai Tamás 
Date:   Tue Apr 2 21:37:25 2013 +0200

No localize descripiton.xml of test tool

Change-Id: Ie6d155d158244825d4fc2731dc264ac9d4dd875c

diff --git 
a/desktop/test/deployment/update/website_update/update/web6/description.xml 
b/desktop/test/deployment/update/website_update/update/web6/description.xml
index a800d64..47a32a2 100644
--- a/desktop/test/deployment/update/website_update/update/web6/description.xml
+++ b/desktop/test/deployment/update/website_update/update/web6/description.xml
@@ -21,7 +21,7 @@
 
 
 
-  web-based update test 1
+  web-based update test 1
 
 
 
diff --git 
a/desktop/test/deployment/update/website_update/update/web7/description.xml 
b/desktop/test/deployment/update/website_update/update/web7/description.xml
index fc5f40f..9d5e456 100644
--- a/desktop/test/deployment/update/website_update/update/web7/description.xml
+++ b/desktop/test/deployment/update/website_update/update/web7/description.xml
@@ -21,7 +21,7 @@
 
 
 
-  web-based update test 1
+  web-based update test 1
 
 
 
diff --git a/dictionaries b/dictionaries
index 36776c3..26b7c42 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4
+Subproject commit 26b7c425b0cecaad38249bfdc17b8d5cecee2670
diff --git a/helpcontent2 b/helpcontent2
index 368e41d..f25d6a1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 368e41dfa3f5f1d0cd04c9605cf36db49b9d03b3
+Subproject commit f25d6a1081dd929a8872fcd9305b5f06355d3337
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: desktop/test

2013-03-16 Thread Zolnai Tamás
 desktop/test/deployment/update/website_update/update/web6/description.xml |
2 +-
 desktop/test/deployment/update/website_update/update/web7/description.xml |
2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0ae470fd0205d8c28bf06c611026244f4c13ce09
Author: Zolnai Tamás 
Date:   Sat Mar 16 12:33:36 2013 +0100

Make some xml entries localizable

Localization works only with en-US entries,
others are ignored

Change-Id: Iad8e82bf14535c98f311a8b6c2a94d6aeb1b1af9

diff --git 
a/desktop/test/deployment/update/website_update/update/web6/description.xml 
b/desktop/test/deployment/update/website_update/update/web6/description.xml
index 1d85a98..a800d64 100644
--- a/desktop/test/deployment/update/website_update/update/web6/description.xml
+++ b/desktop/test/deployment/update/website_update/update/web6/description.xml
@@ -21,7 +21,7 @@
 
 
 
-  web-based update test 1
+  web-based update test 1
 
 
 
diff --git 
a/desktop/test/deployment/update/website_update/update/web7/description.xml 
b/desktop/test/deployment/update/website_update/update/web7/description.xml
index c1c6c41..fc5f40f 100644
--- a/desktop/test/deployment/update/website_update/update/web7/description.xml
+++ b/desktop/test/deployment/update/website_update/update/web7/description.xml
@@ -21,7 +21,7 @@
 
 
 
-  web-based update test 1
+  web-based update test 1
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: desktop/test

2013-03-07 Thread Stephan Bergmann
 desktop/test/deployment/passive/makefile.mk |  132 
 1 file changed, 132 deletions(-)

New commits:
commit aadde74084a4813ca2be0e777866d7676e7d6255
Author: Stephan Bergmann 
Date:   Thu Mar 7 12:05:36 2013 +0100

Remove obsoleted dmake makefile.mk

Change-Id: Iadf57ef1dfb7e108d1c7461e60705304f448ab78

diff --git a/desktop/test/deployment/passive/makefile.mk 
b/desktop/test/deployment/passive/makefile.mk
deleted file mode 100644
index b6a18fa..000
--- a/desktop/test/deployment/passive/makefile.mk
+++ /dev/null
@@ -1,132 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ = ../../..
-PRJNAME = desktop
-TARGET = test_deployment_passive
-
-ENABLE_EXCEPTIONS = TRUE
-
-PACKAGE = com/sun/star/comp/test/deployment/passive_java
-JAVAFILES = Dispatch.java Provider.java Services.java
-JARFILES = juh.jar ridl.jar unoil.jar
-
-my_platform_components = passive_native
-my_generic_components = passive_java passive_python
-
-.INCLUDE: settings.mk
-
-
-DLLPRE =
-
-SLOFILES = $(SHL1OBJS)
-
-SHL1TARGET = passive_native.uno
-SHL1OBJS = $(SLO)/passive_native.obj
-SHL1RPATH = OXT
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB)
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE: target.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-
-ALLTAR : $(MISC)/passive.oxt
-
-$(MISC)/passive.oxt : manifest.xml description.xml Addons.xcu \
-ProtocolHandler.xcu $(MISC)/$(TARGET)/platform.components \
-$(MISC)/$(TARGET)/generic.components $(SHL1TARGETN) \
-$(MISC)/$(TARGET)/passive_java.jar passive_python.py
-$(RM) $@
-$(RM) -r $(MISC)/$(TARGET)/passive.oxt-zip
-$(MKDIR) $(MISC)/$(TARGET)/passive.oxt-zip
-$(MKDIRHIER) $(MISC)/$(TARGET)/passive.oxt-zip/META-INF
-$(SED) -e 's|@PLATFORM@|$(RTL_OS:l)_$(RTL_ARCH:l)|g' < manifest.xml \
-> $(MISC)/$(TARGET)/passive.oxt-zip/META-INF/manifest.xml
-$(COPY) description.xml Addons.xcu ProtocolHandler.xcu \
-$(MISC)/$(TARGET)/platform.components \
-$(MISC)/$(TARGET)/generic.components $(SHL1TARGETN) \
-$(MISC)/$(TARGET)/passive_java.jar passive_python.py \
-$(MISC)/$(TARGET)/passive.oxt-zip/
-cd $(MISC)/$(TARGET)/passive.oxt-zip && zip ../../passive.oxt \
-META-INF/manifest.xml description.xml Addons.xcu ProtocolHandler.xcu \
-platform.components generic.components $(SHL1TARGETN:f) \
-passive_java.jar passive_python.py
-
-$(MISC)/$(TARGET)/platform.components : $(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/$(TARGET)/platform.components.input \
-$(my_platform_components:^"$(MISC)/$(TARGET)/":+".component")
-$(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/$(TARGET)/ -o $@ \
-$(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/$(TARGET)/platform.components.input
-
-$(MISC)/$(TARGET)/platform.components.input :
-$(MKDIRHIER) $(@:d)
-echo '' \
-'$(my_platform_components:^"":+".component")' \
-'' > $@
-
-$(MISC)/$(TARGET)/generic.components : $(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/$(TARGET)/generic.components.input \
-$(my_generic_components:^"$(MISC)/$(TARGET)/":+".component")
-$(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/$(TARGET)/ -o $@ \
-$(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/$(TARGET)/generic.components.input
-
-$(MISC)/$(TARGET)/generic.components.input :
-$(MKDIRHIER) $(@:d)
-echo '' \
-'$(my_generic_components:^"":+".component")' \
-'' > $@
-
-$(MISC)/$(TARGET)/passive_native.component : \
-$(SOLARENV)/bin/createcomponent.xslt passive_native.component
-$(MKDIRHIER) $(@:d)
-$(XSLTPROC) --nonet --stringparam uri \
-'$(COMPONENTPREFIX_EXTENSION)$(SHL1TARGETN:f)' -o $@ \
-$(SOLARENV)/bin/createcomponent.xslt passive_native.component
-
-$(MISC)/$(TARGET)/passive_java.component : \
-$(SOLARENV)/bin/createcomponent.xslt passive_java.component
-$(MKDIRHIER) $(@:d)
-$(XSLTPROC) --nonet --stringparam uri \
-'$(COMPONENTPREFIX_EXTENSION)passive_java.jar' -o $@ \
-$(SOLARENV)/bin/createcomponent.xslt passive_java.component
-
-$(MISC)/$(TARGET)/passive_pytho