[Libreoffice-commits] .: 16 commits - configmgr/source officecfg/registry
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Nov 25 12:12:37 PST 2010
configmgr/source/childaccess.cxx | 25 +++++++++----
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 -
2 files changed, 19 insertions(+), 8 deletions(-)
New commits:
commit 942df6544106661aba8c23e37a19cec8b188a5fb
Merge: e29dff1... dd1ebc4...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Nov 25 20:59:45 2010 +0100
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/libs-core
commit e29dff1571e059c443cf2c7d6118e5e4a2747801
Merge: 4fb0d33... 5402dad...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Nov 25 14:27:00 2010 +0100
Merge remote branch 'origin/libreoffice-3-3'
commit 5402dad2397bed9d87ff2e348e28a99b4f6e06c1
Merge: 124c46e... 74112b4...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Nov 25 14:04:03 2010 +0100
Merge commit 'ooo/OOO330_m16' into libreoffice-3-3
commit 124c46e959a895a2008937a2ed71a9ffd25759e4
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Thu Nov 25 00:24:05 2010 +0100
Switch toolbar icon size to 'auto-detect'
This semantically reverts commit
b05860f43e4943bfdee59b0e44ad7bfa7f52c202, in favour of a dynamic
solution in the native widgets code.
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index b5fa24a..a85b598 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5823,7 +5823,7 @@
</info>
</enumeration>
</constraints>
- <value>1</value>
+ <value>2</value>
</prop>
<prop oor:name="SymbolStyle" oor:type="xs:string">
<!-- UIHints: Tools Options General View -->
commit 5e2fc23bbd05cc3f1a1a8aa90118c8d6012ba371
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Tue Nov 23 15:42:32 2010 -0500
Temporarily disable the extra ACL check.
The fix for i#102464 no longer seems necessary. In fact, leaving
that "fix" would interfere with documents saved in samba shere;
when a 2nd user tries to open a document in a samba share that's
already opened by someone else, it would silently open in read-only
mode, but the correct behavior is to launch the "Document in Use"
dialog telling the 2nd user which user has it open.
If disabling this checks causes no regressions, we can remove this.
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index f2e903e..7da31fb 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -143,12 +143,11 @@ using namespace ::com::sun::star::io;
#include "openflag.hxx" // SFX_STREAM_READONLY etc.
#include "sfxresid.hxx"
#include <sfx2/appuno.hxx>
+#include "sfxacldetect.hxx"
#define MAX_REDIRECT 5
-sal_Bool IsReadonlyAccordingACL( const sal_Unicode* pFilePath );
-
//==========================================================
namespace {
@@ -1055,6 +1054,11 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
catch( uno::Exception )
{}
+#if EXTRA_ACL_CHECK
+ // This block was introduced as a fix to i#102464, but removing
+ // this does not make the problem re-appear. But leaving this
+ // part would interfere with documents saved in samba share. This
+ // affects Windows only.
if ( !bContentReadonly )
{
// the file is not readonly, check the ACL
@@ -1063,6 +1067,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
if ( ::utl::LocalFileHelper::ConvertURLToPhysicalName( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), aPhysPath ) )
bContentReadonly = IsReadonlyAccordingACL( aPhysPath.GetBuffer() );
}
+#endif
}
// do further checks only if the file not readonly in fs
diff --git a/sfx2/source/doc/sfxacldetect.cxx b/sfx2/source/doc/sfxacldetect.cxx
index 825bbdd..0aa9cb9 100644
--- a/sfx2/source/doc/sfxacldetect.cxx
+++ b/sfx2/source/doc/sfxacldetect.cxx
@@ -26,6 +26,13 @@
*
************************************************************************/
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sfx2.hxx"
+
+#include "sfxacldetect.hxx"
+
+#if EXTRA_ACL_CHECK
+
#ifdef WNT
// necessary to include system headers without warnings
@@ -104,4 +111,6 @@ sal_Bool IsReadonlyAccordingACL( const sal_Unicode* )
#endif
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/sfxacldetect.hxx b/sfx2/source/doc/sfxacldetect.hxx
new file mode 100644
index 0000000..99868f6
--- /dev/null
+++ b/sfx2/source/doc/sfxacldetect.hxx
@@ -0,0 +1,39 @@
+/*
+ * 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. 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
+ * Kohei Yoshida <kyoshida at novell.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 __SFXACLDETECT_HXX__
+#define __SFXACLDETECT_HXX__
+
+// Let's check if this extra ACL check is still necessary... If disabling it
+// causes no regressions, then we can safely remove this code.
+#define EXTRA_ACL_CHECK 0
+
+#if EXTRA_ACL_CHECK
+sal_Bool IsReadonlyAccordingACL( const sal_Unicode* pFilePath );
+#endif
+
+#endif
commit 6d716265f4871dfcb899d5a0fae971f99e36c3e8
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Wed Nov 24 00:14:12 2010 +0100
One more readme change: no support subdomain
diff --git a/readlicense_oo/docs/readme/readme.xrm b/readlicense_oo/docs/readme/readme.xrm
index 2448469..f114450 100755
--- a/readlicense_oo/docs/readme/readme.xrm
+++ b/readlicense_oo/docs/readme/readme.xrm
@@ -241,7 +241,7 @@
<div id="UserSupport">
<h2 id="support" xml:lang="en-US">User Support</h2>
- <p id="support1" xml:lang="en-US">The main support page <a href="http://support.libreoffice.org/">http://support.libreoffice.org/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://www.documentfoundation.org/nabble/">http://www.documentfoundation.org/nabble/</a> or search the archives of the 'users at libreoffice.org' mailing list at <a href="http://www.libreoffice.org/lists/users/">http://www.libreoffice.org/lists/users/</a>. Alternatively, you can send in your questions to <a href="mailto:users at libreoffice.org">users at libreoffice.org</a>. If you like to subscribe to the list (to get email responses), send an empty mail to: <a href="mailto:users+subscribe at libreoffice.org">users+subscribe at libreoffice.org</a>.</p>
+ <p id="support1" xml:lang="en-US">The main support page <a href="http://www.libreoffice.org/support/">http://www.libreoffice.org/support/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://www.documentfoundation.org/nabble/">http://www.documentfoundation.org/nabble/</a> or search the archives of the 'users at libreoffice.org' mailing list at <a href="http://www.libreoffice.org/lists/users/">http://www.libreoffice.org/lists/users/</a>. Alternatively, you can send in your questions to <a href="mailto:users at libreoffice.org">users at libreoffice.org</a>. If you like to subscribe to the list (to get email responses), send an empty mail to: <a href="mailto:users+subscribe at libreoffice.org">users+subscribe at libreoffice.org</a>.</p>
<p id="faq" url="ahead" xml:lang="en-US">Also check the FAQ section at <a href="http://www.libreoffice.org/faq/">http://www.libreoffice.org/faq/.</a></p>
</div>
commit c60a7a9fe9a6ac0897af92fcc812a38ce10da046
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Wed Nov 24 00:05:05 2010 +0100
Adapted readme according to list feedback
* unified links to be directory-style
* renamed all sites to libreoffice (except central infrastructure)
* removed obsolete info (gnome session manager etc)
* added hint for gfx perf on linux
* better mac system requirements
diff --git a/readlicense_oo/docs/readme/readme.xrm b/readlicense_oo/docs/readme/readme.xrm
index c08a750..2448469 100755
--- a/readlicense_oo/docs/readme/readme.xrm
+++ b/readlicense_oo/docs/readme/readme.xrm
@@ -18,15 +18,15 @@
<body>
<div id="Intro">
<h1 id="Welcome" xml:lang="en-US">${PRODUCTNAME} ${PRODUCTVERSION} ReadMe</h1>
- <p id="LatestUpdates" xml:lang="en-US">For latest updates to this readme file, see <a href="http://www.libreoffice.org/welcome/readme.html">http://www.libreoffice.org/welcome/readme.html</a></p>
+ <p id="LatestUpdates" xml:lang="en-US">For latest updates to this readme file, see <a href="http://www.libreoffice.org/welcome/readme/">http://www.libreoffice.org/welcome/readme/</a></p>
<p id="A6" xml:lang="en-US">This file contains important information about this program. Please read this information very carefully before starting work.</p>
- <p id="A7" xml:lang="en-US">The LibreOffice Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} site with helpful user information at <a href="http://www.libreoffice.org/about_us/introduction.html">http://www.libreoffice.org/about_us/introduction.html</a></p>
+ <p id="A7" xml:lang="en-US">The LibreOffice Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} site with helpful user information at <a href="http://www.libreoffice.org/welcome/introduction/">http://www.libreoffice.org/welcome/introduction/</a></p>
<p id="A9" xml:lang="en-US">Also read the sections below about getting involved in the LibreOffice project.</p>
<h3 id="A10" xml:lang="en-US">Is ${PRODUCTNAME} really free for any user? </h3>
- <p id="A11" xml:lang="en-US">${PRODUCTNAME} is free for use by everybody. You may take this copy of ${PRODUCTNAME} and install it on as many computers as you like, and use it for any purpose you like (including commercial, government, public administration and educational use). For further details see the license text delivered together with ${PRODUCTNAME} or <a href="http://www.libreoffice.org/license.html">http://www.libreoffice.org/license.html</a></p>
+ <p id="A11" xml:lang="en-US">${PRODUCTNAME} is free for use by everybody. You may take this copy of ${PRODUCTNAME} and install it on as many computers as you like, and use it for any purpose you like (including commercial, government, public administration and educational use). For further details see the license text delivered together with ${PRODUCTNAME} or <a href="http://www.libreoffice.org/license/">http://www.libreoffice.org/license/</a></p>
<h3 id="A12" xml:lang="en-US">Why is ${PRODUCTNAME} free for any user?</h3>
<p id="A13" xml:lang="en-US">You can use this copy of ${PRODUCTNAME} today free of charge because individual contributors and corporate sponsors have designed, developed, tested, translated, documented, supported, marketed, and helped in many other ways to make ${PRODUCTNAME} what it is today - the world's leading open-source office software.</p>
- <p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure LibreOffice continues into the future, please consider contributing to the project - see <a href="http://www.documentfoundation.org/contribution/">http://www.documentfoundation.org/contribution/</a> for details. Everyone has a contribution to make.</p>
+ <p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure LibreOffice continues into the future, please consider contributing to the project - see <a href="http://www.libreoffice.org/contribution/">http://www.libreoffice.org/contribution/</a> for details. Everyone has a contribution to make.</p>
</div>
<div id="Installation">
@@ -39,7 +39,7 @@
</li>
<li>
- <p id="macxicpu" xml:lang="en-US">Intel processor</p>
+ <p id="macxicpu" xml:lang="en-US">Intel or PowerPC processor</p>
</li>
<li>
@@ -47,7 +47,7 @@
</li>
<li>
- <p id="macxHardDiksSpace" xml:lang="en-US">Up to 1.5 GB available hard disk space</p>
+ <p id="macxHardDiksSpace" xml:lang="en-US">Up to 800 MB available hard disk space</p>
</li>
<li>
@@ -189,18 +189,8 @@
<p id="Precautions" xml:lang="en-US">Please make sure you have enough free memory in the temporary directory on your system and that read, write and run access rights have been granted. Close all other programs before starting the installation.</p>
</div>
- <div id="BerkeleyDB">
- <h2 id="BDB11" xml:lang="en-US">Extension Database Incompatibility</h2>
- <p id="BDB2a" xml:lang="en-US">The Berkeley database engine has been upgraded in this version of ${PRODUCTNAME}. The database engine upgrade introduces an incompatibility with user data for installed extensions for ${PRODUCTNAME} versions prior to 3.2 that may require your action if you downgrade your version of ${PRODUCTNAME}.</p>
- <p id="BDB3a" xml:lang="en-US">This version of ${PRODUCTNAME} will convert your extension database to the new Berkeley database format when extensions are installed or removed. After this conversion, the database can no longer be read by earlier versions of ${PRODUCTNAME}. Downgrading to an earlier version may result in a dysfunctional installation.</p>
- <p id="BDB4a" xml:lang="en-US">If you downgrade to an earlier version of ${PRODUCTNAME}, you must remove the user data directory <tt>{user data}/uno_packages</tt>, for example <tt>~/.libreoffice/3/user/uno_packages</tt>, and reinstall all extensions.</p>
- </div>
-
<div class="LINUX WIN" id="StartupProblems">
<h2 id="naso01" xml:lang="en-US">Problems During Program Startup</h2>
- <div class="LINUX" id="GnomeStartupProblems">
- <p id="naso02" xml:lang="en-US">If you experience ${PRODUCTNAME} startup problems (most notably while using Gnome) please 'unset' the <tt>SESSION_MANAGER</tt> environment variable inside the shell you use to start ${PRODUCTNAME}. This can be done by adding the line "<tt>unset SESSION_MANAGER</tt>" to the beginning of the soffice shell script found in the "<tt>[office folder]/program</tt>" directory.</p>
- </div>
<p id="abcdef" xml:lang="en-US">Difficulties starting ${PRODUCTNAME} (e.g. applications hang) as well as problems with the screen display are often caused by the graphics card driver. If these problems occur, please update your graphics card driver or try using the graphics driver delivered with your operating system. Difficulties displaying 3D objects can often be solved by deactivating the option "Use OpenGL" under 'Tools - Options - ${PRODUCTNAME} - View - 3D view'.</p>
</div>
@@ -234,6 +224,11 @@
<p class="note" id="pji76wsdf" xml:lang="en-US">Warning: The activated file locking feature can cause problems with Solaris 2.5.1 and 2.7 used in conjunction with Linux NFS 2.0. If your system environment has these parameters, we strongly recommend that you avoid using the file locking feature. Otherwise, ${PRODUCTNAME} will hang when you try to open a file from a NFS mounted directory from a Linux computer.</p>
</div>
+ <div class="LINUX" id="Graphic Performance">
+ <h2 id="gfh6w" xml:lang="en-US">Graphic Performance</h2>
+ <p id="pji76w" xml:lang="en-US">By default, ${PRODUCTNAME} favours nice-looking graphics over speed. If you experience slow graphics, switching off 'Tools - Options - ${PRODUCTNAME} - View - Use Anti-Aliasing' may help.</p>
+ </div>
+
<div class="WIN" id="Mapi">
<h2 id="gfh6w1" xml:lang="en-US">Problems When Sending Documents as E-mails From ${PRODUCTNAME}</h2>
<p id="pji76w1" xml:lang="en-US">When sending a document via 'File - Send - Document as E-mail' or 'Document as PDF Attachment' problems might occur (program crashes or hangs). This is due to the Windows system file "Mapi" (Messaging Application Programming Interface) which causes problems in some file versions. Unfortunately, the problem cannot be narrowed down to a certain version number. For more information visit <a href="http://www.microsoft.com">http://www.microsoft.com</a> to search the Microsoft Knowledge Base for "mapi dll".</p>
@@ -241,38 +236,28 @@
<div id="A11y">
<h2 id="aw22" xml:lang="en-US">Important Accessibility Notes</h2>
- <p id="access7" xml:lang="en-US">For more information on the accessibility features in ${PRODUCTNAME}, see <a href="http://www.libreoffice.org/access/">http://www.libreoffice.org/access/</a></p>
- </div>
-
- <div id="Registration">
- <h2 id="reg1" xml:lang="en-US">Registration </h2>
- <p id="reg2" xml:lang="en-US">Please take a little time to complete the minimal Product Registration process when you install the software. While registration is optional, we encourage you to register, since the information enables the community to make an even better software suite and address user needs directly. Through its Privacy Policy, the ${PRODUCTNAME} Community takes every precaution to safeguard your personal data. If you missed the registration at installation, you can return and register at any time at by choosing "Help - Registration" from the main menu.</p>
- </div>
-
- <div id="UserSurvey">
- <h2 id="survey" xml:lang="en-US">User Survey</h2>
- <p id="survey1" xml:lang="en-US">There is also a User Survey located online which we encourage you to fill out. The User Survey results will help ${PRODUCTNAME} move more rapidly in setting new standards for the creation of the next-generation office suite. Through its Privacy Policy, the ${PRODUCTNAME} Community takes every precaution to safeguard your personal data.</p>
+ <p id="access7" xml:lang="en-US">For more information on the accessibility features in ${PRODUCTNAME}, see <a href="http://www.libreoffice.org/accessibility/">http://www.libreoffice.org/accessibility/</a></p>
</div>
<div id="UserSupport">
<h2 id="support" xml:lang="en-US">User Support</h2>
<p id="support1" xml:lang="en-US">The main support page <a href="http://support.libreoffice.org/">http://support.libreoffice.org/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://www.documentfoundation.org/nabble/">http://www.documentfoundation.org/nabble/</a> or search the archives of the 'users at libreoffice.org' mailing list at <a href="http://www.libreoffice.org/lists/users/">http://www.libreoffice.org/lists/users/</a>. Alternatively, you can send in your questions to <a href="mailto:users at libreoffice.org">users at libreoffice.org</a>. If you like to subscribe to the list (to get email responses), send an empty mail to: <a href="mailto:users+subscribe at libreoffice.org">users+subscribe at libreoffice.org</a>.</p>
- <p id="faq" url="ahead" xml:lang="en-US">Also check the FAQ section at <a href="http://www.documentfoundation.org/faq/">http://www.documentfoundation.org/faq/.</a></p>
+ <p id="faq" url="ahead" xml:lang="en-US">Also check the FAQ section at <a href="http://www.libreoffice.org/faq/">http://www.libreoffice.org/faq/.</a></p>
</div>
<div id="ReportBugsIssues">
<h2 id="reportbugs" xml:lang="en-US">Reporting Bugs & Issues</h2>
- <p id="reportbugs1" xml:lang="en-US">The ${PRODUCTNAME} Web site hosts IssueZilla, our mechanism for reporting, tracking and solving bugs and issues. We encourage all users to feel entitled and welcome to report issues that may arise on your particular platform. Energetic reporting of issues is one of the most important contributions that the user community can make to the ongoing development and improvement of the suite.</p>
+ <p id="reportbugs1" xml:lang="en-US">Our system for reporting, tracking and solving bugs is currently BugZilla, kindly hosted at <a href="https://bugs.freedesktop.org/">https://bugs.freedesktop.org/</a>. We encourage all users to feel entitled and welcome to report bugs that may arise on your particular platform. Energetic reporting of bugs is one of the most important contributions that the user community can make to the ongoing development and improvement of ${PRODUCTNAME}.</p>
</div>
<div id="GettingInvolved">
<h2 id="gettinginvolved1" xml:lang="en-US">Getting Involved</h2>
<p id="gettinginvolved2" xml:lang="en-US">The ${PRODUCTNAME} Community would very much benefit from your active participation in the development of this important open source project.</p>
- <p id="gettingimvolved3" xml:lang="en-US">As a user, you are already a valuable part of the suite's development process and we would like to encourage you to take an even more active role with a view to being a long-term contributor to the community. Please join and check out the contributing page at <a href="http://www.documentfoundation.org/contribution/">http://www.documentfoundation.org/contribution/</a></p>
+ <p id="gettingimvolved3" xml:lang="en-US">As a user, you are already a valuable part of the suite's development process and we would like to encourage you to take an even more active role with a view to being a long-term contributor to the community. Please join and check out the contributing page at <a href="http://www.libreoffice.org/contribution/">http://www.libreoffice.org/contribution/</a></p>
<h3 id="howtostart" xml:lang="en-US">How to Start</h3>
- <p id="howtostart1" xml:lang="en-US">The best way to start contributing is to subscribe to one or more of the mailing lists, lurk for a while, and gradually use the mail archives to familiarize yourself with many of the topics covered since the ${PRODUCTNAME} source code was released back in October 2000. When you're comfortable, all you need to do is send an email self-introduction and jump right in. If you are familiar with Open Source Projects, check out our To-Dos list and see if there is anything you would like to help with at <a href="http://www.documentfoundation.org/develop/">http://www.documentfoundation.org/develop/</a>.</p>
+ <p id="howtostart1" xml:lang="en-US">The best way to start contributing is to subscribe to one or more of the mailing lists, lurk for a while, and gradually use the mail archives to familiarize yourself with many of the topics covered since the ${PRODUCTNAME} source code was released back in October 2000. When you're comfortable, all you need to do is send an email self-introduction and jump right in. If you are familiar with Open Source Projects, check out our To-Dos list and see if there is anything you would like to help with at <a href="http://www.libreoffice.org/develop/">http://www.libreoffice.org/develop/</a>.</p>
<h3 id="subscribe" xml:lang="en-US">Subscribe</h3>
- <p id="subscribe1" xml:lang="en-US">Here are a few of the mailing lists to which you can subscribe at <a href="http://www.documentfoundation.org/contribution/">http://www.documentfoundation.org/contribution/</a></p>
+ <p id="subscribe1" xml:lang="en-US">Here are a few of the mailing lists to which you can subscribe at <a href="http://www.libreoffice.org/contribution/">http://www.libreoffice.org/contribution/</a></p>
<ul>
<li>
<p id="subscribelist1" xml:lang="en-US">News: announce at documentfoundation.org *recommended to all users* (light traffic)</p>
commit 4c645168924f7115a3dd8c9fdaac6a1a6167a0a7
Author: David Tardon <dtardon at redhat.com>
Date: Tue Nov 23 10:36:26 2010 +0100
Related: rhbz#650170 don't crash when quickstarter is exited by user
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 3bb5b77..c28e73a 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -409,8 +409,17 @@ void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray()
::SolarMutexGuard aGuard;
if( !pTrayIcon )
return;
- gtk_widget_destroy( GTK_WIDGET( pTrayIcon ) );
+
+ /* we have to set pTrayIcon to NULL now, because gtk_widget_destroy
+ * causes calling exit_quickstarter_cb (which then calls this func.)
+ * again -> crash.
+ * As an alternative, we could deregister the "destroy" signal here,
+ * but this is simpler .-)
+ */
+ GtkWidget* const pIcon = GTK_WIDGET( pTrayIcon );
pTrayIcon = NULL;
+ gtk_widget_destroy( pIcon );
+
pExitMenuItem = NULL;
pOpenMenuItem = NULL;
pDisableMenuItem = NULL;
commit a695cce9540178845ac294083a7f0c94c3f73542
Author: David Tardon <dtardon at redhat.com>
Date: Mon Nov 22 09:28:34 2010 +0100
rhbz#650170# shutdown quickstarter at end of desktop session
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index c1cc855..45e91d0 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -429,6 +429,8 @@ class Desktop : // interfaces
*/
::sal_Bool impl_closeFrames(::sal_Bool bAllowUI);
+ sal_Bool impl_terminate();
+
//-------------------------------------------------------------------------------------------------------------
// debug methods
// (should be private everytime!)
@@ -507,6 +509,8 @@ class Desktop : // interfaces
css::uno::Reference< css::frame::XUntitledNumbers > m_xTitleNumberGenerator;
+ bool m_bTerminating; // we are in the process of terminating already
+
}; // class Desktop
} // namespace framework
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index d0a4a8e..d59b361 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -83,6 +83,7 @@
//_________________________________________________________________________________________________________________
// includes of other projects
//_________________________________________________________________________________________________________________
+#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/factory.hxx>
@@ -264,6 +265,7 @@ Desktop::Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >&
, m_xSWThreadManager ( )
, m_xSfxTerminator ( )
, m_xTitleNumberGenerator ( )
+ , m_bTerminating(false)
{
// Safe impossible cases
// We don't accept all incoming parameter.
@@ -291,6 +293,39 @@ Desktop::~Desktop()
sal_Bool SAL_CALL Desktop::terminate()
throw( css::uno::RuntimeException )
{
+ bool bTerminating(false);
+ {
+ WriteGuard aGuard(m_aLock);
+ bTerminating = m_bTerminating;
+ m_bTerminating = true;
+ }
+ if (bTerminating)
+ return false;
+
+ css::uno::Any aException;
+ sal_Bool bTerminate(false);
+ try
+ {
+ bTerminate = impl_terminate();
+ }
+ catch (const css::uno::RuntimeException& rEx)
+ {
+ aException <<= rEx;
+ }
+
+ {
+ WriteGuard aGuard(m_aLock);
+ m_bTerminating = false;
+ }
+
+ if (aException.hasValue())
+ cppu::throwException(aException);
+
+ return bTerminate;
+}
+
+sal_Bool Desktop::impl_terminate()
+{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
SYNCHRONIZED_START
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 510c6ca..3bb5b77 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -66,11 +66,14 @@ static void systray_disable_cb()
static void exit_quickstarter_cb( GtkWidget * )
{
- egg_tray_icon_cancel_message (pTrayIcon, 1 );
- plugin_shutdown_sys_tray();
- //terminate may cause this .so to be unloaded. So we must be hands off
- //all calls into this .so after this call
- ShutdownIcon::terminateDesktop();
+ if (pTrayIcon)
+ {
+ egg_tray_icon_cancel_message (pTrayIcon, 1 );
+ plugin_shutdown_sys_tray();
+ //terminate may cause this .so to be unloaded. So we must be hands off
+ //all calls into this .so after this call
+ ShutdownIcon::terminateDesktop();
+ }
}
static void menu_deactivate_cb( GtkWidget *pMenu )
@@ -396,6 +399,9 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
// disable shutdown
pShutdownIcon->SetVeto( true );
pShutdownIcon->addTerminateListener();
+
+ g_signal_connect(GTK_WIDGET(pTrayIcon), "destroy",
+ G_CALLBACK(exit_quickstarter_cb), NULL);
}
void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray()
commit f7df6cf55618d2dcb6778666990e38816b6c5c22
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Mon Nov 22 10:53:22 2010 +0100
Fix for i#115681
Some missing condition before actually draggging the border.
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 9f3cb23..c1fc788 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2780,7 +2780,8 @@ void SvxRuler::EvalModifier()
const RulerType eType = GetDragType();
nDragType = DRAG_OBJECT_SIZE_PROPORTIONAL;
if( RULER_TYPE_TAB == eType ||
- ( ( RULER_TYPE_BORDER == eType || RULER_TYPE_MARGIN1 == eType ) &&
+ ( ( RULER_TYPE_BORDER == eType || RULER_TYPE_MARGIN1 == eType ||
+ RULER_TYPE_MARGIN2 == eType ) &&
pColumnItem ) )
PrepareProportional_Impl(eType);
break;
commit 07117ad2a4c7cf9b09bc6d7636df81ad10c0bed0
Author: sb <sb at openoffice.org>
Date: Wed Nov 17 15:16:52 2010 +0100
sb136: #i115386# prefer en[-US] over empty xml:lang value, to accomodate existing extensions with bad .xcu content
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index d3b5480..3ec23b7 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -283,8 +283,8 @@ css::uno::Any ChildAccess::asValue() {
if (!Components::allLocales(locale)) {
// Find best match using an adaption of RFC 4647 lookup matching
// rules, removing "-" or "_" delimited segments from the end;
- // defaults are the empty string locale, the "en-US" locale, the
- // "en" locale, the first child (if any), or a nil value (even
+ // defaults are the "en-US" locale, the "en" locale, the empty
+ // string locale, the first child (if any), or a nil value (even
// though it may be illegal for the given property), in that
// order:
rtl::Reference< ChildAccess > child;
@@ -297,6 +297,9 @@ css::uno::Any ChildAccess::asValue() {
while (i > 0 && locale[i] != '-' && locale[i] != '_') {
--i;
}
+ if (i == 0) {
+ break;
+ }
locale = locale.copy(0, i);
}
if (!child.is()) {
@@ -306,10 +309,13 @@ css::uno::Any ChildAccess::asValue() {
child = getChild(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")));
if (!child.is()) {
- std::vector< rtl::Reference< ChildAccess > > all(
- getAllChildren());
- if (!all.empty()) {
- child = all.front();
+ child = getChild(rtl::OUString());
+ if (!child.is()) {
+ std::vector< rtl::Reference< ChildAccess > >
+ all(getAllChildren());
+ if (!all.empty()) {
+ child = all.front();
+ }
}
}
}
commit f5fca8ffd0bf39198ed424240fa83556c568b7dd
Author: sb <sb at openoffice.org>
Date: Thu Sep 23 16:17:38 2010 +0200
sb132: #i114155# use "en" as additional fallback locale after "en-US"
(transplanted from 630d6876c61cd1e0d42b8aa18bfc2ab22079a20f)
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 81e0feb..d3b5480 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -284,8 +284,9 @@ css::uno::Any ChildAccess::asValue() {
// Find best match using an adaption of RFC 4647 lookup matching
// rules, removing "-" or "_" delimited segments from the end;
// defaults are the empty string locale, the "en-US" locale, the
- // first child (if any), or a nil value (even though it may be
- // illegal for the given property), in that order:
+ // "en" locale, the first child (if any), or a nil value (even
+ // though it may be illegal for the given property), in that
+ // order:
rtl::Reference< ChildAccess > child;
for (;;) {
child = getChild(locale);
@@ -302,10 +303,14 @@ css::uno::Any ChildAccess::asValue() {
child = getChild(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US")));
if (!child.is()) {
- std::vector< rtl::Reference< ChildAccess > > all(
- getAllChildren());
- if (!all.empty()) {
- child = all.front();
+ child = getChild(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")));
+ if (!child.is()) {
+ std::vector< rtl::Reference< ChildAccess > > all(
+ getAllChildren());
+ if (!all.empty()) {
+ child = all.front();
+ }
}
}
}
commit 74112b4eb8953e419446aece91e2a99c1774e147
Merge: 8742380... a17c5f4...
Author: obo <obo at openoffice.org>
Date: Thu Nov 18 18:39:08 2010 +0100
CWS-TOOLING: integrate CWS sb136
commit a17c5f4ba0c14b5774a956e8de41bfc5f041f636
Author: sb <sb at openoffice.org>
Date: Wed Nov 17 15:16:52 2010 +0100
sb136: #i115386# prefer en[-US] over empty xml:lang value, to accomodate existing extensions with bad .xcu content
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index c20fa49..d387f35 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -282,8 +282,8 @@ css::uno::Any ChildAccess::asValue() {
if (!Components::allLocales(locale)) {
// Find best match using an adaption of RFC 4647 lookup matching
// rules, removing "-" or "_" delimited segments from the end;
- // defaults are the empty string locale, the "en-US" locale, the
- // "en" locale, the first child (if any), or a nil value (even
+ // defaults are the "en-US" locale, the "en" locale, the empty
+ // string locale, the first child (if any), or a nil value (even
// though it may be illegal for the given property), in that
// order:
rtl::Reference< ChildAccess > child;
@@ -296,6 +296,9 @@ css::uno::Any ChildAccess::asValue() {
while (i > 0 && locale[i] != '-' && locale[i] != '_') {
--i;
}
+ if (i == 0) {
+ break;
+ }
locale = locale.copy(0, i);
}
if (!child.is()) {
@@ -305,10 +308,13 @@ css::uno::Any ChildAccess::asValue() {
child = getChild(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")));
if (!child.is()) {
- std::vector< rtl::Reference< ChildAccess > > all(
- getAllChildren());
- if (!all.empty()) {
- child = all.front();
+ child = getChild(rtl::OUString());
+ if (!child.is()) {
+ std::vector< rtl::Reference< ChildAccess > >
+ all(getAllChildren());
+ if (!all.empty()) {
+ child = all.front();
+ }
}
}
}
commit cce6be23d70e5d8911fc54dfc4c04a07097caf14
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Tue Nov 16 20:14:20 2010 +0100
Fix crash during toolpanel re-docking
The fix for i#112795 introduced a crash when re-docking the Impress
toolpanel (in that case, the splitwin had zero dockwins, thus
inserting the new one one-past-the end)
(cherry picked from commit d3648ec90cc99f4c3be1e18ef636e1c0d9f6d76b)
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index b674922..0521abb 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -650,7 +650,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
}
}
}
- if (nInsertPos == nCount && nLastWindowIdx != nCount - 1)
+ if (nCount != 0 && nInsertPos == nCount && nLastWindowIdx != nCount - 1)
{
nInsertPos = nLastWindowIdx + 1; // ignore all non-windows after the last window
}
commit 99a6c38393f104753301f49d53df750e45d66f2e
Author: sb <sb at openoffice.org>
Date: Thu Sep 23 16:17:38 2010 +0200
sb132: #i114155# use "en" as additional fallback locale after "en-US"
(transplanted from 630d6876c61cd1e0d42b8aa18bfc2ab22079a20f)
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index ef2b213..c20fa49 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -283,8 +283,9 @@ css::uno::Any ChildAccess::asValue() {
// Find best match using an adaption of RFC 4647 lookup matching
// rules, removing "-" or "_" delimited segments from the end;
// defaults are the empty string locale, the "en-US" locale, the
- // first child (if any), or a nil value (even though it may be
- // illegal for the given property), in that order:
+ // "en" locale, the first child (if any), or a nil value (even
+ // though it may be illegal for the given property), in that
+ // order:
rtl::Reference< ChildAccess > child;
for (;;) {
child = getChild(locale);
@@ -301,10 +302,14 @@ css::uno::Any ChildAccess::asValue() {
child = getChild(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US")));
if (!child.is()) {
- std::vector< rtl::Reference< ChildAccess > > all(
- getAllChildren());
- if (!all.empty()) {
- child = all.front();
+ child = getChild(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")));
+ if (!child.is()) {
+ std::vector< rtl::Reference< ChildAccess > > all(
+ getAllChildren());
+ if (!all.empty()) {
+ child = all.front();
+ }
}
}
}
More information about the Libreoffice-commits
mailing list