bin/findunusedcode | 51 ++++++++++++++++++++------
solenv/bin/callcatchEnv.Set.sh | 15 -------
solenv/bin/callcatcher.Makefile | 34 -----------------
svx/source/dialog/docrecovery.src | 2 -
svx/source/sidebar/area/AreaPropertyPanel.src | 2 -
svx/source/svdraw/svdstr.src | 2 -
svx/uiconfig/ui/sidebararea.ui | 4 +-
7 files changed, 45 insertions(+), 65 deletions(-)
New commits:
commit 351cfed9dea6099cf27f7f818dcd0e4f94c9f35e
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Feb 5 16:50:12 2014 +0000
transparence->transparency
Change-Id: Ief774a0e02dc1489239b2a0c1fd550a5f6ee66de
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 8e591c6..725980cc 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -135,8 +135,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Select the
type of transparence to apply.</property>
- <property name="tooltip_text" translatable="yes">Select the
type of transparence to apply.</property>
+ <property name="tooltip_markup" translatable="yes">Select the
type of transparency to apply.</property>
+ <property name="tooltip_text" translatable="yes">Select the
type of transparency to apply.</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
commit 8d6debac7796ba35c254da282bbcb039f56f6d15
Author: Jürgen Schmidt <j...@apache.org>
Date: Wed Feb 5 14:06:17 2014 +0000
Resolves: #i123116# correct spelling errors
Patch By: Aivaras Stepukonis
Review By: jsc
(cherry picked from commit a845d71360fc3cd0205d554964c4fd9fe87f0f8a)
Conflicts:
svx/source/sidebar/area/AreaPropertyPanel.src
Change-Id: Ib5158a2e28f1af426cd845ac648bcd4674d496f0
diff --git a/svx/source/dialog/docrecovery.src
b/svx/source/dialog/docrecovery.src
index 10d9e3c..48f9f58 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -148,7 +148,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER
Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW2 );
Size = MAP_APPFONT( RECOV_CONTROLWIDTH, RECOV_DESCRHEIGHT );
WordBreak = TRUE;
- Text[ en-US ] = "Press 'Start Recovery' to start the recovery process
of the documents listed below.\n\nThe 'Status' column shows whether the
document could be recovered.";
+ Text[ en-US ] = "Press 'Start Recovery' to start the recovery process
of the documents listed below.\n\nThe 'Status' column shows whether the
document can be recovered.";
};
FixedText FT_RECOV_PROGR
{
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src
b/svx/source/sidebar/area/AreaPropertyPanel.src
index 77bb6cb..888d33b 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -178,7 +178,7 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR
Border = TRUE ;
Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_BORDER ;
- QuickHelpText [ en-US ] = "Specify the border value of gradient
transparence." ;
+ QuickHelpText [ en-US ] = "Specify the border value of gradient
transparency." ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 2abdd28..fe82180 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -2301,7 +2301,7 @@ String SIP_SA_MEASUREDECIMALPLACES
String SIP_SA_MEASURERESERVE05
{
- Text [ en-US ] = "Dimensioning reserved 5";
+ Text [ en-US ] = "Dimensioning reserved for 5";
};
String SIP_SA_MEASURERESERVE06
commit 621ddc9c951262cdbdda1fe5479b48bc40e6e3b4
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Feb 5 16:23:24 2014 +0000
get make findunusedcode working again
Change-Id: I8fed32b8eb1e986321dde0542c15b7b8cf91b123
diff --git a/bin/findunusedcode b/bin/findunusedcode
index 62e56c8..4aaf9cc 100755
--- a/bin/findunusedcode
+++ b/bin/findunusedcode
@@ -6,16 +6,45 @@ GNUMAKE=$2
cd ${SRCDIR}
which callcatcher > /dev/null 2>&1 || \
(echo "callcatcher not installed" && false)
-mkdir -p ${SRCDIR}/callcatcher/config_host
-cp config_host/* callcatcher/config_host
-cp config_host.mk* callcatcher
-cat config_host.mk | sed -e s,"export OOO_JUNIT_JAR=.*","export
OOO_JUNIT_JAR=",g > ${SRCDIR}/callcatcher/config_host.mk
-sed -i -e s,g++,"callcatcher g++",g ${SRCDIR}/callcatcher/config_host.mk
-sed -i -e s,gcc,"callcatcher gcc",g ${SRCDIR}/callcatcher/config_host.mk
-echo unexport ARCH_FLAGS >> ${SRCDIR}/callcatcher/config_host.mk
-echo unexport CFLAGS >> ${SRCDIR}/callcatcher/config_host.mk
-echo unexport CXXFLAGS >> ${SRCDIR}/callcatcher/config_host.mk
-${GNUMAKE} -f ${SRCDIR}/solenv/bin/callcatcher.Makefile findunusedcode
+
+mkdir -p ${SRCDIR}/callcatcher
+cd ${SRCDIR}/callcatcher
+
+echo "--without-doxygen
+ --enable-verbose
+ --enable-gio
+ --enable-packagekit
+ --disable-gnome-vfs
+ --enable-extension-integration
+ --enable-graphite
+ --enable-evolution2
+ --enable-lockdown
+ --enable-online-update
+ --enable-dbgutil
+ --enable-werror
+ --enable-gtk3
+ --enable-kde4
+ --enable-dbus
+ --enable-gstreamer
+ --disable-gstreamer-0-10"
+ > autogen.input
+
+export CC="callcatcher ${CC:-gcc}"
+export CXX="callcatcher ${CXX:-g++}"
+export AR="callarchive ${AR:-ar}"
+
+/bin/env -i CC="$CC" CXX="$CXX" AR="$AR" /bin/bash -l ../autogen.sh
+
+export dbglevel=2
+
+make
+
+callanalyse \
+ instdir/program/* \
+ workdir/LinkTarget/*/* workdir/LinkTarget/*/*/* \
+ workdir/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \
+ > unusedcode.all
+
grep ::.*\( unusedcode.all \
| grep -v ^Atom \
| grep -v ^atom:: \
@@ -46,4 +75,4 @@ grep ::.*\( unusedcode.all \
| grep -v ^WPS \
| grep -v WPX \
| grep -v ^WSObject \
- > unusedcode.easy
+ > ../unusedcode.easy
diff --git a/solenv/bin/callcatchEnv.Set.sh b/solenv/bin/callcatchEnv.Set.sh
deleted file mode 100644
index 38c24c1..0000000
--- a/solenv/bin/callcatchEnv.Set.sh
+++ /dev/null
@@ -1,15 +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/.
-#
-CC="callcatcher ${CC:-gcc}"
-CXX="callcatcher ${CXX:-g++}"
-AR="callarchive ${AR:-ar}"
-#old-school ones, can go post-gbuildification is complete
-LINK="callcatcher $CXX"
-LIBMGR="callarchive ${LIBMGR:-ar}"
-export CC CXX AR LINK LIBMGR
-export dbglevel=2
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
deleted file mode 100644
index 10b09e3..0000000
--- a/solenv/bin/callcatcher.Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- 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/.
-#
-
-.PHONY: all
-
-include callcatcher/config_host.mk
-
-export CC:=callcatcher $(CC)
-export CXX:=callcatcher $(CXX)
-ifeq ($(AR),)
-export AR:=callarchive ar
-else
-export AR:=callarchive $(AR)
-endif
-export dbglevel:=2
-
-include $(SRCDIR)/solenv/gbuild/gbuild.mk
-
-findunusedcode:
- $(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
Makefile.gbuild
- $(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
Makefile.gbuild subsequentcheck
- callanalyse \
- $(INSTDIR)/program/* \
- $(WORKDIR)/LinkTarget/*/* $(WORKDIR)/LinkTarget/*/*/* \
- $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \
- > unusedcode.all
-
-# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
