summaryrefslogtreecommitdiff
path: root/external/rhino/ExternalProject_rhino.mk
blob: 4f6cab6c873db58ae70d63c925fba49adba399ac (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# 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/.
#

$(eval $(call gb_ExternalProject_ExternalProject,rhino))

$(eval $(call gb_ExternalProject_register_targets,rhino,\
	build \
))

$(call gb_ExternalProject_get_state_target,rhino,build) :
	$(call gb_ExternalProject_run,build,\
		$(ICECREAM_RUN) "$(ANT)" \
			-q \
			-f build.xml \
			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
			-DTARFILE_LOCATION="$(if $(findstring -cygwin,$(BUILD_PLATFORM)),$(shell cygpath -m $(TARFILE_LOCATION)),$(TARFILE_LOCATION))" \
			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
			$(if $(debug),-Dbuild.debug="on") \
			jar \
	)

# vim: set noet sw=4 ts=4:
ct'>remove more rtl::OUString and OString prefixes
which seem to have snuck back in since the great rounds of removals. Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1 Reviewed-on: https://gerrit.libreoffice.org/62229 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/uielement/statusbaritem.hxx22
-rw-r--r--framework/inc/uielement/statusbarmerger.hxx20
-rw-r--r--framework/source/fwe/classes/addonmenu.cxx6
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx58
-rw-r--r--framework/source/services/ContextChangeEventMultiplexer.cxx12
-rw-r--r--framework/source/uielement/genericstatusbarcontroller.cxx4
-rw-r--r--framework/source/uielement/menubarmanager.cxx2
-rw-r--r--framework/source/uielement/newmenucontroller.cxx2
-rw-r--r--framework/source/uielement/statusbaritem.cxx4
-rw-r--r--framework/source/uielement/statusbarmerger.cxx13
-rw-r--r--framework/source/uifactory/uicontrollerfactory.cxx4
11 files changed, 71 insertions, 76 deletions
diff --git a/framework/inc/uielement/statusbaritem.hxx b/framework/inc/uielement/statusbaritem.hxx
index 759bf5ef6cac..961f39b7bba0 100644
--- a/framework/inc/uielement/statusbaritem.hxx
+++ b/framework/inc/uielement/statusbaritem.hxx
@@ -40,26 +40,26 @@ public:
explicit StatusbarItem(
StatusBar *pStatusBar,
sal_uInt16 nId,
- const rtl::OUString& aCommand );
+ const OUString& aCommand );
virtual ~StatusbarItem() override;
void SAL_CALL disposing() override;
// css::ui::XStatusbarItem Attributes
- virtual ::rtl::OUString SAL_CALL getCommand() override;
+ virtual OUString SAL_CALL getCommand() override;
virtual ::sal_uInt16 SAL_CALL getItemId() override;
virtual ::sal_uInt32 SAL_CALL getWidth() override;
virtual ::sal_uInt16 SAL_CALL getStyle() override;
virtual ::sal_Int32 SAL_CALL getOffset() override;
virtual css::awt::Rectangle SAL_CALL getItemRect() override;
- virtual ::rtl::OUString SAL_CALL getText() override;
- virtual void SAL_CALL setText( const rtl::OUString& rText ) override;
- virtual ::rtl::OUString SAL_CALL getHelpText() override;
- virtual void SAL_CALL setHelpText( const rtl::OUString& rHelpText ) override;
- virtual ::rtl::OUString SAL_CALL getQuickHelpText() override;
- virtual void SAL_CALL setQuickHelpText( const rtl::OUString& rQuickHelpText ) override;
- virtual ::rtl::OUString SAL_CALL getAccessibleName() override;
- virtual void SAL_CALL setAccessibleName( const rtl::OUString& rAccessibleName ) override;
+ virtual OUString SAL_CALL getText() override;
+ virtual void SAL_CALL setText( const OUString& rText ) override;
+ virtual OUString SAL_CALL getHelpText() override;
+ virtual void SAL_CALL setHelpText( const OUString& rHelpText ) override;
+ virtual OUString SAL_CALL getQuickHelpText() override;
+ virtual void SAL_CALL setQuickHelpText( const OUString& rQuickHelpText ) override;
+ virtual OUString SAL_CALL getAccessibleName() override;
+ virtual void SAL_CALL setAccessibleName( const OUString& rAccessibleName ) override;
virtual sal_Bool SAL_CALL getVisible() override;
virtual void SAL_CALL setVisible( sal_Bool bVisible ) override;
@@ -70,7 +70,7 @@ private:
VclPtr<StatusBar> m_pStatusBar;
sal_uInt16 m_nId;
sal_uInt16 m_nStyle;
- rtl::OUString m_aCommand;
+ OUString m_aCommand;
};
diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx
index 0d676b86b35c..4f61ed7c3ff5 100644
--- a/framework/inc/uielement/statusbarmerger.hxx
+++ b/framework/inc/uielement/statusbarmerger.hxx
@@ -28,14 +28,14 @@ namespace framework
struct AddonStatusbarItemData
{
- rtl::OUString aLabel;
+ OUString aLabel;
};
struct AddonStatusbarItem
{
- rtl::OUString aCommandURL;
- rtl::OUString aLabel;
- rtl::OUString aContext;
+ OUString aCommandURL;
+ OUString aLabel;
+ OUString aContext;
StatusBarItemBits nItemBits;
sal_Int16 nWidth;
};
@@ -44,25 +44,25 @@ typedef ::std::vector< AddonStatusbarItem > AddonStatusbarItemContainer;
namespace StatusbarMerger
{
- bool IsCorrectContext( const ::rtl::OUString& aContext );
+ bool IsCorrectContext( const OUString& aContext );
bool ConvertSeqSeqToVector( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence,
AddonStatusbarItemContainer& rContainer );
sal_uInt16 FindReferencePos( StatusBar* pStatusbar,
- const ::rtl::OUString& rReferencePoint );
+ const OUString& rReferencePoint );
bool ProcessMergeOperation( StatusBar* pStatusbar,
sal_uInt16 nPos,
sal_uInt16& rItemId,
- const ::rtl::OUString& rMergeCommand,
- const ::rtl::OUString& rMergeCommandParameter,
+ const OUString& rMergeCommand,
+ const OUString& rMergeCommandParameter,
const AddonStatusbarItemContainer& rItems );
bool ProcessMergeFallback( StatusBar* pStatusbar,
sal_uInt16& rItemId,
- const ::rtl::OUString& rMergeCommand,
- const ::rtl::OUString& rMergeFallback,
+ const OUString& rMergeCommand,
+ const OUString& rMergeFallback,