[Libreoffice-commits] .: 4 commits - chart2/source cui/source desktop/test solenv/bin solenv/gdb solenv/inc
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Tue Sep 20 11:51:30 PDT 2011
chart2/source/view/main/ShapeFactory.cxx | 1
cui/source/tabpages/tpline.cxx | 4
desktop/test/deployment/boxt/Addons.xcu | 50 ------
desktop/test/deployment/boxt/ProtocolHandler.xcu | 38 ----
desktop/test/deployment/boxt/boxt.cxx | 184 -----------------------
desktop/test/deployment/boxt/description.xml | 39 ----
desktop/test/deployment/boxt/makefile.mk | 68 --------
desktop/test/deployment/boxt/manifest.xml | 37 ----
solenv/bin/macosx-change-install-names.pl | 4
solenv/gdb/makefile.mk | 3
solenv/inc/settings.mk | 1
solenv/inc/unxaigppc.mk | 1
solenv/inc/unxgcc.mk | 1
solenv/inc/unxmacx.mk | 1
solenv/inc/unxsoli4.mk | 1
solenv/inc/unxsols4.mk | 1
solenv/inc/unxsolu4.mk | 1
17 files changed, 4 insertions(+), 431 deletions(-)
New commits:
commit ae8102f1e38c4da840f8343bbbd628f1c660c132
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Sep 20 20:13:02 2011 +0200
Removed pPageView made unused by previous changeset 3e5edf6c.
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index b6825b9..ac170a2 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -898,7 +898,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
pModel->InsertPage( pPage, 0 );
SdrView* pView = new SdrView( pModel, &aVDev );
pView->hideMarkHandles();
- SdrPageView* pPageView = pView->ShowSdrPage(pPage);
+ pView->ShowSdrPage(pPage);
SdrObject *pObj=NULL;
long nSymTmp=nSymType;
if(pSymbolList)
@@ -1545,7 +1545,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
// 3D View
SdrView* pView = new SdrView( pModel, &aVDev );
pView->hideMarkHandles();
- SdrPageView* pPageView = pView->ShowSdrPage(pPage);
+ pView->ShowSdrPage(pPage);
PopupMenu* pPopup = new PopupMenu;
String aEmptyStr;
commit 122b729a5a974179265b6d7a8c1c92199262b76a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Sep 20 20:06:39 2011 +0200
Removed unused fMaxSize introduced by previous changeset 3e5edf6c.
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index dc06eba..c2626ca 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -1293,7 +1293,6 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const drawing::Position3D&
const double fWidthH = rSize.DirectionX/2.0; //fWidthH stands for Half Width
const double fHeightH = rSize.DirectionY/2.0; //fHeightH stands for Half Height
- double fMaxSize = fHeightH > fWidthH ? fHeightH : fWidthH; //assumes non negative
const sal_Int32 nQuarterCount = 35; // points inside a quadrant, used in case circle
sal_Int32 nPointCount = 4; //all arrow symbols only need 4 points
commit 5bc0a6cf4e5e17fce49dad2575a13435908f2223
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Sep 20 19:56:08 2011 +0200
Cleaned up solenv/gdb/makefile.mk
diff --git a/solenv/gdb/makefile.mk b/solenv/gdb/makefile.mk
index 4078428..9e4383d 100644
--- a/solenv/gdb/makefile.mk
+++ b/solenv/gdb/makefile.mk
@@ -26,12 +26,11 @@
# instead of those above.
PRJ=..
-PRJNAME=gdb
+PRJNAME=solenv
TARGET=gdb
.INCLUDE : settings.mk
.INCLUDE : target.mk
-.INCLUDE : versionlist.mk
ALLTAR : $(MISC)/autoloaders.flag
commit b1f4e8424b2cdb2d59da7c3cc0fb7799fcd28916
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Sep 20 19:20:11 2011 +0200
Removed unused BOXT feature.
diff --git a/desktop/test/deployment/boxt/Addons.xcu b/desktop/test/deployment/boxt/Addons.xcu
deleted file mode 100644
index 3df7e2d..0000000
--- a/desktop/test/deployment/boxt/Addons.xcu
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org. If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-**********************************************************************-->
-
-<o:component-data xmlns:o="http://openoffice.org/2001/registry"
- o:package="org.openoffice.Office" o:name="Addons">
- <node o:name="AddonUI">
- <node o:name="OfficeMenuBar">
- <node o:name="org.openoffice.test.desktop.deployment.boxt" o:op="replace">
- <prop o:name="Title" xml:lang="en-US">
- <value>boxt</value>
- </prop>
- <node o:name="Submenu">
- <node o:name="1" o:op="replace">
- <prop o:name="URL">
- <value>vnd.org.openoffice.test.desktop.deployment.boxt:</value>
- </prop>
- <prop o:name="Title" xml:lang="en-US">
- <value>boxt</value>
- </prop>
- </node>
- </node>
- </node>
- </node>
- </node>
-</o:component-data>
diff --git a/desktop/test/deployment/boxt/ProtocolHandler.xcu b/desktop/test/deployment/boxt/ProtocolHandler.xcu
deleted file mode 100644
index fe448ae..0000000
--- a/desktop/test/deployment/boxt/ProtocolHandler.xcu
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org. If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-**********************************************************************-->
-
-<o:component-data xmlns:o="http://openoffice.org/2001/registry"
- o:package="org.openoffice.Office" o:name="ProtocolHandler">
- <node o:name="HandlerSet">
- <node o:name="com.sun.star.test.deployment.boxt" o:op="replace">
- <prop o:name="Protocols">
- <value>vnd.org.openoffice.test.desktop.deployment.boxt:*</value>
- </prop>
- </node>
- </node>
-</o:component-data>
diff --git a/desktop/test/deployment/boxt/boxt.cxx b/desktop/test/deployment/boxt/boxt.cxx
deleted file mode 100644
index b67625d..0000000
--- a/desktop/test/deployment/boxt/boxt.cxx
+++ /dev/null
@@ -1,184 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org. If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-************************************************************************/
-
-#include "precompiled_desktop.hxx"
-#include "sal/config.h"
-
-#include "boost/noncopyable.hpp"
-#include "com/sun/star/beans/PropertyValue.hpp"
-#include "com/sun/star/frame/DispatchDescriptor.hpp"
-#include "com/sun/star/frame/XDispatch.hpp"
-#include "com/sun/star/frame/XDispatchProvider.hpp"
-#include "com/sun/star/frame/XStatusListener.hpp"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/uno/Exception.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/uno/XInterface.hpp"
-#include "com/sun/star/util/URL.hpp"
-#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase3.hxx"
-#include "cppuhelper/implementationentry.hxx"
-#include "cppuhelper/weak.hxx"
-#include "filter/msfilter/countryid.hxx"
-#include "osl/diagnose.h"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-#include "uno/lbnames.h"
-#include "vcl/svapp.hxx"
-
-namespace {
-
-namespace css = com::sun::star;
-
-class Service:
- public cppu::WeakImplHelper3<
- css::lang::XServiceInfo, css::frame::XDispatchProvider,
- css::frame::XDispatch >,
- private boost::noncopyable
-{
-public:
- static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
- css::uno::Reference< css::uno::XComponentContext > const &)
- SAL_THROW((css::uno::Exception))
- { return static_cast< cppu::OWeakObject * >(new Service); }
-
- static rtl::OUString SAL_CALL static_getImplementationName();
-
- static css::uno::Sequence< rtl::OUString > SAL_CALL
- static_getSupportedServiceNames();
-
-private:
- Service() {}
-
- virtual ~Service() {}
-
- virtual rtl::OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException)
- { return static_getImplementationName(); }
-
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
- throw (css::uno::RuntimeException)
- { return ServiceName == getSupportedServiceNames()[0]; } //TODO
-
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException)
- { return static_getSupportedServiceNames(); }
-
- virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
- css::util::URL const &, rtl::OUString const &, sal_Int32)
- throw (css::uno::RuntimeException)
- { return this; }
-
- 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);
-
- virtual void SAL_CALL dispatch(
- css::util::URL const &,
- css::uno::Sequence< css::beans::PropertyValue > const &)
- throw (css::uno::RuntimeException);
-
- virtual void SAL_CALL addStatusListener(
- css::uno::Reference< css::frame::XStatusListener > const &,
- css::util::URL const &)
- throw (css::uno::RuntimeException)
- {}
-
- virtual void SAL_CALL removeStatusListener(
- css::uno::Reference< css::frame::XStatusListener > const &,
- css::util::URL const &)
- throw (css::uno::RuntimeException)
- {}
-};
-
-rtl::OUString Service::static_getImplementationName() {
- return rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.test.deployment.boxt"));
-}
-
-css::uno::Sequence< rtl::OUString > Service::static_getSupportedServiceNames() {
- rtl::OUString name(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.deployment.boxt"));
- return css::uno::Sequence< rtl::OUString >(&name, 1);
-}
-
-css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
-Service::queryDispatches(
- css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests)
- throw (css::uno::RuntimeException)
-{
- css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > s(
- Requests.getLength());
- for (sal_Int32 i = 0; i < s.getLength(); ++i) {
- s[i] = queryDispatch(
- Requests[i].FeatureURL, Requests[i].FrameName,
- Requests[i].SearchFlags);
- }
- return s;
-}
-
-void Service::dispatch(
- css::util::URL const &,
- css::uno::Sequence< css::beans::PropertyValue > const &)
- throw (css::uno::RuntimeException)
-{
- msfilter::ConvertCountryToLanguage(msfilter::COUNTRY_DONTKNOW);
- // link against some obscure library that is unlikely already loaded
- Application::ShowNativeErrorBox(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("boxt")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test")));
-}
-
-static cppu::ImplementationEntry const services[] = {
- { &Service::static_create, &Service::static_getImplementationName,
- &Service::static_getSupportedServiceNames,
- &cppu::createSingleComponentFactory, 0, 0 },
- { 0, 0, 0, 0, 0, 0 }
-};
-
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
- char const * pImplName, void * pServiceManager, void * pRegistryKey)
-{
- return cppu::component_getFactoryHelper(
- pImplName, pServiceManager, pRegistryKey, services);
-}
-
-extern "C" sal_Bool SAL_CALL component_writeInfo(
- void * pServiceManager, void * pRegistryKey)
-{
- return component_writeInfoHelper(pServiceManager, pRegistryKey, services);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/test/deployment/boxt/description.xml b/desktop/test/deployment/boxt/description.xml
deleted file mode 100755
index 5a67bf3..0000000
--- a/desktop/test/deployment/boxt/description.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org. If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-**********************************************************************-->
-
-<d:description xmlns:d="http://openoffice.org/extensions/description/2006">
- <d:identifier value="org.openoffice/framework/desktop/test/deployment/boxt"/>
- <d:version value="@VERSION@"/>
- <d:platform value="@PLATFORM@"/>
- <d:dependencies>
- <d:OpenOffice.org-minimal-version d:name="OpenOffice.org @VERSION@"
- value="@VERSION@"/>
- <d:OpenOffice.org-maximal-version d:name="OpenOffice.org @VERSION@ or older"
- d:OpenOffice.org-minimal-version="2.3" value="@VERSION@"/>
- </d:dependencies>
-</d:description>
diff --git a/desktop/test/deployment/boxt/makefile.mk b/desktop/test/deployment/boxt/makefile.mk
deleted file mode 100755
index 88e72ae..0000000
--- a/desktop/test/deployment/boxt/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-PRJ = ../../..
-PRJNAME = desktop
-TARGET = test_deployment_boxt
-
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE: settings.mk
-.INCLUDE: rtlbootstrap.mk
-.INCLUDE: versionlist.mk
-
-my_version = $(OOOBASEVERSIONMAJOR).$(OOOBASEVERSIONMINOR)
-
-DLLPRE =
-
-SLOFILES = $(SHL1OBJS)
-
-SHL1TARGET = boxt.uno
-SHL1OBJS = $(SLO)/boxt.obj
-SHL1RPATH = BOXT
-SHL1STDLIBS = \
- $(CPPUHELPERLIB) $(CPPULIB) $(MSFILTERLIB) $(SALLIB) $(TOOLSLIB) $(VCLLIB)
-SHL1VERSIONMAP = $(SOLARENV)/src/reg-component.map
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE: target.mk
-
-ALLTAR : $(MISC)/boxt.oxt
-
-$(MISC)/boxt.oxt .ERRREMOVE : manifest.xml description.xml Addons.xcu \
- ProtocolHandler.xcu $(SHL1TARGETN)
- $(RM) -r $@ $(MISC)/$(TARGET).zip
- $(MKDIR) $(MISC)/$(TARGET).zip
- $(MKDIR) $(MISC)/$(TARGET).zip/META-INF
- $(SED) -e 's|@PATH@|$(SHL1TARGETN:f)|g' < manifest.xml \
- > $(MISC)/$(TARGET).zip/META-INF/manifest.xml
- $(SED) -e 's|@PLATFORM@|$(RTL_OS:l)_$(RTL_ARCH:l)|g' \
- -e 's|@VERSION@|$(my_version)|g' < description.xml \
- > $(MISC)/$(TARGET).zip/description.xml
- $(COPY) Addons.xcu ProtocolHandler.xcu $(SHL1TARGETN) $(MISC)/$(TARGET).zip
- cd $(MISC)/$(TARGET).zip && zip ../boxt.oxt META-INF/manifest.xml \
- description.xml Addons.xcu ProtocolHandler.xcu $(SHL1TARGETN:f)
diff --git a/desktop/test/deployment/boxt/manifest.xml b/desktop/test/deployment/boxt/manifest.xml
deleted file mode 100755
index 73ebfc3..0000000
--- a/desktop/test/deployment/boxt/manifest.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org. If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-**********************************************************************-->
-
-<m:manifest xmlns:m="http://openoffice.org/2001/manifest">
- <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
- m:full-path="Addons.xcu"/>
- <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
- m:full-path="ProtocolHandler.xcu"/>
- <m:file-entry
- m:media-type="application/vnd.sun.star.uno-component;type=native"
- m:full-path="@PATH@"/>
-</m:manifest>
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index 29bf64d..343f953 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -45,8 +45,6 @@ sub action($$$)
'shl/OOO/OOO' => '@loader_path',
'shl/LOADER/LOADER' => '@loader_path',
'shl/OXT/URELIB' => '@executable_path/urelibs',
- 'shl/BOXT/URELIB' => '@executable_path/urelibs',
- 'shl/BOXT/OOO' => '@loader_path/../../../basis-link/program',
'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
'shl/OOO/NONE' => '@__VIA_LIBRARY_PATH__',
'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
@@ -58,7 +56,7 @@ sub action($$$)
}
@ARGV == 3 || @ARGV >= 2 && $ARGV[0] eq "extshl" or die
- 'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|BRAND|OXT|BOXT|NONE|LOADER <filepath>*';
+ 'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|BRAND|OXT|NONE|LOADER <filepath>*';
$type = shift @ARGV;
$loc = shift @ARGV;
if ($type eq "SharedLibrary")
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index b5b7e60..0b53429 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1307,7 +1307,6 @@ LINKFLAGSRUNPATH_OOO*=
LINKFLAGSRUNPATH_SDK*=
LINKFLAGSRUNPATH_BRAND*=
LINKFLAGSRUNPATH_OXT*=
-LINKFLAGSRUNPATH_BOXT*=
LINKFLAGSRUNPATH_NONE*=
# make sure both linker variables are set
diff --git a/solenv/inc/unxaigppc.mk b/solenv/inc/unxaigppc.mk
index 240aa9c..d474ee2 100644
--- a/solenv/inc/unxaigppc.mk
+++ b/solenv/inc/unxaigppc.mk
@@ -46,7 +46,6 @@ LINKFLAGSRUNPATH_UREBIN:=-Wl,-blibpath:$(URELIBDIRS):$(UREBINDIRS):/usr/lib:/lib
LINKFLAGSRUNPATH_OOO:=-Wl,-blibpath:$(BASISPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
LINKFLAGSRUNPATH_SDK:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
LINKFLAGSRUNPATH_BRAND:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(BASISPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
-LINKFLAGSRUNPATH_BOXT:=-Wl,-blibpath:$(BASISPROGRAMDIRS):/usr/lib:/lib
LINKFLAGS:=-Wl,-brtl -Wl,-bnolibpath
LINKFLAGSAPPGUI:=
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index f85c7dc..66d8e9e 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -171,7 +171,6 @@ LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable
LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\',--enable-new-dtags
LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\',--enable-new-dtags
LINKFLAGSRUNPATH_NONE=
# flag -Wl,-z,noexecstack sets the NX bit on the stack
LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 5d4136e..b5351cb 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -182,7 +182,6 @@ LINKFLAGSRUNPATH_OOO=-install_name '@___________________________________________
LINKFLAGSRUNPATH_SDK=
LINKFLAGSRUNPATH_BRAND=
LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=
LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)'
LINKFLAGS=$(LINKFLAGSDEFS)
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index 3c2bf5f..8fce32c 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -134,7 +134,6 @@ LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\'
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
LINKCFLAGS=-w -mt -z combreloc -norunpath
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 4728d59..02c01f4 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -140,7 +140,6 @@ LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\'
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
LINKCFLAGS=-w -mt -z combreloc -norunpath
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index f0129ea..91a6c89 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -134,7 +134,6 @@ LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\'
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath
LINKCFLAGS=-m64 -w -mt -z combreloc -norunpath
More information about the Libreoffice-commits
mailing list