[Libreoffice-commits] .: 6 commits - automation/source basic/inc basic/source Repository.mk sal/osl solenv/bin unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Sep 16 02:57:32 PDT 2011
Repository.mk | 2 +-
automation/source/server/sta_list.cxx | 4 ----
basic/inc/basic/ttstrhlp.hxx | 15 ++++-----------
basic/source/app/app.cxx | 7 ++++---
sal/osl/unx/process_impl.cxx | 4 ++++
solenv/bin/linkoo | 2 +-
unusedcode.easy | 6 ------
7 files changed, 14 insertions(+), 26 deletions(-)
New commits:
commit 1c99ba0f792a123d2e3cf4ffc6690a85921f2aeb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 16 10:56:29 2011 +0100
visibility problems under Linux, swap these around
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index 4581b6e..f9f8e06 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -97,10 +97,6 @@ sal_Bool StatementList::bIsSlotInExecute = sal_False;
sal_Bool StatementList::bCatchGPF = sal_True;
-
-IMPL_GEN_RES_STR;
-
-
static TTSettings* pTTSettings = NULL;
TTSettings* GetTTSettings()
diff --git a/basic/inc/basic/ttstrhlp.hxx b/basic/inc/basic/ttstrhlp.hxx
index 19d6d15..2d87aeb 100644
--- a/basic/inc/basic/ttstrhlp.hxx
+++ b/basic/inc/basic/ttstrhlp.hxx
@@ -59,21 +59,14 @@
#define ResString(nNumber) MakeStringNumber(ResKenn,nNumber)
#define ArgString(nNumber, aText) MakeStringParam(ArgKenn(nNumber),aText)
-BASIC_DLLPUBLIC UniString GEN_RES_STR0( sal_uIntPtr nResId );
-BASIC_DLLPUBLIC UniString GEN_RES_STR1( sal_uIntPtr nResId, const String &Text1 );
-BASIC_DLLPUBLIC UniString GEN_RES_STR2( sal_uIntPtr nResId, const String &Text1, const String &Text2 );
-BASIC_DLLPUBLIC UniString GEN_RES_STR3( sal_uIntPtr nResId, const String &Text1, const String &Text2, const String &Text3 );
+inline UniString GEN_RES_STR0( sal_uIntPtr nResId ) { return ResString( nResId ); }
+inline UniString GEN_RES_STR1( sal_uIntPtr nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); }
+inline UniString GEN_RES_STR2( sal_uIntPtr nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); }
+inline UniString GEN_RES_STR3( sal_uIntPtr nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );}
#define GEN_RES_STR1c( nResId, Text1 ) GEN_RES_STR1( nResId, CUniString(Text1) )
#define GEN_RES_STR2c2( nResId, Text1, Text2 ) GEN_RES_STR2( nResId, Text1, CUniString(Text2) )
#define GEN_RES_STR3c3( nResId, Text1, Text2, Text3 ) GEN_RES_STR3( nResId, Text1, Text2, CUniString(Text3) )
-#define IMPL_GEN_RES_STR \
-UniString GEN_RES_STR0( sal_uIntPtr nResId ) { return ResString( nResId ); } \
-UniString GEN_RES_STR1( sal_uIntPtr nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); } \
-UniString GEN_RES_STR2( sal_uIntPtr nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); } \
-UniString GEN_RES_STR3( sal_uIntPtr nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );}
-
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8dfb36a292892dfbd55198341cc1106aada809db
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 16 10:54:46 2011 +0100
Fallback to osl_getExecutableFile when dlsym("main") fails
e.g. testtool under Linux
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 49d6603..a41bc68 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -142,6 +142,10 @@ oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
}
}
+ /* Fallback to ordinary osl_getExecutableFile(). */
+ if (result == osl_Process_E_NotFound)
+ result = osl_getExecutableFile (ppFileURL);
+
return (result);
}
commit 2c09909bce08b57fb66a59dcd70d2528b66fa9e1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 16 10:23:50 2011 +0100
avoid assert and crash-before-vcl-is-ready-to-show-it in dbgutil testtool
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 6609cdc..9c5597d 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -213,8 +213,10 @@ uno::Reference< XContentProviderManager > InitializeUCB( void )
// set global factory
setProcessServiceFactory( xSMgr );
-// Create unconfigured Ucb:
- Sequence< Any > aArgs;
+// Create Ucb that can handle local files:
+ Sequence< Any > aArgs(2);
+ aArgs[0] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
+ aArgs[1] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
::ucbhelper::ContentBroker::initialize( xSMgr, aArgs );
uno::Reference< XContentProviderManager > xUcb =
::ucbhelper::ContentBroker::get()->getContentProviderManagerInterface();
@@ -252,7 +254,6 @@ int BasicApp::Main( )
try
{
- // this line is not ( afaics ) necessary ( remove from master )
uno::Reference< XContentProviderManager > xUcb = InitializeUCB();
{
DirEntry aIniPath( Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ) );
commit 6d13e2072d1775a81bd785d9f9a5c2dc6c1d2842
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 16 08:54:21 2011 +0100
update list
diff --git a/unusedcode.easy b/unusedcode.easy
index 4d6f8b9..b53df87 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1727,12 +1727,6 @@ binfilter::CharPosArray::Replace(int const&, unsigned short)
binfilter::CharPosArray::Replace(int const*, unsigned short, unsigned short)
binfilter::CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
binfilter::Dictionary::~Dictionary()
-binfilter::EECharAttribArray::Insert(binfilter::EECharAttrib const&, unsigned short)
-binfilter::EECharAttribArray::Insert(binfilter::EECharAttribArray const*, unsigned short, unsigned short, unsigned short)
-binfilter::EECharAttribArray::Remove(unsigned short, unsigned short)
-binfilter::EECharAttribArray::Replace(binfilter::EECharAttrib const&, unsigned short)
-binfilter::EECharAttribArray::Replace(binfilter::EECharAttrib const*, unsigned short, unsigned short)
-binfilter::EECharAttribArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::EECharAttrib const&, void*), void*)
binfilter::GeometryIndexValueBucketMemArr::Insert(binfilter::GeometryIndexValueBucketMemArr const*, unsigned short, unsigned short, unsigned short)
binfilter::GeometryIndexValueBucketMemArr::Replace(char const*&, unsigned short)
binfilter::GeometryIndexValueBucketMemArr::Replace(char const**, unsigned short, unsigned short)
commit d38327338942404bc87853515e8aafae85c98ea4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 15 23:37:28 2011 +0100
spadmin.bin gets installed into basis-foo/program, needs corresponding RPATH
diff --git a/Repository.mk b/Repository.mk
index 4cee3e3..dde5f11 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
))
$(eval $(call gb_Helper_register_executables,OOO, \
+ spadmin.bin \
testtool \
))
@@ -68,7 +69,6 @@ else
$(eval $(call gb_Helper_register_executables,BRAND,\
soffice.bin \
- spadmin.bin \
unopkg.bin \
))
commit 596981370acda590ba183a6adb03e0fd432ed4da
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 15 23:14:57 2011 +0100
tell linkoo pageein-FOO are gbuildified
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 51c1879..107553f 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -352,7 +352,7 @@ sub link_iso_res()
sub link_pagein_files()
{
print "pagein case:";
- my $src = "$OOO_BUILD/desktop/$TARGET/misc";
+ my $src = "$OOO_BUILD/solver/$TARGET/bin";
my $dest = "$OOO_INSTALL/" . $program_dir;
for my $c ('calc', 'draw', 'impress', 'writer', 'common') {
do_link ($src, $dest, "pagein-$c", "pagein-$c");
More information about the Libreoffice-commits
mailing list