[Libreoffice-commits] .: 10 commits - sal/osl sal/qa
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue May 31 02:04:44 PDT 2011
sal/osl/unx/diagnose.c | 2 +-
sal/qa/osl/security/osl_Security.cxx | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e6d8b9c96ff6803bd13df453d454c9f9d9ef061b
Merge: c9189d8... c715403...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue May 31 10:45:56 2011 +0200
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
sal/osl/unx/diagnose.c
diff --cc sal/osl/unx/diagnose.c
index 728f4f6,041a5e6..0f89ddd
--- a/sal/osl/unx/diagnose.c
+++ b/sal/osl/unx/diagnose.c
@@@ -255,9 -255,8 +255,9 @@@ sal_Bool SAL_CALL osl_assertFailedLine
/* output message buffer */
OSL_DIAGNOSE_OUTPUTMESSAGE(f, szMessage);
- /* output backtrace */
- /* if SAL backtrace for assertions is disabled, skip here */
- if ( !getenv("DISABLE_SAL_BACKTRACE") )
++ /* should we output backtrace? */
+ char const * envBacktrace = getenv( "SAL_DIAGNOSE_BACKTRACE" );
+ if( envBacktrace != NULL && *envBacktrace != '\0' )
osl_diagnose_backtrace_Impl(f);
/* release lock and leave */
commit c7154038c8bca0b336d66e57f4e136eb406c4e9b
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 24 19:29:16 2011 +0200
Version 3.4.0.2, tag libreoffice-3.4.0.2 (3.4.0-rc2)
commit 1780245094f1f45e5e72e96217994b33561ddc85
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 20:49:50 2011 +0200
Branch libreoffice-3-4-0
This is 'libreoffice-3-4-0' - the stable branch for the 3.4.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.4.x release,
please use the 'libreoffice-3-4' branch.
If you want to build something cool, unstable, and risky, use master.
commit 8088ce0e53851ddabaf487349e03c55064d5a0b5
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 19:55:40 2011 +0200
Version 3.4.0.1, tag libreoffice-3.4.0.1 (3.4.0-rc1)
commit 083eb568c05255662f6d3cae5eac04d6f710eaa0
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 10 20:01:47 2011 +0200
Version 3.3.99.5, tag libreoffice-3.3.99.5 (3.4.0-beta5)
commit 5cacb644f19969ddc60011c7fc5d92966a70fa0d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Wed May 4 21:07:31 2011 +0200
add new uno interface for sheet local anonymous db data
Signed-off-by: Kohei Yoshida <kyoshida at novell.com>
diff --git a/offapi/com/sun/star/sheet/XUnnamedDatabaseRanges.idl b/offapi/com/sun/star/sheet/XUnnamedDatabaseRanges.idl
new file mode 100644
index 0000000..3a53561
--- /dev/null
+++ b/offapi/com/sun/star/sheet/XUnnamedDatabaseRanges.idl
@@ -0,0 +1,78 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Markus Mohrhard <markus.mohrhard at googlemail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Major Contributor(s):
+ * Markus Mohrhard <markus.mohrhard at googlemail.com>
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __com_sun_star_sheet_XUnnamedDatabaseRanges_idl__
+#define __com_sun_star_sheet_XUnnamedDatabaseRanges_idl__
+
+#ifndef __com_sun_star_table_CellRangeAddress_idl__
+#include <com/sun/star/table/CellRangeAddress.idl>
+#endif
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_container_NoSuchElementException_idl__
+#include <com/sun/star/container/NoSuchElementException.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
+#endif
+
+//=============================================================================
+
+module com { module sun { module star { module sheet {
+
+//=============================================================================
+
+/** provides functions to manage the sheet local databases
+ */
+
+interface XUnnamedDatabaseRanges: com::sun::star::uno::XInterface
+ {
+ void setByTable( [in] com::sun::star::table::CellRangeAddress aRange )
+ raises( com::sun::star::lang::IndexOutOfBoundsException );
+
+ any getByTable( [in] long nTab )
+ raises( com::sun::star::container::NoSuchElementException,
+ com::sun::star::lang::IndexOutOfBoundsException );
+
+ boolean hasByTable ( [in] long nTab )
+ raises( com::sun::star::lang::IndexOutOfBoundsException );
+
+ };
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/sheet/makefile.mk b/offapi/com/sun/star/sheet/makefile.mk
index 37a0cad..10bb43d 100644
--- a/offapi/com/sun/star/sheet/makefile.mk
+++ b/offapi/com/sun/star/sheet/makefile.mk
@@ -338,6 +338,7 @@ IDLFILES=\
XSubTotalDescriptor.idl\
XSubTotalField.idl\
XUniqueCellFormatRangesSupplier.idl\
+ XUnnamedDatabaseRanges.idl\
XUsedAreaCursor.idl\
XViewFreezable.idl\
XViewPane.idl\
commit 241b8ef6e5145c9b4731c37ca62f013c82d06723
Author: Miklos Vajna <vmiklos at frugalware.org>
Date: Sun May 8 14:13:51 2011 +0200
Fix osl_Security::getHomeDir test under fakeroot
fakeroot uses LD_PRELOAD to let getuid() return 0, so getpwuid() will
not return the correct home directory. If we are under fakeroot, the
HOME environment variable can be used to do so.
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index e93714b..93fa96a 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -393,8 +393,11 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
strUserName = ::rtl::OUString::createFromAscii( pw->pw_name );
/// get home directory;
+ char *pw_dir = pw->pw_dir;
+ if( getenv( "FAKEROOTKEY" ) )
+ pw_dir = getenv("HOME");
CPPUNIT_ASSERT_MESSAGE( "#Convert from system path to URL failed.",
- ::osl::File::E_None == ::osl::File::getFileURLFromSystemPath( ::rtl::OUString::createFromAscii( pw->pw_dir ), strHomeDirectory ) );
+ ::osl::File::E_None == ::osl::File::getFileURLFromSystemPath( ::rtl::OUString::createFromAscii( pw_dir ), strHomeDirectory ) );
/// get config directory;
strConfigDirectory = strHomeDirectory.copy(0);
commit 6d1998a1e4ab2c1df914ba08445f95a750224144
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 3 20:01:40 2011 +0200
Version 3.3.99.4, tag libreoffice-3.3.99.4 (3.4.0-beta4)
commit aba11ba22d16a2666f970cd2c3da9b51fd8ed679
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Wed Apr 27 21:06:28 2011 +0200
sal-disable-backtrace.diff: disable backtrace with DISABLE_SAL_BACKTRACE
allow to disable backtrace when defined the environment variable
DISABLE_SAL_BACKTRACE
diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c
index 30d15ad..041a5e6 100644
--- a/sal/osl/unx/diagnose.c
+++ b/sal/osl/unx/diagnose.c
@@ -255,8 +255,9 @@ sal_Bool SAL_CALL osl_assertFailedLine (
/* output message buffer */
OSL_DIAGNOSE_OUTPUTMESSAGE(f, szMessage);
- /* output backtrace */
- osl_diagnose_backtrace_Impl(f);
+ /* if SAL backtrace for assertions is disabled, skip here */
+ if ( !getenv("DISABLE_SAL_BACKTRACE") )
+ osl_diagnose_backtrace_Impl(f);
/* release lock and leave */
pthread_mutex_unlock(&g_mutex);
commit 44df3508cc3b04e272b222cc194c57024eb757a2
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 26 17:09:20 2011 +0200
Version 3.3.99.3, tag libreoffice-3.3.99.3 (3.4.0-beta3)
More information about the Libreoffice-commits
mailing list