[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 45724, which changed state. Bug 45724 Summary: FILESAVE, FORMATTING, Text field data loss https://bugs.freedesktop.org/show_bug.cgi?id=45724 What|Old Value |New Value Resolution|FIXED | Status|RESOLVED|REOPENED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |4 -
solenv/bin/modules/installer/followme.pm | 102 ---
2 files changed, 106 deletions(-)
New commits:
commit c65bc1d7ac6671dc5099c66fea38ff9c4f975e5d
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed Aug 15 14:43:19 2012 +0200
installer: remove save_followme_info
Change-Id: I87875922d952387d9ffd2667dd621d5cd94b4ea4
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index fce4522..91e8ca6 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -43,7 +43,6 @@ use installer::environment;
use installer::epmfile;
use installer::exiter;
use installer::files;
-use installer::followme;
use installer::globals;
use installer::helppack;
use installer::languagepack;
@@ -1502,7 +1501,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
installer::worker::clean_output_tree(); # removing directories created
in the output tree
($is_success, $finalinstalldir) =
installer::worker::analyze_and_save_logfile($loggingdir, $installdir,
$installlogdir, $allsettingsarrayref, $languagestringref,
$current_install_number);
my $downloadname =
installer::ziplist::getinfofromziplist($allsettingsarrayref, downloadname);
-if ( $is_success ) {
installer::followme::save_followme_info($finalinstalldir, $includepatharrayref,
$allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref,
$current_install_number, $loggingdir, $installlogdir); }
###
# Creating download installation set
@@ -1917,8 +1915,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
if ( $installer::globals::helppack ) { $downloadname =
installer::ziplist::getinfofromziplist($allsettingsarrayref,
helppackdownloadname); }
if ( $installer::globals::patch ) { $downloadname =
installer::ziplist::getinfofromziplist($allsettingsarrayref,
patchdownloadname); }
-if ( $is_success ) {
installer::followme::save_followme_info($finalinstalldir, $includepatharrayref,
$allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref,
$current_install_number, $loggingdir, $installlogdir); }
-
if ( $$downloadname ne ) { $create_download = 1; }
if ( $installer::globals::iswindowsbuild )
{
diff --git a/solenv/bin/modules/installer/followme.pm
b/solenv/bin/modules/installer/followme.pm
deleted file mode 100644
index 73b1d2e..000
--- a/solenv/bin/modules/installer/followme.pm
+++ /dev/null
@@ -1,102 +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.
-#
-#*
-
-package installer::followme;
-
-use File::Spec;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::systemactions;
-
-
-# Creating a file, that contains all information
-# to create a follow up process.
-
-
-sub save_followme_info
-{
-my ($finalinstalldir, $includepatharrayref, $allvariableshashref,
$downloadname, $languagestringref, $languagesarrayref, $current_install_number,
$loggingdir, $installlogdir) = @_;
-
-my $downloadinfofilename = $installer::globals::logfilename;
-$downloadinfofilename =~ s/log_/follow_me_/;
-
-# Creating directory
-my $downloadinfodir =
installer::systemactions::create_directory_next_to_directory($finalinstalldir,
follow_me);
-
-my @filecontent = ();
-
-push(@filecontent, finalinstalldir: $finalinstalldir\n);
-push(@filecontent, downloadname: $downloadname\n);
-push(@filecontent, currentinstallnumber: $current_install_number\n);
-push(@filecontent, loggingdir: $loggingdir\n);
-push(@filecontent, installlogdir: $installlogdir\n);
-
Re: Licensing 35079
On Wed, 2012-08-15 at 09:35 +0200, Lennard Wasserthal wrote: So to make it clear: I publish my patch [PATCH] fdo#35079: EDITING: Drawing element completely in mouse selection frame not selected. Drawing: Fixed Custom Shape Frame-Selection Bounding box bug. under the terms of the LGPLv3+ and MPL dual license. An next time I will write it directly to avoid unnecessary mails. Thanks a lot! I added you to the list here with a link to this email: https://wiki.documentfoundation.org/Development/Developers -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |1
solenv/bin/modules/installer/environment.pm |1
solenv/bin/modules/installer/epmfile.pm |4
solenv/bin/modules/installer/globals.pm | 89 --
solenv/bin/modules/installer/parameter.pm | 24 -
solenv/bin/modules/installer/windows/directory.pm |2
solenv/bin/modules/par2script/globals.pm |7 -
solenv/bin/modules/pre2par/globals.pm |8 -
8 files changed, 136 deletions(-)
New commits:
commit e327840a6d41d8d68e5b5157c944d2acbd3232b0
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed Aug 15 15:27:09 2012 +0200
installer: remove unused globals
Change-Id: I521e2c816b3dbc4aba1770e5a3b5eb47d5542ac1
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 91e8ca6..57dedc3 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -517,7 +517,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
{
my $languagesarrayref =
installer::languages::get_all_languages_for_one_product($installer::globals::languageproducts[$n],
$allvariableshashref);
-$installer::globals::alllanguagesinproductarrayref = $languagesarrayref;
my $languagestringref =
installer::languages::get_language_string($languagesarrayref);
installer::logger::print_message( \n
);
installer::logger::print_message( ... languages $$languagestringref ...
\n );
diff --git a/solenv/bin/modules/installer/environment.pm
b/solenv/bin/modules/installer/environment.pm
index 5459761..b0c541b 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -122,7 +122,6 @@ sub set_global_environment_variables
if ( $ENV{'LOCALUNPACKDIR'} ) { $installer::globals::localunpackdir =
$ENV{'LOCALUNPACKDIR'}; }
if ( $ENV{'MAX_LANG_LENGTH'} ) { $installer::globals::max_lang_length =
$ENV{'MAX_LANG_LENGTH'}; }
-if ( $ENV{'SOLAR_JAVA'} ) { $installer::globals::solarjavaset = 1; }
if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; }
if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress =
1; }
if ( $ENV{'IGNORE_ERROR_IN_LOGFILE'} ) {
$installer::globals::ignore_error_in_logfile = 1; }
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index 1ea9572..bc50aeb 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2360,10 +2360,6 @@ sub create_packages_without_epm
my $rpmcommand = $installer::globals::rpm;
my $rpmversion = determine_rpm_version();
-# saving globally for later usage
-$installer::globals::rpmcommand = $rpmcommand;
-$installer::globals::rpmquerycommand = rpm;
-
my $target = ;
if ( $installer::globals::compiler =~ /unxlngi/) { $target = i586; }
elsif ( $installer::globals::compiler =~ /unxaigppc/) { $target =
ppc; }
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index 7b5876f..6a2bc77 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -108,7 +108,6 @@ BEGIN
$languagelist = ;
$added_english = 0;
$set_office_start_language = 0;
-$solarjavaset = 0;
$destdir = ;
$rootpath = ;
@@ -124,19 +123,10 @@ BEGIN
$dounzip = 1;
$languages_defined_in_productlist = 0;
$setupscript_defined_in_productlist = 0;
-$islinux = 0;
-$issolaris = 0;
-$ismacosx = 0;
$iswindowsbuild = 0;
$islinuxbuild = 0;
$isrpmbuild = 0;
$isdebbuild = 0;
-$islinuxintelrpmbuild = 0;
-$islinuxppcrpmbuild = 0;
-$islinuxinteldebbuild = 0;
-$islinuxppcdebbuild = 0;
-$islinuxx86_64rpmbuild = 0;
-$islinuxx86_64debbuild = 0;
$issolarisbuild = 0;
$issolarispkgbuild = 0;
$issolarissparcbuild = 0;
@@ -149,13 +139,11 @@ BEGIN
$idttemplatepath = ;
$idtlanguagepath = ;
$buildid = Not set;
-$guidcounter = 1000; # for uniqueness of guids
$fontsfolder = FontsFolder;
$fontsfoldername = Fonts;
$fontsdirparent = ;
$fontsdirname = ;
$fontsdirhostname = truetype;
-$officefolder = OfficeFolder;
$officemenufolder = OfficeMenuFolder;
$startupfolder = StartupFolder;
$startmenufolder = StartMenuFolder;
@@ -180,12 +168,10 @@ BEGIN
$packagerevision = 1;
$rpm = ;
$rpmcommand = ;
-$rpmquerycommand = ;
$rpminfologged = 0;
$debian = ;
$installertypedir = ;
$controlledmakecabversion = 5;
-$saved_packages_path = ;
$max_lang_length = 50;
$globalblock = Globals;
$rootmodulegid = ;
@@ -206,11 +192,6 @@ BEGIN
$packageformat = ;
$packagename = ;
$packagelist = ;
-$addpackagelist = ;
-$is_unix_multi = 0;
-$unixmultipath =
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/generic
vcl/generic/fontmanager/fontmanager.cxx | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 16be10d016c8ecb2e5df21466510bc0e9e2e3a27
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 13 15:52:43 2012 +0100
Resolves: fdo#53258 Aquabase-spanish-support busts ttf reader again
Once as #i107552# and now again as fdo#53258. This is one sick puppy
of a font. It makes fontforge and fontconfig jump through hoops
as well.
Change-Id: Ifee780bb1463dca4e8b045828a07369e6c3863fc
Signed-off-by: Tomas Chvatal tchva...@suse.cz
diff --git a/vcl/generic/fontmanager/fontmanager.cxx
b/vcl/generic/fontmanager/fontmanager.cxx
index ddb2fdb..76ca13e 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -1554,9 +1554,14 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont*
pFont ) const
if( aInfo.usubfamily )
pFont-m_aStyleName = OUString( aInfo.usubfamily );
-pFont-m_nPSName = m_pAtoms-getAtom( ATOM_PSNAME,
-rtl::OUString(aInfo.psname, rtl_str_getLength(aInfo.psname),
aEncoding),
-sal_True );
+SAL_WARN_IF( !aInfo.psname, vcl, No PostScript name in font:
aFile.getStr() );
+
+rtl::OUString sPSName = aInfo.psname ?
+rtl::OUString(aInfo.psname, rtl_str_getLength(aInfo.psname),
aEncoding) :
+m_pAtoms-getString(ATOM_FAMILYNAME, pFont-m_nFamilyName); //
poor font does not have a postscript name
+
+pFont-m_nPSName = m_pAtoms-getAtom( ATOM_PSNAME, sPSName, sal_True );
+
switch( aInfo.weight )
{
case FW_THIN: pFont-m_eWeight = WEIGHT_THIN; break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSOC-UPDATE](15.08) Impress Remote
Hi Michael, On 08/15/2012 09:55 PM, Michael Meeks wrote: Nice work :-) I guess bluetooth is the last big nasty ? :-) Yep, bluetooth is the main remaining item -- which I'm now starting. Although the html notes export will probably also be hard to actually implement. (The only other item missing is the disconnection screen / automatic reconnection, which shouldn't be particularly complicated -- I think for this it's probably best if I add caching of approved clients to the server which would also save the need to approve a client every single time it is used.) Attached is a screenshot of the About Dialog -- it is loosely based on the LO equivalent -- I'm not entirely sure what would be appropriate to be shown here, but it can be easily edited. Who knows; it'd be good to point to the license I guess. I'll add that -- I should probably also mention my use of the Coverflow and ActionBarSherlock, which are both Apache licenced. Thanks to tml for pointing out that ActionBarSherlock is already present. At the moment ant building of the remote fails due to a missing sdk.dir: I assume this is somewhere in the build scripts being used for the android viewer; I'll be taking a more detailed look tomorrow. The sdk.dir property is imported from the local.properties file and is generated by the Makefile see the echo in the build-ant: rule in LibreOffice4Android. Thanks! Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LibreOffice 3.6.1.1 test builds available
Hi *, for the upcoming new version 3.6.1, the RC1 builds now start to be available on pre-releases. This build is slated to be first release candidate build on the way towards 3.6.0, please refer to our release plan timings here: http://wiki.documentfoundation.org/ReleasePlan#3.6_release Builds are now being uploaded to a public (but non-mirrored - so don't spread news too widely!) place, as soon as they're available. Grab them here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report *critical* bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. NOTE: This build is in a release configuration and _will_ replace your existing LibreOffice install on Windows. The list of fixed bugs relative to 3.6.0 RC3 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugfixes-libreoffice-3-6-1-release-3.6.1.1.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - solenv/gbuild
solenv/gbuild/Helper.mk |2 -- solenv/gbuild/Jar.mk|2 +- 2 files changed, 1 insertion(+), 3 deletions(-) New commits: commit b0db8fbdb58d40998ea6ba144c07c73becbed0f0 Author: Tor Lillqvist t...@iki.fi Date: Thu Aug 16 10:38:26 2012 +0300 No need to bother with the MISCDUMMY file here This rule failed if the MISCDUMMY file did not exist yet. Change-Id: Ie9b1ecab2848f5ed2c459020a50013db691a9ca3 diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 1b9b370..1985d3b 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -61,7 +61,7 @@ define gb_Jar__command echo Manifest-Version: 1.0 $(call gb_Jar_get_manifest_target,$(1)) \ $(if $(JARCLASSPATH),echo Class-Path: $(strip $(JARCLASSPATH)) $(call gb_Jar_get_manifest_target,$(1)) ) \ echo Solar-Version: $(RSCREVISION) $(call gb_Jar_get_manifest_target,$(1)) \ - cat $(if $(MANIFEST),$(MANIFEST),$(gb_Helper_MISCDUMMY)) $(call gb_Jar_get_manifest_target,$(1)) \ + $(if $(MANIFEST),cat $(MANIFEST) $(call gb_Jar_get_manifest_target,$(1)) ) \ mkdir -p $(dir $(2)) cd $(call gb_Jar_get_workdir,$(1)) \ $(gb_Jar_JARCOMMAND) cfm $(2) $(call gb_Jar_get_manifest_target,$(1)) \ META-INF $(PACKAGEROOTS) $(PACKAGEFILES) \ commit b3a50700c789ad6a26cf6b4fb324c83a81ed7c43 Author: Tor Lillqvist t...@iki.fi Date: Thu Aug 16 10:36:15 2012 +0300 Let's not overdo the abstraction, /dev/null is just fine to use as such Change-Id: Ib291d5b053f9ed7b597f0ebbed725602430e36b7 diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 93a0ad7..0c241f6 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -26,8 +26,6 @@ # #* -gb_Helper_NULLFILE := /dev/null - gb_Helper_MISC := $(WORKDIR)/Misc # general purpose phony target ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values
On 08/15/2012 04:58 PM, anwen wrote: A brief summary of this discussion: My purpose is to develop a Calc extension based on LibreOffice environment. As an extension, it registers itself as a UNO component and provides some add-in functions which retrieve streaming data. This extension object builds connections via worker threads to an outside streaming data server. Everything runs well until I terminate the LibreOffice with x click: Soffice.bin/Soffice.exe are still alive after the termination process is completed and all the documents are closed. It happens when the worker threads try to update the spreadsheet using modified() function and the termination process tries to stop the worker threads. SolarMutex may be the reason of this issue. To solve the issue, I implemented two interfaces: XTerminationListener and XEventListener. The former listens to desktop.termination. The latter listens to document events. From my observation, the worker thread could be blocked within modified() forever by queryTermination() and notifyTermination(). It could also be blocked forever by some documents events, like OnPrepareViewClosing, OnPrepareUnload, OnViewClosed, OnUnload, OnUnfocus, and OnCloseApp. Interestingly, I observed that the worker thread could resume running when seeing OnModeChanged event. So the situation is as follows: When your notifyTermination() listener is called (which apparently happens with the SolarMutex being locked), you need to synchronously terminate and join your worker thread. But at that time your worker thread happens to be blocked waiting for the SolarMutex, at some stack frame nested in a call to some modified() (which is part of your code). Right? (Can you make available the source code of your extension?) I still see no true fix short of having the notifyTermination listeners being fired without SolarMutex locked. Currently, my workaround with the SolarMutex issue is double termination 'x'' clicks: first termination is vetoed in queryTermination() where I setup status change to avoid modified(). Then the second termination will kill all the threads and the LibreOffice process. Right now, I did double terminations manually. I am wondering if I could manipulate OnModeChanged events which may solve the issue too. Although the spreadsheet shows dynamic data with XVolatileResult return type, it does not popup save dialogue if I open an existing calc file. So, you manually need to click the 'X' to close the LibreOffice window twice? And where do you call the code to terminate and join your worker thread now? (Or do you not call such code at all, and things appear to work by chance, due to changes in timing?) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 53113, which changed state. Bug 53113 Summary: DOCX filter loses shape containing text https://bugs.freedesktop.org/show_bug.cgi?id=53113 What|Old Value |New Value Resolution||FIXED Status|REOPENED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: basctl/source vcl/source
basctl/source/basicide/baside2.cxx |9 +
vcl/source/window/split.cxx| 56 +
2 files changed, 30 insertions(+), 35 deletions(-)
New commits:
commit 9658704fc4c691dfea7411eb36951ddc5154538a
Author: Jean-Tiare LE BIGOT ad...@jtlebi.fr
Date: Sun Aug 12 17:08:16 2012 -0400
Set ide sizer color to dark grey; was dark black
The color setting was picked from SplitWindow::Paint()
for visual consistency with the sizers used in Impress
for example.
This commit also resurects presumably dead code.
In fact GDB let me see that only the short path
was taken.
This has an impact on Calc's window splitters and
on more visibly on the basic IDE which now looks
much nicer :)
EDITS:
restricted this commit impact to IDE as a poc
Change-Id: I9a051fd894feccff4bbc7db7efe1160cb2c3a2c6
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index fa2b050..3d2bfd8 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1397,6 +1397,15 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
{
SetBackground(GetSettings().GetStyleSettings().GetWindowColor());
+Color splitterColor(GetSettings().GetStyleSettings().GetShadowColor());
+
+aLeftSplit.SetLineColor(splitterColor);
+aLeftSplit.SetFillColor(splitterColor);
+aBottomSplit.SetLineColor(splitterColor);
+aBottomSplit.SetFillColor(splitterColor);
+aVertSplit.SetLineColor(splitterColor);
+aVertSplit.SetFillColor(splitterColor);
+
aLeftSplit.Show();
aBottomSplit.Show();
aVertSplit.Show();
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index ac2e9f7..d958c29 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -158,6 +158,9 @@ Splitter::Splitter( Window* pParent, WinBits nStyle ) :
{
ImplInitSplitterData();
ImplInit( pParent, nStyle );
+
+SetLineColor();
+SetFillColor();
}
// ---
@@ -171,6 +174,9 @@ Splitter::Splitter( Window* pParent, const ResId rResId ) :
ImplInit( pParent, nStyle );
ImplLoadRes( rResId );
+SetLineColor();
+SetFillColor();
+
if ( !(nStyle WB_HIDE) )
Show();
}
@@ -748,46 +754,26 @@ void Splitter::DataChanged( const DataChangedEvent
rDCEvt )
void Splitter::Paint( const Rectangle rPaintRect )
{
-if( HasFocus() || mbKbdSplitting )
-{
-Color oldFillCol = GetFillColor();
-Color oldLineCol = GetLineColor();
-
-SetLineColor();
-SetFillColor( GetSettings().GetStyleSettings().GetFaceColor() );
-DrawRect( rPaintRect );
-
-Color aSelectionBorderCol(
GetSettings().GetStyleSettings().GetActiveColor() );
-SetFillColor( aSelectionBorderCol );
-SetLineColor();
-
-Polygon aPoly( rPaintRect );
-PolyPolygon aPolyPoly( aPoly );
-DrawTransparent( aPolyPoly, 85 );
+DrawRect( rPaintRect );
-SetLineColor( aSelectionBorderCol );
-SetFillColor();
+Polygon aPoly( rPaintRect );
+PolyPolygon aPolyPoly( aPoly );
+DrawTransparent( aPolyPoly, 85 );
-if( mbKbdSplitting )
-{
-LineInfo aInfo( LINE_DASH );
-//aInfo.SetDashLen( 2 );
-//aInfo.SetDashCount( 1 );
-aInfo.SetDistance( 1 );
-aInfo.SetDotLen( 2 );
-aInfo.SetDotCount( 1 );
-
-DrawPolyLine( aPoly, aInfo );
-}
-else
-DrawRect( rPaintRect );
-
-SetFillColor( oldFillCol);
-SetLineColor( oldLineCol);
+if( mbKbdSplitting )
+{
+LineInfo aInfo( LINE_DASH );
+//aInfo.SetDashLen( 2 );
+//aInfo.SetDashCount( 1 );
+aInfo.SetDistance( 1 );
+aInfo.SetDotLen( 2 );
+aInfo.SetDotCount( 3 );
+
+DrawPolyLine( aPoly, aInfo );
}
else
{
-Window::Paint( rPaintRect );
+DrawRect( rPaintRect );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
MSVC stack traces Fwd: Tinderbox failure, Win-x86@6, MASTER, last success: 2012-08-14 09:27:23
it appears this tinderbox (which is now running subsequentcheck) crashes a lot on toolkit_unoapi MutableTreeNode, which doesn't happen locally here. does anybody know if it would be possible to put some automatic core dump stack trace printing thingy into the build system for MSVC like we do already for GCC? can somebody run the test locally on the machine and obtain a stack? * State for toolkit.MutableTreeDataModel::com::sun::star::awt::tree::XTreeDataModel ** Whole interface: PASSED.OK ** LOG Log started 16.07.2012 - 01:54:40 checking: [toolkit.MutableTreeDataModel::com::sun::star::lang::XComponent] is iface: [com.sun.star.lang.XComponent] testcode: [ifc.lang._XComponent] LOG Execute: dispose() LOG Execute: removeEventListener() LOG Execute: addEventListener() LOG addEventListener(): null LOG Thread[main,5,main] is removing EL ifc.lang._XComponent$MyEventListener2@dc67e LOG removeEventListener(): null LOG begin dispose in thread Thread[main,5,main] LOG Listener 1: disposing LOG Thread[main,5,main] is DISPOSING EV1ifc.lang._XComponent$MyEventListener@d09ad3 LOG end disposeThread[main,5,main] Method addEventListener() finished with state OK Method removeEventListener() finished with state OK Method dispose() finished with state OK LOG dispose(): PASSED.OK LOG disposing xTextDoc * State for toolkit.MutableTreeDataModel::com::sun::star::lang::XComponent ** Whole interface: PASSED.OK * LOG disposing xTextDoc Couldn't close document * State for toolkit.MutableTreeDataModel ** Whole component: PASSED.OK *** Creating: toolkit.MutableTreeNode LOG Log started 16.07.2012 - 01:54:42 Exception while getting Environment com.sun.star.lang.DisposedException com.sun.star.lang.DisposedException at com.sun.star.lib.uno.environments.remote.JobQueue.removeJob(JobQueue.java:203) at com.sun.star.lib.uno.environments.remote.JobQueue.enter(JobQueue.java:323) at com.sun.star.lib.uno.environments.remote.JobQueue.enter(JobQueue.java:296) at com.sun.star.lib.uno.environments.remote.JavaThreadPool.enter(JavaThreadPool.java:81) at com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge.sendRequest(java_remote_bridge.java:628) at com.sun.star.lib.uno.bridges.java_remote.ProxyFactory$Handler.request(ProxyFactory.java:141) at com.sun.star.lib.uno.bridges.java_remote.ProxyFactory$Handler.invoke(ProxyFactory.java:123) at $Proxy47.getFolderContents(Unknown Source) at mod._toolkit.MutableTreeNode.dirlist(MutableTreeNode.java:152) at mod._toolkit.MutableTreeNode.dirlist(MutableTreeNode.java:157) at mod._toolkit.MutableTreeNode.dirlist(MutableTreeNode.java:157) at mod._toolkit.MutableTreeNode.dirlist(MutableTreeNode.java:157) at mod._toolkit.MutableTreeNode.dirlist(MutableTreeNode.java:157) at mod._toolkit.MutableTreeNode.dirlist(MutableTreeNode.java:157) at mod._toolkit.MutableTreeNode.dirlist(MutableTreeNode.java:157) at mod._toolkit.MutableTreeNode.dirlist(MutableTreeNode.java:157) at mod._toolkit.MutableTreeNode.fillNode(MutableTreeNode.java:131) at mod._toolkit.MutableTreeNode.createTestEnvironment(MutableTreeNode.java:91) at lib.TestCase.getTestEnvironment(TestCase.java:123) at base.java_fat.getTestEnvironment(java_fat.java:321) at base.java_fat.executeTest(java_fat.java:169) at org.openoffice.Runner.run(Runner.java:234) at org.openoffice.test.UnoApiTest.test(UnoApiTest.java:38) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:592) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:45) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:42) at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20) at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28) at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:30) at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:263) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:68) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:47) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:231) at
Re: [REVIEW: 3-5] fdo#47311 crash when copying cells into more than one sheet
On 14/08/12 12:54, David Tardon wrote: Hi all, fdo#47311 has got at least 2 duplicates since it was first reported, so I think we should fix it in 3.5. It has got clear and simple reproducer and one-liner fix. Any takers? ok, I will have a look Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #80 from ape os...@yandex.ru 2012-08-16 08:34:35 UTC --- Bug 46716 (Some formulas are lost by DOCX import filter) reopened as a blocker: - regression; - LibreOffice is frozen now. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/ui/dbgui/pfiltdlg.cxx | 22 ---
sc/source/ui/dbgui/tpsort.cxx | 58 +---
sc/source/ui/dbgui/tpsubt.cxx | 16 ++-
sc/source/ui/inc/tpsort.hxx | 14 -
sc/source/ui/inc/tpsubt.hxx |4 +-
5 files changed, 61 insertions(+), 53 deletions(-)
New commits:
commit 2ba8fe1e28fef76b1efea5f401360b38f720dbcf
Author: Bence Babati b.baa...@gmail.com
Date: Wed Aug 15 10:46:08 2012 +0200
String to OUString
Change-Id: I424a3e91cd6163907e364c7d6f40e19d8bf12b48
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index a661795..b23df01 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -162,7 +162,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet rArgSet )
if ( pViewData pDoc )
{
-String theAreaStr;
+rtl::OUString theAreaStr;
ScRange theCurArea ( ScAddress( theQueryData.nCol1,
theQueryData.nRow1,
nSrcTab ),
@@ -290,7 +290,7 @@ void ScPivotFilterDlg::FillFieldLists()
if ( pDoc )
{
-String aFieldName;
+rtl::OUString aFieldName;
SCTAB nTab= nSrcTab;
SCCOL nFirstCol = theQueryData.nCol1;
SCROW nFirstRow = theQueryData.nRow1;
@@ -301,11 +301,13 @@ void ScPivotFilterDlg::FillFieldLists()
for ( col=nFirstCol; col=nMaxCol; col++ )
{
pDoc-GetString( col, nFirstRow, nTab, aFieldName );
-if ( aFieldName.Len() == 0 )
+if ( aFieldName.isEmpty() )
{
-aFieldName = aStrColumn;
-aFieldName += ' ';
-aFieldName += ScColToAlpha( col );
+ rtl::OUStringBuffer aBuf;
+aBuf.append(aStrColumn);
+aBuf.append(sal_Unicode(' '));
+aBuf.append(ScColToAlpha(col));
+aFieldName = aBuf.makeStringAndClear();
}
aLbField1.InsertEntry( aFieldName, i );
aLbField2.InsertEntry( aFieldName, i );
@@ -325,7 +327,7 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList )
ComboBox* pValList= aValueEdArr[nList-1];
sal_uInt16 nFieldSelPos=
aFieldLbArr[nList-1]-GetSelectEntryPos();
sal_uInt16 nListPos= 0;
-String aCurValue = pValList-GetText();
+rtl::OUString aCurValue = pValList-GetText();
pValList-Clear();
pValList-InsertEntry( aStrNotEmpty, 0 );
@@ -565,9 +567,9 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox )
for (sal_uInt16 i=0; i=MAXCOL; i++)
DELETEZ( pEntryLists[i] );
-String aCurVal1 = aEdVal1.GetText();
-String aCurVal2 = aEdVal2.GetText();
-String aCurVal3 = aEdVal3.GetText();
+rtl::OUString aCurVal1 = aEdVal1.GetText();
+rtl::OUString aCurVal2 = aEdVal2.GetText();
+rtl::OUString aCurVal3 = aEdVal3.GetText();
UpdateValueList( 1 );
UpdateValueList( 2 );
UpdateValueList( 3 );
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 41c6e9f..9c235c6 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -91,9 +91,9 @@ ScTabPageSortFields::ScTabPageSortFields( Window*
pParent,
ScResId( RID_SCPAGE_SORT_FIELDS ),
rArgSet ),
//
-aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
-aStrColumn ( ScResId( SCSTR_COLUMN ) ),
-aStrRow ( ScResId( SCSTR_ROW ) ),
+aStrUndefined ( SC_RESSTR( SCSTR_UNDEFINED ) ),
+aStrColumn ( SC_RESSTR( SCSTR_COLUMN ) ),
+aStrRow ( SC_RESSTR( SCSTR_ROW ) ),
//
nWhichSort ( rArgSet.GetPool()-GetWhich( SID_SORT ) ),
pDlg( (ScSortDlg*)(GetParent()-GetParent()) ),
@@ -350,18 +350,20 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16
nStartField )
if ( bSortByRows )
{
-String aFieldName;
+rtl::OUString aFieldName;
SCCOL nMaxCol = aSortData.nCol2;
SCCOL col;
for ( col=nFirstSortCol; col=nMaxCol iSC_MAXFIELDS; col++
)
{
pDoc-GetString( col, nFirstSortRow, nTab, aFieldName );
-if ( !bHasHeader || (aFieldName.Len() == 0) )
+if ( !bHasHeader || aFieldName.isEmpty() )
{
-aFieldName = aStrColumn;
-aFieldName += ' ';
-aFieldName += ScColToAlpha( col );
+rtl::OUStringBuffer aBuf;
+aBuf.append(aStrColumn);
+
[Libreoffice-commits] .: sc/source
sc/source/ui/dbgui/pfiltdlg.cxx |4 +---
sc/source/ui/dbgui/tpsort.cxx | 11 +--
sc/source/ui/dbgui/tpsubt.cxx |6 ++
sc/source/ui/src/scstring.src |4 ++--
4 files changed, 10 insertions(+), 15 deletions(-)
New commits:
commit bd465b57caf1bf5eba04c37a2095e902c8b4e4f9
Author: Bence Babati b.baa...@gmail.com
Date: Wed Aug 15 10:55:32 2012 +0200
fix a linguistic issue on Calc UI
Change-Id: I1d69be65e2d55f1de0a3d800cd920cc881e8a8ce
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index b23df01..3245b4c 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -305,9 +305,7 @@ void ScPivotFilterDlg::FillFieldLists()
{
rtl::OUStringBuffer aBuf;
aBuf.append(aStrColumn);
-aBuf.append(sal_Unicode(' '));
-aBuf.append(ScColToAlpha(col));
-aFieldName = aBuf.makeStringAndClear();
+aFieldName = aBuf.makeStringAndClear().replaceAll(%1,
ScColToAlpha( col ));
}
aLbField1.InsertEntry( aFieldName, i );
aLbField2.InsertEntry( aFieldName, i );
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 9c235c6..7f586db 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -361,9 +361,7 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16
nStartField )
{
rtl::OUStringBuffer aBuf;
aBuf.append(aStrColumn);
-aBuf.append(sal_Unicode(' '));
-aBuf.append(ScColToAlpha(col));
-aFieldName = aBuf.makeStringAndClear();
+aFieldName =
aBuf.makeStringAndClear().replaceAll(%1, ScColToAlpha( col ));
}
nFieldArr.push_back( col );
@@ -385,10 +383,11 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16
nStartField )
if ( !bHasHeader || aFieldName.isEmpty() )
{
rtl::OUStringBuffer aBuf;
+rtl::OUStringBuffer tempBuf;
+
aBuf.append(aStrRow);
-aBuf.append(sal_Unicode(' '));
-aBuf.append(row+1);
-aFieldName = aBuf.makeStringAndClear();
+tempBuf.append(row+1 );
+aFieldName =
aBuf.makeStringAndClear().replaceAll(%1, tempBuf.makeStringAndClear());
}
nFieldArr.push_back( row );
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 510f348..ea24d6c 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -288,11 +288,9 @@ void ScTpSubTotalGroup::FillListBoxes()
pDoc-GetString( col, nFirstRow, nTab, aFieldName );
if ( aFieldName.isEmpty() )
{
-rtl::OUStringBuffer aBuf;
+ rtl::OUStringBuffer aBuf;
aBuf.append(aStrColumn);
-aBuf.append(sal_Unicode(' '));
-aBuf.append(ScColToAlpha(col));
-aFieldName = aBuf.makeStringAndClear();
+aFieldName = aBuf.makeStringAndClear().replaceAll(%1,
ScColToAlpha( col ));
}
nFieldArr[i] = col;
aLbGroup.InsertEntry( aFieldName, i+1 );
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index 50335dc..05ea091 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -203,12 +203,12 @@ String SCSTR_NONAME
String SCSTR_COLUMN
{
-Text [ en-US ] = Column ;
+Text [ en-US ] = Column %1 ;
};
String SCSTR_ROW
{
-Text [ en-US ] = Row ;
+Text [ en-US ] = Row %1 ;
};
String SCSTR_NEW
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'update' - check.php
check.php | 21 -
1 file changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 507e9ca48c375f8c536bc9e2a7370af7732c4a95
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Aug 16 11:04:59 2012 +0200
'' in the xml snippet has to be escaped as 'amp;'
diff --git a/check.php b/check.php
index 80e6a7d..8447812 100644
--- a/check.php
+++ b/check.php
@@ -29,7 +29,7 @@ function get_update_info($agent=null) {
global $debug;
if ($debug)
-error_log($_SERVER['HTTP_USER_AGENT'] . ; .
$_SERVER['HTTP_ACCEPT_LANGUAGE']);
+error_log($_SERVER['HTTP_USER_AGENT'] . ; .
$_SERVER['HTTP_ACCEPT_LANGUAGE'] . ; . $_SERVER['QUERY_STRING']);
if ($agent == null array_key_exists('HTTP_USER_AGENT', $_SERVER))
$agent = $_SERVER['HTTP_USER_AGENT'];
@@ -47,12 +47,14 @@ function get_update_info($agent=null) {
# check the package format for Linux packages
# FIXME this should be improved, but serves the purpose for now
-if ($_SERVER['QUERY_STRING'] == 'pkgfmt=rpm')
-$match['pkgfmt'] = 'rpm';
-else if ($_SERVER['QUERY_STRING'] == 'pkgfmt=deb')
-$match['pkgfmt'] = 'deb';
-else
-$match['pkgfmt'] = '';
+$match['pkgfmt'] = '';
+if (array_key_exists('QUERY_STRING', $_SERVER))
+{
+if ($_SERVER['QUERY_STRING'] == 'pkgfmt=rpm')
+$match['pkgfmt'] = 'rpm';
+else if ($_SERVER['QUERY_STRING'] == 'pkgfmt=deb')
+$match['pkgfmt'] = 'deb';
+}
return $match;
}
@@ -156,14 +158,15 @@ $update_versions = array(
# 'id' is what is going to be shown in the update information dialog
# 'update_src' specifies the target url. When 'substitute' is set to true,
# you can use there a string like
-#
'http://www.libreoffice.org/download/?type=typelang=langversion=3.5.6'
+#
'http://www.libreoffice.org/download/?type=typeamp;lang=langamp;version=3.5.6'
# where 'type' and 'lang' will be substitued with the right value
+# NOTE: '' in the URL has to be escaped as amp;
$update_map = array(
'LO-3.5' = array('gitid' =
'e0fbe70-5879838-a0745b0-0cd1158-638b327',
'id' = 'LibreOffice 3.5.6',
'version' = '3.5.6',
'update_type' = 'text/html',
- 'update_src' =
'http://www.libreoffice.org/download/?type=typelang=langversion=3.5.6',
+ 'update_src' =
'http://www.libreoffice.org/download/?type=typeamp;lang=langamp;version=3.5.6',
'substitute' = true ),
# To be uncommented when 3.5.7 RC2 is out, to get updates from 3.5.7 RC1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSOC-UPDATE](15.08) Impress Remote
On Thu, 2012-08-16 at 09:43 +0200, Andrzej J. R. Hunt wrote: Who knows; it'd be good to point to the license I guess. I'll add that -- I should probably also mention my use of the Coverflow and ActionBarSherlock, which are both Apache licenced. Important to ensure we're distributing a copy of the Apache license, and (if there is one) a NOTICE file for that - inside the .zip file / .apk should be fine I guess; should also have a COPYING.MPL file in there too I guess. Good work :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build LO for Android on Mac OS 10.8
On Thu, 2012-08-16 at 10:51 +0800, James Chen wrote: Cool - I assume you noticed you need to follow a build from the top-level with something like: cd android/experimental/LibreOffice4Android/ make clean all install ... Michael, Thanks for the advice. Thank you! I forgot to mention; you need a device plugged in, or an emulator running for 'make install' to do much ;-) Hopefully it worked out for you, ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 5 commits - tubes/CppunitTest_tubes_test.mk tubes/inc tubes/Library_tubes.mk tubes/qa tubes/source
tubes/CppunitTest_tubes_test.mk | 11 --
tubes/Library_tubes.mk |2
tubes/inc/tubes/contact-list.hxx |5
tubes/inc/tubes/manager.hxx | 41 +--
tubes/qa/test_manager.cxx| 175 +---
tubes/source/collaboration.cxx |6 -
tubes/source/contact-list.cxx| 23
tubes/source/contacts.cxx|3
tubes/source/manager.cxx | 213 ---
9 files changed, 165 insertions(+), 314 deletions(-)
New commits:
commit 4662df8a7561ce71ba00accbb5170e10818d6008
Author: Matúš Kukan matus.ku...@gmail.com
Date: Thu Aug 16 10:53:35 2012 +0200
tubes: simplify and make more readable, I believe
Change-Id: I83a4332d9947d03382b10ea050f26bf3ed544299
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index ce17fd9..032f539 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -132,11 +132,6 @@ public:
// Only for callbacks.
static void addConference( TeleConference* pConference );
-static void setChannelReadyHandlerInvoked( bool b );
-static bool isChannelReadyHandlerInvoked();
-static void setAccountManagerReady( bool bPrepared);
-static void setAccountManagerReadyHandlerInvoked( bool b );
-static bool isAccountManagerReadyHandlerInvoked();
/// LibreOfficeWhatEver
static rtl::OString getFullClientName();
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index f1548c5..d8884ee 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -87,9 +87,9 @@ public:
TpBaseClient* mpClient;
TpBaseClient* mpFileTransferClient;
TpAccountManager* mpAccountManager;
-boolmbAccountManagerReady : 1;
-boolmbAccountManagerReadyHandlerInvoked :
1;
-boolmbChannelReadyHandlerInvoked : 1;
+static bool mbAccountManagerReady;
+static bool mbAccountManagerReadyHandlerInvoked;
+static bool mbChannelReadyHandlerInvoked;
ContactList*mpContactList;
OString msCurrentUUID;
OString msNameSuffix;
@@ -102,9 +102,14 @@ public:
TeleManagerImpl();
~TeleManagerImpl();
+static void AccountManagerReadyHandler( GObject* pSourceObject,
GAsyncResult* pResult, gpointer pUserData );
+static void ChannelReadyHandler( GObject* pSourceObject, GAsyncResult*
pResult, gpointer pUserData );
};
TeleManagerImpl* TeleManager::pImpl = new TeleManagerImpl();
+bool TeleManagerImpl::mbAccountManagerReady;
+bool TeleManagerImpl::mbAccountManagerReadyHandlerInvoked;
+bool TeleManagerImpl::mbChannelReadyHandlerInvoked;
static void TeleManager_DBusChannelHandler(
TpSimpleHandler*/*handler*/,
@@ -307,14 +312,6 @@ static void TeleManager_TransferError( EmpathyFTHandler
*handler, const GError *
g_object_unref( handler);
}
-static void lcl_iterateLoop( bool (*pFunc)() )
-{
-while (!(*pFunc)())
-{
-g_main_context_iteration( NULL, TRUE );
-}
-}
-
static void lcl_IncomingHandlerReady (
EmpathyFTHandler* pHandler,
GError* pError,
@@ -389,20 +386,20 @@ static void TeleManager_FileTransferHandler(
}
}
-static void TeleManager_ChannelReadyHandler(
+void TeleManagerImpl::ChannelReadyHandler(
GObject*pSourceObject,
GAsyncResult* pResult,
gpointerpUserData
)
{
-INFO_LOGGER_F( TeleManager_ChannelReadyHandler);
+INFO_LOGGER_F( TeleManagerImpl::ChannelReadyHandler);
TeleConference* pConference = reinterpret_castTeleConference*(pUserData);
-SAL_WARN_IF( !pConference, tubes, TeleManager_ChannelReadyHandler: no
conference);
+SAL_WARN_IF( !pConference, tubes, TeleManagerImpl::ChannelReadyHandler:
no conference);
if (!pConference)
return;
-TeleManager::setChannelReadyHandlerInvoked( true );
+mbChannelReadyHandlerInvoked = true;
TpAccountChannelRequest* pChannelRequest = TP_ACCOUNT_CHANNEL_REQUEST(
pSourceObject);
GError* pError = NULL;
@@ -412,7 +409,7 @@ static void TeleManager_ChannelReadyHandler(
{
// account isn't Enabled means just that..
/* FIXME: detect and handle, domain=132, code=3 */
-SAL_WARN( tubes, TeleManager_ChannelReadyHandler: no channel:
pError-message);
+SAL_WARN( tubes, TeleManagerImpl::ChannelReadyHandler: no channel:
pError-message);
g_error_free( pError);
return;
}
@@ -421,25 +418,25 @@ static void TeleManager_ChannelReadyHandler(
pConference-offerTube();
}
[REVIEW 3-6-1] Skip check for DIFAT sector count
On Thu, 2012-08-16 at 07:52 +0400, Ivan Timofeev wrote: On 15.08.2012 22:12, Kohei Yoshida wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=50d89530eee57afb890e2e65aac8a5b0f93a74a3 sure, pushed to libreoffice-3-6. I'd like to get this into -3-6-1, we need one more approval. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/data/document.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 38d18fcd644fafeb0234a1804563853a17b47c4f Author: David Tardon dtar...@redhat.com Date: Thu Aug 16 10:41:56 2012 +0100 fdo#47311 don't crash when pasting into more than 1 sheet Change-Id: I61c2c988eedd91f44a0b9c2553f69a692f47dbfb diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 93a067e..cfcce6d 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -2292,7 +2292,7 @@ void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW nRow1, while ( i + nFollow nTabEnd rMark.GetTableSelect( i + nFollow + 1 ) nClipTab + nFollow MAXTAB - rClipTabs[nClipTab + nFollow + 1] ) + rClipTabs[ (nClipTab + nFollow + 1) % (static_castSCTAB(rClipTabs.size()))] ) ++nFollow; if ( pCBFCP-pClipDoc-GetClipParam().mbCutMode ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re:[PUSHED ][REVIEW: 3-5] fdo#47311 crash when copying cells into more than one sheet
On 16/08/12 09:32, Noel Power wrote: On 14/08/12 12:54, David Tardon wrote: Hi all, fdo#47311 has got at least 2 duplicates since it was first reported, so I think we should fix it in 3.5. It has got clear and simple reproducer and one-liner fix. Any takers? ok, I will have a look Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Licensing 35079
On Wed, 2012-08-15 at 09:35 +0200, Lennard Wasserthal wrote: I publish my patch ... under the terms of the LGPLv3+ and MPL dual license. An next time I will write it directly to avoid unnecessary mails. Thanks for your contribution ! :-) it's simply brilliant to have people working on bug fixing and improving the product. As for the boring paper-work; it makes my life -significantly- easier, if instead of having to track and associated an archived license statement per-patch; you could give a blanket license statement. This is what linkage into: http://wiki.documentfoundation.org/Development/Developers is really for - see some of the samples there; Cedric - please don't link single license statements into there without some annotation just one patch or something - otherwise reviewers can get confused. Of course, I check all the links there as I build my database but ... ;-) Anyhow - excited by the contribution, and looking forward to your next ! :-) All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6-1' - sot/source
sot/source/sdstor/stgelem.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1b71741b7a1d7c1f120226e8f6c7a93e149f9a2 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Wed Aug 15 14:06:06 2012 -0400 Do not check the stored DIFAT sector count. Refer to this thread for details. http://lists.freedesktop.org/archives/libreoffice/2012-August/036852.html (cherry picked from commit 50d89530eee57afb890e2e65aac8a5b0f93a74a3) Change-Id: Id2115732a1e1bcd78c13445f5aaefe1ec7cfa0c2 Signed-off-by: Ivan Timofeev timofeev@gmail.com Signed-off-by: Noel Power noel.po...@suse.com Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index d63398c..7048e77 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -203,7 +203,7 @@ sal_Bool StgHeader::Check() nTOCstrm = 0 nThreshold 0 ( nDataFAT == -2 || ( nDataFAT = 0 nDataFATSize 0 ) ) - ( nMasterChain == -2 || ( nMasterChain =0 nMaster 109 ) ) + ( nMasterChain == -2 || nMasterChain =0 ) nMaster = 0; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED][REVIEW 3-6-1] Skip check for DIFAT sector count
On 16/08/12 10:44, Michael Meeks wrote: On Thu, 2012-08-16 at 07:52 +0400, Ivan Timofeev wrote: On 15.08.2012 22:12, Kohei Yoshida wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=50d89530eee57afb890e2e65aac8a5b0f93a74a3 sure, pushed to libreoffice-3-6. I'd like to get this into -3-6-1, we need one more approval. ATB, Michael. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC] testing - Weekly Report no. 12
On Wed, 2012-08-15 at 16:04 +0200, Artur Dorda wrote: Yes I have seen it and I have just setup gerrit. Cool :-) I just didn't want to apply some new stuff *before* I finish my GSoC coding job - and now it's finished so I could setup it :) Heh - great; I added your account to the gerrit committers list. Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 51620, which changed state. Bug 51620 Summary: Windows: Toolbar look inconsistent, depends on docking place https://bugs.freedesktop.org/show_bug.cgi?id=51620 What|Old Value |New Value Resolution||WORKSFORME Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 5 commits - avmedia/inc editeng/inc editeng/source sd/source svx/inc svx/source ucb/source unoxml/source
avmedia/inc/avmedia/mediaplayer.hxx |2 -- editeng/inc/editeng/numitem.hxx |3 --- editeng/inc/editeng/svxacorr.hxx |4 +--- editeng/source/editeng/eehtml.cxx |4 +--- editeng/source/editeng/eehtml.hxx |2 -- editeng/source/misc/svxacorr.cxx |8 +++- editeng/source/xml/xmltxtexp.cxx |2 -- sd/source/ui/view/sdview3.cxx |2 +- svx/inc/extrusiondepthdialog.hxx |2 -- svx/inc/svx/bmpmask.hxx |1 - svx/inc/svx/clipboardctl.hxx |1 - svx/inc/svx/e3dundo.hxx |9 ++--- svx/inc/svx/float3d.hxx |6 +- svx/inc/svx/fontwork.hxx |1 - svx/inc/svx/galctrl.hxx |1 - svx/inc/svx/itemwin.hxx |1 - svx/inc/svx/numfmtsh.hxx |1 - svx/inc/svx/sdrpagewindow.hxx |1 - svx/inc/svx/svdetc.hxx|2 -- svx/inc/svx/tbcontrl.hxx |3 --- svx/inc/svx/xflftrit.hxx |2 -- svx/source/dialog/contimp.hxx |2 -- svx/source/dialog/imapdlg.cxx |2 +- svx/source/dialog/imapimp.hxx |6 +- svx/source/engine3d/e3dundo.cxx |6 +- svx/source/engine3d/float3d.cxx |7 ++- svx/source/gallery2/galctrl.cxx |3 +-- svx/source/inc/fmobj.hxx |5 - svx/source/items/numfmtsh.cxx |2 -- svx/source/mnuctrls/clipboardctl.cxx |1 - svx/source/svdraw/svddrgm1.hxx|3 --- svx/source/svdraw/svddrgmt.cxx|3 +-- svx/source/svdraw/svdetc.cxx |2 -- svx/source/table/tablertfimporter.cxx |2 -- svx/source/tbxctrls/tbcontrl.cxx |7 +-- ucb/source/ucp/cmis/cmis_repo_content.cxx |1 - ucb/source/ucp/cmis/cmis_repo_content.hxx |3 +-- ucb/source/ucp/file/bc.cxx|6 ++ ucb/source/ucp/file/filid.cxx |3 +-- ucb/source/ucp/file/filid.hxx |1 - ucb/source/ucp/file/filinpstr.cxx |4 +--- ucb/source/ucp/file/filinpstr.hxx |3 --- ucb/source/ucp/file/filnot.cxx|8 ++-- ucb/source/ucp/file/filnot.hxx|4 ucb/source/ucp/file/filstr.cxx|1 - ucb/source/ucp/file/filstr.hxx|2 -- unoxml/source/dom/documenttype.cxx|4 ++-- unoxml/source/dom/entitiesmap.cxx |4 +--- unoxml/source/dom/entitiesmap.hxx |4 +--- unoxml/source/dom/notationsmap.cxx|4 +--- unoxml/source/dom/notationsmap.hxx|4 +--- 51 files changed, 30 insertions(+), 135 deletions(-) New commits: commit a7ba47243cb70b78c8d8674558ed6db35b79da99 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 16 11:39:58 2012 +0200 -Werror,-Wunused-private-field (Clang towards 3.2) Change-Id: I63d27cd70a7c6d4ad73f83db5e19985c0e3b8d7c diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 356eddd..511dde2 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -761,7 +761,7 @@ sal_Bool View::InsertData( const TransferableDataHelper rDataHelper, aNewSet.Put( pObj-GetMergedItemSet() ); if( bUndo ) -AddUndo( new E3dAttributesUndoAction( mrDoc, this, (E3dObject*) pPickObj, aNewSet, aOldSet, sal_False ) ); +AddUndo( new E3dAttributesUndoAction( mrDoc, (E3dObject*) pPickObj, aNewSet, aOldSet ) ); pPickObj-SetMergedItemSetAndBroadcast( aNewSet ); } diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx index e619052..50ff00e 100644 --- a/svx/inc/extrusiondepthdialog.hxx +++ b/svx/inc/extrusiondepthdialog.hxx @@ -37,8 +37,6 @@ class ExtrusionDepthDialog : public ModalDialog CancelButtonmaCancelButton; HelpButton maHelpButton; -FieldUnit meDefaultUnit; - public: ExtrusionDepthDialog( Window* pParent, double fDepth, FieldUnit eDefaultUnit ); ~ExtrusionDepthDialog(); diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx index 0e85f0f..158931f 100644 --- a/svx/inc/svx/bmpmask.hxx +++ b/svx/inc/svx/bmpmask.hxx @@ -90,7 +90,6 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow friend class MaskData; friend class MaskSet; -Window* pParentWin; SizeaLastSize; ToolBox aTbxPipette; ColorWindow*pCtlPipette; diff --git a/svx/inc/svx/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx index 1b55eee..4654363 100644 --- a/svx/inc/svx/clipboardctl.hxx +++ b/svx/inc/svx/clipboardctl.hxx @@ -35,7 +35,6 @@ class
[REVIEW 3-6] [REVIEW 3-5] fdo#46250
please consider cherry-picking http://cgit.freedesktop.org/libreoffice/core/commit/?id=7bfb229230a439c2edb3e8452fe0d3430f9931ce Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/source
svx/source/items/clipfmtitem.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e413403590c3fb68a62db6d34d202e320fd99017 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 16 12:51:21 2012 +0200 fdo#53061: Work around boost::ptr_vector.insert(..., nullptr) problem At least with certain versions of Boost and Clang, and when NULL is defined as nullptr, compilation failed here. To me, looks like an error of either Boost or Clang; replacing NULL with 0 appears to be a good enough workaround. (Identified by Jung-uk Kim.) Change-Id: I702587abfabad6dba55a2b4c65a53e332b4ab048 diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index 1af4be8..e287966 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -132,7 +132,7 @@ void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos ) if( nPos pImpl-aFmtNms.size() ) nPos = pImpl-aFmtNms.size(); -pImpl-aFmtNms.insert(pImpl-aFmtNms.begin() + nPos, NULL); +pImpl-aFmtNms.insert(pImpl-aFmtNms.begin() + nPos, 0); pImpl-aFmtIds.insert( pImpl-aFmtIds.begin()+nPos, nId ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/drawingml/textbodyproperties.hxx |3 ++
oox/source/drawingml/shape.cxx |3 ++
oox/source/drawingml/textbodyproperties.cxx| 22 ++
oox/source/drawingml/textbodypropertiescontext.cxx | 25 +
4 files changed, 34 insertions(+), 19 deletions(-)
New commits:
commit 5ac575ee3e10961177263d8900073d046af66176
Author: Muthu Subramanian sumu...@suse.com
Date: Thu Aug 16 16:57:47 2012 +0530
n#773048: PPTX shape margins need to be rotated as well.
diff --git a/oox/inc/oox/drawingml/textbodyproperties.hxx
b/oox/inc/oox/drawingml/textbodyproperties.hxx
index ce2dcab..25007be 100644
--- a/oox/inc/oox/drawingml/textbodyproperties.hxx
+++ b/oox/inc/oox/drawingml/textbodyproperties.hxx
@@ -23,6 +23,7 @@
#include com/sun/star/drawing/TextVerticalAdjust.hpp
#include oox/helper/helper.hxx
#include oox/helper/propertymap.hxx
+#include boost/optional.hpp
namespace oox {
namespace drawingml {
@@ -34,10 +35,12 @@ struct TextBodyProperties
PropertyMap maPropertyMap;
OptValue sal_Int32moRotation;
OptValue sal_Int32moVert;
+boost::optional sal_Int32 moInsets[4];
::com::sun::star::drawing::TextVerticalAdjust meVA;
explicitTextBodyProperties();
+voidpushRotationAdjustments( sal_Int32 nRotation );
voidpushVertSimulation();
};
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index c796554..6d2ff4c 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -516,7 +516,10 @@ Reference XShape Shape::createAndInsert(
// add properties from textbody to shape properties
if( mpTextBody.get() )
+{
+mpTextBody-getTextProperties().pushRotationAdjustments(
mnRotation );
aShapeProps.assignUsed(
mpTextBody-getTextProperties().maPropertyMap );
+}
// applying properties
aShapeProps.assignUsed( getShapeProperties() );
diff --git a/oox/source/drawingml/textbodyproperties.cxx
b/oox/source/drawingml/textbodyproperties.cxx
index 1f61392..f377ee9 100644
--- a/oox/source/drawingml/textbodyproperties.cxx
+++ b/oox/source/drawingml/textbodyproperties.cxx
@@ -58,6 +58,28 @@ void TextBodyProperties::pushVertSimulation()
}
}
+/* Push adjusted values, taking into consideration Shape Rotation */
+void TextBodyProperties::pushRotationAdjustments( sal_Int32 nRotation )
+{
+sal_Int32 nOff = 0;
+sal_Int32 aProps[] = { PROP_TextLeftDistance, PROP_TextUpperDistance,
PROP_TextRightDistance, PROP_TextLowerDistance };
+sal_Int32 n = ( sal_Int32 )( sizeof( aProps ) / sizeof( sal_Int32
) );
+
+switch( nRotation ) // TODO: What happens for part rotations ?
+{
+case (90*1*6): nOff = 1; break;
+case (90*2*6): nOff = 2; break;
+case (90*3*6): nOff = 3; break;
+default: break;
+}
+
+for( sal_Int32 i = 0; i n; i++ )
+{
+if( moInsets[i] )
+maPropertyMap[ aProps[ ( nOff++ ) % n ] ] = static_cast
sal_Int32 ( *moInsets[i] );
+}
+}
+
//
} // namespace drawingml
diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx
b/oox/source/drawingml/textbodypropertiescontext.cxx
index a21591c..5bae9f0 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -53,25 +53,12 @@ TextBodyPropertiesContext::TextBodyPropertiesContext(
ContextHandler rParent,
// ST_Coordinate
OUString sValue;
-sValue = xAttributes-getOptionalValue( XML_lIns );
-if( !sValue.isEmpty() ) {
-sal_Int32 nLeftInset = ( !sValue.isEmpty() ? GetCoordinate( sValue ) :
91440 / 360 );
-mrTextBodyProp.maPropertyMap[ PROP_TextLeftDistance ] = static_cast
sal_Int32 ( nLeftInset );
-}
-sValue = xAttributes-getOptionalValue( XML_tIns );
-if( !sValue.isEmpty() ) {
-sal_Int32 nTopInset = ( !sValue.isEmpty() ? GetCoordinate( sValue ) :
91440 / 360 );
-mrTextBodyProp.maPropertyMap[ PROP_TextUpperDistance ] = static_cast
sal_Int32 ( nTopInset );
-}
-sValue = xAttributes-getOptionalValue( XML_rIns );
-if( !sValue.isEmpty() ) {
-sal_Int32 nRightInset = ( !sValue.isEmpty() ? GetCoordinate( sValue ) :
91440 / 360 );
-mrTextBodyProp.maPropertyMap[ PROP_TextRightDistance ] = static_cast
sal_Int32 ( nRightInset );
-}
-sValue = xAttributes-getOptionalValue( XML_bIns );
-if( !sValue.isEmpty() ) {
-sal_Int32 nBottonInset = ( !sValue.isEmpty() ? GetCoordinate( sValue ) :
45720 / 360 );
-mrTextBodyProp.maPropertyMap[ PROP_TextLowerDistance ] = static_cast
sal_Int32 ( nBottonInset );
+sal_Int32 aIns[] = { XML_lIns, XML_tIns,
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx |4
binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx | 73 ++--
2 files changed, 68 insertions(+), 9 deletions(-)
New commits:
commit de9acff682c036f7e0f24427098a14042371b155
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 15 17:02:29 2012 +0100
merge in various filter work from core
Change-Id: I14ca1319e7e96941037450aee59d7a926d290c71
diff --git a/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
b/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
index 511b1a2..5f3c5b8 100644
--- a/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
@@ -44,6 +44,10 @@ GIFReader::GIFReader( SvStream rStm ) :
nLastPos( rStm.Tell() ),
nLogWidth100( 0UL ),
nLogHeight100 ( 0UL ),
+nGlobalWidth( 0 ),
+nGlobalHeight ( 0 ),
+nImageWidth ( 0 ),
+nImageHeight( 0 ),
nLoops ( 1 ),
eActAction ( GLOBAL_HEADER_READING ),
bGCTransparent ( FALSE ),
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
index d617a99..7934b87 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
@@ -18,6 +18,7 @@
*/
#include winmtf.hxx
+#include boost/scoped_array.hpp
#include rtl/crc.h
#include rtl/tencinfo.h
#include osl/endian.h
@@ -320,28 +321,54 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
case W_META_POLYPOLYGON:
{
-USHORT i, nPoly, nPoints;
-USHORT* pnPoints;
+bool bRecordOk = true;
+USHORT i, nPoly = 0, nPoints = 0;
Point* pPtAry;
// Anzahl der Polygone:
*pWMF nPoly;
// Anzahl der Punkte eines jeden Polygons holen, Gesammtzahl der
Punkte ermitteln:
-pnPoints = new USHORT[ nPoly ];
-nPoints = 0;
+boost::scoped_arrayUSHORT xPolygonPointCounts(new USHORT[nPoly]);
+USHORT* pnPoints = xPolygonPointCounts.get();
for( i = 0; i nPoly; i++ )
{
*pWMF pnPoints[i];
-nPoints = nPoints + pnPoints[i];
+
+if (pnPoints[i] SAL_MAX_UINT16 - nPoints)
+{
+bRecordOk = false;
+break;
+}
+
+nPoints += pnPoints[i];
}
+
+SAL_WARN_IF(!bRecordOk, svtools, polypolygon record has more
polygons than we can handle);
+
+bRecordOk = pWMF-good();
+
+if (!bRecordOk)
+{
+pWMF-SetError( SVSTREAM_FILEFORMAT_ERROR );
+break;
+}
+
// Polygonpunkte holen:
-pPtAry = (Point*) new char[ nPoints * sizeof(Point) ];
+boost::scoped_arrayPoint xPolygonPoints(new Point[nPoints]);
+pPtAry = xPolygonPoints.get();
for ( i = 0; i nPoints; i++ )
pPtAry[ i ] = ReadPoint();
+
+bRecordOk = pWMF-good();
+
+if (!bRecordOk)
+{
+pWMF-SetError( SVSTREAM_FILEFORMAT_ERROR );
+break;
+}
+
// PolyPolygon Actions erzeugen
PolyPolygon aPolyPoly( nPoly, pnPoints, pPtAry );
pOut-DrawPolyPolygon( aPolyPoly );
-delete[] (char*) pPtAry;
-delete[] pnPoints;
}
break;
@@ -1171,16 +1198,44 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle
rPlaceableBound, SvStream* pSt
case W_META_POLYPOLYGON:
{
+bool bRecordOk = true;
USHORT i, nPoly, nPoints = 0;
*pStm nPoly;
for( i = 0; i nPoly; i++ )
{
-sal_uInt16 nP;
+sal_uInt16 nP = 0;
*pStm nP;
nPoints = nPoints + nP;
+if (nP SAL_MAX_UINT16 - nPoints)
+{
+bRecordOk = false;
+break;
+}
+nPoints += nP;
}
+
+SAL_WARN_IF(!bRecordOk, svtools, polypolygon record has
more polygons than we can handle);
+
+bRecordOk = pStm-good();
+
+if (!bRecordOk)
+{
+pStm-SetError( SVSTREAM_FILEFORMAT_ERROR );
+bRet = sal_False;
+break;
+}
+
for ( i = 0; i nPoints; i++ )
Re: Beware of Boost-1.50
On Wed, 2012-08-15 at 17:08 +0200, Francois Tigeot wrote: A quick head's up as I've just been bitten by this issue. Both 3.5 and 3.6 branches fail at runtime when built with the new Boost-1.50 libraries. There is another potential gotcha with the later boost versions. We're using boosts unordered_map, etc. and with gcc at least the latest versions of boost::unordered_map only build in c++11 mode I think so I don't think it'll be possible to upgrade our internal boost (unless patched to revert to an older version of boost::unordered_map) ? Will be obvious at buildtime with lots of errors that suggest that copy ctors (or was it assignment operators) are non const or some such. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: instsetoo_native/util Makefile.top
Makefile.top |8 instsetoo_native/util/makefile.mk |9 - 2 files changed, 8 insertions(+), 9 deletions(-) New commits: commit 19990a9c5c5761687f757456015cb26d46d4830b Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 16 14:44:37 2012 +0200 Fix Windows dev-install for --enable-release-build, --with-lang=... etc. Introduced special token LIBO_DEV_INSTALL=TRUE to communicate what install set to build from Makefile.top's dev-install target to instsetoo_native/util/makefile.mk. Somewhat arbitrarily, always use a release install set regardless of --enable-release-build (the dev-install set is used for make check, and it is safer to test release install sets in --disable-release-build builds than the other way around, should those builds ever start to deviate significantly). The always build a defaul-laguage openoffice product logic had been obsoleted a long time ago already. Change-Id: I64ec87a0b8dc6fe81cab5531c43e29db3f5128af diff --git a/Makefile.top b/Makefile.top index d9ddea4..b23b5be 100644 --- a/Makefile.top +++ b/Makefile.top @@ -436,8 +436,8 @@ dev-install: build @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) - cd instsetoo_native unset MAKEFLAGS $(SOLARENV)/bin/build.pl PKGFORMAT=archive - unzip -q -d $(DEVINSTALLDIR) $(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip + cd instsetoo_native unset MAKEFLAGS $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE + unzip -q -d $(DEVINSTALLDIR) $(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibO*_install-arc_en-US.zip mv $(DEVINSTALLDIR)/LibO*_install-arc_en-US/* $(DEVINSTALLDIR)/opt else ifeq ($(DISABLE_LINKOO),TRUE) @@ -453,8 +453,8 @@ install-tb: @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) - cd instsetoo_native unset MAKEFLAGS $(SOLARENV)/bin/build.pl PKGFORMAT=archive - unzip -q -d $(DEVINSTALLDIR) $(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip + cd instsetoo_native unset MAKEFLAGS $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE + unzip -q -d $(DEVINSTALLDIR) $(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibO*_install-arc_en-US.zip mv $(DEVINSTALLDIR)/LibO*_install-arc_en-US/* $(DEVINSTALLDIR)/opt else @ooinstall $(DEVINSTALLDIR)/opt diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index a4dc1f9..8b3171c 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -88,6 +88,9 @@ allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j : echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch $(RTL_ARCH) --os $(RTL_OS) --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml +.IF $(LIBO_DEV_INSTALL) == TRUE +ALLTAR: openoffice_$(defaultlangiso).archive +.ELSE .IF $(GUI)!=WNT $(EPM)==NO ALLTAR : $(LOCALPYFILES) @echo No EPM: do no packaging at this stage @@ -122,16 +125,12 @@ ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $( .ENDIF .ENDIF # $(ENABLE_RELEASE_BUILD)==TRUE .ENDIF # $(GUI)!=WNT $(EPM)==NO +.ENDIF # $(LIBO_DEV_INSTALL) == TRUE .IF $(MAKETARGETS:e)!= PKGFORMAT+=$(MAKETARGETS:e:s/.//) .ENDIF # $(MAKETARGETS:e)!= -# Independent of PKGFORMAT, always build a default-language openoffice product -# also in archive format, so that tests that require an OOo installation (like -# smoketestoo_native) have one available: -openoffice_$(defaultlangiso) : $$@.archive - .IF $(VERBOSE)==TRUE VERBOSESWITCH=-verbose .ENDIF ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - vcl/inc vcl/source
vcl/inc/vcl/builder.hxx |4 ++--
vcl/source/uipreviewer/previewer.cxx |2 +-
vcl/source/window/builder.cxx| 13 +++--
vcl/source/window/dialog.cxx | 17 ++---
vcl/source/window/window2.cxx|4 +++-
5 files changed, 27 insertions(+), 13 deletions(-)
New commits:
commit d9a6a2b3967b47644d3ade05aa82f608b638d2c7
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 16 14:04:00 2012 +0100
Cut Gordian Knot of helpids with .ui format
There isn't really an equivalent feature in gtk as help ids (apparently
anyway)
Rather than munge one in, use the widget id + path as an unique help
identifier
For the retro-fit where code remains unchanged, don't override the
.res loaded id with the .ui generated id
Change-Id: I1befe77408cb317e0462dacb26b7d12f9399d372
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index 7b9823f..ff346dd 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -43,7 +43,6 @@ class VCL_DLLPUBLIC VclBuilder
public:
typedef std::maprtl::OString, rtl::OString stringmap;
private:
-//todo merge into Windows UniqueID/HelpID ?
struct WinAndId
{
rtl::OString m_sID;
@@ -122,9 +121,10 @@ private:
rtl::OString getTranslation(const rtl::OString rId, const rtl::OString
rProperty) const;
rtl::OString m_sID;
+rtl::OString m_sHelpRoot;
Window *m_pParent;
public:
-VclBuilder(Window *pParent, rtl::OUString sUIFile, rtl::OString sID =
rtl::OString());
+VclBuilder(Window *pParent, rtl::OUString sUIRootDir, rtl::OUString
sUIFile, rtl::OString sID = rtl::OString());
~VclBuilder();
Window *get_widget_root();
Window *get_by_name(rtl::OString sID);
diff --git a/vcl/source/uipreviewer/previewer.cxx
b/vcl/source/uipreviewer/previewer.cxx
index e18730b..42c0353 100644
--- a/vcl/source/uipreviewer/previewer.cxx
+++ b/vcl/source/uipreviewer/previewer.cxx
@@ -85,7 +85,7 @@ int UIPreviewApp::Main()
Dialog *pDialog = new Dialog(NULL, WB_STDDIALOG);
{
-VclBuilder aBuilder(pDialog, uifiles[0]);
+VclBuilder aBuilder(pDialog, rtl::OUString(), uifiles[0]);
Dialog *pRealDialog =
dynamic_castDialog*(aBuilder.get_widget_root());
if (!pRealDialog)
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 0176bfa..a9e5601 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -39,10 +39,18 @@
#include vcl/tabpage.hxx
#include window.h
-VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUri, rtl::OString sID)
+VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUIDir, rtl::OUString
sUIFile, rtl::OString sID)
: m_sID(sID)
+, m_sHelpRoot(rtl::OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8))
, m_pParent(pParent)
{
+sal_Int32 nIdx = m_sHelpRoot.lastIndexOf('.');
+if (nIdx != -1)
+m_sHelpRoot = m_sHelpRoot.copy(0, nIdx);
+m_sHelpRoot = m_sHelpRoot + rtl::OString('/');
+
+rtl::OUString sUri = sUIDir + sUIFile;
+
::com::sun::star::lang::Locale aLocale =
Application::GetSettings().GetUILocale();
for (int i = aLocale.Country.isEmpty() ? 1 : 0; i 2; ++i)
{
@@ -375,7 +383,8 @@ Window *VclBuilder::makeObject(Window *pParent, const
rtl::OString name, const
fprintf(stderr, TO-DO, implement %s\n, name.getStr());
if (pWindow)
{
-fprintf(stderr, for %s, created %p child of %p (%p/%p/%p)\n,
name.getStr(), pWindow, pParent, pWindow-mpWindowImpl-mpParent,
pWindow-mpWindowImpl-mpRealParent, pWindow-mpWindowImpl-mpBorderWindow);
+pWindow-SetHelpId(m_sHelpRoot + id);
+fprintf(stderr, for %s, created %p child of %p (%p/%p/%p) with helpid
%s\n, name.getStr(), pWindow, pParent, pWindow-mpWindowImpl-mpParent,
pWindow-mpWindowImpl-mpRealParent, pWindow-mpWindowImpl-mpBorderWindow,
pWindow-GetHelpId().getStr());
m_aChildren.push_back(WinAndId(id, pWindow));
}
return pWindow;
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 0b97fdc..d4d2d43 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -510,7 +510,7 @@ Dialog::Dialog(Window* pParent, const rtl::OString rID,
const rtl::OUString rU
{
ImplInitDialogData();
ImplInit(pParent, WB_SIZEMOVE|WB_3DLOOK|WB_CLOSEABLE);
-m_pUIBuilder = new VclBuilder(this, getUIRootDir() + rUIXMLDescription,
rID);
+m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription,
rID);
}
Dialog::Dialog(Window* pParent, const rtl::OString rID, const rtl::OUString
rUIXMLDescription, WindowType nType)
@@ -518,7 +518,7 @@ Dialog::Dialog(Window* pParent, const rtl::OString rID,
const rtl::OUString rU
{
ImplInitDialogData();
ImplInit(pParent, WB_SIZEMOVE|WB_3DLOOK|WB_CLOSEABLE);
-m_pUIBuilder = new VclBuilder(this, getUIRootDir() + rUIXMLDescription,
rID);
+
[PUSHED] Re: [PATCH] Converting code to STL in SVX module
On 15/08/12 14:08, Noel Grandin wrote:
Hi
Just when I thought I was done, more of the stuff crawls out.
These patches pass a full make check.
thanks, pushed
patch #10 has this, which (since the Remove is, uhm, removed) will
delete the same entry multiple times... also previously the elements
were removed at the end, now at the begin
-if (aList.Count()nEntryNum) { // maybe still too many entries
-sal_uIntPtr nTooMuch=aList.Count()-nEntryNum;
+if (aList.size()nEntryNum) { // maybe still too many entries
+sal_uIntPtr nTooMuch=aList.size()-nEntryNum;
for (sal_uIntPtr nNum=0; nNumnTooMuch; nNum++) {
delete ImpGetEntry(nEntryNum);
-aList.Remove(nEntryNum);
}
+aList.erase(aList.begin(), aList.begin() + nTooMuch);
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdmrkv1.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8a4c858d7a16be7ec4215d19652135bda782831a
Author: Michael Stahl mst...@redhat.com
Date: Thu Aug 16 15:56:42 2012 +0200
SdrMarkView::UndirtyMrkPnt: set::erase returns void in C++98
Change-Id: I5c1c06de9f149f77d2235684239ad077d28e64ba
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 7ffeec0..c98a798 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -370,7 +370,7 @@ void SdrMarkView::UndirtyMrkPnt() const
{
sal_uInt16 nId=*it;
if (pGPL-FindGluePoint(nId)==SDRGLUEPOINT_NOTFOUND) {
-it = pPts-erase(it);
+pPts-erase(it++);
bChg=sal_True;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/access/accportions.cxx |4 ++--
sw/source/core/access/accportions.hxx |4 ++--
sw/source/core/inc/SwPortionHandler.hxx |7 +--
sw/source/core/text/porlin.cxx |2 +-
sw/source/core/text/portxt.cxx |2 +-
sw/source/core/text/xmldump.cxx | 15 +--
6 files changed, 24 insertions(+), 10 deletions(-)
New commits:
commit cecff561687865359a695f1cf6ecb99300ce121b
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Aug 16 14:13:20 2012 +0200
sw layout dump: include the height and width of SwTxtPortion
Change-Id: Ia2bdff098d1bbd466f857e19315a22c835810202
diff --git a/sw/source/core/access/accportions.cxx
b/sw/source/core/access/accportions.cxx
index d802a2b..3fd41ec 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -112,7 +112,7 @@ SwAccessiblePortionData::~SwAccessiblePortionData()
delete pSentences;
}
-void SwAccessiblePortionData::Text(sal_uInt16 nLength, sal_uInt16 nType)
+void SwAccessiblePortionData::Text(sal_uInt16 nLength, sal_uInt16 nType,
sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/)
{
OSL_ENSURE( (nModelPosition + nLength) = pTxtNode-GetTxt().Len(),
portion exceeds model string! );
diff --git a/sw/source/core/access/accportions.hxx
b/sw/source/core/access/accportions.hxx
index ef9093b..d193125 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -94,7 +94,7 @@ public:
virtual ~SwAccessiblePortionData();
// SwPortionHandler methods
-virtual void Text(sal_uInt16 nLength, sal_uInt16 nType);
+virtual void Text(sal_uInt16 nLength, sal_uInt16 nType, sal_Int32 nHeight
= 0, sal_Int32 nWidth = 0);
virtual void Special(sal_uInt16 nLength, const String rText, sal_uInt16
nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0);
virtual void LineBreak();
virtual void Skip(sal_uInt16 nLength);
diff --git a/sw/source/core/inc/SwPortionHandler.hxx
b/sw/source/core/inc/SwPortionHandler.hxx
index d3a8779..fa71c4a 100644
--- a/sw/source/core/inc/SwPortionHandler.hxx
+++ b/sw/source/core/inc/SwPortionHandler.hxx
@@ -55,7 +55,9 @@ public:
*/
virtual void Text(
sal_uInt16 nLength, /// length of this portion in the model string
-sal_uInt16 nType /// type of this portion
+sal_uInt16 nType, /// type of this portion
+sal_Int32 nHeight = 0, /// height of this portion
+sal_Int32 nWidth = 0 /// width of this portion
) = 0;
/** special portion. This method is called for every non-text
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index d51ece8..a6391f5 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -697,7 +697,7 @@ long SwTxtPortion::CalcSpacing( long nSpaceAdd, const
SwTxtSizeInfo rInf ) cons
void SwTxtPortion::HandlePortion( SwPortionHandler rPH ) const
{
-rPH.Text( GetLen(), GetWhichPor() );
+rPH.Text( GetLen(), GetWhichPor(), Height(), Width() );
}
/*
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 38339d9..ec6408c 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -134,7 +134,9 @@ class XmlPortionDumper:public SwPortionHandler
text which is painted on-screen
*/
virtual void Text( sal_uInt16 nLength,
- sal_uInt16 nType )
+ sal_uInt16 nType,
+ sal_Int32 nHeight,
+ sal_Int32 nWidth)
{
ofs += nLength;
xmlTextWriterStartElement( writer, BAD_CAST( Text ) );
@@ -144,6 +146,11 @@ class XmlPortionDumper:public SwPortionHandler
xmlTextWriterWriteFormatAttribute( writer,
BAD_CAST( nType ),
%s, getTypeName( nType ) );
+if (nHeight 0)
+xmlTextWriterWriteFormatAttribute(writer, BAD_CAST(nHeight),
%i, (int)nHeight);
+if (nWidth 0)
+xmlTextWriterWriteFormatAttribute(writer, BAD_CAST(nWidth),
%i, (int)nWidth);
+
xmlTextWriterEndElement( writer );
}
commit 8f846dab6db8e912ccb87209d365f1e20d13d293
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Aug 16 12:21:58 2012 +0200
sw layout dump: include the height and width of SwFlyPortion
Change-Id: Ib47087a9dcb96779958edfc1a984cf38cabd1086
diff --git a/sw/source/core/access/accportions.cxx
b/sw/source/core/access/accportions.cxx
index a2b039d..d802a2b 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -142,7 +142,7 @@ void SwAccessiblePortionData::Text(sal_uInt16 nLength,
sal_uInt16 nType)
}
void SwAccessiblePortionData::Special(
-sal_uInt16 nLength, const String rText,
fdo#46808, shiny UNO conversion: would be nice to have some additional helper methods
Hi I'm starting on this again: https://bugs.freedesktop.org/show_bug.cgi?id=46808 Large chunks of the work are pretty mechanical, but it would make work much easier if the auto-generated C++ had some additional helper methods. (1) Down-conversion implicit conversion operators for converting from an interface to it's sub-interfaces. Which would help me replace this: uno::Reference i18n::XBreakIterator2 xB2 = i18n::BreakIterator2::create(xContext); uno::Reference i18n::XBreakIterator xB1 = uno::Referencei18n::XBreakIterator(xB2, uno::UNO_QUERY_THROW); with this: uno::Reference i18n::XBreakIterator xB1 = i18n::BreakIterator2::create(xContext); to simplify code when converting from the new interfaces to the old interfaces, which happens a lot because I don't want the changes to ripple out. (2) A new version of the factory create method that uses the current process component context. i.e. instead of uno::Reference i18n::XBreakIterator xLocalBreakIterator; uno::Reference uno::XComponentContext xContext(::comphelper::getProcessComponentContext()); xLocalBreakIterator.set(i18n::BreakIterator2::create(xContext)); I could write: uno::Reference i18n::XBreakIterator xLocalBreakIterator; xLocalBreakIterator.set(i18n::BreakIterator2::createWithProcessContext()); Thanks, Noel Grandin (yes, I do indeed pride myself on being a very lazy programmer :-) Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6] [REVIEW 3-5] fdo#46250
On 08/16/2012 06:31 AM, Noel Power wrote: please consider cherry-picking http://cgit.freedesktop.org/libreoffice/core/commit/?id=7bfb229230a439c2edb3e8452fe0d3430f9931ce I see the point of this change, but... Isn't this a bit too hacky? I'd rather not add this sort of are you Calc? type of check in the framework code, but delegate such app-specific stuff to the application side... Sorry about the negative feedback. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 37 +
1 file changed, 37 insertions(+)
New commits:
commit 0484239b2704235fef611820af6780364120fbe4
Author: Noel Power noel.po...@suse.com
Date: Wed Aug 15 13:03:04 2012 +0100
fix for fdo#53229, import group shapes position and size correctly
a) need to properly calculate the topleftmost position for the combined
shapes
in the group.
b) when you have groups within groups then the offsets need to be applied to
the topmost parent.
Change-Id: Ie1967f3625030fcd0201f2ab43a0740153cd4bd7
Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
index 1b58d21..638d29f 100644
--- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
+++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
@@ -76,6 +76,17 @@ void
XMLTableShapeImportHelper::SetLayer(uno::Referencedrawing::XShape rShape
}
}
+// Attempt to find the topmost parent of the group, this is the one we apply
+// offsets to
+uno::Reference drawing::XShape lcl_getTopLevelParent( const uno::Reference
drawing::XShape rShape )
+{
+uno::Reference container::XChild xChild( rShape, uno::UNO_QUERY );
+uno::Reference drawing::XShape xParent( xChild-getParent(),
uno::UNO_QUERY );
+if ( xParent.is() )
+return lcl_getTopLevelParent( xParent );
+return rShape;
+}
+
void XMLTableShapeImportHelper::finishShape(
uno::Reference drawing::XShape rShape,
const uno::Reference xml::sax::XAttributeList xAttrList,
@@ -192,6 +203,32 @@ void XMLTableShapeImportHelper::finishShape(
}
else //this are grouped shapes which should also get the layerid
{
+uno::Reference drawing::XShapes xGroup( rShape, uno::UNO_QUERY );
+// ignore the group ( within group ) object it it exists
+if ( !bOnTable !xGroup.is() )
+{
+// For cell anchored grouped shape we need to set the start
+// position from the most top and left positioned shape(s) within
+// the group
+Point aStartPoint( rShape-getPosition().X,rShape-getPosition().Y
);
+awt::Size aSize(rShape-getSize() );
+uno::Reference drawing::XShape xChild( rShapes, uno::UNO_QUERY
);
+if (SvxShape* pGroupShapeImp = SvxShape::getImplementation(
lcl_getTopLevelParent( xChild ) ))
+{
+if (SdrObject *pSdrObj = pGroupShapeImp-GetSdrObject())
+{
+if ( ScDrawObjData* pAnchor = ScDrawLayer::GetObjData(
pSdrObj ) )
+{
+if ( pAnchor-maStartOffset.getX() == 0
pAnchor-maStartOffset.getY() == 0 )
+pAnchor-maStartOffset = aStartPoint;
+ if ( aStartPoint.getX() pAnchor-maStartOffset.getX()
)
+ pAnchor-maStartOffset.setX( aStartPoint.getX() );
+ if ( aStartPoint.getY() pAnchor-maStartOffset.getY()
)
+ pAnchor-maStartOffset.setY( aStartPoint.getY() );
+}
+}
+}
+}
sal_Int16 nAttrCount(xAttrList.is() ? xAttrList-getLength() : 0);
sal_Int16 nLayerID(-1);
for( sal_Int16 i=0; i nAttrCount; ++i )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 37 +
1 file changed, 37 insertions(+)
New commits:
commit e7f9b7642c7a2f7723871e72de9f8ed6b3a07e26
Author: Noel Power noel.po...@suse.com
Date: Wed Aug 15 13:03:04 2012 +0100
fix for fdo#53229, import group shapes position and size correctly
a) need to properly calculate the topleftmost position for the combined
shapes
in the group.
b) when you have groups within groups then the offsets need to be applied to
the topmost parent.
Change-Id: Ie1967f3625030fcd0201f2ab43a0740153cd4bd7
Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
index e2b1216..2dafec5 100644
--- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
+++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
@@ -76,6 +76,17 @@ void
XMLTableShapeImportHelper::SetLayer(uno::Referencedrawing::XShape rShape
}
}
+// Attempt to find the topmost parent of the group, this is the one we apply
+// offsets to
+uno::Reference drawing::XShape lcl_getTopLevelParent( const uno::Reference
drawing::XShape rShape )
+{
+uno::Reference container::XChild xChild( rShape, uno::UNO_QUERY );
+uno::Reference drawing::XShape xParent( xChild-getParent(),
uno::UNO_QUERY );
+if ( xParent.is() )
+return lcl_getTopLevelParent( xParent );
+return rShape;
+}
+
void XMLTableShapeImportHelper::finishShape(
uno::Reference drawing::XShape rShape,
const uno::Reference xml::sax::XAttributeList xAttrList,
@@ -192,6 +203,32 @@ void XMLTableShapeImportHelper::finishShape(
}
else //this are grouped shapes which should also get the layerid
{
+uno::Reference drawing::XShapes xGroup( rShape, uno::UNO_QUERY );
+// ignore the group ( within group ) object it it exists
+if ( !bOnTable !xGroup.is() )
+{
+// For cell anchored grouped shape we need to set the start
+// position from the most top and left positioned shape(s) within
+// the group
+Point aStartPoint( rShape-getPosition().X,rShape-getPosition().Y
);
+awt::Size aSize(rShape-getSize() );
+uno::Reference drawing::XShape xChild( rShapes, uno::UNO_QUERY
);
+if (SvxShape* pGroupShapeImp = SvxShape::getImplementation(
lcl_getTopLevelParent( xChild ) ))
+{
+if (SdrObject *pSdrObj = pGroupShapeImp-GetSdrObject())
+{
+if ( ScDrawObjData* pAnchor = ScDrawLayer::GetObjData(
pSdrObj ) )
+{
+if ( pAnchor-maStartOffset.getX() == 0
pAnchor-maStartOffset.getY() == 0 )
+pAnchor-maStartOffset = aStartPoint;
+ if ( aStartPoint.getX() pAnchor-maStartOffset.getX()
)
+ pAnchor-maStartOffset.setX( aStartPoint.getX() );
+ if ( aStartPoint.getY() pAnchor-maStartOffset.getY()
)
+ pAnchor-maStartOffset.setY( aStartPoint.getY() );
+}
+}
+}
+}
sal_Int16 nAttrCount(xAttrList.is() ? xAttrList-getLength() : 0);
sal_Int16 nLayerID(-1);
for( sal_Int16 i=0; i nAttrCount; ++i )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW 3-6][REVIEW 3-5] [PUSHED 3-6][PUSHED 3-5] fdo#53229 afaiks ( fdo#48272 )
On 08/16/2012 06:35 AM, Noel Power wrote: these regressions seem fixed by http://cgit.freedesktop.org/libreoffice/core/commit/?id=541986fef0993d749cc7ed790eacace322f43bb0 followup patch http://cgit.freedesktop.org/libreoffice/core/commit/?id=6c70bd9e2748b375b53eea4454a5b4f922c439ae please ( squash ) and cherry-pick Squashed and cherry-picked to the 3-6 and 3-5 branches with no conflicts. Thanks a lot! Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6] [REVIEW 3-5] fdo#46250
On 16/08/12 15:53, Kohei Yoshida wrote: On 08/16/2012 06:31 AM, Noel Power wrote: please consider cherry-picking http://cgit.freedesktop.org/libreoffice/core/commit/?id=7bfb229230a439c2edb3e8452fe0d3430f9931ce I see the point of this change, but... Isn't this a bit too hacky? I'd rather not add this sort of are you Calc? type of check in the framework code, but delegate such app-specific stuff to the application side... no, as far as I can tell it is the framework code that is blanket ignoring ( if unix ) the state set by the application code ( this code here runs 'after' the application specific code ) , the alternative is like the comment says to remove this 'hack' when each application handles the state properly. Now, it maybe that an alternative solution right now is to just remove this 'hack' in the framework code and move the 'hack' ( I mean just set the state to enabled in each application if platform is linux ) I'm not anymore comfortable with that ordetermining if blanket setting those states in those applications ( that I don't have much clue about ) is a really good idea anyway. And certainly for 3.5/3.6 I would suggest that the approach above is the least risky way to do it. But.. open to suggestions Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: extras/prj extras/source scp2/source sw/inc sw/source
dev/null|binary extras/prj/build.lst|2 extras/source/templates/wizard/desktop/html.stw |binary extras/source/templates/wizard/desktop/idxexample.odt |binary extras/source/templates/wizard/desktop/lang/delzip |2 extras/source/templates/wizard/desktop/lang/makefile.mk | 38 --- scp2/source/ooo/directory_ooo.scp | 10 - scp2/source/ooo/file_extra_ooo.scp |6 sw/inc/rcid.hrc |5 sw/source/filter/html/css1atr.cxx | 20 +- sw/source/filter/html/htmlfldw.cxx |8 sw/source/filter/html/htmlgrin.cxx |9 sw/source/filter/html/htmltab.cxx | 29 +- sw/source/filter/html/swhtml.cxx| 155 sw/source/filter/html/swhtml.hxx|2 sw/source/ui/inc/utlui.hrc | 15 + sw/source/ui/index/cnttab.cxx |1 sw/source/ui/utlui/unotools.cxx | 57 + sw/source/ui/utlui/utlui.src| 32 +++ 19 files changed, 275 insertions(+), 116 deletions(-) New commits: commit 1b0f7ee1e04d7b0fe81f7458ae2116615e0f6889 Author: Istvan Turi turipi...@freemail.hu Date: Thu Aug 16 17:38:03 2012 +0200 idxexample.odt and html.stw cleanup (fdo#49101, fdo#49098) idxexample.odt will be localized through the standard l10n framework, i.e. with use of .po files, because now strings are read from resources. html.stw is language independent now, defaults for different scripts are handled in the code. Change-Id: Ie20cafc6191721a959b33e2559b9866e3762a146 diff --git a/extras/prj/build.lst b/extras/prj/build.lst index 5ff18d7..61223f0 100644 --- a/extras/prj/build.lst +++ b/extras/prj/build.lst @@ -116,7 +116,7 @@ er extras\source\templates\layout nmake - er extras\source\templates\presnt\lang nmake - all er_tprel NULL er extras\source\templates\wizard\agenda\lang nmake - all er_twagl NULL er extras\source\templates\wizard\bitmap nmake - all er_twbmp NULL -er extras\source\templates\wizard\desktop\lang nmake - all er_twdkl NULL +er extras\source\templates\wizard\desktop nmake - all er_twdkl NULL er extras\source\templates\wizard\fax\lang nmake - all er_twfal NULL er extras\source\templates\wizard\letter\lang nmake - all er_twlel NULL er extras\source\templates\wizard\report\lang nmake - all er_twrel NULL diff --git a/extras/source/templates/wizard/desktop/html.stw b/extras/source/templates/wizard/desktop/html.stw new file mode 100644 index 000..87330a7 Binary files /dev/null and b/extras/source/templates/wizard/desktop/html.stw differ diff --git a/extras/source/templates/wizard/desktop/idxexample.odt b/extras/source/templates/wizard/desktop/idxexample.odt new file mode 100644 index 000..0fdb58e Binary files /dev/null and b/extras/source/templates/wizard/desktop/idxexample.odt differ diff --git a/extras/source/templates/wizard/desktop/lang/bg/html.stw b/extras/source/templates/wizard/desktop/lang/bg/html.stw deleted file mode 100644 index cb670d1..000 Binary files a/extras/source/templates/wizard/desktop/lang/bg/html.stw and /dev/null differ diff --git a/extras/source/templates/wizard/desktop/lang/bg/idxexample.odt b/extras/source/templates/wizard/desktop/lang/bg/idxexample.odt deleted file mode 100644 index 6776d8c..000 Binary files a/extras/source/templates/wizard/desktop/lang/bg/idxexample.odt and /dev/null differ diff --git a/extras/source/templates/wizard/desktop/lang/cs/idxexample.odt b/extras/source/templates/wizard/desktop/lang/cs/idxexample.odt deleted file mode 100644 index 05a71ec..000 Binary files a/extras/source/templates/wizard/desktop/lang/cs/idxexample.odt and /dev/null differ diff --git a/extras/source/templates/wizard/desktop/lang/da/html.stw b/extras/source/templates/wizard/desktop/lang/da/html.stw deleted file mode 100644 index 7047b51..000 Binary files a/extras/source/templates/wizard/desktop/lang/da/html.stw and /dev/null differ diff --git a/extras/source/templates/wizard/desktop/lang/da/idxexample.odt b/extras/source/templates/wizard/desktop/lang/da/idxexample.odt deleted file mode 100644 index e2667ad..000 Binary files a/extras/source/templates/wizard/desktop/lang/da/idxexample.odt and /dev/null differ diff --git a/extras/source/templates/wizard/desktop/lang/de/html.stw b/extras/source/templates/wizard/desktop/lang/de/html.stw deleted file mode 100644 index
Re: [REVIEW 3-6] [REVIEW 3-5] fdo#46250
On 08/16/2012 11:42 AM, Noel Power wrote: On 16/08/12 15:53, Kohei Yoshida wrote: On 08/16/2012 06:31 AM, Noel Power wrote: please consider cherry-picking http://cgit.freedesktop.org/libreoffice/core/commit/?id=7bfb229230a439c2edb3e8452fe0d3430f9931ce I see the point of this change, but... Isn't this a bit too hacky? I'd rather not add this sort of are you Calc? type of check in the framework code, but delegate such app-specific stuff to the application side... no, as far as I can tell it is the framework code that is blanket ignoring ( if unix ) the state set by the application code ( this code here runs 'after' the application specific code ) , the alternative is like the comment says to remove this 'hack' when each application handles the state properly. Now, it maybe that an alternative solution right now is to just remove this 'hack' in the framework code and move the 'hack' ( I mean just set the state to enabled in each application if platform is linux ) I'm not anymore comfortable with that ordetermining if blanket setting those states in those applications ( that I don't have much clue about ) is a really good idea anyway. And certainly for 3.5/3.6 I would suggest that the approach above is the least risky way to do it. But.. open to suggestions Hi Noel, I'm with you on this. I would be okay with this for 3-5 and 3-6. On master, though, perhaps we can remove that original hack for all apps and see how that goes... And make changes in each app as we see fit. Let me work on cherry-picking to 3-5 and 3-6 meanwhile... Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/inc
svx/inc/svx/svdmark.hxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit d2ca1e5ec8e89d7c44a95fa216aee53b7a47f73d
Author: Michael Stahl mst...@redhat.com
Date: Thu Aug 16 17:36:02 2012 +0200
SdrUShortCont: MSVC build can't link libsw if that is public
Change-Id: Id21368194c32f43e2f3bb091205ef7387fc0ee5b
diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx
index c29ce81..ffae34c 100644
--- a/svx/inc/svx/svdmark.hxx
+++ b/svx/inc/svx/svdmark.hxx
@@ -43,8 +43,7 @@ class SdrObjList;
class SdrObject;
class SdrPageView;
-// Ein Container fuer USHORTs (im Prinzip ein dynamisches Array)
-class SVX_DLLPUBLIC SdrUShortCont : public std::setsal_uInt16 {};
+class SdrUShortCont : public std::setsal_uInt16 {};
// Alles was eine View ueber ein markiertes Objekt wissen muss
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW 3-6] [REVIEW 3-5] fdo#46250
On 16/08/12 16:46, Kohei Yoshida wrote: On 08/16/2012 11:42 AM, Noel Power wrote: On 16/08/12 15:53, Kohei Yoshida wrote: On 08/16/2012 06:31 AM, Noel Power wrote: please consider cherry-picking http://cgit.freedesktop.org/libreoffice/core/commit/?id=7bfb229230a439c2edb3e8452fe0d3430f9931ce I see the point of this change, but... Isn't this a bit too hacky? I'd rather not add this sort of are you Calc? type of check in the framework code, but delegate such app-specific stuff to the application side... no, as far as I can tell it is the framework code that is blanket ignoring ( if unix ) the state set by the application code ( this code here runs 'after' the application specific code ) , the alternative is like the comment says to remove this 'hack' when each application handles the state properly. Now, it maybe that an alternative solution right now is to just remove this 'hack' in the framework code and move the 'hack' ( I mean just set the state to enabled in each application if platform is linux ) I'm not anymore comfortable with that ordetermining if blanket setting those states in those applications ( that I don't have much clue about ) is a really good idea anyway. And certainly for 3.5/3.6 I would suggest that the approach above is the least risky way to do it. But.. open to suggestions Hi Noel, I'm with you on this. I would be okay with this for 3-5 and 3-6. On master, though, perhaps we can remove that original hack for all apps and see how that goes... And make changes in each app as we see fit. ok, let me remove that on master lets just start with removing the logic entirely for paste-special, I'm not brave enough to do it for paste ( iirc I think you pointed out previously there probably is a good reason why paste seems to be enabled always on linux ( to match other applications and perhaps I guess to workaround some other linux clipboard issues ) and thanks for reviewing :-) Noel Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sfx2/source
sfx2/source/doc/objserv.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 4e923fb5a293ce570974e620b87ff84ccb6a139b
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 16 17:53:45 2012 +0200
fdo#53280: Reset read-only UI after successful Save As
Change-Id: Ica9214d3655df27bbb259c463a7589a842f01c47
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 6a25743..1bd9c9c 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -694,6 +694,11 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest rReq)
nErrorCode = ( lErr != ERRCODE_IO_ABORT ) ( nErrorCode ==
ERRCODE_NONE ) ? nErrorCode : lErr;
}
+if (nId == SID_SAVEASDOC nErrorCode == ERRCODE_NONE)
+{
+SetReadOnlyUI(false);
+}
+
rReq.SetReturnValue( SfxBoolItem(0, nErrorCode == ERRCODE_NONE ) );
ResetError();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - framework/source
framework/source/uielement/menubarmanager.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 9082c45b911ff605622cf67007c79a244a230e7b Author: Noel Power noel.po...@suse.com Date: Mon Aug 13 16:14:34 2012 +0100 sync cell context menu edit menu 'PasteSpecial' entries for calc fdo#46250 calc application specifically handles PasteSpecial so no need to set the state of the menu entry to enabled always ( for calc at least ) Change-Id: Iaf13dd825f0cbdcf9f455db07d727753fae90868 Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 4c64446..0aedb9c 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -518,7 +518,9 @@ throw ( RuntimeException ) #ifdef UNIX //enable some slots hardly, because UNIX clipboard does not notify all changes // Can be removed if follow up task will be fixed directly within applications. -if ( pMenuItemHandler-aMenuItemURL == .uno:Paste || pMenuItemHandler-aMenuItemURL == .uno:PasteSpecial +// Note: PasteSpecial is handled specifically by calc +if ( pMenuItemHandler-aMenuItemURL == .uno:Paste || +( m_aModuleIdentifier != com.sun.star.sheet.SpreadsheetDocument pMenuItemHandler-aMenuItemURL == .uno:PasteSpecial ) || pMenuItemHandler-aMenuItemURL == .uno:PasteClipboard ) // special for draw/impress bEnabledItem = sal_True; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
Hi, some additions: On Thu, Aug 16, 2012 at 04:36:17PM +0100, Michael Meeks wrote: * bugzilla / gerrit integration (Bjoern) + concern about getting spammed a lot. + if only one mail if there is a patch at all, it doesn't hurt too much + changing it is an easy-hack Not changing -- creating. There is currently no gerrit-integration on bugzilla. (gerrit integrated bugzilla quite nicely already.) + want a hard-hacks query - with five hits We can give that a try, but thinking about it that is really easy abused when just triggering on a whiteboard keyword (as in: people adding it to their pet peeve bugs). If that happens, handing over a query with 5 hardcoded bug numbers via mail should be safe and simple. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6] [REVIEW 3-5] [PUSHED 3-6] fdo#46250
On 08/16/2012 11:53 AM, Noel Power wrote: On 16/08/12 16:46, Kohei Yoshida wrote: I'm with you on this. I would be okay with this for 3-5 and 3-6. On master, though, perhaps we can remove that original hack for all apps and see how that goes... And make changes in each app as we see fit. ok, let me remove that on master lets just start with removing the logic entirely for paste-special, I'm not brave enough to do it for paste ( iirc I think you pointed out previously there probably is a good reason why paste seems to be enabled always on linux ( to match other applications and perhaps I guess to workaround some other linux clipboard issues ) Yeah. I'm still not 100% sure about this linux specific paste behavior, but it sounds good enough to me for the time being. and thanks for reviewing :-) No problem. :-) BTW, I cherry-picked it to 3-6 branch but the 3-5 branch has a conflict and I couldn't cherry-pick there. I think it's enough to fix this just for 3.6, or, if you think it's absolutely important for 3.5, feel free to massage the patch and push it o 3-5 with my sign-off. Best, Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sfx2/source
sfx2/source/doc/objserv.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 9c2588950be1d4b3051586359175b5a643fee880
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 16 17:53:45 2012 +0200
fdo#53280: Reset read-only UI after successful Save As
Change-Id: Ica9214d3655df27bbb259c463a7589a842f01c47
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 7b4475a..b305a82 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -705,6 +705,11 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest rReq)
nErrorCode = ( lErr != ERRCODE_IO_ABORT ) ( nErrorCode ==
ERRCODE_NONE ) ? nErrorCode : lErr;
}
+if (nId == SID_SAVEASDOC nErrorCode == ERRCODE_NONE)
+{
+SetReadOnlyUI(false);
+}
+
rReq.SetReturnValue( SfxBoolItem(0, nErrorCode == ERRCODE_NONE ) );
ResetError();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED 3-6][REVIEW 3-6-1] fdo#53280: Reset read-only UI after successful Save As
On Thu, 2012-08-16 at 18:02 +0200, Stephan Bergmann wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=4e923fb5a293ce570974e620b87ff84ccb6a139b fdo#53280: Reset read-only UI after successful Save As is a rather trivial fix for the annoying little regression Looks sensible :-) pushed to -3-6 (though I personally loathe burning two lines of non-renewable vspace for no good reason ;-). 2x more needed for -3-6-1. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - vcl/inc vcl/source
vcl/inc/vcl/layout.hxx | 10 +++
vcl/source/window/layout.cxx | 110 +--
2 files changed, 85 insertions(+), 35 deletions(-)
New commits:
commit fad6985ea2e36d7d5fe176a4c32318a911172059
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 16 17:19:22 2012 +0100
honour hexpand/vexpand in the grid
Change-Id: I6f57592d83a53de0933d669438851c9a326af02e
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index aa78852..ca6d50f 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -315,7 +315,15 @@ private:
array_type assembleGrid() const;
bool isNullGrid(const array_type A) const;
-void calcMaxs(const array_type A, std::vectorlong rWidths,
std::vectorlong rHeights) const;
+public:
+struct Value
+{
+long m_nValue;
+bool m_bExpand;
+Value() : m_nValue(0), m_bExpand(false) {}
+};
+private:
+void calcMaxs(const array_type A, std::vectorValue rWidths,
std::vectorValue rHeights) const;
virtual Size calculateRequisition() const;
virtual void setAllocation(const Size rAllocation);
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 6c9305c..1bc2233 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -400,11 +400,6 @@ VclGrid::array_type VclGrid::assembleGrid() const
{
array_type A;
-rtl::OString sLeftAttach(RTL_CONSTASCII_STRINGPARAM(left-attach));
-rtl::OString sWidth(RTL_CONSTASCII_STRINGPARAM(width));
-rtl::OString sTopAttach(RTL_CONSTASCII_STRINGPARAM(top-attach));
-rtl::OString sHeight(RTL_CONSTASCII_STRINGPARAM(height));
-
for (Window* pChild = GetWindow(WINDOW_FIRSTCHILD); pChild;
pChild = pChild-GetWindow(WINDOW_NEXT))
{
@@ -492,7 +487,7 @@ bool VclGrid::isNullGrid(const array_type A) const
return false;
}
-void VclGrid::calcMaxs(const array_type A, std::vectorlong rWidths,
std::vectorlong rHeights) const
+void VclGrid::calcMaxs(const array_type A, std::vectorValue rWidths,
std::vectorValue rHeights) const
{
sal_Int32 nMaxX = A.shape()[0];
sal_Int32 nMaxY = A.shape()[1];
@@ -500,9 +495,6 @@ void VclGrid::calcMaxs(const array_type A,
std::vectorlong rWidths, std::vec
rWidths.resize(nMaxX);
rHeights.resize(nMaxY);
-rtl::OString sWidth(RTL_CONSTASCII_STRINGPARAM(width));
-rtl::OString sHeight(RTL_CONSTASCII_STRINGPARAM(height));
-
for (sal_Int32 x = 0; x nMaxX; ++x)
{
for (sal_Int32 y = 0; y nMaxY; ++y)
@@ -514,15 +506,34 @@ void VclGrid::calcMaxs(const array_type A,
std::vectorlong rWidths, std::vec
sal_Int32 nWidth = pChild-get_grid_width();
for (sal_Int32 nSpanX = 0; nSpanX nWidth; ++nSpanX)
-rWidths[x+nSpanX] = std::max(rWidths[x+nSpanX],
aChildSize.Width()/nWidth);
+{
+rWidths[x+nSpanX].m_nValue =
std::max(rWidths[x+nSpanX].m_nValue, aChildSize.Width()/nWidth);
+rWidths[x+nSpanX].m_bExpand = rWidths[x+nSpanX].m_bExpand |
pChild-get_hexpand();
+}
sal_Int32 nHeight = pChild-get_grid_height();
for (sal_Int32 nSpanY = 0; nSpanY nHeight; ++nSpanY)
-rHeights[y+nSpanY] = std::max(rHeights[y+nSpanY],
aChildSize.Height()/nHeight);
+{
+rHeights[y+nSpanY].m_nValue =
std::max(rHeights[y+nSpanY].m_nValue, aChildSize.Height()/nHeight);
+rHeights[y+nSpanY].m_bExpand = rHeights[y+nSpanY].m_bExpand |
pChild-get_vexpand();
+}
}
}
}
+bool compareValues(const VclGrid::Value i, const VclGrid::Value j)
+{
+return i.m_nValue j.m_nValue;
+}
+
+VclGrid::Value accumulateValues(const VclGrid::Value i, const VclGrid::Value
j)
+{
+VclGrid::Value aRet;
+aRet.m_nValue = i.m_nValue + j.m_nValue;
+aRet.m_bExpand = i.m_bExpand | j.m_bExpand;
+return aRet;
+}
+
Size VclGrid::calculateRequisition() const
{
array_type A = assembleGrid();
@@ -530,19 +541,19 @@ Size VclGrid::calculateRequisition() const
if (isNullGrid(A))
return Size();
-std::vectorlong aWidths;
-std::vectorlong aHeights;
+std::vectorValue aWidths;
+std::vectorValue aHeights;
calcMaxs(A, aWidths, aHeights);
long nTotalWidth = 0;
if (get_column_homogeneous())
{
-nTotalWidth = *std::max_element(aWidths.begin(), aWidths.end());
+nTotalWidth = std::max_element(aWidths.begin(), aWidths.end(),
compareValues)-m_nValue;
nTotalWidth *= aWidths.size();
}
else
{
-nTotalWidth = std::accumulate(aWidths.begin(), aWidths.end(), 0);
+nTotalWidth = std::accumulate(aWidths.begin(), aWidths.end(), Value(),
accumulateValues).m_nValue;
}
nTotalWidth += get_column_spacing() * (aWidths.size()-1);
@@ -550,12 +561,12 @@ Size VclGrid::calculateRequisition() const
long nTotalHeight = 0;
if
Re: [PUSHED 3-6][REVIEW 3-6-1] fdo#53280: Reset read-only UI after successful Save As
On 08/16/2012 06:13 PM, Michael Meeks wrote:
Looks sensible :-) pushed to -3-6 (though I personally loathe burning
two lines of non-renewable vspace for no good reason ;-).
The { and } lines you mean? I /do/ consider them helpful; spent a
long time scratching my head just the other day again trying to grok
what's going on---when all that was going on was a deceivingly formatted
single-statement if-condition to which another statement had been added
(not).
Incidentally, noticed a couple days ago a commit of yours where you
removed such { ... } lines, in a mumbo rebase commit, so thought it
was likely more a rebasing artifact than deliberate doing. Anyway, I
would appreciate it if such lines were /not/ removed.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: connectivity/source sc/source
connectivity/source/drivers/ado/APreparedStatement.cxx |1 +
connectivity/source/drivers/ado/AStatement.cxx |1 +
connectivity/source/drivers/evoab2/NPreparedStatement.cxx |1 +
connectivity/source/drivers/evoab2/NStatement.cxx |1 +
connectivity/source/drivers/file/FPreparedStatement.cxx |1 +
connectivity/source/drivers/file/FStatement.cxx |1 +
connectivity/source/drivers/file/fcomp.cxx |1 +
connectivity/source/drivers/jdbc/JStatement.cxx |1 +
connectivity/source/drivers/kab/KPreparedStatement.cxx |1 +
connectivity/source/drivers/kab/KStatement.cxx |1 +
connectivity/source/drivers/macab/MacabPreparedStatement.cxx|1 +
connectivity/source/drivers/macab/MacabStatement.cxx|1 +
connectivity/source/drivers/mozab/MPreparedStatement.cxx|1 +
connectivity/source/drivers/mozab/MStatement.cxx|1 +
connectivity/source/drivers/odbcbase/OPreparedStatement.cxx |1 +
connectivity/source/drivers/odbcbase/OStatement.cxx |1 +
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx |1 +
connectivity/source/drivers/postgresql/pq_statement.cxx |1 +
sc/source/filter/xml/xmlfilti.cxx |2 --
sc/source/filter/xml/xmlfilti.hxx |1 -
20 files changed, 18 insertions(+), 3 deletions(-)
New commits:
commit 094654fcebe35af07a9e12137becdf85277ef706
Author: Noel Power noel.po...@suse.com
Date: Thu Aug 16 17:38:47 2012 +0100
fix for fdo#48200.diff import regrex state for filter
Change-Id: I46b07341e96d78130e6301e40fa32df6ed2c7879
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx
b/connectivity/source/drivers/ado/APreparedStatement.cxx
index d12d0c2..07ddbee 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -151,6 +151,7 @@ void SAL_CALL OPreparedStatement::close( )
throw(SQLException, RuntimeException
sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException,
RuntimeException)
{
+printf(OPreparedStatement::execute);
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/ado/AStatement.cxx
b/connectivity/source/drivers/ado/AStatement.cxx
index cf0e8c6..63e1746 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -252,6 +252,7 @@ void OStatement_Base::assignRecordSet( ADORecordset* _pRS )
// -
sal_Bool SAL_CALL OStatement_Base::execute( const ::rtl::OUString sql )
throw(SQLException, RuntimeException)
{
+printf(OStatement_Base::execute\n);
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index 3265547..6c94688 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
@@ -128,6 +128,7 @@ void SAL_CALL OEvoabPreparedStatement::close( )
throw(SQLException, RuntimeExce
sal_Bool SAL_CALL OEvoabPreparedStatement::execute( ) throw(SQLException,
RuntimeException)
{
+printf(OEvoabPreparedStatement::execute()\n);
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx
b/connectivity/source/drivers/evoab2/NStatement.cxx
index 7bf0016..136f92e 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -615,6 +615,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement,
OCommonStatement, OStatement_IBase
// -
sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString _sql )
throw(SQLException, RuntimeException)
{
+printf(OStatement::execute()\n);
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx
b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 0d810fc..ee6f01c 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -169,6 +169,7 @@ void SAL_CALL OPreparedStatement::close( )
throw(SQLException, RuntimeException
sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException,
RuntimeException)
{
+printf(OPreparedStatement::execute() #2\n);
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger,
[Libreoffice-commits] .: connectivity/source sc/source
connectivity/source/drivers/ado/APreparedStatement.cxx |1 -
connectivity/source/drivers/ado/AStatement.cxx |1 -
connectivity/source/drivers/evoab2/NPreparedStatement.cxx |1 -
connectivity/source/drivers/evoab2/NStatement.cxx |1 -
connectivity/source/drivers/file/FPreparedStatement.cxx |1 -
connectivity/source/drivers/file/FStatement.cxx |1 -
connectivity/source/drivers/file/fcomp.cxx |1 -
connectivity/source/drivers/jdbc/JStatement.cxx |1 -
connectivity/source/drivers/kab/KPreparedStatement.cxx |1 -
connectivity/source/drivers/kab/KStatement.cxx |1 -
connectivity/source/drivers/macab/MacabPreparedStatement.cxx|1 -
connectivity/source/drivers/macab/MacabStatement.cxx|1 -
connectivity/source/drivers/mozab/MPreparedStatement.cxx|1 -
connectivity/source/drivers/mozab/MStatement.cxx|1 -
connectivity/source/drivers/odbcbase/OPreparedStatement.cxx |1 -
connectivity/source/drivers/odbcbase/OStatement.cxx |1 -
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx |1 -
connectivity/source/drivers/postgresql/pq_statement.cxx |1 -
sc/source/filter/xml/xmlfilti.cxx |2 ++
sc/source/filter/xml/xmlfilti.hxx |1 +
20 files changed, 3 insertions(+), 18 deletions(-)
New commits:
commit d88325f73e6912928913eb41297e6aa4643655f5
Author: Noel Power noel.po...@suse.com
Date: Thu Aug 16 17:43:12 2012 +0100
Revert fix for fdo#48200.diff import regrex state for filter
This reverts commit 094654fcebe35af07a9e12137becdf85277ef706.
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx
b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 07ddbee..d12d0c2 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -151,7 +151,6 @@ void SAL_CALL OPreparedStatement::close( )
throw(SQLException, RuntimeException
sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException,
RuntimeException)
{
-printf(OPreparedStatement::execute);
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/ado/AStatement.cxx
b/connectivity/source/drivers/ado/AStatement.cxx
index 63e1746..cf0e8c6 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -252,7 +252,6 @@ void OStatement_Base::assignRecordSet( ADORecordset* _pRS )
// -
sal_Bool SAL_CALL OStatement_Base::execute( const ::rtl::OUString sql )
throw(SQLException, RuntimeException)
{
-printf(OStatement_Base::execute\n);
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index 6c94688..3265547 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
@@ -128,7 +128,6 @@ void SAL_CALL OEvoabPreparedStatement::close( )
throw(SQLException, RuntimeExce
sal_Bool SAL_CALL OEvoabPreparedStatement::execute( ) throw(SQLException,
RuntimeException)
{
-printf(OEvoabPreparedStatement::execute()\n);
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx
b/connectivity/source/drivers/evoab2/NStatement.cxx
index 136f92e..7bf0016 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -615,7 +615,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement,
OCommonStatement, OStatement_IBase
// -
sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString _sql )
throw(SQLException, RuntimeException)
{
-printf(OStatement::execute()\n);
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx
b/connectivity/source/drivers/file/FPreparedStatement.cxx
index ee6f01c..0d810fc 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -169,7 +169,6 @@ void SAL_CALL OPreparedStatement::close( )
throw(SQLException, RuntimeException
sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException,
RuntimeException)
{
-printf(OPreparedStatement::execute() #2\n);
[REVIEW 3-6][REVIEW 3-5] fdo#48200 ( regression )
Please think about cherrypicking http://cgit.freedesktop.org/libreoffice/core/commit/?id=b94bff540a47a9fc5ce0586aa58e28321c96e4aa Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: framework/source
framework/source/uielement/menubarmanager.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 18a39e216fa66d915e4426e87350ab4cc592 Author: Noel Power noel.po...@suse.com Date: Thu Aug 16 17:48:35 2012 +0100 remove menubar post processing of SID_PASTESPECIAL state to always enabled at least calc deals with paste-special correct, if other applications don't let's fix 'em up one by one Change-Id: I1beb04e227f2971ee8ef2ce9b7ebdabf566be086 diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index d3ea1b1..26b1233 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -506,8 +506,7 @@ throw ( RuntimeException ) //enable some slots hardly, because UNIX clipboard does not notify all changes // Can be removed if follow up task will be fixed directly within applications. // Note: PasteSpecial is handled specifically by calc -if ( pMenuItemHandler-aMenuItemURL == .uno:Paste || -( m_aModuleIdentifier != com.sun.star.sheet.SpreadsheetDocument pMenuItemHandler-aMenuItemURL == .uno:PasteSpecial ) +if ( pMenuItemHandler-aMenuItemURL == .uno:Paste || pMenuItemHandler-aMenuItemURL == .uno:PasteClipboard ) // special for draw/impress bEnabledItem = sal_True; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: download
download |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4054dd8fc407f7766710beaac575b20a809a912c Author: Peter Foley pefol...@verizon.net Date: Thu Aug 16 12:49:17 2012 -0400 fix gdiplus.dll extraction Change-Id: I4220af58c48be5b411cc75875c121d1e2c133a00 diff --git a/download b/download index 19f91e7..815d849 100755 --- a/download +++ b/download @@ -243,7 +243,7 @@ if [ $COM = MSC -a -n $md5sum ]; then echo echo echo -cmd /c `cygpath -d $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe` /extract:$TMPUNPACK /q +cmd /c `cygpath -w $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe` /extract:$TMPUNPACK /q if [ -f $TARFILE_LOCATION/tmp/$gdiplus_dll_path ]; then echo Extraction succeeded sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$gdiplus_dll_path | sed s/ .*//` ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6][REVIEW 3-6-1] fdo#53280: Reset read-only UI after successful Save As
On Thu, 2012-08-16 at 18:22 +0200, Stephan Bergmann wrote:
The { and } lines you mean? I /do/ consider them helpful; spent a
long time scratching my head just the other day again trying to grok
Sure - everyone's spent time doing that; like looking for:
if (a);
{
always_happens();
}
but ... people also waste time hitting page up and down trying to get
enough of the code in scope to see what is going on. Arguably by
habituating yourself to these being here, you're more likely to fall
victim to this when reading other people's code ;- so bad style can be
good practise ! :-)
Incidentally, noticed a couple days ago a commit of yours where you
removed such { ... } lines, in a mumbo rebase commit, so thought it
was likely more a rebasing artifact than deliberate doing. Anyway, I
would appreciate it if such lines were /not/ removed.
Well - it seems that as each person touches the code, and has a
different view they change the local scope. c'est la vie. I usually try
to go for consistency in the function / module.
On that basis it's notable that you made that function inconsistent on
this topic :-)
ATB,
Michael.
--
michael.me...@suse.com , Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
the inevitable C formatting/brace style flamewar
On 16/08/12 18:22, Stephan Bergmann wrote:
On 08/16/2012 06:13 PM, Michael Meeks wrote:
Looks sensible :-) pushed to -3-6 (though I personally loathe burning
two lines of non-renewable vspace for no good reason ;-).
you are _half_ right: burning 2 lines for that is silly :)
The { and } lines you mean? I /do/ consider them helpful; spent a
long time scratching my head just the other day again trying to grok
what's going on---when all that was going on was a deceivingly formatted
single-statement if-condition to which another statement had been added
(not).
Incidentally, noticed a couple days ago a commit of yours where you
removed such { ... } lines, in a mumbo rebase commit, so thought it
was likely more a rebasing artifact than deliberate doing. Anyway, I
would appreciate it if such lines were /not/ removed.
but i certainly agree with Stephan that adding { } to every if, for etc.
is a Good Thing.
if memory serves i've reviewed 2 patches in the last 3 months or so that
added a statement to a 1-line then or else clause that was indented but
did not have braces, and the author indented his new line and forgot the
braces. clearly that indicates to me that syntax significant
indentation (as in Haskell or Python) is an excellent idea that prevents
bugs, and in a language that lacks this convenience always adding the
braces is the next best you can do.
but the braces only burn 2 lines of vspace instead of 1 because of our
silly coding convention, with which i disagree strongly in this aspect.
apparently somebody thought it a great idea to mandate Allman style for
large parts of OOo, which is a) ugly and b) unnecessarily wastes 1 line
of vspace on very short blocks.
what i would like instead is a context-sensitive and common-sense based
coding style:
1) if the condition is long, then put the opening brace on a new line.
rationale: in this case it's good to visually separate the condition
from the compound statement, e.g. this is a PITA to read:
if ( !pFly-Lower() ||
!pFly-Lower()-IsNoTxtFrm() ||
!((SwNoTxtFrm*)pFly-Lower())-HasAnimation())
pFly-RefreshLaySubsidiary( pPage, rRect );
if (bCalledFromShell !lcl_IsItemSet(*pNewTxtNd, RES_PARATR_ADJUST)
SFX_ITEM_SET == pAnchorNode-GetSwAttrSet().
GetItemState(RES_PARATR_ADJUST, sal_True, pItem))
static_castSwCntntNode *(pNewTxtNd)-SetAttr(*pItem);
2) if the condition is short, then put the opening brace on the same line
rationale: in this case it's immediately obvious where the condition
ends, so no need for an extra vspace wasting line
so this:
if( pCT-pInsBox )
{
pCT-pInsBox-GetTabLines().push_back( pNewLine );
}
else
{
pCT-pTblNd-GetTable().GetTabLines().push_back( pNewLine );
}
could be much shorter, with only 20% brace line overhead:
if( pCT-pInsBox ) {
pCT-pInsBox-GetTabLines().push_back( pNewLine );
} else {
pCT-pTblNd-GetTable().GetTabLines().push_back( pNewLine );
}
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LibreOffice 3.6.1 RC1 available
Dear Community, The Document Foundation is happy to announce the first release candidate of LibreOffice 3.6.1. The upcoming 3.6.1 will be the second in a series of frequent bugfix releases for our 3.6 code line. Please be aware that LibreOffice 3.6.1 RC1 is not yet ready for production use, you should continue to use LibreOffice 3.5.6 or 3.6.0 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the beta quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test (and the announcement mail: http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html) For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/Translation_for_3.6 or help with funding our operations: http://www.libreoffice.org/get-involved/donate/ A list of known issues and fixed bugs with 3.6.1 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/3.6.1/RC1 Please find the list of changes here: http://download.documentfoundation.org/libreoffice/src/commit-log-libreoffice-3-6-1-release-3.6.1.1.log Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors -- Florian Effenberger, Chairman of the Board (Vorstandsvorsitzender) Tel: +49 8341 99660880 | Mobile: +49 151 14424108 The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Makefile.top
Makefile.top | 20 +++- 1 file changed, 7 insertions(+), 13 deletions(-) New commits: commit af69e72e1d6c04e23f17c4d1e58aa891b95611ee Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Aug 16 18:25:16 2012 +0200 avoid defining gb_TAILBUILDMODULES, use the command only when necessary This enables to properly use make module.all for builds without dictionaries and hopefully also solves the problem behind 5133d3c48fd6d2a795e42b87a1e7b464946606a3 Change-Id: I43872864aa135014ea51d15b34ef4de151f14c3d diff --git a/Makefile.top b/Makefile.top index b23b5be..d08cd5e 100644 --- a/Makefile.top +++ b/Makefile.top @@ -247,10 +247,6 @@ xpdf\ xsltml\ zlib\ -ifneq ($(wildcard dictionaries/Module_dictionaries.mk),) -gb_TAILBUILDMODULES := $(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules) -endif - export gb_TAILBUILDTARGET=all slowcheck define gbuild_module_rules @@ -259,16 +255,14 @@ define gbuild_module_rules $(1): bootstrap fetch cd $(1) $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T -ifeq ($(filter $(1),$(gb_TAILBUILDMODULES)),) -$(1).all: bootstrap fetch - cd $(1) unset MAKEFLAGS \ -$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) -else $(1).all: bootstrap fetch - cd tail_build unset MAKEFLAGS \ - export gb_TAILBUILDTARGET=$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) \ -$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) -endif + $$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)), \ + cd tail_build unset MAKEFLAGS \ + export gb_TAILBUILDTARGET=$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) \ + , \ + cd $(1) unset MAKEFLAGS \ + ) \ + $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) $(1).clean: cd $(1) $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean gb_PARTIALBUILD=T ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 53089, which changed state. Bug 53089 Summary: Numbers from external URL are always interpreted as text https://bugs.freedesktop.org/show_bug.cgi?id=53089 What|Old Value |New Value Resolution||FIXED Status|ASSIGNED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdotxat.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 0c33ffb21f7f239eb1ff07766911d21bccf9236b
Author: Michael Stahl mst...@redhat.com
Date: Thu Aug 16 19:39:55 2012 +0200
svdotxat.cxx: MSVC needs set included
Change-Id: I8cc16c16c3884c5451b643b7de848aad15f02fcf
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 9a6338f..48541e7 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -57,6 +57,8 @@
#include editeng/numitem.hxx
#include editeng/postitem.hxx
+#include set
+
bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle rR, bool bHgt, bool
bWdt) const
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/agenda/AgendaTemplate.java |1 -
1 file changed, 1 deletion(-)
New commits:
commit b57ebd8c1f6a3b4261a97198aaf38f8ffe46198c
Author: Andras Timar ati...@suse.com
Date: Thu Aug 16 19:48:15 2012 +0200
Don't say yeeep
Change-Id: I239be1b35103c53e9ace3a7e2917bd24a24497a3
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
index 9df88a0..860d413 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
@@ -652,7 +652,6 @@ public class AgendaTemplate extends TextDocument implements
TemplateConsts, Data
private void writeTitle(TextElement te, XTextRange tr, String text)
{
-System.out.println(yeeep);
te.text = (text == null ? PropertyNames.EMPTY_STRING : text);
te.write(tr);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - framework/source
framework/source/uielement/menubarmanager.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6719ef77c4068c8d02eb0f690dfd3bc0c61cb58d Author: Noel Power noel.po...@suse.com Date: Thu Aug 16 18:54:14 2012 +0100 sync cell context menu edit menu 'PasteSpecial' entries for calc fdo#46250 calc application specifically handles PasteSpecial so no need to set the state of the menu entry to enabled always ( for calc at least ) Change-Id: Iaa4b3713f55bff9e129f8f9ee7105650122b7145 Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 5e80d0e..5b9cfb3 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -522,7 +522,8 @@ throw ( RuntimeException ) // Can be removed if follow up task will be fixed directly within applications. if ( ( pMenuItemHandler-aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(.uno:Paste))) || -( pMenuItemHandler-aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(.uno:PasteSpecial))) || +// Note: PasteSpecial is handled specifically by calc +( !m_aModuleIdentifier.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.sheet.SpreadsheetDocument)) pMenuItemHandler-aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(.uno:PasteSpecial))) || ( pMenuItemHandler-aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(.uno:PasteClipboard))) // special for draw/impress ) bEnabledItem = sal_True; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: the inevitable C formatting/brace style flamewar
On Thu, Aug 16, 2012 at 12:07 PM, Michael Stahl mst...@redhat.com wrote:
so this:
if( pCT-pInsBox )
{
pCT-pInsBox-GetTabLines().push_back( pNewLine );
}
else
{
pCT-pTblNd-GetTable().GetTabLines().push_back( pNewLine );
}
could be much shorter, with only 20% brace line overhead:
if( pCT-pInsBox ) {
pCT-pInsBox-GetTabLines().push_back( pNewLine );
} else {
pCT-pTblNd-GetTable().GetTabLines().push_back( pNewLine );
}
and
if( pCT-pInsBox ) { pCT-pInsBox-GetTabLines().push_back( pNewLine );
} else { pCT-pTblNd-GetTable().GetTabLines().push_back( pNewLine );}
is 80% shorter.. what's the point ?
The braces lines are not 'overhead', there are visual-aid... chasing
'{' at the end of lines is cumbersome and slow, and the irregularity
of the use of braces at all make the endeavor even more cumbersome and
error prone.
you said it yourself:
rationale: in this case it's good to visually separate the condition
from the compound statement, e.g. this is a PITA to read: [...]
so you agree that it's good to visually separate the condition
from the compound statement,
which version best achieve that goodness:
if( pCT-pInsBox )
{
pCT-pInsBox-GetTabLines().push_back( pNewLine );
}
else
{
pCT-pTblNd-GetTable().GetTabLines().push_back( pNewLine );
}
or
if( pCT-pInsBox ) {
pCT-pInsBox-GetTabLines().push_back( pNewLine );
} else {
pCT-pTblNd-GetTable().GetTabLines().push_back( pNewLine );
}
( it is a rhetorical question)
furthermore, how many people still use 80x24 terminal ? iow, why
putting a premium on vspace at the expense of readability ?
Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.in
configure.in |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) New commits: commit 2eb39893df0fa008da0f863caa65d8aea7eb107b Author: Tor Lillqvist t...@iki.fi Date: Thu Aug 16 20:59:41 2012 +0300 Having a pkg-config on the Mac *will* break the build, so error out Change-Id: I2393b893766acd9f630100c7b4ef1e15360f80b4 diff --git a/configure.in b/configure.in index 1e96a4e..9e7760e 100644 --- a/configure.in +++ b/configure.in @@ -4296,14 +4296,12 @@ if test $_os = Darwin; then AC_MSG_CHECKING([for bogus pkg-config]) if test -n $PKG_CONFIG; then if test $PKG_CONFIG = /usr/bin/pkg-config ls -l /usr/bin/pkg-config | $GREP -q Mono.framework; then -AC_MSG_RESULT([yes, from Mono]) +AC_MSG_ERROR([yes, from Mono. This *will* break the build. Please remove or hide $PKG_CONFIG]) else -AC_MSG_RESULT([yes, from unknown origin]) +AC_MSG_ERROR([yes, from unknown origin. This *will* break the build. Please remove or hide $PKG_CONFIG]) fi -AC_MSG_WARN([This might have unexpected consequences, please consider hiding $PKG_CONFIG]) -echo Having a $PKG_CONFIG might have unexpected consequences, please consider hiding it warn else -AC_MSG_RESULT([no]) +AC_MSG_RESULT([no, good]) fi fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bridges/source configure.in cppunit/makefile.mk fontconfig/fontconfig-2.8.0.patch icu/icu4c-android.patch icu/makefile.mk sal/android solenv/gbuild solenv/inc
bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx | 19 +++
bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk |2
configure.in | 27 -
cppunit/makefile.mk|2
fontconfig/fontconfig-2.8.0.patch |4
icu/icu4c-android.patch|2
icu/makefile.mk|2
sal/android/lo-bootstrap.c |6 -
solenv/gbuild/platform/ANDROID_GODSON_GCC.mk | 102 +
solenv/inc/unx.mk |9 -
solenv/inc/unxand.mk | 78
solenv/inc/unxandr.mk | 76 ---
12 files changed, 230 insertions(+), 99 deletions(-)
New commits:
commit 8b5cf7fb57c0f68ee312d7f7b404533807349318
Author: Tor Lillqvist t...@iki.fi
Date: Thu Aug 16 21:04:10 2012 +0300
For kicks, enable cross-building for Android on MIPS
Change-Id: I6fa2b9a50c525fb2d8666a144409eb9a3ad2698a
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index e62c779..0e94144 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -51,7 +51,14 @@ using namespace ::std;
using namespace ::osl;
using namespace ::rtl;
#endif
+
+#ifndef ANDROID
#include sys/sysmips.h
+#endif
+
+#ifdef ANDROID
+#include unistd.h
+#endif
#ifdef OSL_BIGENDIAN
#define IS_BIG_ENDIAN 1
@@ -619,7 +626,9 @@ namespace
case typelib_TypeClass_DOUBLE:
{ register double dret asm($f0);
-dret = (*((double*)nRegReturn)); }
+dret = (*((double*)nRegReturn));
+(void) dret;
+ }
break;
case typelib_TypeClass_HYPER:
@@ -710,9 +719,15 @@ namespace
}
-void bridges::cpp_uno::shared::VtableFactory::flushCode(unsigned char const *
/*bptr*/, unsigned char const * /*eptr*/)
+void bridges::cpp_uno::shared::VtableFactory::flushCode(unsigned char const
*bptr, unsigned char const *eptr)
{
+#ifndef ANDROID
+ (void) bptr;
+ (void) eptr;
sysmips(FLUSH_CACHE,0,0,0);
+#else
+ cacheflush((long) bptr, (long) eptr, 0);
+#endif
}
struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; };
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
b/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
index ddb4817..3c6ab81 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files
-.IF $(COM)$(OS)$(CPU) == GCCLINUXM
+.IF $(COM)$(OS)$(CPU) == GCCLINUXM || $(COM)$(OS)$(CPU) == GCCANDROIDM
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
diff --git a/configure.in b/configure.in
index 9e7760e..a270350 100644
--- a/configure.in
+++ b/configure.in
@@ -126,13 +126,15 @@ if test -n $with_android_ndk; then
if test $host_cpu = arm; then
android_cpu=arm
+elif test $host_cpu = mips; then
+android_cpu=mips
else
# host_cpu is something like i386 or i686 I guess, NDK uses
# x86 in some contexts
android_cpu=x86
fi
-ANDROID_ABI_PREBUILT_BIN=`echo
$ANDROID_NDK_HOME/toolchains/$android_cpu-*$with_android_ndk_toolchain_version/prebuilt/*/bin`
+ANDROID_ABI_PREBUILT_BIN=`echo
$ANDROID_NDK_HOME/toolchains/$android_cpu*-*$with_android_ndk_toolchain_version/prebuilt/*/bin`
# Check if there are several toolchain versions
case $ANDROID_ABI_PREBUILT_BIN in
*/bin\ */bin*)
@@ -141,7 +143,7 @@ if test -n $with_android_ndk; then
# This stays empty if there is just one version of the toolchain in the NDK
ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=
-case `echo $ANDROID_NDK_HOME/toolchains/$android_cpu-*/prebuilt/*/bin` in
+case `echo $ANDROID_NDK_HOME/toolchains/$android_cpu*-*/prebuilt/*/bin`
in
*/bin\ */bin*)
# Trailing slash intentional and necessary, compare to how this is used
ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=${with_android_ndk_toolchain_version}/
@@ -150,6 +152,8 @@ if test -n $with_android_ndk; then
if test $host_cpu = arm; then
android_gcc_prefix=arm-linux-androideabi
+elif test $host_cpu = mips; then
+ android_gcc_prefix=mipsel-linux-android
elif test -f $ANDROID_ABI_PREBUILT_BIN/i686-android-linux-gcc; then
android_gcc_prefix=i686-android-linux
elif test -f $ANDROID_ABI_PREBUILT_BIN/i686-linux-android-gcc; then
@@ -167,6 +171,8 @@ if test -n $with_android_ndk; then
if test $host_cpu = arm; then
ANDROIDCFLAGS=-Wno-psabi -march=armv7-a -mfloat-abi=softfp -mfpu=neon
-Wl,--fix-cortex-a8 --sysroot
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java |4 ++--
wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c13c0c7d76d9ef7fa475590f5ec9fae185752f79
Author: Andras Timar ati...@suse.com
Date: Thu Aug 16 20:33:52 2012 +0200
make buttons wider
Change-Id: I7af919450f6c75f87f0877e32ad6945ec392dbef
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java
b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java
index 5b84ce9..755651f 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java
@@ -321,11 +321,11 @@ public abstract class AgendaWizardDialog extends
WizardDialog implements Agenda
);
btnUp = insertButton(btnUp, BTNUP_ACTION_PERFORMED,
PROPS_BUTTON,
-new Object[] {
INTEGER_14,BTNUP_HID,resources.resButtonUp,222,136,INTEGERS[5],new
Short((short)582),INTEGER_40}
+new Object[] {
INTEGER_14,BTNUP_HID,resources.resButtonUp,202,136,INTEGERS[5],new
Short((short)582),INTEGER_50}
);
btnDown = insertButton(btnDown, BTNDOWN_ACTION_PERFORMED,
PROPS_BUTTON,
-new Object[] {
INTEGER_14,BTNDOWN_HID,resources.resButtonDown,264,136,INTEGERS[5],new
Short((short)583),INTEGER_40}
+new Object[] {
INTEGER_14,BTNDOWN_HID,resources.resButtonDown,254,136,INTEGERS[5],new
Short((short)583),INTEGER_50}
);
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
index 0f39eed..82b29b5 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
@@ -278,10 +278,10 @@ class AgendaWizardDialog(WizardDialog):
self.resources.resButtonRemove, 134, 136, 5, 581, 40),
self)
self.btnUp = self.insertButton(btnUp, BTNUP_ACTION_PERFORMED,
self.PROPS_BUTTON, (14, BTNUP_HID,
-self.resources.resButtonUp, 222, 136, 5, 582, 40), self)
+self.resources.resButtonUp, 202, 136, 5, 582, 50), self)
self.btnDown = self.insertButton(btnDown, BTNDOWN_ACTION_PERFORMED,
self.PROPS_BUTTON, (14, BTNDOWN_HID,
-self.resources.resButtonDown, 264, 136, 5, 583, 40), self)
+self.resources.resButtonDown, 254, 136, 5, 583, 50), self)
def buildStep6(self):
self.insertLabel(lblTitle6, self.PROPS_LABEL_B,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: comphelper/inc comphelper/source
comphelper/inc/comphelper/storagehelper.hxx | 177 -
comphelper/source/misc/storagehelper.cxx| 511 +---
2 files changed, 332 insertions(+), 356 deletions(-)
New commits:
commit 72777a66bb8d9e71c4786c282c7971d7ededa729
Author: Tomaž Vajngerl qui...@gmail.com
Date: Thu Aug 16 19:05:36 2012 +0200
Cleanup comphelper::storagehelper
Change-Id: I04313cf4235ce3db20ff340474691435e9b440b6
diff --git a/comphelper/inc/comphelper/storagehelper.hxx
b/comphelper/inc/comphelper/storagehelper.hxx
index f255dc8..5e4916e 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -33,14 +33,20 @@
#include com/sun/star/io/XStream.hpp
#include comphelper/comphelperdllapi.h
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::embed;
+using namespace com::sun::star::io;
+using namespace com::sun::star::beans;
+using rtl::OUString;
-#define PACKAGE_STORAGE_FORMAT_STRING ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageFormat ) )
-#define ZIP_STORAGE_FORMAT_STRING ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ZipFormat ) )
-#define OFOPXML_STORAGE_FORMAT_STRING ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( OFOPXMLFormat ) )
+#define PACKAGE_STORAGE_FORMAT_STRING OUString( RTL_CONSTASCII_USTRINGPARAM(
PackageFormat ) )
+#define ZIP_STORAGE_FORMAT_STRING OUString( RTL_CONSTASCII_USTRINGPARAM(
ZipFormat ) )
+#define OFOPXML_STORAGE_FORMAT_STRING OUString( RTL_CONSTASCII_USTRINGPARAM(
OFOPXMLFormat ) )
-#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA256UTF8EncryptionKey ) )
-#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8 ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA1UTF8EncryptionKey ) )
-#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA1MS1252EncryptionKey ) )
+#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA256UTF8EncryptionKey ) )
+#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8 OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA1UTF8EncryptionKey ) )
+#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA1MS1252EncryptionKey ) )
namespace comphelper {
@@ -63,131 +69,120 @@ public:
class COMPHELPER_DLLPUBLIC OStorageHelper
{
public:
-static ::com::sun::star::uno::Reference
::com::sun::star::lang::XSingleServiceFactory
+static Reference XSingleServiceFactory
GetStorageFactory(
-const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xSF
-= ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory () )
-throw ( ::com::sun::star::uno::Exception );
+const Reference XMultiServiceFactory xSF = Reference
XMultiServiceFactory () )
+throw ( Exception );
-static ::com::sun::star::uno::Reference
::com::sun::star::lang::XSingleServiceFactory
+static Reference XSingleServiceFactory
GetFileSystemStorageFactory(
-const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xSF
-= ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory () )
-throw ( ::com::sun::star::uno::Exception );
+const Reference XMultiServiceFactory xSF = Reference
XMultiServiceFactory () )
+throw ( Exception );
-static ::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage
+static Reference XStorage
GetTemporaryStorage(
-const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xFactory
-= ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory () )
-throw ( ::com::sun::star::uno::Exception );
+const Reference XMultiServiceFactory xFactory = Reference
XMultiServiceFactory () )
+throw ( Exception );
-/// this one will only return Storage
-static ::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage
+// this one will only return Storage
+static Reference XStorage
GetStorageFromURL(
-const ::rtl::OUString aURL,
-sal_Int32 nStorageMode,
-const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xFactory
-= ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory () )
-throw ( ::com::sun::star::uno::Exception );
+const OUString aURL, sal_Int32 nStorageMode,
+const Reference XMultiServiceFactory xFactory = Reference
XMultiServiceFactory () )
+throw ( Exception );
-/// this one will return either Storage or FileSystemStorage
-static
Re: [PATCH][REVIEW 3-6][REVIEW 3-6-1] Create the desktop icon (on Windows) again
On Thu, 2012-08-16 at 18:52 +0200, Jan Holesovsky wrote: Attached is a patch that I know you are not too happy about ;-) - change the default of creating the desktop icon on Windows back to 'yes'. Patch itself seems reasonable; the ux-advise mail I saw seemed like we'd got confused about what other people were doing we've accidentally gone out on a limb here. So; assuming Astron's ok for -3-6 - I'm donating a +1 to get it into 3.6.1 ;-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: comphelper/inc comphelper/source
comphelper/inc/comphelper/storagehelper.hxx | 177 -
comphelper/source/misc/storagehelper.cxx| 511 ++--
2 files changed, 356 insertions(+), 332 deletions(-)
New commits:
commit e3648d4ebc7378cc31b6ce73716328f48b8903e5
Author: Matúš Kukan matus.ku...@gmail.com
Date: Thu Aug 16 21:47:01 2012 +0200
Revert Cleanup comphelper::storagehelper
This reverts commit 72777a66bb8d9e71c4786c282c7971d7ededa729.
+using namespace com::sun::star::uno; in header is not a good idea
Fails to compile and is hard to parse and figure out what was the point,
so just reverting.
Also +using rtl::OUString; is automatic nowadays whenever possible and
RTL_CONSTASCII_USTRINGPARAM is obsoleted.
Change-Id: I24cb24b7f1a6007734d26cbba41d46323cb55b18
diff --git a/comphelper/inc/comphelper/storagehelper.hxx
b/comphelper/inc/comphelper/storagehelper.hxx
index 5e4916e..f255dc8 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -33,20 +33,14 @@
#include com/sun/star/io/XStream.hpp
#include comphelper/comphelperdllapi.h
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::embed;
-using namespace com::sun::star::io;
-using namespace com::sun::star::beans;
-using rtl::OUString;
-#define PACKAGE_STORAGE_FORMAT_STRING OUString( RTL_CONSTASCII_USTRINGPARAM(
PackageFormat ) )
-#define ZIP_STORAGE_FORMAT_STRING OUString( RTL_CONSTASCII_USTRINGPARAM(
ZipFormat ) )
-#define OFOPXML_STORAGE_FORMAT_STRING OUString( RTL_CONSTASCII_USTRINGPARAM(
OFOPXMLFormat ) )
+#define PACKAGE_STORAGE_FORMAT_STRING ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageFormat ) )
+#define ZIP_STORAGE_FORMAT_STRING ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ZipFormat ) )
+#define OFOPXML_STORAGE_FORMAT_STRING ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( OFOPXMLFormat ) )
-#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA256UTF8EncryptionKey ) )
-#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8 OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA1UTF8EncryptionKey ) )
-#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA1MS1252EncryptionKey ) )
+#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA256UTF8EncryptionKey ) )
+#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8 ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA1UTF8EncryptionKey ) )
+#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA1MS1252EncryptionKey ) )
namespace comphelper {
@@ -69,120 +63,131 @@ public:
class COMPHELPER_DLLPUBLIC OStorageHelper
{
public:
-static Reference XSingleServiceFactory
+static ::com::sun::star::uno::Reference
::com::sun::star::lang::XSingleServiceFactory
GetStorageFactory(
-const Reference XMultiServiceFactory xSF = Reference
XMultiServiceFactory () )
-throw ( Exception );
+const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xSF
+= ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory () )
+throw ( ::com::sun::star::uno::Exception );
-static Reference XSingleServiceFactory
+static ::com::sun::star::uno::Reference
::com::sun::star::lang::XSingleServiceFactory
GetFileSystemStorageFactory(
-const Reference XMultiServiceFactory xSF = Reference
XMultiServiceFactory () )
-throw ( Exception );
+const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xSF
+= ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory () )
+throw ( ::com::sun::star::uno::Exception );
-static Reference XStorage
+static ::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage
GetTemporaryStorage(
-const Reference XMultiServiceFactory xFactory = Reference
XMultiServiceFactory () )
-throw ( Exception );
+const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xFactory
+= ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory () )
+throw ( ::com::sun::star::uno::Exception );
-// this one will only return Storage
-static Reference XStorage
+/// this one will only return Storage
+static ::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage
GetStorageFromURL(
-const OUString aURL, sal_Int32 nStorageMode,
-const Reference XMultiServiceFactory xFactory = Reference
XMultiServiceFactory () )
-throw ( Exception );
+const ::rtl::OUString aURL,
+sal_Int32 nStorageMode,
+
[Libreoffice-commits] .: sc/source
sc/source/ui/src/scstring.src |2 ++
1 file changed, 2 insertions(+)
New commits:
commit baf5c7fb1085acb09050bd9e361d8bda510d8dd9
Author: Andras Timar ati...@suse.com
Date: Thu Aug 16 22:09:48 2012 +0200
add x-comment for translators
Change-Id: I3b0db36991cc21928cce00d051ba3981ad39703d
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index 05ea091..59c8a83 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -203,11 +203,13 @@ String SCSTR_NONAME
String SCSTR_COLUMN
{
+Text [ x-comment ] = %1 is replaced to column letter, such as 'Column A'
;
Text [ en-US ] = Column %1 ;
};
String SCSTR_ROW
{
+Text [ x-comment ] = %1 is replaced to row number, such as 'Row 1' ;
Text [ en-US ] = Row %1 ;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
Bjoern Michaelsen wrote + want a hard-hacks query - with five hits We can give that a try, but thinking about it that is really easy abused when just triggering on a whiteboard keyword (as in: people adding it to their pet peeve bugs). If that happens, handing over a query with 5 hardcoded bug numbers via mail should be safe and simple. Hi. Flag system of Bugzilla could be used - create put name here flag for LibreOffice product, create grant and request group, add esc and qa team members to them. See https://bugs.freedesktop.org/docs/en/html/flags-overview.html. put name here could follow version scheme. Bugzilla main developer Frédéric Buclin already declared help in flags setup in bug https://bugs.freedesktop.org/show_bug.cgi?id=33070. Flag mechanism could be used not just to nominate bugs to fix, blockers etc. but all other Bugzilla activities (bibisect, qawanted and other requests) and therefore not abusing whiteboard field. Best regards. -- View this message in context: http://nabble.documentfoundation.org/minutes-of-ESC-call-tp4001839p4001913.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSOC-UPDATE](16.08) Impress Remote -- Bluetooth
Hi everyone, Today I started work on the bluetooth code, specifically on the linux server code. I'm basing most of my code on what is done in the bluecove library (APL, written in Java with some C). I.e. most things go via dbus, and the C sockets API is used for actual communication (I believe Android uses the same methodology internally). I have had two issues: - Linking against glib: specifically I'm using the gio portion of glib for dbus: in the makefile I need to add gtk in the use_externals part of the makefile, having only glib causes linking to fail. Is this expected? - Including the bluez headers: (I've initially used pkg-config to include them -- I still need to look into how I would include them correctly). These headers are part of bluez, and have GPL notices -- I am however only using them for structs and constants, and not linking, as is done both for Android and for Bluecove. The Android sources include cleaned headers, which can be found e.g. here: http://gitorious.org/0xdroid/system_bluetooth/trees/59ca0be6dc8ef3f30f8f863d8fb805a55bf12fe5/bluez-clean-headers/bluetooth . Would it be worth including these headers in the LO sources, to save the need to install the appropriate library to compile LO (bluez-libs-devel on fedora)? I'm assuming that the android bluecove interpretation is correct and I can still use these without GPL issues? Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/mork' - connectivity/source
connectivity/source/drivers/mork/MQueryHelper.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 90734440b27960a23e8b40041e53f58f73df2530
Author: David Ostrovsky da...@ostrovsky.org
Date: Thu Aug 16 22:53:52 2012 +0200
create MQueryHelperResultEntry per row and not per cell
Change-Id: Ibec6eca8807c298f72a440a0e022bf4022132d7c
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx
b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 7097110..6b4e351 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -205,6 +205,7 @@ sal_Int32 MQueryHelper::executeQuery(OConnection*
xConnection)
// Iterate all rows
for ( rowIter = Rows-begin(); rowIter != Rows-end();
rowIter++ )
{
+MQueryHelperResultEntry* entry = new
MQueryHelperResultEntry();
for (MorkCells::iterator CellsIter =
rowIter-second.begin();
CellsIter != rowIter-second.end(); CellsIter++ )
{
@@ -213,14 +214,12 @@ sal_Int32 MQueryHelper::executeQuery(OConnection*
xConnection)
//SAL_INFO(connectivity.mork, key: column
value: value);
-MQueryHelperResultEntry* entry = new
MQueryHelperResultEntry();
-
OString key(column.c_str(),
static_castsal_Int32(column.size()));
OString valueOString(value.c_str(),
static_castsal_Int32(value.size()));
rtl::OUString valueOUString =
::rtl::OStringToOUString( valueOString, RTL_TEXTENCODING_UTF8 );
entry-setValue(key, valueOUString);
-append(entry);
}
+append(entry);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH][REVIEW 3-6][REVIEW 3-6-1] Create the desktop icon (on Windows) again
Hi Kendy, Michael, sure, go ahead. You've disproved the only somewhat weighty argument I had (the password requirement – sorry for not researching that before). What remains is a purely philosophical argument (the desktop is the user's space) which everyone has different opinions about. So, I guess if it helps users start LibO, I can hardly object to the patch. :) Sorry for the delay... I meant to write this yesterday evening... Astron. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - boost/boost.vc2012.patch boost/makefile.mk configure.in external/msvcp110 oowintool openssl/openssl.patch
boost/boost.vc2012.patch | 14 ++
boost/makefile.mk |1 +
configure.in | 18 +-
external/msvcp110/README_msvcX110.dll |2 ++
oowintool | 16 ++--
openssl/openssl.patch |4 ++--
6 files changed, 46 insertions(+), 9 deletions(-)
New commits:
commit 5d25bbee44cda24b61188ab2fa1a892824b55f40
Author: Peter Foley pefol...@verizon.net
Date: Thu Aug 16 15:38:00 2012 -0400
fix sal build with vs2012
Change-Id: Ia03980d5d890de7db1e606409a646a5a4f79e91e
diff --git a/boost/boost.vc2012.patch b/boost/boost.vc2012.patch
new file mode 100644
index 000..146ac09
--- /dev/null
+++ b/boost/boost.vc2012.patch
@@ -0,0 +1,14 @@
+--- misc/build/boost_1_44_0/boost/config/compiler/visualc.hpp
misc/build/boost_1_44_0/boost/config/compiler/visualc.hpp
+@@ -101,6 +101,11 @@
+ # define BOOST_NO_ADL_BARRIER
+ #endif
+
++#if _MSC_VER = 1700 // 1700 == VC++ 11.0
++ // Removed in VC11:
++# define BOOST_NO_0X_HDR_INITIALIZER_LIST
++#endif
++
+
+ #if (_MSC_VER = 1600)
+ // MSVC (including the latest checked version) has not yet completely
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 5ce795f..6a3a7b0 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -69,6 +69,7 @@ PATCH_FILES+=boost.6397.warnings.patch
PATCH_FILES+=boost.mipsbackport.patch
PATCH_FILES+=boost.windows.patch
+PATCH_FILES+=boost.vc2012.patch
# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
.IF $(COM) == GCC
commit 37b9e290d9e3d20652df0abe1a1458412f3cfe2c
Author: Peter Foley pefol...@verizon.net
Date: Thu Aug 16 13:51:54 2012 -0400
fix openssl build with VS2012
Change-Id: Ic0e04ab920c50320785f2e1b847026cc4e7b1e0d
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index 538b2c1..4bf7761 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -91,7 +91,7 @@
$cc='$(CC)';
-$base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE
-DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD
-I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
-+$base_cflags=' -W3 -WX -GF -Gy -nologo -DUNICODE -D_UNICODE
-DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD
-I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
++$base_cflags=' -W3 -GF -Gy -nologo -DUNICODE -D_UNICODE
-DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD
-I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
$base_cflags.= $wcecdefs;
-$opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics...
-$dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
@@ -102,7 +102,7 @@
else # Win32
{
-$base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
-+$base_cflags=' -W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
++$base_cflags=' -W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
$base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
$base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
-my $f = $shlib || $fips ?' /MD':' /MT';
commit fdcd85087147e0f016f667706a27899f49e836f0
Author: Peter Foley pefol...@verizon.net
Date: Thu Aug 16 13:23:56 2012 -0400
enable build with Visual Studio 2012
Change-Id: I95e5974e4f109eb8882f7260d19c439a86931e64
diff --git a/configure.in b/configure.in
index a270350..39b78a6 100644
--- a/configure.in
+++ b/configure.in
@@ -2969,13 +2969,13 @@ if test $_os = WINNT; then
AC_MSG_RESULT([$with_cl_home])
dnl ===
-dnl Check for mspdb80.dll/mspdb100.dll
+dnl Check for mspdb80.dll/mspdb100.dll/mspdb110.dll
dnl ===
-dnl MSVS 2008/10 Compiler
+dnl MSVS 2008/10/12 Compiler
if test -n $with_mspdb_path;then
with_mspdb_path=`cygpath -u $with_mspdb_path`
fi
-if test -e $with_mspdb_path/mspdb80.dll -o -e
$with_mspdb_path/mspdb100.dll; then
+if test -e $with_mspdb_path/mspdb80.dll -o -e
$with_mspdb_path/mspdb100.dll -o -e $with_mspdb_path/mspdb110.dll; then
MSPDB_PATH=$with_mspdb_path
fi
dnl MSVS 2008 case
@@ -2990,16 +2990,21 @@ if test $_os = WINNT; then
if test -z $MSPDB_PATH -a -e
$with_cl_home/../Common7/IDE/mspdb100.dll; then
MSPDB_PATH=$with_cl_home/../Common7/IDE
fi
+ dnl MSVS 2012 case
+if test -z $MSPDB_PATH -a -e
$with_cl_home/../Common7/IDE/mspdb110.dll; then
+MSPDB_PATH=$with_cl_home/../Common7/IDE
+fi
if test -z $MSPDB_PATH;then
dnl AC_PATH_PROG only
[Libreoffice-commits] .: Branch 'feature/unitymenus' - vcl/inc vcl/unx
vcl/inc/unx/gtk/gloactiongroup.h | 27 +--
vcl/inc/unx/gtk/gtksalmenu.hxx| 19 +-
vcl/unx/gtk/window/gloactiongroup.cxx | 263 +-
vcl/unx/gtk/window/gtksalmenu.cxx | 130 ++--
4 files changed, 181 insertions(+), 258 deletions(-)
New commits:
commit a8eca38fa4e5008cb3d2efcba9d2cb412645e71d
Author: Antonio Fernandez antonio.fernan...@aentos.es
Date: Thu Aug 16 22:48:54 2012 +0100
GLOActionGroup partially implemented. Menus work but no special items shown.
Change-Id: I7c48fbc5763daf789e7347cfedc62f14be53c934
diff --git a/vcl/inc/unx/gtk/gloactiongroup.h b/vcl/inc/unx/gtk/gloactiongroup.h
index 431b93b..a44dbaa 100644
--- a/vcl/inc/unx/gtk/gloactiongroup.h
+++ b/vcl/inc/unx/gtk/gloactiongroup.h
@@ -2,7 +2,6 @@
#define GLOACTIONGROUP_H
#include gio/gio.h
-//#include gactionmap.h
G_BEGIN_DECLS
@@ -39,26 +38,22 @@ struct _GLOActionGroupClass
gpointer padding[12];
};
-GType g_lo_action_group_get_type (void)
G_GNUC_CONST;
+GType g_lo_action_group_get_type (void)
G_GNUC_CONST;
-GLOActionGroup *g_lo_action_group_new (void);
+GLOActionGroup *g_lo_action_group_new (void);
-GAction * g_lo_action_group_lookup
(GLOActionGroup *group,
- const gchar
*action_name);
+voidg_lo_action_group_insert(GLOActionGroup
*group,
+ const gchar
*action_name,
+ gpointer
action_info);
-voidg_lo_action_group_insert
(GLOActionGroup *group,
- GAction
*action);
+voidg_lo_action_group_set_action_enabled(GLOActionGroup
*group,
+ const gchar
*action_name,
+ gboolean
enabled);
-voidg_lo_action_group_remove
(GLOActionGroup *group,
- const gchar
*action_name);
+voidg_lo_action_group_remove(GLOActionGroup
*group,
+ const gchar
*action_name);
-// This function has been added to make current implementation of GtkSalMenu
work.
-voidg_lo_action_group_clear
(GLOActionGroup *group);
-
-voidg_lo_action_group_add_entries
(GLOActionGroup *group,
- const
GActionEntry *entries,
- gint
n_entries,
- gpointer
user_data);
+voidg_lo_action_group_clear (GLOActionGroup
*group);
G_END_DECLS
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 3bffc6c..d5ee38f 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -98,6 +98,7 @@ public:
virtual GMenuModel* GetCurrentSection() { return mpCurrentSection;
}
virtual unsignedGetItemCount() { return maItems.size(); }
virtual GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return
maItems[ nPos ]; }
+virtual GActionGroup* GetActionGroup() { return mpActionGroup; }
};
class GtkSalMenuItem : public SalMenuItem
@@ -106,14 +107,16 @@ public:
GtkSalMenuItem( const SalItemParams* );
virtual ~GtkSalMenuItem();
-sal_uInt16 mnId; // Item ID
-sal_uInt16 mnPos;// Item position
-Menu* mpVCLMenu;// VCL Menu into which this
MenuItem is inserted
-GtkSalMenu* mpParentMenu; // The menu in which this menu
item is inserted
-GtkSalMenu* mpSubMenu;// Sub menu of this item (if
defined)
-GMenuModel* mpParentSection; // Section where this item is
added.
-GLOMenuItem*mpMenuItem; // The GMenuItem
-GAction*mpAction; // The GAction associated with
this item
+sal_uInt16 mnId; // Item ID
+sal_uInt16 mnPos; // Item position
+gchar* maCommand; // Item command
+Menu* mpVCLMenu; // VCL Menu into which this
MenuItem is inserted
+GtkSalMenu* mpParentMenu; // The menu in which this menu
item is inserted
+GtkSalMenu*
[Libreoffice-commits] .: basic/source
basic/source/basmgr/basmgr.cxx | 10 --
1 file changed, 10 deletions(-)
New commits:
commit 0d5d4bacb27351a4d4d62cc48a25acf6b46342d8
Author: Takeshi Abe t...@fixedpoint.jp
Date: Fri Aug 17 09:48:25 2012 +0900
Remove unused member variable
its usefulness was gone at ac25ae2544969f57b0c3d51a7ee9e3eb047a8915
Change-Id: I606cd4adb6dc92cc6d981e1da7ce3ecf2160c28e
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index f37cdd7..e8ee8bf 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -116,14 +116,12 @@ struct BasicManagerImpl
SvMemoryStream* mpManagerStream;
SvMemoryStream** mppLibStreams;
sal_Int32mnLibStreamCount;
-sal_Bool mbModifiedByLibraryContainer;
sal_Bool mbError;
BasicManagerImpl( void )
: mpManagerStream( NULL )
, mppLibStreams( NULL )
, mnLibStreamCount( 0 )
-, mbModifiedByLibraryContainer( sal_False )
, mbError( sal_False )
{}
~BasicManagerImpl();
@@ -266,8 +264,6 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted(
const ContainerEvent
::rtl::OUString aName;
Event.Accessor = aName;
-mpMgr-mpImpl-mbModifiedByLibraryContainer = sal_True;
-
if( bLibContainer )
{
Reference XLibraryContainer xScriptCont( Event.Source, UNO_QUERY );
@@ -314,8 +310,6 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced(
const ContainerEvent
::rtl::OUString aName;
Event.Accessor = aName;
-mpMgr-mpImpl-mbModifiedByLibraryContainer = sal_True;
-
// Replace not possible for library container
#ifdef DBG_UTIL
sal_Bool bLibContainer = ( maLibName.getLength() == 0 );
@@ -346,8 +340,6 @@ void SAL_CALL BasMgrContainerListenerImpl::elementRemoved(
const ContainerEvent
::rtl::OUString aName;
Event.Accessor = aName;
-mpMgr-mpImpl-mbModifiedByLibraryContainer = sal_True;
-
sal_Bool bLibContainer = ( maLibName.getLength() == 0 );
if( bLibContainer )
{
@@ -786,8 +778,6 @@ void BasicManager::SetLibraryContainerInfo( const
LibraryContainerInfo rInfo )
}
}
}
-
-mpImpl-mbModifiedByLibraryContainer = sal_False;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6][REVIEW 3-6-1] fdo#53280: Reset read-only UI after successful Save As
Hi there, On Thu, Aug 16, 2012 at 12:13 PM, Michael Meeks michael.me...@suse.com wrote: Looks sensible :-) pushed to -3-6 (though I personally loathe burning two lines of non-renewable vspace for no good reason ;-). To keep our world peace, I'm intentionally not responding to this comment of yours. ;-) 2x more needed for -3-6-1. I'll give my sign-off on this. One more needed for 3-6-1. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 ape os...@yandex.ru changed: What|Removed |Added Depends on||46716 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: oox/source
Hi, On Tue, Aug 07, 2012 at 03:42:11AM -0700, Muthu Subramanian wrote: oox/source/drawingml/table/tablecell.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 36233b158b5de6c474f06c8c8772f0012b191baa Author: Muthu Subramanian sumu...@suse.com Date: Tue Aug 7 16:14:13 2012 +0530 n#774167: Crash fix. diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index c89a4f9..7675c10 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -358,7 +358,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase rFilterBase, ::oo aFillProperties.pushToPropMap( aPropMap, rFilterBase.getGraphicHelper() ); PropertySet( xPropSet ).setProperties( aPropMap ); -getTextBody()-insertAt( rFilterBase, xText, xAt, aTextStyleProps, pMasterTextListStyle ); +if( getTextBody() ) +getTextBody()-insertAt( rFilterBase, xText, xAt, aTextStyleProps, pMasterTextListStyle ); } } } } This test is superfluous after commit 772699ac1f2375c33f0819ebb127555d3178c4e5 (that is already in 3.6.1), because a TableCell always has a TextBody now. D. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/property.pm |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 6abaf44f813e76d80e76b5f42504e772de8c211b
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Aug 16 18:19:39 2012 +0200
Revert fdo#49919 Don't default to desktop pollution
If somebody made a mistake in his / her preferences during installation, it
is much easier to remove the unwanted icon, than to add it.
This reverts commit 6af68b494dafcc6822463a0445692929735eb0af.
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 62919a1..7d4ba0d 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -324,6 +324,9 @@ sub set_important_properties
{
my $onepropertyline = DESKTOPLINKEXISTS . \t . 1 . \n;
push(@{$propertyfile}, $onepropertyline);
+
+$onepropertyline = CREATEDESKTOPLINK . \t . 1 . \n; # Setting
the default
+push(@{$propertyfile}, $onepropertyline);
}
if ( $installer::globals::patch )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - solenv/bin
solenv/bin/modules/installer/windows/property.pm |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 2009b20dec72c20a6f3fc1d9223c24e7a68d5ad2
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Aug 16 18:19:39 2012 +0200
Revert fdo#49919 Don't default to desktop pollution
If somebody made a mistake in his / her preferences during installation, it
is much easier to remove the unwanted icon, than to add it.
This reverts commit 6af68b494dafcc6822463a0445692929735eb0af.
Signed-off-by: Stefan Knorr heinzless...@gmail.com
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index e48d89c..33f312b 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -324,6 +324,9 @@ sub set_important_properties
{
my $onepropertyline = DESKTOPLINKEXISTS . \t . 1 . \n;
push(@{$propertyfile}, $onepropertyline);
+
+$onepropertyline = CREATEDESKTOPLINK . \t . 1 . \n; # Setting
the default
+push(@{$propertyfile}, $onepropertyline);
}
if ( $installer::globals::patch )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] [ANN] LibreOffice 3.6.1.1 test builds available
Hi *, for the upcoming new version 3.6.1, the RC1 builds now start to be available on pre-releases. This build is slated to be first release candidate build on the way towards 3.6.0, please refer to our release plan timings here: http://wiki.documentfoundation.org/ReleasePlan#3.6_release Builds are now being uploaded to a public (but non-mirrored - so don't spread news too widely!) place, as soon as they're available. Grab them here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report *critical* bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. NOTE: This build is in a release configuration and _will_ replace your existing LibreOffice install on Windows. The list of fixed bugs relative to 3.6.0 RC3 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugfixes-libreoffice-3-6-1-release-3.6.1.1.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Petr ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Online update testing
Hi Klaus-Juergen, all, I'd like to ask you test the online update a bit. I had to do some larger changes in order to be able to update the 3.5 line to 3.5.6, so now it explicitly preselects 3.5.6 for you, when you try to update from an older version. The 3.6 update (from the previous RC's, for example) should lead you to the generic download page. Please let me know should you find any trouble :-) Thank you, Kendy ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Moztrap, some questions
Hi, On Thu, Aug 16, 2012 at 02:35:49PM +0200, Petr Mladek wrote: On one side, I like the idea of automatic translations. Though, I am afraid that we will need real localizations support in Moztrap anyway because: + better translations quality; tests need to be understandable even for beginners + language dependent tests; they can't be translated directly + support more languages; Google is powerful but the translator supports less localizations than LO; also I am not sure of the quality of each language; I guess that some languages are easier to translate automatically than others BTW: I think that there will be similar problems with automatic translations and real translations. You will need to modify UI and touch similar piece of code for both of them. I would prefer to spend resources on real localization than on the automatic translation. Note that we have many active translators. We currently do not have enough hackers that would allow them to translate Moztrap. Still the timing is critical here -- blocking on translations in the beta-frenzy is not an option and the time windos is rather tight. What could be done though is doing both: Using manual translation and priming it with an automatic translation that than can be improved upon by an manual one. However even then there are lots of issues with translations: The (english) source text might change (because of an UI cleanup), making the localized version needing an update (or at least an 'this is outdated' marker). That was one of the reasons, why I like and suggested automatic translation as it changes with the source text. Doing manual translations, you will need the source and the translations text to be under some form of version control. Possible, but a lot of work. Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] minutes of ESC call ...
Hi, some additions: On Thu, Aug 16, 2012 at 04:36:17PM +0100, Michael Meeks wrote: * bugzilla / gerrit integration (Bjoern) + concern about getting spammed a lot. + if only one mail if there is a patch at all, it doesn't hurt too much + changing it is an easy-hack Not changing -- creating. There is currently no gerrit-integration on bugzilla. (gerrit integrated bugzilla quite nicely already.) + want a hard-hacks query - with five hits We can give that a try, but thinking about it that is really easy abused when just triggering on a whiteboard keyword (as in: people adding it to their pet peeve bugs). If that happens, handing over a query with 5 hardcoded bug numbers via mail should be safe and simple. Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [ANN] LibreOffice 3.6.1 RC1 available
Dear Community, The Document Foundation is happy to announce the first release candidate of LibreOffice 3.6.1. The upcoming 3.6.1 will be the second in a series of frequent bugfix releases for our 3.6 code line. Please be aware that LibreOffice 3.6.1 RC1 is not yet ready for production use, you should continue to use LibreOffice 3.5.6 or 3.6.0 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the beta quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test (and the announcement mail: http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html) For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/Translation_for_3.6 or help with funding our operations: http://www.libreoffice.org/get-involved/donate/ A list of known issues and fixed bugs with 3.6.1 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/3.6.1/RC1 Please find the list of changes here: http://download.documentfoundation.org/libreoffice/src/commit-log-libreoffice-3-6-1-release-3.6.1.1.log Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors -- Florian Effenberger, Chairman of the Board (Vorstandsvorsitzender) Tel: +49 8341 99660880 | Mobile: +49 151 14424108 The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Moztrap, some questions
Hi. tl;dr, but IMHO ideal localized MozTrap system could be designed this way: Tests should be written using some kind of special text editor with autocomplete, in generic language (or based on English) using UI strings and then those strings substituted to the language of choice (not only French). The framework should be using .po files only. How to achieve this? I don't know. Maybe integrate with Pootle server or sync with LO sources? This would allow to present UI strings in any language supported by LibreOffice. All this seems like good candidate for GSOC project... My 2 eurocents. Best regards. P.S. Having multilanguage MozTrap can lead us to multilanguage reports in Bugzilla... We do not want multilanguage Bugzilla, don't we? I already have to use translator services in reports submitted by French or Spanish people. Good to learn new languages, but... you know... time consuming while bugs triage. -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Moztrap-some-questions-tp4000922p4001926.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 53571] New: FILEOPEN
https://bugs.freedesktop.org/show_bug.cgi?id=53571 Bug #: 53571 Summary: FILEOPEN Classification: Unclassified Product: LibreOffice Version: 3.5.6.2 rc Platform: x86-64 (AMD64) OS/Version: Windows (All) Status: NEW Severity: normal Priority: medium Component: Presentation AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: gam...@poczta.fm Created attachment 65627 -- https://bugs.freedesktop.org/attachment.cgi?id=65627 Screen Hi,I have a ppt (new287.ppt) file when trying to open it, LibreOffice 3.6.1.1 opens in Calc (screen). When trying to open it now in version 3.5.6, LibreOffice 3.5.6 opens it as text. The file is too big I can not attache. I send screen with LibreOffice 3.6.1.1 (In LibreOffice 3.6.0.4 and 3.5.5 everything is OK). Sorry for my english. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 35112] A section in writer document is not visible to AT-SPI.
https://bugs.freedesktop.org/show_bug.cgi?id=35112 --- Comment #7 from Dattatray Bhat bha...@gmail.com 2012-08-16 05:40:36 UTC --- The bug is real. I noticed it in version 3.3.0 and submitted it with a supporting screenshot. I reconfirmed that the bug exists with version 3.5.0 beta2. It falls in the same category as bugs 35105, 35107, 35110, 35111, 35129 which you have reopened and changed to NEW. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 37937] Saving file dialog, no warning about restricted chars in filename.
https://bugs.freedesktop.org/show_bug.cgi?id=37937 Urmas davian...@gmail.com changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME | --- Comment #7 from Urmas davian...@gmail.com 2012-08-16 05:52:22 UTC --- No, it doesn't. Try other characters than / and :. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 35652] ACC: AT-SPI accessible tree omits objects which are not visible on the screen.
https://bugs.freedesktop.org/show_bug.cgi?id=35652 --- Comment #12 from Dattatray Bhat bha...@gmail.com 2012-08-16 05:53:30 UTC --- The bug is real. I noticed it in version 3.3.0 and submitted it with a supporting screenshot. I reconfirmed that the bug exists with version 3.5.0 beta2. It falls in the same category as bugs 35105, 35107, 35110, 35111, 35129 which you have reopened and changed to NEW. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
