[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/outdev3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5551702b8dc3e9d06510ea7d12e6a25f35468a93
Author: Tor Lillqvist t...@iki.fi
Date: Thu Apr 4 08:13:44 2013 +0300
WaE: variable is uninitialized when used within its own initialization
Presumably aStr is intended here, not aTmpStr itself.
Change-Id: I9a887c33f89d519c17ee0156ba9cea55b465fe97
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 353a3be..0413cc0 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -6688,7 +6688,7 @@ OUString OutputDevice::ImplGetEllipsisString( const
OutputDevice rTargetDevice,
}
else if ( nStyle TEXT_DRAW_ENDELLIPSIS )
{
-OUString aTmpStr = aStr.replaceAt( nIndex,
aTmpStr.getLength()-nIndex, );
+OUString aTmpStr = aStr.replaceAt( nIndex,
aStr.getLength()-nIndex, );
if ( nIndex 1 )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/bastyp/helper.cxx | 12
1 file changed, 12 deletions(-)
New commits:
commit f935aa9d9cb6dde3dfd1b018c4b8938ff6c16183
Author: Tor Lillqvist t...@iki.fi
Date: Thu Apr 4 08:25:08 2013 +0300
WaE: unused function 'convertDateTime'
Change-Id: I6d36291f4381cc43782861ca1180b7fa7b11
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 444dda9..434d7a8 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -56,18 +56,6 @@ using ::std::vector;
using ::rtl::OStringToOUString;
-namespace {
-
-DateTime convertDateTime( const util::DateTime rUnoDT )
-{
-return DateTime( Date( rUnoDT.Day, rUnoDT.Month, rUnoDT.Year ),
- Time( rUnoDT.Hours, rUnoDT.Minutes, rUnoDT.Seconds,
rUnoDT.HundredthSeconds ) );
-}
-
-}
-
-// ---
-
std::vectorOUString SfxContentHelper::GetResultSet( const OUString rURL )
{
vectorOUString aList;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - solenv/bin
solenv/bin/modules/installer/ziplist.pm | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit f5c25c54d38e06e8fb5f36be043b9316da036bf9
Author: Andras Timar ati...@suse.com
Date: Wed Apr 3 23:43:13 2013 -0700
For Intel AppUp build hide the links in start center
Change-Id: I74e6757741ba9d8c8c494018e4bf3e4f638aa3f6
diff --git a/solenv/bin/modules/installer/ziplist.pm
b/solenv/bin/modules/installer/ziplist.pm
index c052e72..66c0688 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -104,6 +104,7 @@ sub read_ziplist {
set_default_productversion_if_required($allvariableshashref);
add_variables_to_allvariableshashref($allvariableshashref);
overwrite_branding( $allvariableshashref );
+startcenter_links_hide_or_not( $allvariableshashref );
return $allsettingsarrayref, $allvariableshashref;
}
@@ -833,6 +834,16 @@ sub overwrite_branding
}
###
+# For Intel AppUp build hide the links in start center
+###
+sub startcenter_links_hide_or_not
+{
+my ($variableshashref) = @_;
+$variableshashref-{'STARTCENTER_HIDE_EXTERNAL_LINKS'} = 1 , if( defined
$ENV{'ENABLE_SILENT_MSI'} $ENV{'ENABLE_SILENT_MSI'} eq TRUE );
+}
+
+
+###
# Adding the lowercase variables into the variableshashref
###
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - instsetoo_native/util readlicense_oo/eula readlicense_oo/Package_files.mk solenv/bin
instsetoo_native/util/openoffice.lst |2
readlicense_oo/Package_files.mk |2
readlicense_oo/eula/EULA_en-US.rtf| 210 ++
solenv/bin/modules/installer/windows/idtglobal.pm | 11 -
4 files changed, 222 insertions(+), 3 deletions(-)
New commits:
commit 7427902a403f2d13204463b9a4d43e82d1caa954
Author: Andras Timar ati...@suse.com
Date: Thu Apr 4 08:51:40 2013 +0200
[SUSE only] add EULA
Change-Id: I28b5e36d8e88dba2fa3a6f7cd66e25b3316ef42a
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 8f0e2aa..b08c40e 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -13,7 +13,7 @@ Globals
SERVICETAG_PARENTNAME LibreOffice 4.0
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
-HIDELICENSEDIALOG 1
+HIDELICENSEDIALOG 0
PACKAGEPREFIX
BASISPACKAGEPREFIX libobasis
UREPACKAGEPREFIX libreoffice
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index f3f146b..c992082 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -22,4 +22,6 @@ $(eval $(call
gb_Package_add_file,readlicense_oo_files,bin/CREDITS.odt,odt/CREDI
$(eval $(call
gb_Package_add_file,readlicense_oo_files,bin/LICENSE.html,html/LICENSE.html))
+$(eval $(call
gb_Package_add_file,readlicense_oo_files,bin/EULA_en-US.rtf,eula/EULA_en-US.rtf))
+
# vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/eula/EULA_en-US.rtf
b/readlicense_oo/eula/EULA_en-US.rtf
new file mode 100644
index 000..3e40a64
--- /dev/null
+++ b/readlicense_oo/eula/EULA_en-US.rtf
@@ -0,0 +1,210 @@
+{\rtf1\ansi\deff3\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New
Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0
Arial;}{\f3\froman\fprq2\fcharset0 Thorndale AMT{\*\falt Times New
Roman};}{\f4\froman\fprq0\fcharset1 Tahoma;}{\f5\froman\fprq2\fcharset1
Thorndale AMT{\*\falt Times New Roman};}{\f6\froman\fprq0\fcharset1 Thorndale
AMT{\*\falt Times New Roman};}{\f7\fswiss\fprq0\fcharset1 Albany AMT{\*\falt
Arial};}{\f8\fmodern\fprq0\fcharset1 Cumberland AMT{\*\falt Courier
New};}{\f9\froman\fprq2\fcharset1 Arial;}{\f10\froman\fprq0\fcharset1
Arial;}{\f11\fmodern\fprq0\fcharset1 Arial;}{\f12\fmodern\fprq0\fcharset1 Times
New Roman;}{\f13\froman\fprq2\fcharset1 Times New
Roman;}{\f14\froman\fprq0\fcharset1 Times New Roman;}{\f15\fnil\fprq0\fcharset1
Tahoma Cyr;}{\f16\fnil\fprq0\fcharset1 Tahoma Greek;}{\f17\fnil\fprq0\fcharset1
Tahoma Tur;}{\f18\fmodern\fprq0\fcharset1 Tahoma
(Hebrew);}{\f19\fnil\fprq2\fcharset1 SimSun;}{\f20\fnil\fprq2\fcharset1
Arial;}{\f21\fnil\fprq0\fcha
rset1 Arial;}{\f22\fnil\fprq2\fcharset1 Tahoma
(Hebrew);}{\f23\fnil\fprq0\fcharset1 Tahoma
(Hebrew);}{\f24\fnil\fprq2\fcharset1 Tahoma Greek;}{\f25\fnil\fprq0\fcharset1
Mangal;}{\f26\fnil\fprq2\fcharset1 Mangal;}{\f27\fnil\fprq2\fcharset1 Tahoma
Cyr;}}
+{\colortbl;\red0\green0\blue0;\red0\green0\blue128;\red128\green128\blue128;}
+{\stylesheet{\s0\snext0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af28\langfe2052\dbch\af29\afs24\alang1081\loch\f3\fs24\lang1046
Normal;}
+{\*\cs15\snext15\cf2\ul\ulc0\langfe255\alang255\lang255 Internet Link;}
+{\s16\sbasedon0\snext17\ql\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0\sb240\sa120\keepn\dbch\af17\langfe1033\dbch\af21\afs28\loch\f7\fs28\lang1033
Heading;}
+{\s17\sbasedon0\snext17\ql\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0\sb0\sa120\dbch\af16\langfe1033\dbch\af21\afs24\loch\f6\fs24\lang1033
Text body;}
+{\s18\sbasedon17\snext18\ql\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0\sb0\sa120\dbch\af16\langfe1033\dbch\af21\afs24\loch\f6\fs24\lang1033
List;}
+{\s19\sbasedon0\snext19\sb120\sa120\noline\i\dbch\af25\afs24\ai\fs24 Caption;}
+{\s20\sbasedon0\snext20\ql\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0\noline\dbch\af16\langfe1033\dbch\af21\afs24\loch\f6\fs24\lang1033
Index;}
+{\s21\snext21\ql\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0\sb120\sa120{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\i\dbch\af16\langfe1033\dbch\af21\afs24\ai\cf0\kerning1\alang1081\loch\f6\fs24\lang1033
caption;}
+{\s22\sbasedon0\snext22\ql\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0\sb0\sa0\dbch\af18\langfe1033\dbch\af18\afs20\loch\f8\fs20\lang1033
Preformatted Text;}
+{\s23\sbasedon0\snext23\ql\nowidctlpar\tqc\tx4986\tqr\tx9972\faauto\li0\ri0\lin0\rin0\fi0\noline\dbch\af16\langfe1033\dbch\af21\afs24\loch\f6\fs24\lang1033
Header;}
+{\s24\snext24\ql\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\dbch\af15\langfe1033\dbch\af21\afs16\cf0\kerning1\alang1081\loch\f4\fs16\lang1033
Balloon Text;}
+}{\info{\author Jami
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - setup_native/source
setup_native/source/packinfo/libreoffice.pcp |binary 1 file changed New commits: commit 872b56cd8315cc4ae9d9dfef129b1bbe7eb09b7f Author: Andras Timar ati...@suse.com Date: Thu Apr 4 09:17:03 2013 +0200 [SUSE only] update info fields of libreoffice.pcp Change-Id: I90a11006e375c8ad19b70177f250df95c94aecfc diff --git a/setup_native/source/packinfo/libreoffice.pcp b/setup_native/source/packinfo/libreoffice.pcp index 68c98c6..635e863 100644 Binary files a/setup_native/source/packinfo/libreoffice.pcp and b/setup_native/source/packinfo/libreoffice.pcp differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
yet another unit test framework? -- was fdo#55814: unit test is missing
[Moving this discussion to ML to have better visibility] with https://gerrit.libreoffice.org/#/c/3128/ we have support for unit tests written in python. (We have even found two bugs with it already ... and fixed). I am not going to provide the huge advantages of dynamic type languages in general here, but while python is very impressive it *is* truly read-write language compare to number of write-only languages, that used in LO ecosystem. Yes, it is probably true that you can not easily debug these unit tests. But is the debuggability the only argument here? I doubt it. We have logging framework and in the end one can still migrate python unit test to C++ (if needed) to debug it. Thanks David On Fri, 2013-03-22 at 10:58 +0100, Miklos Vajna wrote: Hi David, On Thu, Mar 21, 2013 at 10:42:27AM +0100, David Ostrovsky d.ostrov...@idaia.de wrote: And yes i am going to migrate it to C++ as you argued that it would be easier to debug then java. I wonder if it would make sense to establish Python_test machinery in our build system to be able to write such and many other tests in python instead and just say make Pytest_sw_complex instead of make JunitTest_sw_complex (python have got unittest module that we can start with)? Hmm, yes, I think that would be an improvement. As far as I understand, most of the Java tests have two difficulties: 1) A separate soffice process is started, then Java code connects to this, and executes tests. This is a bit slow, compred to the C++ unit tests, where we bootstap UNO ourselves + a bit painful to debug, as you have to run one process in gdb (listening on a socket) and an other process to trigger the problem. If do a 1:1 conversion of Java tests to Python, this will be still an issue. IMHO doing the C++ way for Python (running the tests in a single process) makes more sense. (Don't confuse these C++ tests with the various uwriter/ucalc/etc tests, which even have access to private library symbols.) 2) When a unit test fails, it's handy to step the unit test line-by-line in gdb to see exactly which line triggers an exception, etc. I imagine this only works if you write the test in C++, but even with basic or python, it should not be *that* bad, as we can have the interpreter with debug symbols, etc. I think in this second case even a 1:1 conversion from java to python would help a lot. And after all, be sure to talk to Markus, he's the testing expert, not me. :-) HTH, Miklos ___ 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: yet another unit test framework? -- was fdo#55814: unit test is missing
while python is very impressive it *is* truly read-write language compare to number of write-only languages, Could we please stop this childish language bigotry? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: yet another unit test framework? -- was fdo#55814: unit test is missing
I'm extremely grateful to anyone willing to work on improving our unit test infrastructure. However... On 2013-04-04 10:24, David Ostrovsky wrote: I am not going to provide the huge advantages of dynamic type languages in general here, but while python is very impressive it *is* truly read-write language compare to number of write-only languages, that used in LO ecosystem. Yes, it is probably true that you can not easily debug these unit tests. But is the debuggability the only argument here? I doubt it. We have Yes it very much is. I'm currently struggling with visibility into a failing unit test, and the dual Java/C++ nature of the unit test makes it incredibly hard for me to find the source of the problem. I am, with great joy, looking forward to the day when almost all of our unit tests are written in C++ so I don't have to jump through hoops when debugging. Besides, the C++ unit tests, thanks to the excellent frameworks we use, have very little extra verbiage compared to their python counterparts. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig sfx2/UI_sfx.mk
sfx2/UI_sfx.mk|1
sfx2/source/appl/app.hrc | 10
sfx2/source/appl/app.src | 55
sfx2/source/appl/appserv.cxx | 52 --
sfx2/uiconfig/ui/licensedialog.ui | 87 ++
5 files changed, 90 insertions(+), 115 deletions(-)
New commits:
commit 26f33b9c61d5b050b398a69a83d4f99fe9c228f5
Author: Caolán McNamara caol...@redhat.com
Date: Wed Apr 3 20:33:10 2013 +0100
convert license dialog to .ui format
Change-Id: Icbcb2a86369c95f9acff05d677a4f5eaa1d9dfb9
diff --git a/sfx2/UI_sfx.mk b/sfx2/UI_sfx.mk
index da23f43..0b59c7f 100644
--- a/sfx2/UI_sfx.mk
+++ b/sfx2/UI_sfx.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UI_add_uifiles,sfx,\
sfx2/uiconfig/ui/descriptioninfopage \
sfx2/uiconfig/ui/documentinfopage \
sfx2/uiconfig/ui/documentpropertiesdialog \
+ sfx2/uiconfig/ui/licensedialog \
sfx2/uiconfig/ui/managestylepage \
sfx2/uiconfig/ui/optprintpage \
sfx2/uiconfig/ui/password \
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 899324f..6a5a97c 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -132,16 +132,6 @@
#define RID_SVXSTR_GRFILTER_FILTERERROR (RID_SFX_APP_START + 202)
#define RID_SVXSTR_GRFILTER_TOOBIG (RID_SFX_APP_START + 203)
-// For the License Information dialog box
-#define DLG_HELP_LICENSING (RID_SFX_APP_START + 204)
-#define STR_LICENSING_INFORMATION_1 (RID_SFX_APP_START + 205)
-#define STR_LICENSING_INFORMATION_2 (RID_SFX_APP_START + 206)
-#define STR_LICENSING_INFORMATION_3 (RID_SFX_APP_START + 207)
-#define STR_LICENSING_INFORMATION_4 (RID_SFX_APP_START + 208)
-#define STR_LICENSING_INFORMATION_5 (RID_SFX_APP_START + 209)
-#define PB_LICENSING_SHOW (RID_SFX_APP_START + 210)
-#define PB_LICENSING_CLOSE (RID_SFX_APP_START + 211)
-
#define RID_SVXSTR_END_REDLINING_WARNING(RID_SFX_APP_START + 212)
#define RID_SVXSTR_INCORRECT_PASSWORD (RID_SFX_APP_START + 213)
#define RID_SVXSTR_FORWARD_ERRMSSG (RID_SFX_APP_START + 214)
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index c05081e..d105a70 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -508,59 +508,4 @@ String RID_SVXSTR_FORWARD_ERRMSSG
Text [ en-US ] = If you select the option \%PLACEHOLDER%\, you must
enter a URL. ;
};
-ModalDialog DLG_HELP_LICENSING
-{
-// Size is computed
-Text [ en-US ] = Licensing and Legal information;
-MOVEABLE = TRUE ;
-CLOSEABLE = TRUE ;
-OUTPUTSIZE = TRUE ;
-SVLOOK = TRUE ;
-String STR_LICENSING_INFORMATION_1
-{
-Text [ en-US ] =
-%PRODUCTNAME is made available subject to the terms of GNU Lesser
General Public\n
-License Version 3. A copy of the LGPL license can be found at\n
-http://www.gnu.org/licenses/lgpl-3.0.html; ;
-};
-String STR_LICENSING_INFORMATION_2
-{
-Text [ en-US ] =
-Third Party Code Additional copyright notices and license terms
applicable to\n
-portions of the Software are set forth in the LICENSE.html\n
-file; choose Show License to see exact details in English. ;
-};
-String STR_LICENSING_INFORMATION_3
-{
-Text [ en-US ] =
-All trademarks and registered trademarks mentioned herein are the
property of\n
-their respective owners. ;
-};
-String STR_LICENSING_INFORMATION_4
-{
-Text [ en-US ] =
-Copyright © 2000, 2013 LibreOffice contributors and/or their
affiliates. All rights\n
-reserved. ;
-};
-String STR_LICENSING_INFORMATION_5
-{
-Text [ en-US ] =
-This product was created by %OOOVENDOR, based on
OpenOffice.org,\n
-which is Copyright 2000, 2011 Oracle and/or its affiliates.\n
-%OOOVENDOR acknowledges all community members, please see\n
-http://www.libreoffice.org/ for more details. ;
-};
-OKButton PB_LICENSING_SHOW
-{
-// Position and size is computed
-Text [ en-US ] = ~Show License ;
-DefButton = TRUE ;
-};
-CancelButton PB_LICENSING_CLOSE
-{
-// Position and size is computed
-Text [ en-US ] = ~Close ;
-};
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index f845a05..d631b7b 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -229,61 +229,15 @@ namespace
class LicenseDialog : public ModalDialog
{
private:
-FixedText aText;
-OKButton aShow;
-CancelButton aClose;
-
-DECL_LINK(CancelHdl, void *);
DECL_LINK(ShowHdl, void
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c7fc3865684be4c5a41c7bdc671e4c6b56c250ab Author: Andras Timar ati...@suse.com Date: Thu Apr 4 10:08:49 2013 +0200 Updated core Project: help 239b55253ecf3cb52b613d948a1d090bf8d3dc43 diff --git a/helpcontent2 b/helpcontent2 index 20791d4..239b552 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 20791d487f493ddd008553e9970a622362ca546c +Subproject commit 239b55253ecf3cb52b613d948a1d090bf8d3dc43 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: to-wiki/wikiconv2.py
to-wiki/wikiconv2.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 239b55253ecf3cb52b613d948a1d090bf8d3dc43
Author: Andras Timar ati...@suse.com
Date: Thu Apr 4 10:08:49 2013 +0200
typo: Curren-Current
Change-Id: I2724ac6f84917303a284217046afefd0d3b8e75e
diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py
index 0e3bb5b..38df61f 100755
--- a/to-wiki/wikiconv2.py
+++ b/to-wiki/wikiconv2.py
@@ -1271,7 +1271,7 @@ class ParserBase:
paragraph, text.encode('utf-8'))
except xml.parsers.expat.ExpatError:
sys.stderr.write( 'Invalid XML in translated text. Using the
original text. Error location:\n'\
- + 'Curren xhp: ' + self.filename +
'\nParagraph id: ' + attrs['id'] + '\n')
+ + 'Current xhp: ' + self.filename +
'\nParagraph id: ' + attrs['id'] + '\n')
obj.parse_child(Paragraph_type(attrs, obj)) # new paragraph
must be created because paragraph is corrupted by ParserBase
else:
# add it to the overall structure
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] fdo#51916 don't try to support nested tables having table st...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3199
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/3199/1
fdo#51916 don't try to support nested tables having table styles for now
Also fix an out of bounds substring access, triggered by the same bugdoc.
(cherry picked from commits 7a7d77f97b61ae7f602ed403ecfbbcdb03a06c00,
7006ef460bb68d27a74381fab7b8826b786b31c6 and
008275d56f9ac5248f0e94f606671b4c1993ca20)
Change-Id: I7db46ef17b8aed443faa7eb0c13b6ba109242cc1
---
A sw/qa/extras/rtfimport/data/fdo51916.rtf
M sw/qa/extras/rtfimport/rtfimport.cxx
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
M writerfilter/source/rtftok/rtfdocumentimpl.hxx
4 files changed, 345 insertions(+), 5 deletions(-)
diff --git a/sw/qa/extras/rtfimport/data/fdo51916.rtf
b/sw/qa/extras/rtfimport/data/fdo51916.rtf
new file mode 100644
index 000..b2359c3
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo51916.rtf
@@ -0,0 +1,319 @@
+{\rtf1
+{\fonttbl
+{\f0\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\f34\fbidi \froman\fcharset238\fprq2
+{\*\panose 02040503050406030204}
+Cambria Math;}
+{\f37\fbidi \fswiss\fcharset238\fprq2
+{\*\panose 020f0502020204030204}
+Calibri
+{\*\falt Century Gothic}
+;}
+{\f38\fbidi \fswiss\fcharset238\fprq2
+{\*\panose 020b0604030504040204}
+Tahoma;}
+{\flomajor\f31500\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\fdbmajor\f31501\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\fhimajor\f31502\fbidi \froman\fcharset238\fprq2
+{\*\panose 02040503050406030204}
+Cambria;}
+{\fbimajor\f31503\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\flominor\f31504\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\fdbminor\f31505\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\fhiminor\f31506\fbidi \fswiss\fcharset238\fprq2
+{\*\panose 020f0502020204030204}
+Calibri
+{\*\falt Century Gothic}
+;}
+{\fbiminor\f31507\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\f297\fbidi \froman\fcharset0\fprq2 Times New Roman;}
+{\f296\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\f298\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\f299\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\f300\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\f301\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\f302\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\f303\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\f637\fbidi \froman\fcharset0\fprq2 Cambria Math;}
+{\f636\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}
+{\f638\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}
+{\f639\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}
+{\f642\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}
+{\f643\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}
+{\f667\fbidi \fswiss\fcharset0\fprq2 Calibri
+{\*\falt Century Gothic}
+;}
+{\f666\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr
+{\*\falt Century Gothic}
+;}
+{\f668\fbidi \fswiss\fcharset161\fprq2 Calibri Greek
+{\*\falt Century Gothic}
+;}
+{\f669\fbidi \fswiss\fcharset162\fprq2 Calibri Tur
+{\*\falt Century Gothic}
+;}
+{\f672\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic
+{\*\falt Century Gothic}
+;}
+{\f673\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese)
+{\*\falt Century Gothic}
+;}
+{\f677\fbidi \fswiss\fcharset0\fprq2 Tahoma;}
+{\f676\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr;}
+{\f679\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur;}
+{\flomajor\f31510\fbidi \froman\fcharset0\fprq2 Times New Roman;}
+{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman
(Vietnamese);}
+{\fdbmajor\f31520\fbidi \froman\fcharset0\fprq2 Times New Roman;}
+{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman
(Vietnamese);}
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a7137727bd643c9b52d3eaf0c858ee6e7e7a57f2 Author: Andras Timar ati...@suse.com Date: Thu Apr 4 10:15:47 2013 +0200 Updated core Project: help d0095f62f7de2e56513dbf97e9b21c2e321f1971 diff --git a/helpcontent2 b/helpcontent2 index 239b552..d0095f6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 239b55253ecf3cb52b613d948a1d090bf8d3dc43 +Subproject commit d0095f62f7de2e56513dbf97e9b21c2e321f1971 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/schart/01/smooth_line_properties.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d0095f62f7de2e56513dbf97e9b21c2e321f1971 Author: Andras Timar ati...@suse.com Date: Thu Apr 4 10:15:47 2013 +0200 fixed bookmarks Change-Id: I0bb790744e6cc66776143aaecfc3f3aaa73f8736 diff --git a/source/text/schart/01/smooth_line_properties.xhp b/source/text/schart/01/smooth_line_properties.xhp index 8a2627e..f614391 100644 --- a/source/text/schart/01/smooth_line_properties.xhp +++ b/source/text/schart/01/smooth_line_properties.xhp @@ -31,10 +31,10 @@ /history /meta body -bookmark xml-lang=en-US branch=index id=bm_id3803827bookmark_valuecurves;properties in line charts/XY charts/bookmark_value bookmark xml-lang=en-US branch=hid/modules/schart/ui/smoothlinesdlg/SmoothLinesDialog id=bm_id1593677 localize=false/ +bookmark xml-lang=en-US branch=index id=bm_id3803827bookmark_valuecurves;properties in line charts/XY charts/bookmark_value bookmark_valueproperties;smooth lines in line charts/XY charts/bookmark_value -/bookmarkcommentmw added two entries/comment +/bookmark paragraph role=heading id=hd_id3050325 xml-lang=en-US level=1 l10n=NEWSmooth Line Properties/paragraph paragraph role=paragraph id=par_id9421979 xml-lang=en-US l10n=NEWIn a chart that displays lines (Line type or XY type), you can choose to show curves instead of straight lines. Some options control the properties of those curves.commentmost possibly these curves are not Bezier curves./comment/paragraph section id=howtoget ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/core/docnode/ndtbl.cxx | 38 +-
1 file changed, 21 insertions(+), 17 deletions(-)
New commits:
commit 11f9cdc2e273a827dfe29316de6f679077ee6a59
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Apr 3 11:49:38 2013 +0200
fdo#32082: Do not reset number format in table cells on edit.
When we changed the default to _not_ to recognize the number formats in
table
cells (commit 334c34e4ec803c65e43abf20edbc6faf7fa95e76), it caused that any
edit of a number formatted cell had reset it to text on edit.
This was quite unexpected, because when eg. there was a number that
contributed
to a sum, and it changed to text, the sum changed as if there was a '0'
there.
To solve this, try hard to retain the number format regardless of the
'Recognize Number Formats' setting when there was a number formatting
assigned
to the cell.
Change-Id: Ib43e0877420d90cdac7a0357d1ef3a549c866fb7
Reviewed-on: https://gerrit.libreoffice.org/3187
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 08b710a..df85ebc 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -4022,31 +4022,35 @@ void SwDoc::ChkBoxNumFmt( SwTableBox rBox, sal_Bool
bCallUpdate )
SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rBox.GetFrmFmt();
SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT,
RES_BOXATR_VALUE );
-sal_Bool bSetNumFmt = IsInsTblFormatNum();
sal_Bool bLockModify = sal_True;
+sal_Bool bSetNumFmt = sal_False;
+const bool bForceNumberFormat = IsInsTblFormatNum()
IsInsTblChangeNumFormat();
-if( bSetNumFmt !IsInsTblChangeNumFormat() )
+// if the user forced a number format in this cell previously,
+// keep it, unless the user set that she wants the full number
+// format recognition
+if( pNumFmtItem !bForceNumberFormat )
{
-if( !pNumFmtItem )
-bSetNumFmt = sal_False;
+sal_uLong nOldNumFmt =
((SwTblBoxNumFormat*)pNumFmtItem)-GetValue();
+SvNumberFormatter* pNumFmtr = GetNumberFormatter();
+
+short nFmtType = pNumFmtr-GetType( nFmtIdx );
+if( nFmtType == pNumFmtr-GetType( nOldNumFmt ) ||
NUMBERFORMAT_NUMBER == nFmtType )
+{
+// Current and specified NumFormat match
+// - keep old Format
+nFmtIdx = nOldNumFmt;
+bSetNumFmt = sal_True;
+}
else
{
-sal_uLong nOldNumFmt =
((SwTblBoxNumFormat*)pNumFmtItem)-GetValue();
-SvNumberFormatter* pNumFmtr = GetNumberFormatter();
-
-short nFmtType = pNumFmtr-GetType( nFmtIdx );
-if( nFmtType == pNumFmtr-GetType( nOldNumFmt ) ||
NUMBERFORMAT_NUMBER == nFmtType )
-// Current and specified NumFormat match
-// - keep old Format
-nFmtIdx = nOldNumFmt;
-else
-// Current and specified NumFormat do not match
-// - insert as Text
-bLockModify = bSetNumFmt = sal_False;
+// Current and specified NumFormat do not match
+// - insert as Text
+bLockModify = bSetNumFmt = sal_False;
}
}
-if( bSetNumFmt )
+if( bSetNumFmt || bForceNumberFormat )
{
pBoxFmt = (SwTableBoxFmt*)rBox.ClaimFrmFmt();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#32082: Do not reset number format in table cells on edit...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3187 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3187 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib43e0877420d90cdac7a0357d1ef3a549c866fb7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Jan Holesovsky ke...@suse.cz Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - basic/source vcl/aqua vcl/headless vcl/inc vcl/Library_vcl.mk vcl/Package_inc.mk vcl/source vcl/unx vcl/win
basic/source/runtime/methods.cxx|2 +
vcl/Library_vcl.mk |1
vcl/Package_inc.mk |1
vcl/aqua/source/window/salframe.cxx |7 ++
vcl/headless/svpframe.cxx |4 +++
vcl/inc/aqua/salframe.h |1
vcl/inc/headless/svpframe.hxx |7 +++---
vcl/inc/salframe.hxx|2 +
vcl/inc/unx/gtk/gtkframe.hxx|2 +
vcl/inc/unx/saldisp.hxx |2 +
vcl/inc/unx/salframe.h |1
vcl/inc/vcl/sound.hxx | 39 +++
vcl/inc/win/salframe.h |1
vcl/source/app/sound.cxx| 40
vcl/unx/generic/app/saldisp.cxx |6 +
vcl/unx/generic/window/salframe.cxx |6 +
vcl/unx/gtk/window/gtkframe.cxx |5
vcl/win/source/window/salframe.cxx |8 +++
18 files changed, 132 insertions(+), 3 deletions(-)
New commits:
commit b2ace6a294e2ce2171e3911a6f8a2ed7d8de4812
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Mar 30 14:55:24 2013 +0100
fdo#58807 bring Beep() for basic back
The functionality was removed by fdo#48549.
This partially reverts
0f6101cfef4c2e45d9f1f1b3a61ef94799e4526b
0bdf6fc7c71c4c49e6d6f83d56ac953272ad16d5
85cb9084533605657aca0394afe4516058a8e4ef
I changed the behavior to always beep, because only the basic macro
function is using Beep(). Looks like the Beep macro function didn't
even work correctly before the removal, because the default was to
not beep for most platforms. So I set the volume from disable (0)
to 50% for XBell().
Reviewed-on: https://gerrit.libreoffice.org/3124
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
(cherry picked from commit 47664d3f2e12649d324b031ca6ffd5589fe3d197)
Conflicts:
vcl/inc/headless/svpframe.hxx
Change-Id: I663ffb7af75d2fd6d2c1f94073e4412d9744de4a
Reviewed-on: https://gerrit.libreoffice.org/3185
Tested-by: Thomas Arnhold tho...@arnhold.org
Reviewed-by: Miklos Vajna vmik...@suse.cz
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index e09f447..858f844 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -22,6 +22,7 @@
#include osl/process.h
#include vcl/svapp.hxx
#include vcl/settings.hxx
+#include vcl/sound.hxx
#include tools/wintypes.hxx
#include vcl/msgbox.hxx
#include basic/sbx.hxx
@@ -4215,6 +4216,7 @@ RTLFUNC(Beep)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
+Sound::Beep();
}
RTLFUNC(Load)
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a05e39b..8f12d2c 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -117,6 +117,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/app/session \
vcl/source/app/settings \
vcl/source/app/solarmutex \
+vcl/source/app/sound \
vcl/source/app/stdtext \
vcl/source/app/svapp \
vcl/source/app/svdata \
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index 53a7326..48d996d 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -126,6 +126,7 @@ $(eval $(call
gb_Package_add_file,vcl_inc,inc/vcl/seleng.hxx,vcl/seleng.hxx))
$(eval $(call
gb_Package_add_file,vcl_inc,inc/vcl/settings.hxx,vcl/settings.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/slider.hxx,vcl/slider.hxx))
$(eval $(call
gb_Package_add_file,vcl_inc,inc/vcl/solarmutex.hxx,vcl/solarmutex.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sound.hxx,vcl/sound.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spinfld.hxx,vcl/spinfld.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.h,vcl/spin.h))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.hxx,vcl/spin.hxx))
diff --git a/vcl/aqua/source/window/salframe.cxx
b/vcl/aqua/source/window/salframe.cxx
index d2e616c..12cbb91 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1339,6 +1339,13 @@ const SystemEnvData* AquaSalFrame::GetSystemData() const
// ---
+void AquaSalFrame::Beep()
+{
+NSBeep();
+}
+
+// ---
+
void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight,
sal_uInt16 nFlags)
{
if ( !mpWindow )
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 0d4e466..5827d51 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -419,6 +419,10 @@ void SvpSalFrame::UpdateSettings( AllSettings )
{
}
+void SvpSalFrame::Beep()
+{
+}
+
const SystemEnvData* SvpSalFrame::GetSystemData() const
{
return m_aSystemChildData;
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h
index e6dcde3..39d9496
Re: yet another unit test framework? -- was fdo#55814: unit test is missing
David Ostrovsky wrote: with https://gerrit.libreoffice.org/#/c/3128/ we have support for unit tests written in python. (We have even found two bugs with it already ... and fixed). I like it, because it probably increases the number of people able to write unit tests. I dislike it, since as you admit yourself it makes debugging a failing test a possibly frustrating experience. Then again, turning a working python test into a working C++ one is probably a rather mechanical EasyHack. Therefore, a net benefit in my mind. Out of curiosity, was that sparked by the Python test discussion at the Impress Sprint? Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#58807 bring Beep() for basic back
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3185 Approvals: Miklos Vajna: Looks good to me, approved Thomas Arnhold: Verified -- To view, visit https://gerrit.libreoffice.org/3185 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I663ffb7af75d2fd6d2c1f94073e4412d9744de4a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a672c2fd726a80483a271624a5bf592080bf0b7c Author: Andras Timar ati...@suse.com Date: Tue Feb 5 10:48:29 2013 +0100 Updated core Project: help db63c79388f2039dd39b292f0ef037b8fc21cdae diff --git a/helpcontent2 b/helpcontent2 index 7dded42..db63c79 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7dded42472968783f5c90a0aa9e497ee3dfb247f +Subproject commit db63c79388f2039dd39b292f0ef037b8fc21cdae ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-4-0' - source/text
source/text/shared/guide/redlining_navigation.xhp |2 -- 1 file changed, 2 deletions(-) New commits: commit db63c79388f2039dd39b292f0ef037b8fc21cdae Author: Andras Timar ati...@suse.com Date: Tue Feb 5 10:48:29 2013 +0100 remove unnecessary section /section pair Change-Id: I0cc3c32b782921afd29718eece64e57975fbea16 Signed-off-by: Andras Timar ati...@suse.com diff --git a/source/text/shared/guide/redlining_navigation.xhp b/source/text/shared/guide/redlining_navigation.xhp index 686e48c..7682f0b 100644 --- a/source/text/shared/guide/redlining_navigation.xhp +++ b/source/text/shared/guide/redlining_navigation.xhp @@ -24,7 +24,6 @@ bookmark_valuereview function; navigating changes/bookmark_value /bookmark paragraph id=par_id3153880 role=heading xml-lang=en-US level=1variable id=redlining_navigationlink href=text/shared/guide/redlining_navigation.xhp name=Navigating ChangesNavigating Changes/link/variable/paragraph -section paragraph id=par_id3153881 role=note xml-lang=en-USThis feature is Writer-specific./paragraph paragraph id=par_id3153882 role=paragraph xml-lang=en-USThere are two available commands to navigate changes in a Writer document:/paragraph list type=unordered @@ -38,7 +37,6 @@ /listitem /list paragraph id=par_id3153885 role=paragraph xml-lang=en-USUsing these commands in conjunction with the emphAccept Change/emph and emphReject Change/emph commands allows navigating, accepting and rejecting changes without invoking the emphEdit - Changes - Accept or Reject/emph dialog./paragraph -/section section id=relatedtopics embed href=text/shared/guide/redlining.xhp#redlining/ embed href=text/shared/guide/redlining_accept.xhp#redlining_accept/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: yet another unit test framework? -- was fdo#55814: unit test is missing
On Thu, Apr 04, 2013 at 09:37:51AM +0200, Noel Grandin wrote: Yes, it is probably true that you can not easily debug these unit tests. But is the debuggability the only argument here? I doubt it. We have Yes it very much is. I'm currently struggling with visibility into a failing unit test, and the dual Java/C++ nature of the unit test makes it incredibly hard for me to find the source of the problem. Well, IMHO the main problem with the unoapi tests wrt this is that they 'centralized' a lot of the expectations on the UNO-Api -- which made them hard to quickly rewrite in C++. THe complex tests should not have this issue. Other than that, IMHO this is mostly a false dilemma -- not everyone who might write Python tests would write C++ tests. If this leads to more reliable tests of any kind, which will turn into tests of the C++ kind when they first fail, Im all for it. A side issue: As I wrote in: http://skyfromme.wordpress.com/2013/03/19/autopkgtests-for-adults/ I enabled running the (Java) tests against a version installed into the system -- which is better than testing against a version not into the system, so I would love to keep that ability when we get more C++ tests (for Python tests I assume that to be trivial). @moggi: As I havent looked into that yet -- would you see any blockers there? Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: yet another unit test framework? -- was fdo#55814: unit test is missing
2013/4/4 David Ostrovsky d.ostrov...@gmx.de [Moving this discussion to ML to have better visibility] with https://gerrit.libreoffice.org/#/c/3128/ we have support for unit tests written in python. (We have even found two bugs with it already ... and fixed). I am not going to provide the huge advantages of dynamic type languages in general here, but while python is very impressive it *is* truly read-write language compare to number of write-only languages, that used in LO ecosystem. Do we really want to start a discussion on this level? Yes, it is probably true that you can not easily debug these unit tests. But is the debuggability the only argument here? I doubt it. We have logging framework and in the end one can still migrate python unit test to C++ (if needed) to debug it. Yes debugging is the main argument for maintainability of our tests. While it has not the nicest syntax it is at least easy for the person debugging a failing test. And often (just according to math) the person debugging a failing unit test is not the one who wrote it so the argument rewrite it when you need to debug it is a bit lame. IMO even debugging the c++ should be easier as we can see with random people running into test failures that the common advice is to disable the test instead of debugging it. I fear that we see this effect much more in the python tests as more people will follow that path when a test randomly fails (and yes every test will fail randomly at some point on a strange platform). To some degree we have the same problem in c++ but until now we were able to limit this behavior mainly to disabled test cases for BSD. Also I'm not the biggest fan of the argumentation that it allows more people to write unit tests. I still believe that tests are mainly written after a bug has been fixed which means that the developer knows at least a bit of C++ and with the existing testing infrastructure adding a test case to one of the existing tests is hopefully easy enough. If it is not we should work on making it easier to write the C++ based test. Additionally an example out of Calc/Impress that the argumentation make writing test easier and magically people will show up writing them is not true: We have for Calc and Impress existing test frameworks that require no coding from the person writing the test and I had exactly two persons after long advocating at conferences who contributed one test case to Calc. I'll stop here because I think I made my point but I have a few other arguments. Personally I'm against python based tests especially if they are out-of-process but as long as someone agrees to maintain them (that also means that this person must feel responsible when a test fails in some rare circumstances and nobody else cares) I can live with them. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: yet another unit test framework? -- was fdo#55814: unit test is missing
On 2013-04-04 10:53, Bjoern Michaelsen wrote: Well, IMHO the main problem with the unoapi tests wrt this is that they 'centralized' a lot of the expectations on the UNO-Api -- which made them hard to quickly rewrite in C++. If this leads to more reliable tests of any kind, which will turn into tests of the C++ kind when they first fail, Im all for it. These two statements are mutually contradictory. Either Java/Python unit tests are easy to convert to C++, or they are not, you can't have it both ways :-) Besides, LO is a C++ program - if you can already code in C++, why would you want to switch to a different language to write a unit test? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Bug 42796 - Macro assigned to dataform Before Unload or While Unloading events are not called when form container is closed
Hi Alex, mcmurchy1917-libreoff...@yahoo.co.uk píše v St 27. 03. 2013 v 09:46 +: I've fallen foul of this bug in recent days so have decided to have a look at it to see if I can provide a patch. Thank you for the offer of help! :-) Unfortunately this is not familiar to me, so I would have to debug that myself first to find out what is going on. But I'm CCing Noel and Lionel - macros are Noel's area, and databases Lionel's; hopefully they will be able to show you the direction. It's been around since November 2011 so possibly no one's looked at it recently. In the bug report it was confirmed that a macro assigned to either the Before Unloading or When Unloading events of a dataform are not called when the form document is closed. However, when editing a form and the Design Mode option is toggled the events are called. Also the events when the form is loaded are called under all circumstances. So hopefully here should be enough clues there to provide a solution. As I haven't provided a patch for a couple of year might take me some time to get back into the swing of things. If anyone has any suggestions as to where to look fist it would be gratefully appreciated. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aebfef8d6ef893655739501c663b9fd6e57b985e Author: Andras Timar ati...@suse.com Date: Thu Apr 4 11:12:25 2013 +0200 Updated core Project: help 4e639b52e7cb790a048586490546fb76c89539ab diff --git a/helpcontent2 b/helpcontent2 index d0095f6..4e639b5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d0095f62f7de2e56513dbf97e9b21c2e321f1971 +Subproject commit 4e639b52e7cb790a048586490546fb76c89539ab ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help-to-wiki.py
help-to-wiki.py |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 4e639b52e7cb790a048586490546fb76c89539ab Author: Andras Timar ati...@suse.com Date: Thu Apr 4 11:12:25 2013 +0200 add more languages to WikiHelp Change-Id: I4210f948f464b9f7e4eebe9bf92f9f94ee691d8b diff --git a/help-to-wiki.py b/help-to-wiki.py index 0ee17ba..706e85f 100755 --- a/help-to-wiki.py +++ b/help-to-wiki.py @@ -60,9 +60,10 @@ def create_wiki_dirs(): except: pass -# Langs to handle -langs = ['', 'ca', 'cs', 'da', 'de', 'es', 'fr', 'hu', \ - 'it', 'ja', 'ko', 'nl', 'pl', 'pt', 'pt-BR', 'ru', \ +# Langs to handle (fully translated or otherwise important) +langs = ['', 'ast', 'bg', 'bn', bn_IN', 'ca', 'cs', 'da', 'de', \ + 'el', 'es', 'eu', 'fi', 'fr', 'hu', 'it', 'ja', 'km', \ + 'ko', 'nb', 'nl', 'om', 'pl', 'pt', 'pt-BR', 'ru', \ 'sl', 'sv', 'tr', 'vi', 'zh-CN', 'zh-TW' ] # Argument handling ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] add more languages to WikiHelp
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3200 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/00/3200/1 add more languages to WikiHelp Change-Id: I4210f948f464b9f7e4eebe9bf92f9f94ee691d8b --- M help-to-wiki.py 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/help-to-wiki.py b/help-to-wiki.py index 0ee17ba..706e85f 100755 --- a/help-to-wiki.py +++ b/help-to-wiki.py @@ -60,9 +60,10 @@ except: pass -# Langs to handle -langs = ['', 'ca', 'cs', 'da', 'de', 'es', 'fr', 'hu', \ - 'it', 'ja', 'ko', 'nl', 'pl', 'pt', 'pt-BR', 'ru', \ +# Langs to handle (fully translated or otherwise important) +langs = ['', 'ast', 'bg', 'bn', bn_IN', 'ca', 'cs', 'da', 'de', \ + 'el', 'es', 'eu', 'fi', 'fr', 'hu', 'it', 'ja', 'km', \ + 'ko', 'nb', 'nl', 'om', 'pl', 'pt', 'pt-BR', 'ru', \ 'sl', 'sv', 'tr', 'vi', 'zh-CN', 'zh-TW' ] # Argument handling -- To view, visit https://gerrit.libreoffice.org/3200 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4210f948f464b9f7e4eebe9bf92f9f94ee691d8b Gerrit-PatchSet: 1 Gerrit-Project: help Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - i18npool/source
i18npool/source/localedata/data/es_PE.xml | 36 +++--- 1 file changed, 18 insertions(+), 18 deletions(-) New commits: commit be46a7db926c281a5409dd213716fd3ade344255 Author: Eike Rathke er...@redhat.com Date: Wed Apr 3 22:47:42 2013 +0200 decimal and group separators were swapped See also https://ssl.icu-project.org/icu-bin/locexp?d_=en_=es_PE Change-Id: I67ca6f1a7a721b308092f20eaab238f5a8f45061 (cherry picked from commit bd4b06fcd84c0f7f3ad82c1a3fe7f91740c5c3c5) Reviewed-on: https://gerrit.libreoffice.org/3194 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/i18npool/source/localedata/data/es_PE.xml b/i18npool/source/localedata/data/es_PE.xml index 2f75eb7..a0a9bc4 100644 --- a/i18npool/source/localedata/data/es_PE.xml +++ b/i18npool/source/localedata/data/es_PE.xml @@ -34,10 +34,10 @@ LC_CTYPE unoid=generic Separators DateSeparator//DateSeparator - ThousandSeparator./ThousandSeparator - DecimalSeparator,/DecimalSeparator + ThousandSeparator,/ThousandSeparator + DecimalSeparator./DecimalSeparator TimeSeparator:/TimeSeparator - Time100SecSeparator,/Time100SecSeparator + Time100SecSeparator./Time100SecSeparator ListSeparator;/ListSeparator LongDateDayOfWeekSeparator /LongDateDayOfWeekSeparator LongDateDaySeparator de /LongDateDaySeparator @@ -136,10 +136,10 @@ FormatCode[HH]:MM:SS/FormatCode /FormatElement FormatElement msgid=TimeFormatskey6 default=false type=short usage=TIME formatindex=44 - FormatCodeMM:SS,00/FormatCode + FormatCodeMM:SS.00/FormatCode /FormatElement FormatElement msgid=TimeFormatskey7 default=false type=medium usage=TIME formatindex=45 - FormatCode[HH]:MM:SS,00/FormatCode + FormatCode[HH]:MM:SS.00/FormatCode /FormatElement FormatElement msgid=DateTimeFormatskey1 default=true type=medium usage=DATE_TIME formatindex=46 FormatCodeDD/MM/AA HH:MM/FormatCode @@ -154,46 +154,46 @@ FormatCode0/FormatCode /FormatElement FormatElement msgid=FixedFormatskey3 default=false type=medium usage=FIXED_NUMBER formatindex=2 - FormatCode0,00/FormatCode + FormatCode0.00/FormatCode /FormatElement FormatElement msgid=FixedFormatskey4 default=false type=short usage=FIXED_NUMBER formatindex=3 - FormatCode#.##0/FormatCode + FormatCode#,##0/FormatCode /FormatElement FormatElement msgid=FixedFormatskey5 default=false type=medium usage=FIXED_NUMBER formatindex=4 - FormatCode#.##0,00/FormatCode + FormatCode#,##0.00/FormatCode /FormatElement FormatElement msgid=FixedFormatskey6 default=false type=medium usage=FIXED_NUMBER formatindex=5 - FormatCode#.###,00/FormatCode + FormatCode#,###.00/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey1 default=true type=short usage=CURRENCY formatindex=12 - FormatCode[CURRENCY]#.##0;[CURRENCY]-#.##0/FormatCode + FormatCode[CURRENCY]#,##0;[CURRENCY]-#,##0/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey2 default=false type=medium usage=CURRENCY formatindex=13 - FormatCode[CURRENCY]#.##0,00;[CURRENCY]-#.##0,00/FormatCode + FormatCode[CURRENCY]#,##0.00;[CURRENCY]-#,##0.00/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey3 default=false type=medium usage=CURRENCY formatindex=14 - FormatCode[CURRENCY]#.##0;[RED][CURRENCY]-#.##0/FormatCode + FormatCode[CURRENCY]#,##0;[RED][CURRENCY]-#,##0/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey4 default=true type=medium usage=CURRENCY formatindex=15 - FormatCode[CURRENCY]#.##0,00;[RED][CURRENCY]-#.##0,00/FormatCode + FormatCode[CURRENCY]#,##0.00;[RED][CURRENCY]-#,##0.00/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey5 default=false type=medium usage=CURRENCY formatindex=16 - FormatCode#.##0,00 CCC/FormatCode + FormatCode#,##0.00 CCC/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey6 default=false type=medium usage=CURRENCY formatindex=17 - FormatCode[CURRENCY]#.##0,--;[RED][CURRENCY]-#.##0,--/FormatCode + FormatCode[CURRENCY]#,##0.--;[RED][CURRENCY]-#,##0.--/FormatCode /FormatElement FormatElement msgid=PercentFormatskey1 default=true type=short usage=PERCENT_NUMBER formatindex=8 FormatCode0%/FormatCode /FormatElement FormatElement msgid=PercentFormatskey2 default=true type=long usage=PERCENT_NUMBER formatindex=9 - FormatCode0,00%/FormatCode + FormatCode0.00%/FormatCode /FormatElement FormatElement msgid=ScientificFormatskey1 default=true type=medium usage=SCIENTIFIC_NUMBER formatindex=6 - FormatCode0,00E+000/FormatCode + FormatCode0.00E+000/FormatCode /FormatElement FormatElement
RE : RE : Difficulties to build LO for windows
Update: About my problem I've done: /usr/bin/sh cd D:/libreOffice/git4/libo source ./Env.Host.sh cd instsetoo_native rm -Rf D:/libreOffice/git4/libo/instsetoo_native/wntmsci12.pro # optional module 'clean' build the result is: ** ERROR: ERROR: msm file not found: Microsoft_VC100_CRT_x86.msm ! in function: merge_mergemodules_into_msi_database ** I will try to this solution: http://markmail.org/message/ineeoshkfn3d5eav#query:+page:1+mid:ineeoshkfn3d5eav+state:results commit: 238eba337cedda17a9ed1ce7e91755c66446195a De : Gay, Matthieu Date d'envoi : jeudi 4 avril 2013 10:17 À : michael.me...@suse.com; Michael Stahl Cc: libreoffice@lists.freedesktop.org; Jan Holesovsky Objet : RE : RE : Difficulties to build LO for windows Hello, Yes it works! Thanks for your activity ! I met others problems here the problem and solution: Error: test cppunit ko Solution: I'll have to delete some wmf files See here: http://lists.freedesktop.org/archives/libreoffice/2012-January/024403.html Error: file globlmn.hrc not found Solution: apply a Patch See here http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-svx.patch?revision=1.1view=markup Error: Cannot open include file: 'atlbase.h': No such file or directory Solution: Solution: use: --disable-atl et --disable-activex See here: http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/16228 I had also not found problem in the step creating help pack (file listed in setup_osl.inf) which I resolved by putting these arguments: --with-system-dicts --without-myspell-dicts Now the error is still in creating help pack step, here the log: Use of uninitialized value $value in lc at D://libreOffice/git4/libo/solenv/bin/modules/installer/packagelist.pm line 451. ... analyzing files ... ... analyzing files with flag ARCHIVE ... ... analyzing files with flag SUBST_FILENAME ... ... analyzing files with flag SCPZIP_REPLACE ... ... analyzing files with flag PATCH_SO_NAME ... ... analyzing files with flag HIDDEN ... ... analyzing all directories for this product ... ... analyzing links ... ... analyzing unix links ... ... creating profiles ... 1: No such file or directory at -e line 1 Use of uninitialized value in substitution (s///) at D://libreOffice/git4/libo/solenv/bin/modules/installer/scri titems.pm line 849. Use of uninitialized value in substitution (s///) at D://libreOffice/git4/libo/solenv/bin/modules/installer/scri titems.pm line 848. ... analyzing folder ... ... analyzing folderitems ... ... analyzing registryitems ... ... analyzing modules ... ... creating inf files ... ... analyzing package list ... ... creating installation set in D://libreOffice/git4/libo/instsetoo_native/wntmsci12.pro/LibreOffice_Dev/native install/en-US ... ... removing old installation directories ... ... creating idt files ... ** ERROR: ERROR: Could not find file gid_File_Help_Common_Zip in list of files! in function: get_specified_file ** ** ERROR: Saved logfile: D://libreOffice/git4/libo/instsetoo_native/wntmsci12.pro/LibreOffice_Dev_helppack/native/l gging/en-US/log_OOO350_en-US.log ** ... analyzing files ... ... analyzing files with flag ARCHIVE ... ... analyzing files with flag SUBST_FILENAME ... ... analyzing files with flag SCPZIP_REPLACE ... ... analyzing files with flag PATCH_SO_NAME ... ... analyzing files with flag HIDDEN ... ... analyzing all directories for this product ... ... analyzing links ... ... analyzing unix links ... ... analyzing folder ... ... analyzing folderitems ... ... analyzing registryitems ... ... analyzing modules ... ... creating inf files ... ... analyzing package list ... ... creating installation set in D://libreOffice/git4/libo/instsetoo_native/wntmsci12.pro/LibreOffice_Dev_helppa k/native/install/en-US ... ... removing old installation directories ... ... creating idt files ... ... cleaning the output tree ... ... removing directory /tmp/ooopackaging/i_79801365061826 ... Thu Apr 4 09:52:23 2013 (01:57 min.) dmake: Error code 255, while making 'ooodevhelppack_en-US.native' --- Oh dear - something failed during the build - sorry ! For more help with debugging build errors, please see the section in: http://wiki.documentfoundation.org/Development internal build errors: ERROR: error 65280 occurred while making /cygdrive/d//libreOffice/git4/libo/instsetoo_native/util it seems that the error is inside 'instsetoo_native', please re-run build inside this module to isolate the error and/or test your fix:
[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/source
vcl/inc/vcl/builder.hxx |1 +
vcl/source/window/builder.cxx | 14 +++---
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 5a5777f0a75e512af35250e90bc2670492ba5c9b
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 4 09:58:29 2013 +0100
need to replace %OOOVENDOR in .ui strings
Change-Id: If44cc1750b8555eab6e3dc2659e60a8fff10b24c
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index 11693a3..c606055 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -197,6 +197,7 @@ private:
OString m_sID;
OString m_sHelpRoot;
OString m_sProductName;
+OString m_sVendor;
Window *m_pParent;
bool m_bToplevelHasDeferredInit;
bool m_bToplevelParentFound;
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 3a09dad..75959b6 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -139,6 +139,7 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir,
OUString sUIFile, OStri
: m_sID(sID)
, m_sHelpRoot(OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8))
, m_sProductName(OUStringToOString(utl::ConfigManager::getProductName(),
RTL_TEXTENCODING_UTF8))
+, m_sVendor(OUStringToOString(utl::ConfigManager::getVendor(),
RTL_TEXTENCODING_UTF8))
, m_pParent(pParent)
, m_bToplevelParentFound(false)
, m_pParserState(new ParserState)
@@ -2402,7 +2403,9 @@ void VclBuilder::collectProperty(xmlreader::XmlReader
reader, const OString rI
if (!sProperty.isEmpty())
{
sProperty = sProperty.replace('_', '-');
-rMap[sProperty] = sValue.replaceAll(%PRODUCTNAME, m_sProductName);
+rMap[sProperty] = sValue.
+replaceAll(%PRODUCTNAME, m_sProductName).
+replaceAll(%OOOVENDOR, m_sVendor);
}
}
commit 8c4f20938bc5d4013126a00a02e8eca80b250284
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 4 09:27:20 2013 +0100
Related: fdo#61688 get strict ordering right
Change-Id: Ibb3e74e98762358614713688d64e50db21025f1d
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index a971614..3a09dad 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1441,8 +1441,13 @@ bool
VclBuilder::sortIntoBestTabTraversalOrder::operator()(const Window *pA, con
if (pA-GetParent() == pB-GetParent())
{
const VclFrame *pFrameParent = dynamic_castconst
VclFrame*(pA-GetParent());
-if (pFrameParent pA == pFrameParent-get_label_widget())
-return true;
+if (pFrameParent)
+{
+const Window *pLabel = pFrameParent-get_label_widget();
+int nFramePosA = (pA == pLabel) ? 0 : 1;
+int nFramePosB = (pB == pLabel) ? 0 : 1;
+return nFramePosA nFramePosB;
+}
}
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] decimal and group separators were swapped
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3194 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3194 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I67ca6f1a7a721b308092f20eaab238f5a8f45061 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - i18npool/source
i18npool/source/localedata/data/es_PY.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 530de50950b5336331ce823c264eac858c53ab0d Author: Eike Rathke er...@redhat.com Date: Wed Apr 3 23:10:16 2013 +0200 use es_AR separators when using es_AR formats Noticed due to the change in es_PE as of bd4b06fcd84c0f7f3ad82c1a3fe7f91740c5c3c5 See also https://ssl.icu-project.org/icu-bin/locexp?d_=en_=es_AR https://ssl.icu-project.org/icu-bin/locexp?d_=en_=es_PY Change-Id: I60e35a14a515a4e6e0d91aacf2a3540f31928415 (cherry picked from commit 59665f86057557e8cd66ee420df94b4d91a1b2de) Reviewed-on: https://gerrit.libreoffice.org/3195 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/i18npool/source/localedata/data/es_PY.xml b/i18npool/source/localedata/data/es_PY.xml index 89de162..acbc1ec 100644 --- a/i18npool/source/localedata/data/es_PY.xml +++ b/i18npool/source/localedata/data/es_PY.xml @@ -31,7 +31,7 @@ PlatformIDgeneric/PlatformID /Platform /LC_INFO - LC_CTYPE ref=es_PE/ + LC_CTYPE ref=es_AR/ LC_FORMAT ref=es_AR replaceTo=[$G-3C0A]/ LC_COLLATION ref=en_US/ LC_SEARCH ref=en_US/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - i18npool/source
i18npool/source/localedata/data/es_VE.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 668f96a802c23a81bf230d9c035254394c23545f Author: Eike Rathke er...@redhat.com Date: Wed Apr 3 23:20:05 2013 +0200 use matching separators and format codes of es_AR Noticed due to the change in es_PE as of bd4b06fcd84c0f7f3ad82c1a3fe7f91740c5c3c5 See also https://ssl.icu-project.org/icu-bin/locexp?d_=en_=es_AR https://ssl.icu-project.org/icu-bin/locexp?d_=en_=es_VE Change-Id: I7ecedd9b111ed95dc68f22a0894f32c8a75ffe5d (cherry picked from commit 640b57dd5fcd7aaeeb334d27fd0982bb516129a7) Reviewed-on: https://gerrit.libreoffice.org/3196 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/i18npool/source/localedata/data/es_VE.xml b/i18npool/source/localedata/data/es_VE.xml index a82138a..532a3d8 100644 --- a/i18npool/source/localedata/data/es_VE.xml +++ b/i18npool/source/localedata/data/es_VE.xml @@ -31,8 +31,8 @@ PlatformIDgeneric/PlatformID /Platform /LC_INFO - LC_CTYPE ref=es_PY/ - LC_FORMAT ref=es_PE replaceTo=[$Bs-200A]/ + LC_CTYPE ref=es_AR/ + LC_FORMAT ref=es_AR replaceTo=[$Bs-200A]/ LC_COLLATION ref=en_US/ LC_SEARCH ref=en_US/ LC_INDEX ref=es_ES/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] use es_AR separators when using es_AR formats
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3195 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3195 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I60e35a14a515a4e6e0d91aacf2a3540f31928415 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] use matching separators and format codes of es_AR
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3196 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3196 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ecedd9b111ed95dc68f22a0894f32c8a75ffe5d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] core.git: use LanguageTag instead of comphelper::Locale
On 04/02/2013 07:27 PM, Eike Rathke wrote:
On Thursday, 2013-03-28 18:28:30 +0100, Stephan Bergmann wrote:
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -337,20 +339,10 @@ void Service::setLocale(css::lang::Locale const eLocale)
-if ( locale_ == * ) {
+if ( locale_ == * ) { /* FIXME-BCP47: WTF is this?!? */
A configuration provider can operate in one of two modes with
regards to localized properties. It can either be set up to use a
specific locale, and return the best matching localized value for a
given localized property. Or it can be set up (via *) to treat
localized properties like sets, where each individual localized
value is accessible under the locale's name.
Oh my ... seeing
offapi/com/sun/star/configuration/AdministrationProvider.idl and
offapi/com/sun/star/configuration/*Access.idl we even exposed * to the
outer world and should regard it as ugly nasty wrong but stable API
My viewpoint would be that those locale parameters used at the
configmgr API to select its behavior wrt localized properties have
string values over a grammar of
* | BCP47 Language-Tag
The only spoiler is that the concerned UNO objects (somewhat needlessly)
also implement com.sun.star.lang.XLocalizable, which doesn't fit.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Bug 42796 - Macro assigned to dataform Before Unload or While Unloading events are not called when form container is closed
On Thu, Apr 04, 2013 at 11:08:54AM +0200, Jan Holesovsky wrote: mcmurchy1917-libreoff...@yahoo.co.uk píše v St 27. 03. 2013 v 09:46 +: I've fallen foul of this bug in recent days so have decided to have a look at it to see if I can provide a patch. Thank you for the offer of help! :-) (...) I'm CCing Noel and Lionel - macros are Noel's area, and databases Lionel's; (...) In the bug report it was confirmed that a macro assigned to either the Before Unloading or When Unloading events of a dataform are not called when the form document is closed. However, when editing a form and the Design Mode option is toggled the events are called. Also the events when the form is loaded are called under all circumstances. I don't have a code pointer ready to give you, but: 1) I've indeed noticed that when opening a form in design mode (that is, edit instead of open), the open event is called; I've always found that rather curious, but have never gone through the time to make a complete bug report of it. Since you are going to touch that area anyway, it may make sense to conditionalise these events to non-design mode. Actually, my first thought is that *all* events should be disabled in design mode, but I'm willing to listen to arguments otherwise. 2) Since you say that in design mode the events fire, my expectation / hope would be that somewhere there is code that does: if (isInDesignMode) fireCloseEvent(); Possibly that is just a forgotten negation there; it would make sense to see the git history that put that condition to see its rationale, and if it turns out it is as I think, just add the negation. (Or maybe the code is something like: if (!isInDesignMode) return false; fireCloseEvent(); and then we have to *remove* the negation) Too see where that code is, I'd suggest to run libreoffice in gdb, break on the event being called and then look at the backtrace. To break on the event, you can bind a macro that does: MessageBosx Even Called! cause the event to be fired (in design mode, thus) and when you get the dialog, just press CTRL-C in gdb. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: unit test failure in forms module, something do with com.sun.star.form.control.FixedText
On 03/04/13 13:19, Noel Grandin wrote: Using GDB, I find that something in the unit test code is passing an awt::XControlModel UNO object to SvxShapeControl::setControl() That XControlModel is returning com.sun.star.form.control.FixedText when called like this: beans::XPropertySet::getPropertyValue(DefaultControl) Grepping through the source code, com.sun.star.form.control.FixedText is only found in forms/source/inc/services.hxxx but the global constants declared there are not used anywhere else (confirmed by removing them and rebuilding). Nothing seems to actually implement this service. yup, I've looked and you're right, nothing implementing that, question is where is the com.sun.star.form.control.FixedText comming from, is it something injected from the test code or test document or... ? On 03/04/13 13:57, Noel Grandin wrote: On 2013-04-03 14:33, Thomas Arnhold wrote: If the com.sun.star.form.control.FixedText service followed the same pattern as the other com.sun.star.form.control.* services, I would expect to find a class called OFixedTextControl inside the file forms/source/component/FixedText.cxx since the text com.sun.star.form.control.FixedText for the service exists ( but is unused ) it would appear it either used to be there in the past ( and has been removed for some reason ) or in was intended for future support? That bring back the issue of the failing test, is this new ( or a resurrected ) test, can't see how it could have worked previously ( unless something has been removed recently ) Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Convert Calc sheet page style to Widget UI
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3140 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3140 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6714ccc710d266a047032166c738063602e6e30d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Olivier Hallot olivier.hal...@edx.srv.br Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig
sc/inc/helpids.h |1 sc/source/ui/pagedlg/pagedlg.hrc |1 sc/uiconfig/scalc/ui/sheetprintpage.ui | 93 + 3 files changed, 49 insertions(+), 46 deletions(-) New commits: commit cb3bf6a1300b15eb800435175036a6d3448b5e9a Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 4 11:08:00 2013 +0100 set adjustment min/maxes Change-Id: I713c1a280c31a7a783e6a0af94b838091fc98779 diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index 93e73d4..96be512 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -79,7 +79,6 @@ #define HID_SCPAGE_HFEDIT SC_HID_SCPAGE_HFEDIT #define HID_SCPAGE_AREAS SC_HID_SCPAGE_AREAS #define HID_SCPAGE_COMPATIBILITY SC_HID_SCPAGE_COMPATIBILITY -#define HID_SCPAGE_TABLE SC_HID_SCPAGE_TABLE #define HID_SCPAGE_PRINT SC_HID_SCPAGE_PRINT #define HID_SCPAGE_DEFAULTS SC_HID_SCPAGE_DEFAULTS #define HID_SCPAGE_SUBT_GROUP1 SC_HID_SCPAGE_SUBT_GROUP1 diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc index abadb48..d4b13b0 100644 --- a/sc/source/ui/pagedlg/pagedlg.hrc +++ b/sc/source/ui/pagedlg/pagedlg.hrc @@ -19,7 +19,6 @@ #include sc.hrc // - RID_SCDLG_PAGE -// - RID_SCPAGE_TABLE // - RID_SCPAGE_AREAS #define TP_PAGE_STD 1 diff --git a/sc/uiconfig/scalc/ui/sheetprintpage.ui b/sc/uiconfig/scalc/ui/sheetprintpage.ui index 85318a1..0f1b6c9 100644 --- a/sc/uiconfig/scalc/ui/sheetprintpage.ui +++ b/sc/uiconfig/scalc/ui/sheetprintpage.ui @@ -1,13 +1,23 @@ ?xml version=1.0 encoding=UTF-8? interface !-- interface-requires gtk+ 3.0 -- + object class=GtkAdjustment id=adjustmentFirstPage +property name=lower1.05/property +property name=upper.04009/property +property name=step_increment1/property +property name=page_increment10/property + /object object class=GtkAdjustment id=adjustmentPage -property name=upper999/property +property name=lower1/property +property name=upper1000/property +property name=value1/property property name=step_increment1/property property name=page_increment10/property /object object class=GtkAdjustment id=adjustmentScalingFactor -property name=upper100/property +property name=lower10/property +property name=upper400/property +property name=value15/property property name=step_increment1/property property name=page_increment10/property /object @@ -110,7 +120,7 @@ property name=can_focusTrue/property property name=max_length5/property property name=invisible_charâ¢/property -property name=adjustmentadjustmentPage/property +property name=adjustmentadjustmentFirstPage/property /object packing property name=left_attach1/property @@ -311,18 +321,6 @@ /packing /child child - placeholder/ -/child -child - placeholder/ -/child -child - placeholder/ -/child -child - placeholder/ -/child -child object class=GtkCheckButton id=checkBTN_NULLVALS property name=label translatable=yes_Zero values/property property name=visibleTrue/property @@ -339,6 +337,18 @@ property name=height1/property /packing /child +child + placeholder/ +/child +child + placeholder/ +/child +child + placeholder/ +/child +child + placeholder/ +/child /object /child /object @@ -382,6 +392,7 @@ object class=GtkLabel id=labelScalingMode property name=visibleTrue/property property name=can_focusFalse/property +property name=xalign0/property property name=label translatable=yesScaling _mode:/property property name=use_underlineTrue/property property name=mnemonic_widgetcomboLB_SCALEMODE/property @@ -403,12 +414,12 @@ object class=GtkHBox id=boxSCALEALL property name=visibleTrue/property property
Re: yet another unit test framework? -- was fdo#55814: unit test is missing
Hi, On Thu, Apr 04, 2013 at 11:00:17AM +0200, Noel Grandin wrote: On 2013-04-04 10:53, Bjoern Michaelsen wrote: Well, IMHO the main problem with the unoapi tests wrt this is that they 'centralized' a lot of the expectations on the UNO-Api -- which made them hard to quickly rewrite in C++. If this leads to more reliable tests of any kind, which will turn into tests of the C++ kind when they first fail, Im all for it. These two statements are mutually contradictory. Either Java/Python unit tests are easy to convert to C++, or they are not, you can't have it both ways :-) No: The unoapi tests are hard to convert (not because of them being in Java, but because of the qadevOOo framework needing a C++ equivalent), the complex tests are not. Besides, LO is a C++ program - if you can already code in C++, why would you want to switch to a different language to write a unit test? Because there are people willing to write Python tests but unable (or unwilling to invest the time) to write C++ tests? I dont see that as a problem. A reliable test should succeed almost always -- and in that case it doesnt matter in what language it is written in. If it fails, its probably well worth the time to reimplement it in C++ proper. But I see little reason to dogmatically write all tests in C++ as: - more people can write tests in Python - there are tests that might never fail (and hopefully they are the majority) and the language they are written in does not matter at all in that case Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: unit test failure in forms module, something do with com.sun.star.form.control.FixedText
On 2013-04-04 12:04, Noel Power wrote: yup, I've looked and you're right, nothing implementing that, question is where is the com.sun.star.form.control.FixedText comming from, is it something injected from the test code or test document or... ? It seems to be coming from the forms unit test code in forms/qa, but how exactly I'm not sure since I have no idea how to debug the java code that is driving the test. since the text com.sun.star.form.control.FixedText for the service exists ( but is unused ) it would appear it either used to be there in the past ( and has been removed for some reason ) or in was intended for future support? That bring back the issue of the failing test, is this new ( or a resurrected ) test, can't see how it could have worked previously ( unless something has been removed recently ) I'm not sure. I run the tests religiously, since I use them to catch problems in my UNO conversion work, and this one started failing somewhere in the last couple of weeks. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/hicontrast vcl/AllLangResTarget_vcl.mk vcl/source
icon-themes/galaxy/vcl/res/spinner-16-01.png |binary icon-themes/galaxy/vcl/res/spinner-16-02.png |binary icon-themes/galaxy/vcl/res/spinner-16-03.png |binary icon-themes/galaxy/vcl/res/spinner-16-04.png |binary icon-themes/galaxy/vcl/res/spinner-16-05.png |binary icon-themes/galaxy/vcl/res/spinner-16-06.png |binary icon-themes/galaxy/vcl/res/spinner-32-01.png |binary icon-themes/galaxy/vcl/res/spinner-32-02.png |binary icon-themes/galaxy/vcl/res/spinner-32-03.png |binary icon-themes/galaxy/vcl/res/spinner-32-04.png |binary icon-themes/galaxy/vcl/res/spinner-32-05.png |binary icon-themes/galaxy/vcl/res/spinner-32-06.png |binary icon-themes/galaxy/vcl/res/spinner-32-07.png |binary icon-themes/galaxy/vcl/res/spinner-32-08.png |binary icon-themes/galaxy/vcl/res/spinner-32-09.png |binary icon-themes/galaxy/vcl/res/spinner-32-10.png |binary icon-themes/galaxy/vcl/res/spinner-32-11.png |binary icon-themes/galaxy/vcl/res/spinner-32-12.png |binary icon-themes/galaxy/vcl/res/spinner-64-01.png |binary icon-themes/galaxy/vcl/res/spinner-64-02.png |binary icon-themes/galaxy/vcl/res/spinner-64-03.png |binary icon-themes/galaxy/vcl/res/spinner-64-04.png |binary icon-themes/galaxy/vcl/res/spinner-64-05.png |binary icon-themes/galaxy/vcl/res/spinner-64-06.png |binary icon-themes/galaxy/vcl/res/spinner-64-07.png |binary icon-themes/galaxy/vcl/res/spinner-64-08.png |binary icon-themes/galaxy/vcl/res/spinner-64-09.png |binary icon-themes/galaxy/vcl/res/spinner-64-10.png |binary icon-themes/galaxy/vcl/res/spinner-64-11.png |binary icon-themes/galaxy/vcl/res/spinner-64-12.png |binary icon-themes/hicontrast/vcl/res/spinner-16-01.png |binary icon-themes/hicontrast/vcl/res/spinner-16-02.png |binary icon-themes/hicontrast/vcl/res/spinner-16-03.png |binary icon-themes/hicontrast/vcl/res/spinner-16-04.png |binary icon-themes/hicontrast/vcl/res/spinner-16-05.png |binary icon-themes/hicontrast/vcl/res/spinner-16-06.png |binary icon-themes/hicontrast/vcl/res/spinner-32-01.png |binary icon-themes/hicontrast/vcl/res/spinner-32-02.png |binary icon-themes/hicontrast/vcl/res/spinner-32-03.png |binary icon-themes/hicontrast/vcl/res/spinner-32-04.png |binary icon-themes/hicontrast/vcl/res/spinner-32-05.png |binary icon-themes/hicontrast/vcl/res/spinner-32-06.png |binary icon-themes/hicontrast/vcl/res/spinner-32-07.png |binary icon-themes/hicontrast/vcl/res/spinner-32-08.png |binary icon-themes/hicontrast/vcl/res/spinner-32-09.png |binary icon-themes/hicontrast/vcl/res/spinner-32-10.png |binary icon-themes/hicontrast/vcl/res/spinner-32-11.png |binary icon-themes/hicontrast/vcl/res/spinner-32-12.png |binary icon-themes/hicontrast/vcl/res/spinner-64-01.png |binary icon-themes/hicontrast/vcl/res/spinner-64-02.png |binary icon-themes/hicontrast/vcl/res/spinner-64-03.png |binary icon-themes/hicontrast/vcl/res/spinner-64-04.png |binary icon-themes/hicontrast/vcl/res/spinner-64-05.png |binary icon-themes/hicontrast/vcl/res/spinner-64-06.png |binary icon-themes/hicontrast/vcl/res/spinner-64-07.png |binary icon-themes/hicontrast/vcl/res/spinner-64-08.png |binary icon-themes/hicontrast/vcl/res/spinner-64-09.png |binary icon-themes/hicontrast/vcl/res/spinner-64-10.png |binary icon-themes/hicontrast/vcl/res/spinner-64-11.png |binary icon-themes/hicontrast/vcl/res/spinner-64-12.png |binary vcl/AllLangResTarget_vcl.mk |1 vcl/source/control/throbber.cxx | 54 +-- vcl/source/src/throbber.src | 108 +++ 63 files changed, 42 insertions(+), 121 deletions(-) New commits: commit ae2c256e228b3d4d01e85abdbc797a907c7f6563 Author: Michael Meeks michael.me...@suse.com Date: Thu Apr 4 11:07:54 2013 +0100 unwind tangled mess around spinner buttons Restore removed spinner artwork, cleanup the code: hicontrast - is now a function of icon theme, not a global boolean. uwith thanks to Ariel Constenla-Haile) Change-Id: I68d4c7293a6faa130274cf45f53509ce140fa8c0 diff --git a/icon-themes/galaxy/vcl/res/spinner-16-01.png b/icon-themes/galaxy/vcl/res/spinner-16-01.png new file mode 100644 index 000..16134fc Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-16-01.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-16-02.png b/icon-themes/galaxy/vcl/res/spinner-16-02.png new file mode 100644 index 000..b78f934 Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-16-02.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-16-03.png b/icon-themes/galaxy/vcl/res/spinner-16-03.png new file mode 100644 index 000..c17dfdc Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-16-03.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-16-04.png b/icon-themes/galaxy/vcl/res/spinner-16-04.png new file mode 100644 index
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - b1/471b955c0678bc9e1aa2ad381415ee38e5cb41 c7/1c09b5c6496c5899ad12091934d47faba66624
b1/471b955c0678bc9e1aa2ad381415ee38e5cb41 |1 + c7/1c09b5c6496c5899ad12091934d47faba66624 |1 + 2 files changed, 2 insertions(+) New commits: commit 2da5d16e3f3f8ccb79cd577ee11800e300a6eb34 Author: Michael Meeks michael.me...@suse.com Date: Thu Apr 4 11:18:01 2013 +0100 Notes added by 'git notes add' diff --git a/b1/471b955c0678bc9e1aa2ad381415ee38e5cb41 b/b1/471b955c0678bc9e1aa2ad381415ee38e5cb41 new file mode 100644 index 000..f3b9f0e --- /dev/null +++ b/b1/471b955c0678bc9e1aa2ad381415ee38e5cb41 @@ -0,0 +1 @@ +prefer: ae2c256e228b3d4d01e85abdbc797a907c7f6563 commit 057da70af0a78b1de502ecef0d2a307d7f1bf47e Author: Michael Meeks michael.me...@suse.com Date: Thu Apr 4 11:17:48 2013 +0100 Notes added by 'git notes add' diff --git a/c7/1c09b5c6496c5899ad12091934d47faba66624 b/c7/1c09b5c6496c5899ad12091934d47faba66624 new file mode 100644 index 000..f3b9f0e --- /dev/null +++ b/c7/1c09b5c6496c5899ad12091934d47faba66624 @@ -0,0 +1 @@ +prefer: ae2c256e228b3d4d01e85abdbc797a907c7f6563 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: yet another unit test framework? -- was fdo#55814: unit test is missing
On Thu, Apr 04, 2013 at 10:57:59AM +0200, Markus Mohrhard wrote: 2013/4/4 David Ostrovsky d.ostrov...@gmx.de I am not going to provide the huge advantages of dynamic type languages in general here, but while python is very impressive it *is* truly read-write language compare to number of write-only languages, that used in LO ecosystem. Do we really want to start a discussion on this level? /me hands Markus a certificate confirming him as the 'trollfeeder of the month' -- with Tor a close second in the category. ;) Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 864e22e14720dc6456e08cb4a01d99353d9c7402 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 4 11:20:59 2013 +0100 Updated core Project: help 2e1a9cae55c82ba0faefc4b7d41b902e90ec6c27 diff --git a/helpcontent2 b/helpcontent2 index 4e639b5..2e1a9ca 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4e639b52e7cb790a048586490546fb76c89539ab +Subproject commit 2e1a9cae55c82ba0faefc4b7d41b902e90ec6c27 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 18 - source/text/scalc/01/05070500.xhp | 70 +++--- 2 files changed, 35 insertions(+), 53 deletions(-) New commits: commit 2e1a9cae55c82ba0faefc4b7d41b902e90ec6c27 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 4 11:20:59 2013 +0100 update help ids for calc sheet page setup Change-Id: Iae1f7f2ee893fc52b59242a44d92cbbfeba11954 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 25cffcd..bcbf719 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3261,7 +3261,6 @@ HID_SCPAGE_SUBT_GROUP1,58885, HID_SCPAGE_SUBT_GROUP2,58886, HID_SCPAGE_SUBT_GROUP3,58887, HID_SCPAGE_SUBT_OPTIONS,58875, -HID_SCPAGE_TABLE,58883, HID_SCPAGE_DEFAULTS,58894, HID_SCPAGE_USERLISTS,58880, HID_SCRIPTORG_DIALOG,39987, @@ -6568,15 +6567,6 @@ sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_FORMATS,956810273, sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_PAGEBREAK,956810261, sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_SORT,956810263, sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_USERDEF,956810274, -sc_CheckBox_RID_SCPAGE_TABLE_BTN_CHARTS,957039629, -sc_CheckBox_RID_SCPAGE_TABLE_BTN_DRAWINGS,957039631, -sc_CheckBox_RID_SCPAGE_TABLE_BTN_FORMULAS,957039632, -sc_CheckBox_RID_SCPAGE_TABLE_BTN_GRID,957039626, -sc_CheckBox_RID_SCPAGE_TABLE_BTN_HEADER,957039627, -sc_CheckBox_RID_SCPAGE_TABLE_BTN_NOTES,957039628, -sc_CheckBox_RID_SCPAGE_TABLE_BTN_NULLVALS,957039633, -sc_CheckBox_RID_SCPAGE_TABLE_BTN_OBJECTS,957039630, -sc_CheckBox_RID_SCPAGE_TABLE_BTN_PAGENO,957039641, sc_CheckBox_TP_VALIDATION_VALUES_CB_SHOWLIST,548275227, sc_CheckBox_TP_VALIDATION_VALUES_CB_SORTLIST,548275228, sc_CheckBox_TP_VALIDATION_VALUES_TSB_ALLOW_BLANKS,548275203, @@ -6782,7 +6772,6 @@ sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974, sc_ListBox_RID_SCPAGE_SUBT_OPTIONS_LB_USERDEF,956812835, -sc_ListBox_RID_SCPAGE_TABLE_LB_SCALEMODE,957042207, sc_ListBox_RID_SCPAGE_USERLISTS_LB_LISTS,956845569, sc_ListBox_TP_VALIDATION_ERROR_LB_ACTION,548310552, sc_ListBox_TP_VALIDATION_VALUES_LB_ALLOW,548277762, @@ -6792,7 +6781,6 @@ sc_MetricField_RID_SCDLG_COL_OPT_ED_VALUE,1494931969, sc_MetricField_RID_SCDLG_ROW_MAN_ED_VALUE,1494948353, sc_MetricField_RID_SCDLG_ROW_OPT_ED_VALUE,1494964737, sc_MetricField_RID_SCPAGE_LAYOUT_MF_TAB,958208577, -sc_MetricField_RID_SCPAGE_TABLE_ED_SCALEALL,957045280, sc_ModalDialog_RID_SCDLG_CHARTCOLROW,1494515712, sc_ModalDialog_RID_SCDLG_COLORROW,1494368256, sc_ModalDialog_RID_SCDLG_GROUP,1493549056, @@ -6828,10 +6816,6 @@ sc_NumericField_RID_SCDLG_LINKAREA_NF_DELAY,1495373835, sc_NumericField_RID_SCDLG_SOLVER_INTEGER_NF_VALUE,1495504897, sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735, sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732, -sc_NumericField_RID_SCPAGE_TABLE_ED_PAGENO,957044762, -sc_NumericField_RID_SCPAGE_TABLE_ED_SCALEPAGEHEIGHT,957044772, -sc_NumericField_RID_SCPAGE_TABLE_ED_SCALEPAGENUM,957044770, -sc_NumericField_RID_SCPAGE_TABLE_ED_SCALEPAGEWIDTH,957044771, sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_ADD,1493537385, sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_REMOVE,1493537386, sc_PushButton_RID_SCDLG_COLROWNAMERANGES_BTN_ADD,2568786435, @@ -6939,8 +6923,6 @@ sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_UP2,956432904, sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_UP3,956432905, sc_RadioButton_RID_SCPAGE_SUBT_OPTIONS_BTN_ASCENDING,956809759, sc_RadioButton_RID_SCPAGE_SUBT_OPTIONS_BTN_DESCENDING,956809760, -sc_RadioButton_RID_SCPAGE_TABLE_BTN_LEFTRIGHT,957039125, -sc_RadioButton_RID_SCPAGE_TABLE_BTN_TOPDOWN,957039124, sc_TabPage_RID_SCPAGE_STAT,957628416, sc_TabPage_TP_VALIDATION_ERROR,548306944, sc_TabPage_TP_VALIDATION_INPUTHELP,548290560, diff --git a/source/text/scalc/01/05070500.xhp b/source/text/scalc/01/05070500.xhp index b70fc59..de04e99 100644 --- a/source/text/scalc/01/05070500.xhp +++ b/source/text/scalc/01/05070500.xhp @@ -30,50 +30,50 @@ /meta body section id=tabelle -bookmark xml-lang=en-US branch=hid/SC_HID_SCPAGE_TABLE id=bm_id3147335 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/sheetprintpage/SheetPrintPage id=bm_id3147335 localize=false/ bookmark xml-lang=en-US branch=index id=bm_id3150542bookmark_valuepages; order when printing/bookmark_value bookmark_valueprinting; page order/bookmark_value /bookmarkcommentmw deletes three printing;... entries and copies 4 index entries to Calc guide print_details.xhp/commentparagraph role=heading id=hd_id3156329 xml-lang=en-US level=1 l10n=U oldref=1link href=text/scalc/01/05070500.xhp name=SheetSheet/link/paragraph -paragraph role=paragraph id=par_id3151384 xml-lang=en-US l10n=CHG oldref=2ahelp hid=HID_SCPAGE_TABLESpecifies the elements to be included in the printout of all sheets with the current Page Style. Additionally, you can set the print order, the first page number, and the page
[Libreoffice-commits] core.git: autogen.sh
autogen.sh | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 68c314fc80b5dd5be26a7207b3459a2be9625240
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Apr 3 18:01:35 2013 +0200
revert back to usign autogen.sh cmdline arguments if given
This is a partial revert of ca0c54d0fe3812cec64e5c7cc83309d4397f5e0a .
Ignoring cmdline arguments if autogen.* exists is broken for several
reasons:
- autogen.sh of every other package passes cmdline arguments to configure
- that's because if I was bothered to give them, I want them used
- there's no reason to prefer autogen.input now, given that autogen.input
cannot be overwritten by autogen.sh, unlike autogen.lastrun , so there's
no accidental loss of the switches
- running autogen.sh --foo followed by autogen.sh --bar actually runs
configure with --foo the second time too, because the first one creates
autogen.lastrun and the second one first complains about the cmdline
args, then complains about autogen.lastrun, and then uses it
Change-Id: I5868610935d0312915be74602b6435eea069f937
Reviewed-on: https://gerrit.libreoffice.org/3190
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/autogen.sh b/autogen.sh
index f5960e3..2498c5a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -112,14 +112,14 @@ my @cmdline_args = ();
my $input = autogen.input;
my $lastrun = autogen.lastrun;
-if (-f $input) {
-warn Ignoring command-line arguments, using $input.\n if (@ARGV);
-warn Ignoring $lastrun, using $input.\n if (-f $lastrun);
-@cmdline_args = read_args ($input);
-} elsif (-f $lastrun) {
-warn Ignoring command-line arguments, using $lastrun.\n if (@ARGV);
-print STDERR Reading $lastrun. Please rename it to $input to avoid this
message.\n;
-@cmdline_args = read_args ($lastrun);
+if (!@ARGV) {
+if (-f $input) {
+warn Ignoring $lastrun, using $input.\n if (-f $lastrun);
+@cmdline_args = read_args ($input);
+} elsif (-f $lastrun) {
+print STDERR Reading $lastrun. Please rename it to $input to avoid
this message.\n;
+@cmdline_args = read_args ($lastrun);
+}
} else {
@cmdline_args = @ARGV;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] revert back to usign autogen.sh cmdline arguments if given
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3190 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3190 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5868610935d0312915be74602b6435eea069f937 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
unit test requirements ...
Hi guys, On Thu, 2013-04-04 at 12:15 +0200, Bjoern Michaelsen wrote: Besides, LO is a C++ program - if you can already code in C++, why would you want to switch to a different language to write a unit test? Because there are people willing to write Python tests but unable (or unwilling to invest the time) to write C++ tests? So - can we rip the language issue out of this. AFAICS no-one truly cares about the language that the tests are written in but they do have some pretty firm requirements that need to work for any/all of: Java, Python, StarBasic etc. + debug-ability - when the test fails - and the best tests are written to fail regularly ;-) we need to be able -very-simply- to get a backtrace we can work with - without a ton of training, reading a dozen wiki pages, poking for obscure symbols, etc. + that backtrace should not have big, opaque chunks that are either empty (cf. Java) or point to random / irrelevant pieces of C/C++ interpreter code - Python / StarBasic others. It should allow interactive inspection of variables up and down the stack. + reliability and performance: new unit tests should be small, fast, non-duplicative (ie. re-using existing code frameworks), readable, and must produce zero false positives. Ideally they should test just one thing - though clearly our bootstrapping process is a nightmare that exercises millions of lines to get to the 'go'. + ideally - the unit tests should run -in-the-same-process- which significantly helps with the above performance, debugging, reliability and more. Personally, flameage aside, my (by far) most preferred solution would be not to discourage python / java / starbasic from being used for unit tests - but instead to encourage working on making python actually debuggable via gdb: presumably (with the new python/gdb framework ;-) That is not a completely unrealistic hope / expectation ? surely ? it would help adoption of hybrid native-code with python / StarBasic /Java etc. across the computing universe rather than just in LibreOffice :-) It is still amazing to me that decades from its creation, the debugging experience around Java from gdb is one of the foulest and least useful things I've ever had the misfortune to use :-) - oh, wait - Mono was just as bad, the stack traces were -still- entirely opaque and unusable for large sections as far as I could see. Of course, in the mono case they wrote their own custom debugger - which worked well - except for it being a new piece of code with it's own bugs, problems, platform issues, etc. But I see little reason to dogmatically write all tests in C++ as: It is not the test - it is the debugging of the test that is the issue. That is something that (potentially) stops people getting their code into LibreOffice. The higher we make that barrier - and the easier we make it for people to raise a barrier to entry that is fundamentally unusable / not-accessible for new people, the worse a world we live in. Just re-write that python stuff in C++ in order to work out why the test fails for your new patch is not a nice message for a new contributor stymied by a potentially buggy un-debug-able test. That is, unless we can debug them cleanly - which I hope is somewhere we can get to without overmuch effort. IMHO it is not trolling to point that out; in particular I'd recommend listening to the advice from those who have written and debugged the most in the area of unit tests; which is neither me nor 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
Re: unit test failure in forms module, something do with com.sun.star.form.control.FixedText
On 04/04/13 11:15, Noel Grandin wrote: On 2013-04-04 12:04, Noel Power wrote: yup, I've looked and you're right, nothing implementing that, question is where is the com.sun.star.form.control.FixedText comming from, is it something injected from the test code or test document or... ? It seems to be coming from the forms unit test code in forms/qa, but how exactly I'm not sure since I have no idea how to debug the java code that is driving the test. me neither, its from complextests or subsequenttests or ? How do you run the tests ? since the text com.sun.star.form.control.FixedText for the service exists ( but is unused ) it would appear it either used to be there in the past ( and has been removed for some reason ) or in was intended for future support? That bring back the issue of the failing test, is this new ( or a resurrected ) test, can't see how it could have worked previously ( unless something has been removed recently ) I'm not sure. I run the tests religiously, since I use them to catch problems in my UNO conversion work, and this one started failing somewhere in the last couple of weeks. odd, 'cause in my 3.4.5 libreoffice you can't create a service from com.sun.star.form.control.FixedText either :/ so I think understanding what the test is doing is key Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/JavaClassSet.mk |4 ++-- solenv/gbuild/JunitTest.mk|4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit f64788427bac5f88936c134def6fed9cbec32c2c Author: Michael Stahl mst...@redhat.com Date: Thu Apr 4 12:02:23 2013 +0100 gbuild: un-break setting classpath on Windows: Apparently LO patched GNU make 3.82 interprets the semicolon which is the value of $(gb_CLASSPATHSEP) as a terminator if it occurs while setting a target local variable; the part of the value that follows the first semicolon is cut off. Hence escape the $(gb_CLASSPATHSEP) and $(XCLASSPATH) vars. (cherry picked from commit 0c2a0de598bd39839a610a7e53660bb67397466b) Signed-off-by: Michael Meeks michael.me...@suse.com Change-Id: I213dba7155f9515e492c20cfff3bef1c4d8269fc diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 0fbb6b0..1ae9ad1 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -87,13 +87,13 @@ endef # build order dependency is a hack to get these prerequisites out of the way in the build command define gb_JavaClassSet_add_jar $(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2)) -$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2))) +$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(strip $(2))) $(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)) endef # this does not generate dependency on the jar define gb_JavaClassSet_add_system_jar -$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2))) +$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(strip $(2))) $(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)) endef diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 4499cba..5436b6e 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -69,7 +69,7 @@ $(call gb_JunitTest_get_target,%) : $(CLEAN_CMD) define gb_JunitTest_JunitTest -$(call gb_JunitTest_get_target,$(1)) : T_CP := $(value XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib +$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(value XCLASSPATH)$$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(OUTDIR)/lib $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(eval $(call gb_JunitTest_JunitTest_platform,$(1))) @@ -110,7 +110,7 @@ $(call gb_JunitTest_get_target,$(1)) : T_CP := $(2) endef define gb_JunitTest_add_jar -$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(2) +$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(2) $(call gb_JunitTest_get_target,$(1)) : $(2) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang
compilerplugins/clang/checkconfigmacros.cxx | 100
compilerplugins/clang/pluginhandler.cxx |7 +
2 files changed, 106 insertions(+), 1 deletion(-)
New commits:
commit c3ffd741b207774be787896dfd305db89aca0e42
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Apr 4 13:02:34 2013 +0200
compiler plugin to check incorrect #ifdef for config_XXX.h macros
http://lists.freedesktop.org/archives/libreoffice/2013-March/047769.html
Change-Id: Ibba9d3dcc87d6d6eee58ab3690a8f87339d00956
diff --git a/compilerplugins/clang/checkconfigmacros.cxx
b/compilerplugins/clang/checkconfigmacros.cxx
new file mode 100644
index 000..3ffaff8
--- /dev/null
+++ b/compilerplugins/clang/checkconfigmacros.cxx
@@ -0,0 +1,100 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ */
+
+#include plugin.hxx
+
+#include clang/Lex/Preprocessor.h
+
+namespace loplugin
+{
+
+/*
+This is a compile check.
+
+Feature macros from config_XXX.h headers are always #defined (to 1 or 0 in
case of yes/no
+settings). It is a mistake to use #ifdef/#ifndef/defined to check them.
+
+Using 1/0 instead of defined/undefined avoids undetected problems when e.g.
the necessary
+#include of the config_XXX.h file is missing.
+*/
+
+class CheckConfigMacros
+: public PPCallbacks
+, public Plugin
+{
+public:
+explicit CheckConfigMacros( CompilerInstance compiler );
+virtual void run();
+virtual void MacroDefined( const Token macroToken, const MacroInfo*
info );
+virtual void MacroUndefined( const Token macroToken , const
MacroInfo* info );
+virtual void Ifdef( SourceLocation location, const Token macroToken );
+virtual void Ifndef( SourceLocation location, const Token macroToken
);
+virtual void Defined( const Token macroToken );
+private:
+void checkMacro( const Token macroToken, SourceLocation location );
+std::set string configMacros;
+};
+
+CheckConfigMacros::CheckConfigMacros( CompilerInstance compiler )
+: Plugin( compiler )
+{
+compiler.getPreprocessor().addPPCallbacks( this );
+}
+
+void CheckConfigMacros::run()
+{
+// nothing, only check preprocessor usage
+}
+
+void CheckConfigMacros::MacroDefined( const Token macroToken, const
MacroInfo* info )
+{
+const char* filename = compiler.getSourceManager().getPresumedLoc(
info-getDefinitionLoc()).getFilename();
+if( filename != NULL
+ ( strncmp( filename, BUILDDIR /config_host/, strlen( BUILDDIR
/config_host/ )) == 0
+|| strncmp( filename, BUILDDIR /config_build/, strlen( BUILDDIR
/config_build/ )) == 0 ))
+{
+//fprintf(stderr,DEF: %s %s\n,
macroToken.getIdentifierInfo()-getName().data(), filename );
+configMacros.insert( macroToken.getIdentifierInfo()-getName());
+}
+}
+
+void CheckConfigMacros::MacroUndefined( const Token macroToken, const
MacroInfo* )
+{
+configMacros.erase( macroToken.getIdentifierInfo()-getName());
+}
+
+void CheckConfigMacros::Ifdef( SourceLocation location, const Token
macroToken )
+{
+checkMacro( macroToken, location );
+}
+
+void CheckConfigMacros::Ifndef( SourceLocation location, const Token
macroToken )
+{
+checkMacro( macroToken, location );
+}
+
+void CheckConfigMacros::Defined( const Token macroToken )
+{
+checkMacro( macroToken, macroToken.getLocation());
+}
+
+void CheckConfigMacros::checkMacro( const Token macroToken, SourceLocation
location )
+{
+if( configMacros.find( macroToken.getIdentifierInfo()-getName()) !=
configMacros.end())
+{
+report( DiagnosticsEngine::Error, checking whether a config macro %0
is defined,
+location ) macroToken.getIdentifierInfo()-getName();
+report( DiagnosticsEngine::Note, use #if instead of
#ifdef/#ifndef/defined, location );
+}
+}
+
+static Plugin::Registration CheckConfigMacros X( bodynotinblock );
+
+} // namespace
commit 996b6fc92b847f70f73cda58f64e5cf438585127
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Apr 4 12:52:04 2013 +0200
don't explicitly delete PPCallbacks-based compiler plugin actions
If the class is based on PPCallbacks too, Clang internals will delete
the instance.
Change-Id: I6dd83d800e6cca17eb0b5de23c8994f11c087fd5
diff --git a/compilerplugins/clang/pluginhandler.cxx
b/compilerplugins/clang/pluginhandler.cxx
index 69b8c04..cd554aa 100644
--- a/compilerplugins/clang/pluginhandler.cxx
+++ b/compilerplugins/clang/pluginhandler.cxx
@@ -12,6 +12,7 @@
#include clang/Frontend/CompilerInstance.h
#include clang/Frontend/FrontendPluginRegistry.h
+#include clang/Lex/PPCallbacks.h
#include stdio.h
#include sys/stat.h
#include unistd.h
@@ -65,7 +66,11 @@
Re: RE : Difficulties to build LO for windows
Hi there, On Thu, 2013-04-04 at 08:17 +, Gay, Matthieu wrote: Yes it works! Thanks for your activity ! I pushed that to the -3-5 branch then; thanks for testing. I met others problems here the problem and solution: I'll leave these to others; Fridrich - do you have any ideas ? the unit tests are run on Windows during our build are they not ? Error: test cppunit ko Solution: I'll have to delete some wmf files See here: http://lists.freedesktop.org/archives/libreoffice/2012-January/024403.html ... Now the error is still in creating help pack step, here the log: Of course, it is rather sad to see all this legacy stuff in -3-5 and so many bugs subsequently fixed rearing their heads again - but ... c'est la vie as they say ;-) 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] help.git: Branch 'libreoffice-4-0' - help-to-wiki.py
help-to-wiki.py |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit b27993adb1aa2aca80ab4f8df055336ff04a7a49 Author: Andras Timar ati...@suse.com Date: Thu Apr 4 11:12:25 2013 +0200 add more languages to WikiHelp Change-Id: I4210f948f464b9f7e4eebe9bf92f9f94ee691d8b Reviewed-on: https://gerrit.libreoffice.org/3200 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com diff --git a/help-to-wiki.py b/help-to-wiki.py index 0ee17ba..706e85f 100755 --- a/help-to-wiki.py +++ b/help-to-wiki.py @@ -60,9 +60,10 @@ def create_wiki_dirs(): except: pass -# Langs to handle -langs = ['', 'ca', 'cs', 'da', 'de', 'es', 'fr', 'hu', \ - 'it', 'ja', 'ko', 'nl', 'pl', 'pt', 'pt-BR', 'ru', \ +# Langs to handle (fully translated or otherwise important) +langs = ['', 'ast', 'bg', 'bn', bn_IN', 'ca', 'cs', 'da', 'de', \ + 'el', 'es', 'eu', 'fi', 'fr', 'hu', 'it', 'ja', 'km', \ + 'ko', 'nb', 'nl', 'om', 'pl', 'pt', 'pt-BR', 'ru', \ 'sl', 'sv', 'tr', 'vi', 'zh-CN', 'zh-TW' ] # Argument handling ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2deecc716a361d34f252e61f0196a01227411c09 Author: Andras Timar ati...@suse.com Date: Thu Apr 4 11:12:25 2013 +0200 Updated core Project: help b27993adb1aa2aca80ab4f8df055336ff04a7a49 add more languages to WikiHelp Change-Id: I4210f948f464b9f7e4eebe9bf92f9f94ee691d8b Reviewed-on: https://gerrit.libreoffice.org/3200 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com diff --git a/helpcontent2 b/helpcontent2 index db63c79..b27993a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit db63c79388f2039dd39b292f0ef037b8fc21cdae +Subproject commit b27993adb1aa2aca80ab4f8df055336ff04a7a49 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: unit test requirements ...
Hi, On Thu, Apr 04, 2013 at 11:42:46AM +0100, Michael Meeks wrote: But I see little reason to dogmatically write all tests in C++ as: It is not the test - it is the debugging of the test that is the issue. That is something that (potentially) stops people getting their code into LibreOffice. The higher we make that barrier - and the easier we make it for people to raise a barrier to entry that is fundamentally unusable / not-accessible for new people, the worse a world we live in. Sooo, IMHO there are multiple ways to use tests and that does different things. _If_ a test or test suite is run on every change submitted to e.g. gerrit and having an influence on the 'verified' result of the tinderbox, than it has to be stable and passing on master too. And if _that_ is the case, assuming the patch is not some 10k LOC diff, it shouldnt be had to guess what the root of the trouble is -- even without debugging. Limiting the scope is king here: If the change is small and the test is readable, you will rarely need debugging. If you need it, it shows other troubles (commit too big, test broken or wrong). Just re-write that python stuff in C++ in order to work out why the test fails for your new patch is not a nice message for a new contributor stymied by a potentially buggy un-debug-able test. Hey, that test is stupid, removed is a valid resolution of a test failure, if that is the case. _If_ tests are not run on every commit (and once we have to luxury of a huge test set we might need to consider that) and we do something like running them every week (like e.g. bug docs stuff), only _then_ you lose the locality/limited scope and then you need debugability. But in that case: - its not blocking contributions - its worth replicating a failed test in C++ then - you lose nothing, you win something = Good Thing(tm) even then That is, unless we can debug them cleanly - which I hope is somewhere we can get to without overmuch effort. Debugability is mostly a red herring if you have good locality (just like a good bibisect makes fixing regressions a lot easier). IMHO it is not trolling to point that out; Do we really need this strawman? Nobody suggested that. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: unit test failure in forms module, something do with com.sun.star.form.control.FixedText
On 2013-04-04 12:44, Noel Power wrote: me neither, its from complextests or subsequenttests or ? How do you run the tests ? make JunitTest_forms_unoapi This is just too weird. After hitting this problem for 4 days in a row, it suddenly starts working on this machine. And no I did not do a clean build, I just rebooted the box. Something must have been stuck in a weird state that triggered this issue. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: RE : Difficulties to build LO for windows
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Salut, Matthieu, comme les problèmes de Windows ne sont souvent pas déterministes, la meilleure solution serait que je puisse accéder à ta machine par RDP. Auparavant, il faut être un utilisateur non-privilégié pour builder LO et aussi il faut être positionné dans un répertoire qui commence par /cygdrive/... un autre répertoire virtuel est la bonne façon d'avoir des problèmes. F. On 04/04/13 13:07, Michael Meeks wrote: Hi there, On Thu, 2013-04-04 at 08:17 +, Gay, Matthieu wrote: Yes it works! Thanks for your activity ! I pushed that to the -3-5 branch then; thanks for testing. I met others problems here the problem and solution: I'll leave these to others; Fridrich - do you have any ideas ? the unit tests are run on Windows during our build are they not ? Error: test cppunit ko Solution: I'll have to delete some wmf files See here: http://lists.freedesktop.org/archives/libreoffice/2012-January/024403.html ... Now the error is still in creating help pack step, here the log: Of course, it is rather sad to see all this legacy stuff in -3-5 and so many bugs subsequently fixed rearing their heads again - but ... c'est la vie as they say ;-) Thanks ! Michael. -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlFdYI8ACgkQu9a1imXPdA+n7gCfe0Kivi7/kdoyyAP1JrOKJ6zl 5NYAnjkIwt3T4wby7oYw2ILiB8KvHkyD =cVcy -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] add more languages to WikiHelp
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3200 Approvals: Michael Meeks: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3200 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4210f948f464b9f7e4eebe9bf92f9f94ee691d8b Gerrit-PatchSet: 2 Gerrit-Project: help Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: unit test requirements ...
On 2013-04-04 13:13, Bjoern Michaelsen wrote: Debugability is mostly a red herring if you have good locality (just like a good bibisect makes fixing regressions a lot easier). For you maybe. Not for someone like me, trying to make cleanup changes and running the unit tests to confirm that I haven't broken anything. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: yet another unit test framework? -- was fdo#55814: unit test is missing
Markus Mohrhard wrote: Also I'm not the biggest fan of the argumentation that it allows more people to write unit tests. There were at least two people at the Impress Sprint willing to write tests, but only able to do so in Python. I think this project has the general policy of welcoming any contribution of good quality, provided it does not totally mess with the architecture. As you say below, if people are willing to maintain it, let's have it in please. :) Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/settings.cxx | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 84e99bd79ab4fef7e91bd302d1426cf1b3653b7f
Author: Cao Cuong Ngo cao.cuong@gmail.com
Date: Sat Mar 30 19:30:07 2013 +0100
fdo#60542 Persona setting: change color of the text menu.
Change-Id: I1d0ed94d41b3b8bcf0504e1528f4f505f817ad86
Reviewed-on: https://gerrit.libreoffice.org/3127
Reviewed-by: Jan Holesovsky ke...@suse.cz
Tested-by: Jan Holesovsky ke...@suse.cz
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index d8b1ce5..a237488 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -702,7 +702,7 @@ static BitmapEx readBitmapEx( const OUString rPath )
enum WhichPersona { PERSONA_HEADER, PERSONA_FOOTER };
/** Update the setting of the Persona header / footer in ImplStyleData */
-static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString
rHeaderFooter, BitmapEx rHeaderFooterBitmap )
+static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString
rHeaderFooter, BitmapEx rHeaderFooterBitmap, Color maMenuBarTextColor )
{
uno::Reference uno::XComponentContext xContext(
comphelper::getProcessComponentContext() );
if ( !xContext.is() )
@@ -721,13 +721,20 @@ static void setupPersonaHeaderFooter( WhichPersona
eWhich, OUString rHeaderFoot
rHeaderFooterBitmap = BitmapEx();
// now read the new values and setup bitmaps
-OUString aHeader, aFooter;
+OUString aHeader, aFooter, aColor;
if ( aPersona == own )
{
sal_Int32 nIndex = 0;
aHeader = aPersonaSettings.getToken( 0, ';', nIndex );
if ( nIndex 0 )
aFooter = aPersonaSettings.getToken( 0, ';', nIndex );
+
+// change menu text color, advance nIndex to skip the '#'
+if ( nIndex 0 )
+{
+aColor = aPersonaSettings.getToken( 0, ';', ++nIndex );
+maMenuBarTextColor = Color( aColor.toInt64( 16 ) );
+}
}
else if ( aPersona == default )
{
@@ -762,7 +769,7 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich,
OUString rHeaderFoot
const BitmapEx StyleSettings::GetPersonaHeader() const
{
-setupPersonaHeaderFooter( PERSONA_HEADER, mpData-maPersonaHeaderFooter,
mpData-maPersonaHeaderBitmap );
+setupPersonaHeaderFooter( PERSONA_HEADER, mpData-maPersonaHeaderFooter,
mpData-maPersonaHeaderBitmap, mpData-maMenuBarTextColor );
return mpData-maPersonaHeaderBitmap;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bug 42796 - Macro assigned to dataform Before Unload or While Unloading events are not called when form container is closed
On 04/04/13 11:03, Lionel Elie Mamane wrote:
On Thu, Apr 04, 2013 at 11:08:54AM +0200, Jan Holesovsky wrote:
mcmurchy1917-libreoff...@yahoo.co.uk píše v St 27. 03. 2013 v 09:46
+:
I've fallen foul of this bug in recent days so have decided to have a
look at it to see if I can provide a patch.
Thank you for the offer of help! :-) (...) I'm CCing Noel and Lionel
- macros are Noel's area, and databases Lionel's; (...)
In the bug report it was confirmed that a macro assigned to either the
Before Unloading or When Unloading events of a dataform are not called
when the form document is closed.
However, when editing a form and the Design Mode option is
toggled the events are called. Also the events when the form is
loaded are called under all circumstances.
I don't have a code pointer ready to give you, but:
1) I've indeed noticed that when opening a form in design mode (that
is, edit instead of open), the open event is called; I've
always found that rather curious, but have never gone through the
time to make a complete bug report of it.
Since you are going to touch that area anyway, it may make sense to
conditionalise these events to non-design mode. Actually, my
first thought is that *all* events should be disabled in design
mode, but I'm willing to listen to arguments otherwise.
2) Since you say that in design mode the events fire, my expectation /
hope would be that somewhere there is code that does:
if (isInDesignMode)
fireCloseEvent();
Possibly that is just a forgotten negation there; it would make
sense to see the git history that put that condition to see its
rationale, and if it turns out it is as I think, just add the
negation.
(Or maybe the code is something like:
if (!isInDesignMode)
return false;
fireCloseEvent();
and then we have to *remove* the negation)
Too see where that code is, I'd suggest to run libreoffice in gdb,
break on the event being called and then look at the backtrace. To
break on the event, you can bind a macro that does:
MessageBosx Even Called!
cause the event to be fired (in design mode, thus) and when you get
the dialog, just press CTRL-C in gdb.
well the advice was good ( I was doing it but not looking at my mail to
see this was answered ) anyway some extra info
First the triggering when in designmode isn't unfortunately that helpful
( although it does identify relevant code ) because there appears to be
specific handling for the designmode e.g. see
FmFormView::ChangeDesignMode
258 // --- 4. load resp. unload the forms
259 FmFormPage* pCurPage = GetCurPage();
260 if ( pCurPage )
261 {
262 if ( pFormShell pFormShell-GetImpl() )
263 pFormShell-GetImpl()-loadForms( pCurPage, ( bDesign
? FORMS_UNLOAD : FORMS_LOAD ) );
264 }
In the normal case of editing the forms ( which presumably that is the
workflow to normally trigger the event ? ) sorry I am not very db forms
enabled but I notice that we don't seem even to hit
ODatabaseForm::load() or ODatabaseForm::unload() (
forms/source/component/DatabaseForm.cxx ) Hopefully the code pointers
above might be useful places to start looking
Noel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/settings.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d9e0c08b52dca00508485cc7a8082200a2693ec9
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Apr 4 13:28:25 2013 +0200
Reduce scope.
Change-Id: I32160cff67494cde2ad21cb6d6fe48091d600b8d
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index a237488..a45f589 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -721,7 +721,7 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich,
OUString rHeaderFoot
rHeaderFooterBitmap = BitmapEx();
// now read the new values and setup bitmaps
-OUString aHeader, aFooter, aColor;
+OUString aHeader, aFooter;
if ( aPersona == own )
{
sal_Int32 nIndex = 0;
@@ -732,7 +732,7 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich,
OUString rHeaderFoot
// change menu text color, advance nIndex to skip the '#'
if ( nIndex 0 )
{
-aColor = aPersonaSettings.getToken( 0, ';', ++nIndex );
+OUString aColor = aPersonaSettings.getToken( 0, ';', ++nIndex );
maMenuBarTextColor = Color( aColor.toInt64( 16 ) );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#60542 Persona setting: change color of the text menu.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3127 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3127 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d0ed94d41b3b8bcf0504e1528f4f505f817ad86 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Cao Cuong Ngo cao.cuong@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ 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 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on||35785 -- 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
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on|35785 | -- 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
[PATCH] use filelist install method for udkapi and offapi
Hello LibreOffice gerrit bot, Michael Stahl, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3152 to look at the new patch set (#10). Change subject: use filelist install method for udkapi and offapi .. use filelist install method for udkapi and offapi ... so we can drop ZipUnoApi again. Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa --- M instsetoo_native/util/openoffice.lst.in M offapi/UnoApi_offapi.mk M scp2/inc/macros.inc M scp2/source/sdkoo/sdkoo.scp M solenv/gbuild/Package.mk M solenv/gbuild/UnoApi.mk D solenv/gbuild/ZipUnoApi.mk M solenv/gbuild/gbuild.mk M solenv/gbuild/platform/IOS_ARM_GCC.mk M solenv/gbuild/platform/WNT_INTEL_GCC.mk M solenv/gbuild/platform/com_MSC_class.mk M solenv/gbuild/platform/macosx.mk M solenv/gbuild/platform/solaris.mk M solenv/gbuild/platform/unxgcc.mk M udkapi/UnoApi_udkapi.mk 15 files changed, 329 insertions(+), 326 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/3152/10 -- To view, visit https://gerrit.libreoffice.org/3152 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa Gerrit-PatchSet: 10 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: config_host/config_global.h.in config_host.mk.in configure.ac sal/inc sal/qa xmlreader/inc
config_host.mk.in |1
config_host/config_global.h.in |1
configure.ac | 36 -
sal/inc/rtl/strbuf.hxx | 24 --
sal/inc/rtl/string.hxx | 20 ---
sal/inc/rtl/stringutils.hxx|2 -
sal/inc/rtl/ustrbuf.hxx| 35
sal/inc/rtl/ustring.hxx| 36 -
sal/qa/rtl/strings/test_ostring_stringliterals.cxx | 19 ---
xmlreader/inc/xmlreader/span.hxx |2 -
10 files changed, 1 insertion(+), 175 deletions(-)
New commits:
commit 598d3228cdcd66a79740bd05740f3e2169b1ec98
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Apr 4 13:34:58 2013 +0200
remove HAVE_SFINAE_ANONYMOUS_BROKEN
Since we no longer support the old Apple SDK using gcc-4.0.1, we can
remove the cruft to work around its problems. Woohoo.
Change-Id: Idf275e76449443f1f0314e75dab993f213a77eb7
diff --git a/config_host.mk.in b/config_host.mk.in
index 08fc52c9..e7c1a0e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -228,7 +228,6 @@ export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
export
HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=@HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION@
export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
export HAVE_READDIR_R=@HAVE_READDIR_R@
-export HAVE_SFINAE_ANONYMOUS_BROKEN=@HAVE_SFINAE_ANONYMOUS_BROKEN@
export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@
export HOST_PLATFORM=@host@
export HSQLDB_JAR=@HSQLDB_JAR@
diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
index 1e256b6..19b13dc 100644
--- a/config_host/config_global.h.in
+++ b/config_host/config_global.h.in
@@ -18,7 +18,6 @@ Any change in this header will cause a rebuild of almost
everything.
#define HAVE_GCC_BUILTIN_ATOMIC 0
#define HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY 0
#define HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE 0
-#define HAVE_SFINAE_ANONYMOUS_BROKEN 0
#define HAVE_THREADSAFE_STATICS 0
#define HAVE_SYSLOG_H 0
diff --git a/configure.ac b/configure.ac
index eabc81a..c460f73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5775,42 +5775,6 @@ AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
AC_SUBST(HAVE_GCC_VISIBILITY_BROKEN)
dnl ===
-dnl SFINAE test
-dnl Pre-C++11 does not allow types without linkage as template arguments.
-dnl Substitution Failure Is Not An Error is an idiom that disables
-dnl template instances that would cause an error, without actually
-dnl causing an error. Old gcc (pre-4.0.2) however causes a real error.
-dnl http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21514
-dnl ===
-HAVE_SFINAE_ANONYMOUS_BROKEN=
-if test \( $_os != WINNT -o $WITH_MINGW = yes \); then
-
-AC_LANG_PUSH([C++])
-AC_MSG_CHECKING([if SFINAE is broken with anonymous types])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-enum { AnonymousEnumValue };
-template typename T class TestPredicate {};
-template class TestPredicate int { public: typedef bool Type; };
-template typename T
-bool test( const T, typename TestPredicate T ::Type = false )
-{ return true; };
-void test( ... );
-]], [[
-test( 10 );
-test( AnonymousEnumValue );
-]])],[sfinae_anonymous_broken=no],[sfinae_anonymous_broken=yes
-])
-AC_MSG_RESULT([$sfinae_anonymous_broken])
-if test $sfinae_anonymous_broken = yes; then
-HAVE_SFINAE_ANONYMOUS_BROKEN=TRUE
-AC_DEFINE(HAVE_SFINAE_ANONYMOUS_BROKEN)
-fi
-AC_LANG_POP([C++])
-fi
-
-AC_SUBST(HAVE_SFINAE_ANONYMOUS_BROKEN)
-
-dnl ===
dnl Clang++ tests
dnl ===
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index d858c89..9ebd495 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -154,15 +154,6 @@ public:
@overload
@since LibreOffice 3.6
*/
-#if HAVE_SFINAE_ANONYMOUS_BROKEN // see the OString ctors
-OStringBuffer( const char* value )
-: pData(NULL)
-{
-sal_Int32 length = rtl_str_getLength( value );
-nCapacity = length + 16;
-rtl_stringbuffer_newFromStr_WithLength( pData, value, length );
-}
-#else
template typename T
OStringBuffer( const T value, typename internal::CharPtrDetector T,
internal::Dummy ::Type = internal::Dummy())
: pData(NULL)
@@ -203,7 +194,6 @@ public:
rtl_string_unittest_const_literal = true;
#endif
}
-#endif // HAVE_SFINAE_ANONYMOUS_BROKEN
/**
Constructs a string buffer so that it represents the same
@@ -458,12 +448,6 @@ public:
@param str the characters
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRTypes.h |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 79bf900ad62492cf3467ea6ffde0d82a199ca4ab
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Apr 4 13:48:36 2013 +0200
This is even better
diff --git a/src/lib/CDRTypes.h b/src/lib/CDRTypes.h
index ae5c1e9..aa5b946 100644
--- a/src/lib/CDRTypes.h
+++ b/src/lib/CDRTypes.h
@@ -167,9 +167,10 @@ struct CDRCharacterStyle
void overrideCharacterStyle(const CDRCharacterStyle override)
{
if (override.m_charSet || override.m_fontId)
+{
m_charSet = override.m_charSet;
-if (override.m_fontId)
m_fontId = override.m_fontId;
+}
if (override.m_fontSize 0.0)
m_fontSize = override.m_fontSize;
if (override.m_align)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo51916.rtf | 319 +
sw/qa/extras/rtfimport/rtfimport.cxx |7
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 21 +
writerfilter/source/rtftok/rtfdocumentimpl.hxx |3
4 files changed, 345 insertions(+), 5 deletions(-)
New commits:
commit dea93b72779747f7a10ecd9681232eb0f0de5d03
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Apr 3 17:04:32 2013 +0200
fdo#51916 don't try to support nested tables having table styles for now
Also fix an out of bounds substring access, triggered by the same bugdoc.
(cherry picked from commits 7a7d77f97b61ae7f602ed403ecfbbcdb03a06c00,
7006ef460bb68d27a74381fab7b8826b786b31c6 and
008275d56f9ac5248f0e94f606671b4c1993ca20)
Change-Id: I7db46ef17b8aed443faa7eb0c13b6ba109242cc1
Reviewed-on: https://gerrit.libreoffice.org/3199
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/sw/qa/extras/rtfimport/data/fdo51916.rtf
b/sw/qa/extras/rtfimport/data/fdo51916.rtf
new file mode 100644
index 000..b2359c3
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo51916.rtf
@@ -0,0 +1,319 @@
+{\rtf1
+{\fonttbl
+{\f0\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\f34\fbidi \froman\fcharset238\fprq2
+{\*\panose 02040503050406030204}
+Cambria Math;}
+{\f37\fbidi \fswiss\fcharset238\fprq2
+{\*\panose 020f0502020204030204}
+Calibri
+{\*\falt Century Gothic}
+;}
+{\f38\fbidi \fswiss\fcharset238\fprq2
+{\*\panose 020b0604030504040204}
+Tahoma;}
+{\flomajor\f31500\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\fdbmajor\f31501\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\fhimajor\f31502\fbidi \froman\fcharset238\fprq2
+{\*\panose 02040503050406030204}
+Cambria;}
+{\fbimajor\f31503\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\flominor\f31504\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\fdbminor\f31505\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\fhiminor\f31506\fbidi \fswiss\fcharset238\fprq2
+{\*\panose 020f0502020204030204}
+Calibri
+{\*\falt Century Gothic}
+;}
+{\fbiminor\f31507\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\f297\fbidi \froman\fcharset0\fprq2 Times New Roman;}
+{\f296\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\f298\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\f299\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\f300\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\f301\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\f302\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\f303\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\f637\fbidi \froman\fcharset0\fprq2 Cambria Math;}
+{\f636\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}
+{\f638\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}
+{\f639\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}
+{\f642\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}
+{\f643\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}
+{\f667\fbidi \fswiss\fcharset0\fprq2 Calibri
+{\*\falt Century Gothic}
+;}
+{\f666\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr
+{\*\falt Century Gothic}
+;}
+{\f668\fbidi \fswiss\fcharset161\fprq2 Calibri Greek
+{\*\falt Century Gothic}
+;}
+{\f669\fbidi \fswiss\fcharset162\fprq2 Calibri Tur
+{\*\falt Century Gothic}
+;}
+{\f672\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic
+{\*\falt Century Gothic}
+;}
+{\f673\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese)
+{\*\falt Century Gothic}
+;}
+{\f677\fbidi \fswiss\fcharset0\fprq2 Tahoma;}
+{\f676\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr;}
+{\f679\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur;}
+{\flomajor\f31510\fbidi \froman\fcharset0\fprq2 Times New Roman;}
+{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman
(Vietnamese);}
+{\fdbmajor\f31520\fbidi \froman\fcharset0\fprq2 Times New Roman;}
+{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times
Re: unit test failure in forms module, something do with com.sun.star.form.control.FixedText
On Thu, Apr 04, 2013 at 01:14:16PM +0200, Noel Grandin wrote: On 2013-04-04 12:44, Noel Power wrote: me neither, its from complextests or subsequenttests or ? How do you run the tests ? make JunitTest_forms_unoapi Just for completeness: The Java code for that would be in qadevOOo. And yes, its a PITA to debug. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/objstor.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 67d0b7033762a80093ab85b490437a3832851497
Author: Tor Lillqvist t...@iki.fi
Date: Thu Apr 4 14:51:39 2013 +0300
Bin a pointless and annoying OSL_ENSURE
If somebody wants it back, please revert, but then also add a comment
telling
what it means.
Change-Id: I40bae1b6747c8fa21f3bf4b3fc6f839226951a12
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 250a640..fbc3921 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1799,8 +1799,6 @@ sal_Bool SfxObjectShell::DisconnectStorage_Impl(
SfxMedium rSrcMedium, SfxMediu
{}
}
-OSL_ENSURE( bResult, Storage disconnecting has failed - affects
performance! );
-
return bResult;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#51916 don't try to support nested tables having table st...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3199 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3199 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7db46ef17b8aed443faa7eb0c13b6ba109242cc1 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdorect.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0c7bbbe9da7602f5d72aecd481f6d26d9af217f0
Author: Radek Doulik r...@novell.com
Date: Thu Apr 4 13:33:34 2013 +0200
disable round corners for rectangle shape. fixes fdo#39907
Change-Id: I4930ff1123783c434859434fef5983455a1e72f5
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index a60894e..2e0feac 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -184,7 +184,7 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec rInfo)
const
rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
rInfo.bShearAllowed =bNoTextFrame;
-rInfo.bEdgeRadiusAllowed=sal_True;
+rInfo.bEdgeRadiusAllowed=sal_False;
bool bCanConv=!HasText() || ImpCanConvTextToCurve();
if (bCanConv !bNoTextFrame !HasText()) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/core/graphichelper.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 1a15ba78c8abf1c9df09163c9b1dad1361ee3f29 Author: Tor Lillqvist t...@iki.fi Date: Thu Apr 4 15:11:10 2013 +0300 Fix warning: unused variable sGraphicURL [loplugin] Change-Id: I455e36a33720d9493480660dc54bd67b665c0fee diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx index deb3397..ff5bd61 100644 --- a/svx/source/core/graphichelper.cxx +++ b/svx/source/core/graphichelper.cxx @@ -206,7 +206,6 @@ void GraphicHelper::SaveShapeAsGraphic( const Reference drawing::XShape xSha Reference XPropertySet xShapeSet( xShape, UNO_QUERY_THROW ); OUString aMimeType; -OUString sGraphicURL; SvtPathOptions aPathOpt; String sGraphicPath( aPathOpt.GetGraphicPath() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: unit test failure in forms module, something do with com.sun.star.form.control.FixedText
On 2013-04-04 13:54, Bjoern Michaelsen wrote: Just for completeness: The Java code for that would be in qadevOOo. And yes, its a PITA to debug. Best, Bjoern Excellent! Thank you! Well, that means that the problem originates in the following file qadevOOo/objdsc/forms/com.sun.star.comp.forms.OFixedTextModel.csv Sadly, it does not explain why the problem decided to go away. But, if it reappears, at least we have narrowed down the search area :-) Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: postprocess/CustomTarget_images.mk
postprocess/CustomTarget_images.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit 974e18faea7b220677c86ee3c6ba41534ef33c5a Author: Andras Timar ati...@suse.com Date: Thu Apr 4 05:31:45 2013 -0700 postprocess: pack help images, too Change-Id: Ib8bafe50c91f2a6098b166a93035acacbd4070ae diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 965d3f6..1555b1a 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -28,6 +28,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,postprocess/images)) packimages_DIR := $(call gb_CustomTarget_get_workdir,postprocess/images) +helpimages_DIR := $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary) # Custom sets, at 24x24 16x16 fall-back to Tango preferentially # (Tango fallbacks to Industrial for the missing icons) @@ -50,6 +51,7 @@ $(packimages_DIR)/images.zip : \ $(call gb_Helper_abbreviate_dirs, \ $(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \ -m $(SRCDIR)/icon-themes/galaxy -c $(packimages_DIR) \ + $(call gb_Helper_optional,HELP,-l $(helpimages_DIR) ) \ -l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -s $ -o $@ \ $(if $(findstring s,$(MAKEFLAGS)), /dev/null)) @@ -62,6 +64,7 @@ $(packimages_DIR)/images_%.zip : \ $(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \ -m $(SRCDIR)/icon-themes/galaxy -c $(SRCDIR)/icon-themes/$* \ $(packimages_CUSTOM_FALLBACK_1) $(packimages_CUSTOM_FALLBACK_2) \ + $(call gb_Helper_optional,HELP,-l $(helpimages_DIR) ) \ -l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -s $ -o $@ \ $(if $(findstring s,$(MAKEFLAGS)), /dev/null)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] icon style fixes in local help
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3201
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/3201/1
icon style fixes in local help
correct icon style in offline help when icon style is Automatic
change icon style in offile help when icon style is changed on UI
Conflicts:
xmlhelp/Library_ucpchelp1.mk
Change-Id: I1b56beeaf370cb6b20b9a7c69f158291b4128ab0
---
M xmlhelp/Library_ucpchelp1.mk
M xmlhelp/source/cxxhelp/provider/databases.cxx
M xmlhelp/source/cxxhelp/provider/databases.hxx
3 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index 23527d1..4749c0d 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -70,6 +70,7 @@
sal \
ucbhelper \
utl \
+ vcl \
))
$(eval $(call gb_Library_add_exception_objects,ucpchelp1,\
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 7eda0aa..38b0ce4 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -61,6 +61,8 @@
#include comphelper/storagehelper.hxx
#include comphelper/string.hxx
+#include vcl/svapp.hxx
+
#include databases.hxx
#include urlparameter.hxx
@@ -138,7 +140,7 @@
vendVersion( rtl::OUString( %VENDORVERSION ) ),
vendShort( rtl::OUString( %VENDORSHORT ) ),
m_aImagesZipPaths( imagesZipPaths ),
- m_nSymbolsStyle( 0 )
+ m_aSymbolsStyleName( )
{
m_xSMgr = Reference XMultiComponentFactory (
m_xContext-getServiceManager(), UNO_QUERY );
@@ -238,8 +240,7 @@
rtl::OString Databases::getImagesZipFileURL()
{
-//sal_Int16 nSymbolsStyle = SvtMiscOptions().GetCurrentSymbolsStyle();
-sal_Int16 nSymbolsStyle = 0;
+OUString aSymbolsStyleName;
try
{
uno::Reference lang::XMultiServiceFactory xConfigProvider =
@@ -259,22 +260,31 @@
bool bChanged = false;
uno::Reference container::XHierarchicalNameAccess xAccess(xCFG,
uno::UNO_QUERY_THROW);
-uno::Any aResult =
xAccess-getByHierarchicalName(::rtl::OUString(Misc/SymbolSet));
-if ( (aResult = nSymbolsStyle) m_nSymbolsStyle != nSymbolsStyle )
+uno::Any aResult =
xAccess-getByHierarchicalName(::rtl::OUString(Misc/SymbolStyle));
+if ( (aResult = aSymbolsStyleName) m_aSymbolsStyleName !=
aSymbolsStyleName )
{
-m_nSymbolsStyle = nSymbolsStyle;
+m_aSymbolsStyleName = aSymbolsStyleName;
bChanged = true;
}
if ( m_aImagesZipFileURL.isEmpty() || bChanged )
{
-rtl::OUString aImageZip, aSymbolsStyleName;
-aResult =
xAccess-getByHierarchicalName(::rtl::OUString(Misc/SymbolStyle));
-aResult = aSymbolsStyleName;
-
+rtl::OUString aImageZip;
bool bFound = false;
+
if ( !aSymbolsStyleName.isEmpty() )
{
+if ( aSymbolsStyleName.equalsAscii(auto) )
+{
+OUString const env =
Application::GetDesktopEnvironment();
+if ( env.equalsIgnoreAsciiCase(tde) ||
+ env.equalsIgnoreAsciiCase(kde) )
+aSymbolsStyleName = crystal;
+else if ( env.equalsIgnoreAsciiCase(kde4) )
+aSymbolsStyleName = oxygen;
+else
+aSymbolsStyleName = tango;
+}
rtl::OUString aZipName = rtl::OUString( images_ );
aZipName += aSymbolsStyleName;
aZipName += rtl::OUString( .zip );
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx
b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 9961cfe..adc826a 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -314,7 +314,7 @@
rtl::OUString m_aInstallDirectory;//
Installation directory
com::sun::star::uno::Sequence rtl::OUString m_aImagesZipPaths;
rtl::OString m_aImagesZipFileURL;
-sal_Int16 m_nSymbolsStyle;
+rtl::OUString m_aSymbolsStyleName;
std::vector rtl::OUString m_avModules;
--
To view, visit https://gerrit.libreoffice.org/3201
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b56beeaf370cb6b20b9a7c69f158291b4128ab0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - xmlhelp/Library_ucpchelp1.mk xmlhelp/source
xmlhelp/Library_ucpchelp1.mk |1
xmlhelp/source/cxxhelp/provider/databases.cxx | 30 +-
xmlhelp/source/cxxhelp/provider/databases.hxx |2 -
3 files changed, 22 insertions(+), 11 deletions(-)
New commits:
commit c6bf17fabafc9f078ad49a937408721b8351dd6e
Author: Andras Timar ati...@suse.com
Date: Tue Apr 2 04:23:56 2013 -0700
icon style fixes in local help
correct icon style in offline help when icon style is Automatic
change icon style in offile help when icon style is changed on UI
Conflicts:
xmlhelp/Library_ucpchelp1.mk
Change-Id: I1b56beeaf370cb6b20b9a7c69f158291b4128ab0
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index 23527d1..4749c0d 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_libraries,ucpchelp1,\
sal \
ucbhelper \
utl \
+ vcl \
))
$(eval $(call gb_Library_add_exception_objects,ucpchelp1,\
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 7eda0aa..38b0ce4 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -61,6 +61,8 @@
#include comphelper/storagehelper.hxx
#include comphelper/string.hxx
+#include vcl/svapp.hxx
+
#include databases.hxx
#include urlparameter.hxx
@@ -138,7 +140,7 @@ Databases::Databases( sal_Bool showBasic,
vendVersion( rtl::OUString( %VENDORVERSION ) ),
vendShort( rtl::OUString( %VENDORSHORT ) ),
m_aImagesZipPaths( imagesZipPaths ),
- m_nSymbolsStyle( 0 )
+ m_aSymbolsStyleName( )
{
m_xSMgr = Reference XMultiComponentFactory (
m_xContext-getServiceManager(), UNO_QUERY );
@@ -238,8 +240,7 @@ static bool impl_getZipFile(
rtl::OString Databases::getImagesZipFileURL()
{
-//sal_Int16 nSymbolsStyle = SvtMiscOptions().GetCurrentSymbolsStyle();
-sal_Int16 nSymbolsStyle = 0;
+OUString aSymbolsStyleName;
try
{
uno::Reference lang::XMultiServiceFactory xConfigProvider =
@@ -259,22 +260,31 @@ rtl::OString Databases::getImagesZipFileURL()
bool bChanged = false;
uno::Reference container::XHierarchicalNameAccess xAccess(xCFG,
uno::UNO_QUERY_THROW);
-uno::Any aResult =
xAccess-getByHierarchicalName(::rtl::OUString(Misc/SymbolSet));
-if ( (aResult = nSymbolsStyle) m_nSymbolsStyle != nSymbolsStyle )
+uno::Any aResult =
xAccess-getByHierarchicalName(::rtl::OUString(Misc/SymbolStyle));
+if ( (aResult = aSymbolsStyleName) m_aSymbolsStyleName !=
aSymbolsStyleName )
{
-m_nSymbolsStyle = nSymbolsStyle;
+m_aSymbolsStyleName = aSymbolsStyleName;
bChanged = true;
}
if ( m_aImagesZipFileURL.isEmpty() || bChanged )
{
-rtl::OUString aImageZip, aSymbolsStyleName;
-aResult =
xAccess-getByHierarchicalName(::rtl::OUString(Misc/SymbolStyle));
-aResult = aSymbolsStyleName;
-
+rtl::OUString aImageZip;
bool bFound = false;
+
if ( !aSymbolsStyleName.isEmpty() )
{
+if ( aSymbolsStyleName.equalsAscii(auto) )
+{
+OUString const env =
Application::GetDesktopEnvironment();
+if ( env.equalsIgnoreAsciiCase(tde) ||
+ env.equalsIgnoreAsciiCase(kde) )
+aSymbolsStyleName = crystal;
+else if ( env.equalsIgnoreAsciiCase(kde4) )
+aSymbolsStyleName = oxygen;
+else
+aSymbolsStyleName = tango;
+}
rtl::OUString aZipName = rtl::OUString( images_ );
aZipName += aSymbolsStyleName;
aZipName += rtl::OUString( .zip );
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx
b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 9961cfe..adc826a 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -314,7 +314,7 @@ namespace chelp {
rtl::OUString m_aInstallDirectory;//
Installation directory
com::sun::star::uno::Sequence rtl::OUString m_aImagesZipPaths;
rtl::OString m_aImagesZipFileURL;
-sal_Int16 m_nSymbolsStyle;
+rtl::OUString m_aSymbolsStyleName;
std::vector rtl::OUString m_avModules;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: officecfg/registry: removal of items
[Thomas, I assume you don't mind moving this to the ML.] On 04/02/2013 09:43 PM, Thomas Arnhold wrote: Is it safe to remove items (which are marked as deprecated) from officecfg/registry/schema/org/openoffice/Office/Common.xcs? I my case I mean: Slot (as fallout from Tor's commit a2bf98857), SendCrashMail and UseMailUI. I did have a short look on other items like SolarizationThreshold which are completely unused, too. Are they in that list for the case that such config item appears in an old config file and get's handled? Generally, the .xcs data makes up part of LO's interface that external code can interact with, and as such should remain compatible. In practice, there is old cruft where it is so unlikely that it is used by any external code that it should be safe to clean it up. (Similar to some UNOIDL stuff that we got rid of.) Also, the configmgr implementation should just ignore any .xcu data for which there is no matching .xcs data. If in doubt, a good compromise might be to mark things as deprecated first, and only actually remove later. (And then, mark the relevant commits as API CHANGE so we can include them in our list of incompatible changes.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: package/source
package/source/xstor/ohierarchyholder.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 92824e8e25fc0cf66f461303da81f122eaf0f01b
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 30 16:33:05 2013 +0100
Simplify a bit
Change-Id: I77cb2b08b1d92f3c8ad406bb1ebd2d080cdbfa1a
Reviewed-on: https://gerrit.libreoffice.org/3123
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/package/source/xstor/ohierarchyholder.cxx
b/package/source/xstor/ohierarchyholder.cxx
index 39f177e..a5fa776 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -301,14 +301,14 @@ void OHierarchyElement_Impl::RemoveElement( const
::rtl::Reference OHierarchyEl
{
{
::osl::MutexGuard aGuard( m_aMutex );
-for ( OHierarchyElementList_Impl::iterator aIter = m_aChildren.begin();
- aIter != m_aChildren.end(); /* increment is done in body */)
+OHierarchyElementList_Impl::iterator aIter = m_aChildren.begin();
+const OHierarchyElementList_Impl::const_iterator aEnd =
m_aChildren.end();
+while (aIter != aEnd)
{
-OHierarchyElementList_Impl::iterator aTmpIter = aIter;
-++aIter;
-
-if ( aTmpIter-second == aRef )
-m_aChildren.erase( aTmpIter );
+if (aIter-second == aRef )
+aIter = m_aChildren.erase(aIter);
+else
+++aIter;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: unit test failure in forms module, something do with com.sun.star.form.control.FixedText
On 04/04/13 12:14, Noel Grandin wrote: On 2013-04-04 12:44, Noel Power wrote: me neither, its from complextests or subsequenttests or ? How do you run the tests ? make JunitTest_forms_unoapi This is just too weird. After hitting this problem for 4 days in a row, it suddenly starts working on this machine. And no I did not do a clean build, I just rebooted the box. Something must have been stuck in a weird state that triggered this issue. keep an eye out I guess, if it happens again we could try and debug it Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Simplify a bit
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3123 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3123 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I77cb2b08b1d92f3c8ad406bb1ebd2d080cdbfa1a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Crashed caused by Library_merged
Hi Peter, On Wed, 2013-04-03 at 21:54 -0400, Peter Foley wrote: While working on adding more libraries to Library_merged, I ran into some bizarre crashes in unit tests. Glad that the tests are catching these things. The errors seem to be related to exporting documents. They only occur when building with --enable-mergelibs. I've attached a log with backtraces from the segfaults. My configure args are: --with-system-cairo --enable-mergelibs --enable-debug CC=clang CXX=clang++ I'm also using the gold linker. Suggestions as to what might be breaking or how to further debug this would be greatly appreciated. I guess the crash on: FlushData(); is down to it being the first virtual method touched on that stream - which will in turn try to de-reference the vtable pointer which is (presuambly) invalid while the instance itself is not (allowing the earlier members to get touched). I'd be inclined to run it under valgrind if you can: export VALGRIND=memcheck# for memory checking That may help; why it would work under mergedlibs and not elsewhere is something more of a mystery of course. You would hope that gold would warn on multiple definitions of classes in case that is the problem; things like 'StreamData' in tools/ look a bit open to duplication ;-) and of course many previously local internal functions / classes will be pushed into a global scope by the mergelibs work. The more that goes in the more risk. I guess it might be possible to bisect the issue out by chopping stuff into / out of mergelibs to find the two modules that interfere with each other somehow - but that'd be quite painful I expect. In this case, looking at: #0 0x2aaabd442384 in SvStream::Flush (this=0x50) at /home/peter/libreoffice/tools/source/stream/stream.cxx:1475 #1 0x2aaab4ffc373 in GraphicHelper::getThumbnailFormatFromGDI_Impl (pMetaFile=0xfbe4d0, bSigned=0 '\000', xStream=uno::Reference to (XInterface) 0x2aaac3b7de20) at /home/peter/libreoffice/sfx2/source/doc/graphhelp.cxx:397 which seems to go wrong pretty quickly with the stream pointer, the situation looks rather fun :-) I'd be inclined to chase through to see where the pStream pointer goes wonky in that method personally. vcl/source/gdi/cvtgrf.cxx is the GraphicConverter impl. that seems to defer to the results of Application::SetFilterHdl - in a typically obscure chain of calls. The test::BootstrapFixture::setup() method does some work around here: // Make GraphicConverter work, normally done in desktop::Desktop::Main() Application::SetFilterHdl( LINK( this, test::BootstrapFixture, ImplInitFilterHdl ) ); Might be worth digging around there ? HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove -dylib_file mappings that are not needed anymore
Hello Luboš Luňák, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3192 to look at the new patch set (#3). Change subject: remove -dylib_file mappings that are not needed anymore .. remove -dylib_file mappings that are not needed anymore XCode 2.5 (i.e. Mac OSX 10.4 10.5) couldn't find the libraries without explicit mapping, but as baseline is now 10.6, this wrapping is no longer necessary Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8 --- M RepositoryExternal.mk M libxmlsec/ExternalProject_xmlsec.mk M odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile M odk/examples/DevelopersGuide/Components/CppComponent/Makefile M odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile M odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile M odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile M odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile M odk/examples/cpp/DocumentLoader/Makefile M odk/examples/cpp/complextoolbarcontrols/Makefile M odk/examples/cpp/counter/Makefile M odk/examples/cpp/remoteclient/Makefile M odk/settings/settings.mk M redland/ExternalProject_rasqal.mk M redland/ExternalProject_redland.mk D solenv/bin/macosx-dylib-link-list.pl M solenv/gbuild/platform/macosx.mk 19 files changed, 16 insertions(+), 131 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3192/3 -- To view, visit https://gerrit.libreoffice.org/3192 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier lohmaier+libreoff...@googlemail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove -dylib_file mappings that are not needed anymore
Hello Luboš Luňák, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/3192 to look at the new rebased patch set (#4). Change subject: remove -dylib_file mappings that are not needed anymore .. remove -dylib_file mappings that are not needed anymore XCode 2.5 (i.e. Mac OSX 10.4 10.5) couldn't find the libraries without explicit mapping, but as baseline is now 10.6, this wrapping is no longer necessary Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8 --- M RepositoryExternal.mk M libxmlsec/ExternalProject_xmlsec.mk M odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile M odk/examples/DevelopersGuide/Components/CppComponent/Makefile M odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile M odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile M odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile M odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile M odk/examples/cpp/DocumentLoader/Makefile M odk/examples/cpp/complextoolbarcontrols/Makefile M odk/examples/cpp/counter/Makefile M odk/examples/cpp/remoteclient/Makefile M odk/settings/settings.mk M redland/ExternalProject_rasqal.mk M redland/ExternalProject_redland.mk D solenv/bin/macosx-dylib-link-list.pl M solenv/gbuild/platform/macosx.mk 19 files changed, 16 insertions(+), 131 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3192/4 -- To view, visit https://gerrit.libreoffice.org/3192 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier lohmaier+libreoff...@googlemail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ 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 Andreas Zollmann cmusunb...@gmail.com changed: What|Removed |Added Depends on||44621 -- 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
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #212 from Andreas Zollmann cmusunb...@gmail.com --- [Bug 44621] With MacOSX 10.7 and later, dragging an image from the desktop to LO Writer is not possible This is a bug so prominent that probably every single LO on Mac OS = 10.7 user has come across and been annoyed by it. And remember that Mac folks tend to be less technical, so the fraction of Mac users creating a bugzilla account when bothered by a bug is going to be smaller than the corresponding fraction of Windows and Linux users. -- 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] libmspub.git: 2 commits - src/lib
src/lib/Fill.cpp | 28 +---
src/lib/Fill.h | 13 -
src/lib/FillType.h |8 +++-
src/lib/MSPUBCollector.cpp |8 ++--
src/lib/MSPUBParser.cpp| 15 +--
src/lib/ShapeInfo.h|3 ++-
6 files changed, 61 insertions(+), 14 deletions(-)
New commits:
commit c51d3825ee97cd563a4791f2b1b43e40c5272a7f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Apr 4 15:05:16 2013 +0200
Astyle stuff (astyle -b -k3 -y -n -s2 -r \*.cpp \*.h)
diff --git a/src/lib/Fill.cpp b/src/lib/Fill.cpp
index 66d55de..aeaeb37 100644
--- a/src/lib/Fill.cpp
+++ b/src/lib/Fill.cpp
@@ -54,11 +54,11 @@ WPXPropertyListVector
ImgFill::getProperties(WPXPropertyList *out) const
out-insert(style:repeat, stretch);
}
if (m_rotation != 0)
- {
- WPXString sValue;
- sValue.sprintf(%d, m_rotation);
- out-insert(libwpg:rotate, sValue);
- }
+{
+ WPXString sValue;
+ sValue.sprintf(%d, m_rotation);
+ out-insert(libwpg:rotate, sValue);
+}
}
return WPXPropertyListVector();
}
@@ -133,19 +133,19 @@ WPXPropertyListVector
GradientFill::getProperties(WPXPropertyList *out) const
out-insert(draw:angle, -m_angle); // draw:angle is clockwise in odf format
switch (m_type)
{
- case 4:
- case 7:
- out-insert(libmspub:shade, normal);
- break;
- case 5:
- out-insert(libmspub:shade, center);
- break;
- case 6:
- out-insert(libmspub:shade, shape);
- break;
- default:
- out-insert(libmspub:shade, normal);
- break;
+ case 4:
+ case 7:
+out-insert(libmspub:shade, normal);
+break;
+ case 5:
+out-insert(libmspub:shade, center);
+break;
+ case 6:
+out-insert(libmspub:shade, shape);
+break;
+ default:
+out-insert(libmspub:shade, normal);
+break;
}
for (unsigned i = 0; i m_stops.size(); ++i)
{
diff --git a/src/lib/FillType.h b/src/lib/FillType.h
index 7b1f4cb..8978ebd 100644
--- a/src/lib/FillType.h
+++ b/src/lib/FillType.h
@@ -34,10 +34,10 @@ namespace libmspub
enum FillType
{
SOLID,
- GRADIENT = 0x07, // msofillShadeScale Similar to msofillShade, but the
fillAngle
- // is additionally scaled by the aspect ratio of
- // the shape. If shape is square, it is the
- // same as msofillShade
+ GRADIENT = 0x07, // msofillShadeScale Similar to msofillShade, but the
fillAngle
+ // is additionally scaled by the aspect ratio of
+ // the shape. If shape is square, it is the
+ // same as msofillShade
GRADIENTCENTER = 0x06, // msofillShadeShape Shade from shape outline to end
point
GRADIENTSHAPE = 0x05, // msofillShadeCenter Shade from bounding rectangle
to end point
GRADIENTNORMAL = 0x04, // msofillShade Shade from start to end points
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index bbe229a..82b7cca 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -348,9 +348,9 @@ void
libmspub::MSPUBCollector::setupShapeStructures(ShapeGroupElement elt)
if (ptr_info-m_imgIndex.is_initialized())
{
unsigned index = ptr_info-m_imgIndex.get();
- int rot = 0;
- if (ptr_info-m_innerRotation.is_initialized())
- rot = ptr_info-m_innerRotation.get();
+ int rot = 0;
+ if (ptr_info-m_innerRotation.is_initialized())
+rot = ptr_info-m_innerRotation.get();
if (index - 1 m_images.size())
{
ptr_info-m_fill = boost::shared_ptrconst Fill(new ImgFill(index,
this, false, rot));
@@ -424,7 +424,7 @@ boost::functionvoid(void)
libmspub::MSPUBCollector::paintShape(const ShapeInfo
{
type = info.m_type.get_value_or(RECTANGLE);
}
-
+
if (hasFill)
{
double x, y, height, width;
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index cdbc155..584c227 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -1894,13 +1894,13 @@ boost::shared_ptrlibmspub::Fill
libmspub::MSPUBParser::getNewFill(const std::m
case TEXTURE:
case BITMAP:
{
- // in the case the shape is rotated we must rotate the image too
+// in the case the shape is rotated we must rotate the image too
int rotation = 0;
const int *ptr_rotation = (const int *)getIfExists_const(foptProperties,
FIELDID_ROTATION);
if (ptr_rotation)
{
- rotation = (int)doubleModulo(toFixedPoint(*ptr_rotation), 360);
- MSPUB_DEBUG_MSG((Rotation value %d\n, rotation));
+ rotation = (int)doubleModulo(toFixedPoint(*ptr_rotation), 360);
+ MSPUB_DEBUG_MSG((Rotation value %d\n, rotation));
}
const unsigned *ptr_bgPxId = getIfExists_const(foptProperties,
Re: Patch for libmspub-0.0.5
Thanks, I merged it into libmspub master. Thanks for your contribution. Could you please send a blanket e-mail to this list saying that your contribution to LibreOffice is under LGPL3+ and MPL2 and to libmspub under LGPL2.1+ and MPL1.1+? Cheers Fridrich On 03/04/13 22:53, Franz Schmid wrote: Hi all, my name is Franz Schmid, and i'm one of the core Scribus developers. Finally i had some time to go for a test of the libmspub library. It works very fine and integrates cleanly in our Scribus build. During the integration process i've done some minor improvements to libmspup, namely the detection of some more gradient types and the rotation of images. Attached is a patch against git master. Use: patch -p1 Image_Gradients.patch in the main directory of libmspup to apply the patch. Hope you accept my patch. Greetings, Franz Schmid ___ 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: Cppcheck: redundantAssignment about encoding in CreatePasswordToModifyHash (docfile.cxx, sfx2 module)
On Tue, 2013-04-02 at 14:13 -0700, julien2412 wrote: Hello, Cppcheck reported this: sfx2/source/doc/docfile.cxx 2626 redundantAssignment style Variable 'nEncoding' is reassigned a value before the old one has been used. See http://opengrok.libreoffice.org/xref/core/sfx2/source/doc/docfile.cxx#2610 I took a look to the git history but it's quite confusing. Moreover UTF8 doesn't appear in the switch some lines below. back before b1ec4b2cd5a9e6ece0e2a928cc0a11fef6bbe818 there was a bMSType argument which protected the switch so it wasn't redundant back then. Looks like the remaining first branch aka writer means in practice the ms .doc format, and the other is the .xls format. Using the system encoding is rather foul looking to me but if that's the way it has always been done I'm comfortable enough just changing the code to be ... rtl_TextEncoding nEncoding = osl_getThreadTextEncoding(); C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/vcl/builder.hxx |4 ++--
vcl/source/window/builder.cxx | 15 ++-
2 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit 1439c2fedd8a8c2e52bac3346e7e2ab588922fd9
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 4 14:23:18 2013 +0100
use existing hook for replacing %FOO variables
Change-Id: Ib10545d964e96ae6f92583bbad8479951385247c
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index c606055..8202aa1 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -11,6 +11,7 @@
#define _VCLBUILDER_HXX
#include typeinfo
+#include tools/resmgr.hxx //for poxy ResHookProc typedef
#include vcl/dllapi.h
#include vcl/window.hxx
#include xmlreader/xmlreader.hxx
@@ -196,8 +197,7 @@ private:
OString m_sID;
OString m_sHelpRoot;
-OString m_sProductName;
-OString m_sVendor;
+ResHookProc m_pStringReplace;
Window *m_pParent;
bool m_bToplevelHasDeferredInit;
bool m_bToplevelParentFound;
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 75959b6..01a7185 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -138,8 +138,7 @@ namespace
VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, OUString sUIFile,
OString sID)
: m_sID(sID)
, m_sHelpRoot(OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8))
-, m_sProductName(OUStringToOString(utl::ConfigManager::getProductName(),
RTL_TEXTENCODING_UTF8))
-, m_sVendor(OUStringToOString(utl::ConfigManager::getVendor(),
RTL_TEXTENCODING_UTF8))
+, m_pStringReplace(ResMgr::GetReadStringHook())
, m_pParent(pParent)
, m_bToplevelParentFound(false)
, m_pParserState(new ParserState)
@@ -2403,9 +2402,15 @@ void VclBuilder::collectProperty(xmlreader::XmlReader
reader, const OString rI
if (!sProperty.isEmpty())
{
sProperty = sProperty.replace('_', '-');
-rMap[sProperty] = sValue.
-replaceAll(%PRODUCTNAME, m_sProductName).
-replaceAll(%OOOVENDOR, m_sVendor);
+if (m_pStringReplace)
+{
+OUString sTmp = (*m_pStringReplace)(OStringToOUString(sValue,
RTL_TEXTENCODING_UTF8));
+rMap[sProperty] = OUStringToOString(sTmp, RTL_TEXTENCODING_UTF8);
+}
+else
+{
+rMap[sProperty] = sValue;
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - dbaccess/source
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit e32fd065075d2baccb9284d1bf55538418806865
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Apr 4 15:37:51 2013 +0200
more efficent readable
Change-Id: If24a2a8488f1b1142b12540e4b8b00eb26bd7873
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index dac3441..3e85d37 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -495,8 +495,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef
/*rController*/, lon
// replace with alias.*
if (aField.trim() == *)
{
-aField = aTable;
-aField += .*;
+aField = aTable + .*;
}
m_pFieldCell-SetText(aField);
} break;
commit e60eca1cfcf4763571f7e87a88740e4517a7dabd
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Apr 4 15:37:31 2013 +0200
replace only single wildcard by table.*
not any string beginning with *
Change-Id: I6afe4db0ae69632990eafb288f715ae9cf7ad837
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 2b53c89..dac3441 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -493,7 +493,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef
/*rController*/, lon
getDesignView()-fillValidFields(aTable, m_pFieldCell);
// replace with alias.*
-if ((aField[0] == '*') aTable.Len())
+if (aField.trim() == *)
{
aField = aTable;
aField += .*;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About clearInsertRow() (connectivity and dbaccess module)
On Sat, Mar 30, 2013 at 08:07:15AM -0700, julien2412 [via Document Foundation
Mail Archive] wrote:
I noticed that a variable wasn't incremented in this loop:
1772 void OResultSet::clearInsertRow()
1773 {
...
1778 for(sal_Int32 nPos = 0;aIter != aEnd;++aIter,++nPos)
1779 {
1780 ORowSetValueDecoratorRef rValue = (*aIter);
1781 if ( rValue-isBound() )
1782 {
1783 (m_aRow-get())[nPos]-setValue( (*aIter)-getValue() );
1784 }
1785 rValue-setBound(nPos == 0);
1786 rValue-setModified(sal_False);
1787 rValue-setNull();
1788 }
1789 }
See
http://opengrok.libreoffice.org/xref/core/connectivity/source/drivers/file/FResultSet.cxx#1772
Which variable is not incremented? I don't see what is not
incremented; both aIter and nPos are incremented, by the statement
++aIter,++nPos
I searched about clearInsertRow and found this method:
1638 void ORowSetCache::clearInsertRow()
1639 {
1640 // we don't unbound the bookmark column
1641 if ( m_aInsertRow != m_pInsertMatrix-end() m_aInsertRow-is()
)
1642 {
1643 ORowSetValueVector::Vector::iterator aIter =
(*m_aInsertRow)-get().begin()+1;
1644 ORowSetValueVector::Vector::iterator aEnd =
(*m_aInsertRow)-get().end();
1645 for(;aIter != aEnd;++aIter)
1646 {
1647 aIter-setBound(sal_False);
1648 aIter-setModified(sal_False);
1649 aIter-setNull();
1650 }
1651 }
1652 }
http://opengrok.libreoffice.org/xref/core/dbaccess/source/core/api/RowSetCache.cxx#1638
I wonder if it's normal that these functions are different. For example,
should we consider a bookmark column in first method?
Well, one is in a specific driver and the other in a generic wrapper
/ cache, so the first may well make things specific to the underlying
database...
Specifically, well, the first treats the bookmark column (which is
always and by definition the column 0; the normal columns are numbered
starting from 1), and sets it to bound.
The second just skips the bookmark column.
I don't immediately see anything wrong with the difference, but I
cannot explain it either, so basically I'm not sure there.
Then if it's ok, should we increment nPos in first one (...)
nPos is incremented.
--
Lionel
--
View this message in context:
http://nabble.documentfoundation.org/About-clearInsertRow-connectivity-and-dbaccess-module-tp4047094p4047882.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
[PATCH] fdo#60834 Find and Replace dialog: fix replace box selection...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3202 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/3202/1 fdo#60834 Find and Replace dialog: fix replace box selection on click Change-Id: Ic5256ae05d9b4646651e897b7d4c00d9a84329bb --- M svx/source/dialog/srchdlg.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 3d5a1fd..0040b32 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2029,7 +2029,7 @@ } bSet = sal_True; -aSearchLB.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) ); +( (ComboBox*)pCtrl )-SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) ); ModifyHdl_Impl( (ComboBox*)pCtrl ); -- To view, visit https://gerrit.libreoffice.org/3202 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5256ae05d9b4646651e897b7d4c00d9a84329bb Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Cao Cuong Ngo cao.cuong@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f7/1b3b72cdd703de3d1aa969913eb8a2746ffa74
f7/1b3b72cdd703de3d1aa969913eb8a2746ffa74 |1 + 1 file changed, 1 insertion(+) New commits: commit ccecbe85b87eb7dece7ef1d1de0c3f07397220d9 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 4 15:06:40 2013 +0100 Notes added by 'git notes add' diff --git a/f7/1b3b72cdd703de3d1aa969913eb8a2746ffa74 b/f7/1b3b72cdd703de3d1aa969913eb8a2746ffa74 new file mode 100644 index 000..aeb5700 --- /dev/null +++ b/f7/1b3b72cdd703de3d1aa969913eb8a2746ffa74 @@ -0,0 +1 @@ +prefer: 126729baee41f637166cf2418ec3ff9cc72cd7b0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtw8esh.cxx |9 +
sw/source/filter/ww8/ww8par.cxx |4
2 files changed, 13 insertions(+)
New commits:
commit 7cd378518b38def9cda5a0055a1d7525aad1c427
Author: Yong Lin Ma mayo...@apache.org
Date: Tue Jul 10 01:07:14 2012 +
Resolves: #i56806# Page background lost when export to doc format
Patch by: Chen ZuoJun
Review by: mayongl
(cherry picked from commit 4034798d137593863fdc9041ec9cd55ad88fbf84)
Change-Id: I76eb50834eae00837caaf4e49d547d7d0e309f30
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index d721e8c..a39f12f 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2091,6 +2091,15 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export
rWW8Wrt)
{
const SvxBrushItem* pBrush = (const SvxBrushItem*)pItem;
WriteBrushAttr(*pBrush, aPropOpt);
+
+SvxGraphicPosition ePos = pBrush-GetGraphicPos();
+if( ePos != GPOS_NONE ePos != GPOS_AREA )
+{
+/* #i56806# 0x033F parameter specifies a 32-bit field of
shape boolean properties.
+0x10001 means fBackground and fUsefBackground flag are
true thus background
+picture will be shown as tiled fill.*/
+aPropOpt.AddOpt( ESCHER_Prop_fBackground, 0x10001 );
+}
}
aPropOpt.AddOpt( ESCHER_Prop_lineColor, 0x801 );
aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x00080008 );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index f78da7b..4c2ab5e 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3803,6 +3803,10 @@ void wwSectionManager::SetSegmentToPageDesc(const
wwSection rSection,
SwFrmFmt rFmt = rPage.GetMaster();
+if(mrReader.pWDop-fUseBackGroundInAllmodes) // #i56806# Make sure
mrReader is initialized
+mrReader.GrafikCtor();
+
+
if (mrReader.pWDop-fUseBackGroundInAllmodes mrReader.pMSDffManager)
{
Rectangle aRect(0, 0, 100, 100); //A dummy, we don't care about the
size
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
