Re: [PATCH] New Layout for 'Insert Table' Dialog
I've commited a patch for this: https://gerrit.libreoffice.org/1217/ Samuel Am 28.11.2012 23:22, schrieb Terrence Enger: On Wed, 2012-11-28 at 23:04 +0100, Samuel Mehrbrodt wrote: Hi Terry, no, this was not intentional. You may change it back. So far, I have completely avoided hacking on ui objects. Can you do the change? Thanks, Terry. Am 28.11.2012 20:40, schrieb Terrence Enger: New Layout for 'Insert Table' Dialog I notice that the shortcut to number of rows has changed from altR to altW. Is this change intentional? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aff20299c1860d800e3edc8fdd17afbaa33c6a88 Author: Miklos Vajna vmik...@suse.cz Date: Sat Dec 1 10:50:16 2012 +0100 Updated core Project: help 14779b36c86679fafbab25f3886b2fb1faf79daa add help for enable remote control checkbox diff --git a/helpcontent2 b/helpcontent2 index 2fe3e71..14779b3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2fe3e715144881d57cce1d8aac7e0ca9c72c9bc8 +Subproject commit 14779b36c86679fafbab25f3886b2fb1faf79daa ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: source/text
source/text/shared/optionen/01070500.xhp |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 14779b36c86679fafbab25f3886b2fb1faf79daa Author: Miklos Vajna vmik...@suse.cz Date: Sat Dec 1 10:50:16 2012 +0100 add help for enable remote control checkbox diff --git a/source/text/shared/optionen/01070500.xhp b/source/text/shared/optionen/01070500.xhp index 2240de3..b747956 100644 --- a/source/text/shared/optionen/01070500.xhp +++ b/source/text/shared/optionen/01070500.xhp @@ -99,10 +99,12 @@ bookmark xml-lang=en-US branch=hid/sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_TABSTOP id=bm_id3154757 localize=false/ paragraph role=heading id=hd_id3152960 xml-lang=en-US level=3 l10n=U oldref=34Tab stops/paragraph paragraph role=paragraph id=par_id3155443 xml-lang=en-US l10n=U oldref=35ahelp hid=SD_METRICFIELD_TP_OPTIONS_MISC_MTR_FLD_TABSTOPDefines the spacing between tab stops./ahelp/paragraph -paragraph role=heading id=hd_id3156383 xml-lang=en-US level=2 l10n=U oldref=24Start presentation (only in presentations)/paragraph +paragraph role=heading id=hd_id3156383 xml-lang=en-US level=2 l10n=U oldref=24Presentation (only in presentations)/paragraph bookmark xml-lang=en-US branch=hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE id=bm_id3151249 localize=false/ paragraph role=heading id=hd_id3155902 xml-lang=en-US level=3 l10n=U oldref=26Always with current page/paragraph paragraph role=paragraph id=par_id3155962 xml-lang=en-US l10n=U oldref=27ahelp hid=SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGESpecifies that you always want a presentation to start with the current slide./ahelp Unmarkemph Always with current page/emph to always start a presentation with the first page./paragraph +paragraph role=heading id=hd_id3155903 xml-lang=en-US level=3 l10n=U oldref=26Enable remote control/paragraph +paragraph role=paragraph id=par_id3155963 xml-lang=en-US l10n=U oldref=27ahelp hid=SD:CHECKBOX:TP_OPTIONS_MISC:CBX_ENABLE_SDREMOTESpecifies that you want to enable Bluetooth remote control while Impress is running./ahelp Unmarkemph Enable remote control/emph to disable remote controlling./paragraph paragraph role=heading id=hd_id3163806 xml-lang=en-US level=2 l10n=U oldref=41Scale (only in drawings)/paragraph bookmark xml-lang=en-US branch=hid/sd:ComboBox:TP_OPTIONS_MISC:CB_SCALE id=bm_id3146317 localize=false/ paragraph role=heading id=hd_id3145147 xml-lang=en-US level=3 l10n=U oldref=43Drawing scale/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Removal ::rtl:: prefixes and macros in oxx
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1211 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/11/1211/1 Removal ::rtl:: prefixes and macros in oxx This commit removes some ::rtl:: prefixes and RTL_CONSTASCII_STRINGPARAM, RTL_CONSTASCII_USTRINGPARAM macros in oxx. Change-Id: I12bfb2528e8a9aaf3f119a1e6f0ae0246d16a772 Signed-off-by: José Guilherme Vanz guilherme@gmail.com --- M oox/source/core/binarycodec.cxx M oox/source/core/filterdetect.cxx M oox/source/core/fragmenthandler2.cxx M oox/source/core/xmlfilterbase.cxx 4 files changed, 30 insertions(+), 30 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1211 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12bfb2528e8a9aaf3f119a1e6f0ae0246d16a772 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: José Guilherme Vanz guilherme@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Fix RTL presnter console standrad layout mode
abdulmajeed ahmed has abandoned this change. Change subject: Fix RTL presnter console standrad layout mode .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/1028 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I7ba73005f9371dcc844c2e44a3eea99b7aac30f7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Lior Kaplan kaplanl...@gmail.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Removal ::rtl:: prefixes and macros in oxx
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1212 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/12/1212/1 Removal ::rtl:: prefixes and macros in oxx This commit removes some ::rtl:: prefixes and RTL_CONSTASCII_STRINGPARAM, RTL_CONSTASCII_USTRINGPARAM macros in oxx. Change-Id: I1139b10256387bb71e8a425153d46add181538bc Signed-off-by: José Guilherme Vanz guilherme@gmail.com --- M oox/source/drawingml/chart/axiscontext.cxx M oox/source/drawingml/chart/axisconverter.cxx M oox/source/drawingml/chart/chartconverter.cxx M oox/source/drawingml/chart/chartdrawingfragment.cxx M oox/source/drawingml/chart/chartspaceconverter.cxx M oox/source/drawingml/chart/chartspacefragment.cxx M oox/source/drawingml/chart/converterbase.cxx M oox/source/drawingml/chart/datasourcecontext.cxx M oox/source/drawingml/chart/datasourceconverter.cxx M oox/source/drawingml/chart/modelbase.cxx M oox/source/drawingml/chart/objectformatter.cxx M oox/source/drawingml/chart/plotareaconverter.cxx M oox/source/drawingml/chart/seriescontext.cxx M oox/source/drawingml/chart/seriesconverter.cxx M oox/source/drawingml/chart/titlecontext.cxx M oox/source/drawingml/chart/titleconverter.cxx M oox/source/drawingml/chart/typegroupconverter.cxx 17 files changed, 28 insertions(+), 28 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1212 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1139b10256387bb71e8a425153d46add181538bc Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: José Guilherme Vanz guilherme@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Removal ::rtl:: prefixes and macros in IO
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1210 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/1210/1 Removal ::rtl:: prefixes and macros in IO This commit removes some ::rtl:: prefixes and RTL_CONSTASCII_STRINGPARAM, RTL_CONSTASCII_USTRINGPARAM macros in IO. Change-Id: I410016990579e4a05843cfe396832a5fc8435e70 Signed-off-by: José Guilherme Vanz guilherme@gmail.com --- M io/source/TextInputStream/TextInputStream.cxx M io/source/TextOutputStream/TextOutputStream.cxx M io/source/stm/odata.cxx M io/source/stm/omark.cxx M io/source/stm/opipe.cxx M io/source/stm/opump.cxx 6 files changed, 37 insertions(+), 37 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1210 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I410016990579e4a05843cfe396832a5fc8435e70 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: José Guilherme Vanz guilherme@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] OUStringBuffer constructor from OUStringBuffer should use co...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1209 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/1209/1 OUStringBuffer constructor from OUStringBuffer should use const arg Change-Id: I9f9e072c0a7ebde2de9be811f2378143b2b7abc6 --- M sal/inc/rtl/ustrbuf.hxx M sal/qa/rtl/strings/test_oustring_stringliterals.cxx 2 files changed, 1 insertion(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1209 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f9e072c0a7ebde2de9be811f2378143b2b7abc6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/shellres.hxx |2 +-
sw/source/ui/utlui/initui.cxx |8
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 32c26ffb1f7585318a11f684a9886b58cea5b307
Author: Caolán McNamara caol...@redhat.com
Date: Sat Dec 1 12:18:53 2012 +
Resolves: fdo#56549 crash in format-autocorrect-apply and edit changes
regression from cad9afa15f53d547733fa55f1353772f6d696611
Change-Id: I1aa36bf86969a5a90456817d360d59125948e519
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index af969a0..253c85d 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -87,7 +87,7 @@ struct SW_DLLPUBLIC ShellResource : public Resource
private:
void _GetAutoFmtNameLst() const;
-std::vectorString *pAutoFmtNameLst;
+mutable std::vectorString *pAutoFmtNameLst;
String sPageDescFirstName;
String sPageDescFollowName;
String sPageDescName;
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index be7fa01..768c7d6 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -229,10 +229,10 @@ struct ImpAutoFmtNameListLoader : public Resource
void ShellResource::_GetAutoFmtNameLst() const
{
-std::vectorString* pLst(pAutoFmtNameLst);
-pLst = new std::vectorString;
-pLst-reserve(STR_AUTOFMTREDL_END);
-ImpAutoFmtNameListLoader aTmp( *pLst );
+assert(!pAutoFmtNameLst);
+pAutoFmtNameLst = new std::vectorString;
+pAutoFmtNameLst-reserve(STR_AUTOFMTREDL_END);
+ImpAutoFmtNameListLoader aTmp(*pAutoFmtNameLst);
}
ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( std::vectorString rLst )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: liblangtag/liblangtag-0.4.0-vsnprintf.patch liblangtag/UnpackedTarball_langtag.mk
liblangtag/UnpackedTarball_langtag.mk |1
liblangtag/liblangtag-0.4.0-vsnprintf.patch | 30
2 files changed, 31 insertions(+)
New commits:
commit 7580038e24b546a5288ab16f8507f73f1c6fd738
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Sat Dec 1 13:22:21 2012 +0100
vsnprintf() is not portable
http://perfec.to/vsnprintf/
At least MSVC2010 implementation returns -1 when the result doesn't fit,
so the excepted size is not computed correctly. Let's hope 16k is
big enough for everybody(TM).
Change-Id: I636487c7723651bfa74513018be786a45b6c796d
diff --git a/liblangtag/UnpackedTarball_langtag.mk
b/liblangtag/UnpackedTarball_langtag.mk
index 94d0438..663d724 100644
--- a/liblangtag/UnpackedTarball_langtag.mk
+++ b/liblangtag/UnpackedTarball_langtag.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,langtag,\
liblangtag/liblangtag-0.4.0-windows2.patch \
liblangtag/liblangtag-0.4.0-msvcprojects.patch \
liblangtag/liblangtag-0.4.0-ppc.patch \
+ liblangtag/liblangtag-0.4.0-vsnprintf.patch \
))
endif
diff --git a/liblangtag/liblangtag-0.4.0-vsnprintf.patch
b/liblangtag/liblangtag-0.4.0-vsnprintf.patch
new file mode 100644
index 000..09e1987
--- /dev/null
+++ b/liblangtag/liblangtag-0.4.0-vsnprintf.patch
@@ -0,0 +1,30 @@
+--- misc/liblangtag-0.4.0/liblangtag/lt-utils.c2012-12-01
10:46:26.0 +0100
misc/build/liblangtag-0.4.0/liblangtag/lt-utils.c 2012-12-01
13:17:41.421568551 +0100
+@@ -18,6 +18,7 @@
+ #include stdio.h
+ #include string.h
+ #include memory.h
++#include stdlib.h
+ #include lt-messages.h
+ #include lt-utils.h
+
+@@ -121,7 +121,7 @@ char *
+ lt_strdup_vprintf(const char *format,
+ va_list args)
+ {
+- char *retval, c;
++ char *retval, tmpbuf[ 16384 ];
+ va_list ap;
+ int size;
+
+@@ -133,7 +133,9 @@ lt_strdup_vprintf(const char *format,
+ va_copy(ap, args);
+ #endif
+
+- size = vsnprintf(c, 1, format, ap) + 1;
++ size = vsnprintf(tmpbuf, sizeof(tmpbuf), format, ap) + 1;
++ if( size == 0 ) // -1 + 1
++ abort();
+
+ va_end(ap);
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-3-6]: Resolves: fdo#56549 crash in format-autocorrect-apply and ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1218 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/18/1218/1 Resolves: fdo#56549 crash in format-autocorrect-apply and edit changes regression from cad9afa15f53d547733fa55f1353772f6d696611 Change-Id: I1aa36bf86969a5a90456817d360d59125948e519 (cherry picked from commit 32c26ffb1f7585318a11f684a9886b58cea5b307) --- M sw/inc/shellres.hxx M sw/source/ui/utlui/initui.cxx 2 files changed, 5 insertions(+), 5 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1218 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1aa36bf86969a5a90456817d360d59125948e519 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source
sd/source/ui/dlg/tpoption.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 4cdb960a79aff565f956f618116f3ea4b3836aa4 Author: Miklos Vajna vmik...@suse.cz Date: Sat Dec 1 09:49:21 2012 +0100 sd: hide 'enable remote control' checkbox when built without bluetooth Change-Id: I3ee70bdf59abf71228a708f05dba07fd2a873128 diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 6cdd463..8e81966 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -623,6 +623,9 @@ void SdTpOptionsMisc::SetImpressMode (void) // Move the printer-independent-metrics check box up two lines to change // places with spacing-between-paragraphs check box. lcl_MoveWin (aCbxUsePrinterMetrics, -2*nLineHeight); +#ifndef ENABLE_SDREMOTE_BLUETOOTH +aCbxEnableSdremote.Hide(); +#endif } voidSdTpOptionsMisc::SetDrawMode() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/Library_msword.mk sw/source sw/util writerfilter/source
sw/Library_msword.mk |1
sw/source/filter/ww8/docxexportfilter.cxx |6 -
sw/source/filter/ww8/rtfimportfilter.cxx | 120 --
sw/source/filter/ww8/rtfimportfilter.hxx | 65
sw/util/msword.component |3
writerfilter/source/filter/RtfFilter.cxx | 13 ---
6 files changed, 208 deletions(-)
New commits:
commit 08162021840608c05eec552a4fda461d2ec6d2ac
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Dec 1 10:59:18 2012 +0100
sw: remove unused UNO wrapper around old internal RTF import
Change-Id: I460f75d03a0af53da7523e290136126e95e01192
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index b5f0b20..5ce6617 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -78,7 +78,6 @@ $(eval $(call gb_Library_add_exception_objects,msword,\
sw/source/filter/ww8/rtfattributeoutput \
sw/source/filter/ww8/rtfexport \
sw/source/filter/ww8/rtfexportfilter \
-sw/source/filter/ww8/rtfimportfilter \
sw/source/filter/ww8/rtfsdrexport \
sw/source/filter/ww8/rtfstringbuffer \
sw/source/filter/ww8/WW8FFData \
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx
b/sw/source/filter/ww8/docxexportfilter.cxx
index c04e329..8149b36 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -19,7 +19,6 @@
#include docxexportfilter.hxx
#include rtfexportfilter.hxx
-#include rtfimportfilter.hxx
#include docxexport.hxx
#include docsh.hxx
@@ -130,11 +129,6 @@ extern C
RtfExport_getSupportedServiceNames,
::cppu::createSingleComponentFactory,
0, 0
},
-{
-RtfImport_createInstance, RtfImport_getImplementationName,
-RtfImport_getSupportedServiceNames,
::cppu::createSingleComponentFactory,
-0, 0
-},
{ 0, 0, 0, 0, 0, 0 }
};
diff --git a/sw/source/filter/ww8/rtfimportfilter.cxx
b/sw/source/filter/ww8/rtfimportfilter.cxx
deleted file mode 100644
index df5fc7c..000
--- a/sw/source/filter/ww8/rtfimportfilter.cxx
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include rtfimportfilter.hxx
-#include ../rtf/swparrtf.hxx
-
-#include docsh.hxx
-#include doc.hxx
-#include unotxdoc.hxx
-
-#include comphelper/mediadescriptor.hxx
-#include unotools/ucbstreamhelper.hxx
-
-using namespace ::comphelper;
-using namespace ::com::sun::star;
-
-RtfImportFilter::RtfImportFilter( const uno::Reference uno::XComponentContext
xCtx ) :
-m_xCtx( xCtx )
-{
-}
-
-RtfImportFilter::~RtfImportFilter()
-{
-}
-
-sal_Bool RtfImportFilter::filter( const uno::Sequence beans::PropertyValue
aDescriptor )
-throw (uno::RuntimeException)
-{
-SAL_INFO(sw.rtf, OSL_THIS_FUNC);
-
-MediaDescriptor aMediaDesc = aDescriptor;
-::uno::Reference io::XInputStream xInputStream =
-aMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_INPUTSTREAM(), uno::Reference io::XInputStream () );
-SvStream* pStream = utl::UcbStreamHelper::CreateStream( xInputStream,
sal_True );
-if (!pStream)
-return sal_False;
-
-// get SwDoc*
-uno::Reference uno::XInterface xIfc( m_xDstDoc, uno::UNO_QUERY );
-SwXTextDocument *pTxtDoc = dynamic_cast SwXTextDocument * ( xIfc.get() );
-if (!pTxtDoc)
-return sal_False;
-SwDoc *pDoc = pTxtDoc-GetDocShell()-GetDoc();
-if (!pDoc)
-return sal_False;
-
-// get SwPaM*
-// NEEDSWORK should we care about partial imports? For now we just import
-// the whole document
-SwPaM aPam( pDoc-GetNodes().GetEndOfContent() );
-aPam.SetMark();
-aPam.Move( fnMoveBackward, fnGoDoc );
-SwPaM *pCurPam = new SwPaM( *aPam.End(), *aPam.Start() );
-
-String aURL;
-OUString sTemp;
-for ( sal_Int32 i = 0; i aDescriptor.getLength(); i++ )
-{
-if( aDescriptor[i].Name == URL )
-{
-aDescriptor[i].Value = sTemp;
-aURL = sTemp;
-}
-}
-
-RtfReader aReader;
-sal_Bool bRet = aReader.Read(pStream, *pDoc, aURL, *pCurPam) == 0;
-delete pStream;
Re: Dailies by banch?
Hello, Niko Rönkkö wrote on 2012-12-01 07:06: Can someone, please, sort dev-build dailies by branch? http://dev-builds.libreoffice.org/daily/ Michael M. said on IRC that that could be done with symlinks quite easily I guess So like: http://dev-builds.libreoffice.org/daily/libreoffice-3-6 http://dev-builds.libreoffice.org/daily/master or: http://dev-builds.libreoffice.org/daily/by_branch/libreoffice-3-6 http://dev-builds.libreoffice.org/daily/by_branch/master It would be much easier to direct common people to test the right builds from Wiki for example.. Not all tinderboxes are building all banches so today its behind some work to find usable build. Luckily(?) there is NOT so many tinderboxes.. I think this is rather a question for the developers, since that machine is maintained by them and I don't want to interfere with their way of working. :-) If someone lets me know what to do, I am happy to, but I'm hesitant to changing things on my own, without knowing all development details. Florian -- Florian Effenberger, Chairman of the Board (Vorstandsvorsitzender) Tel: +49 8341 99660880 | Mobile: +49 151 14424108 Jabber: flo...@jabber.org | SIP: flo...@iptel.org The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sal/inc sal/qa
sal/inc/rtl/ustrbuf.hxx |2 +-
sal/qa/rtl/strings/test_oustring_stringliterals.cxx |1 -
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 10cecb81dbd897aaea5188c9249770877ac20771
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Fri Nov 30 20:24:18 2012 -0600
OUStringBuffer constructor from OUStringBuffer should use const arg
Change-Id: I9f9e072c0a7ebde2de9be811f2378143b2b7abc6
Reviewed-on: https://gerrit.libreoffice.org/1209
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index d8db905..6338dd1 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -409,7 +409,7 @@ public:
@since LibreOffice 4.0
*/
-OUStringBuffer append(OUStringBuffer str)
+OUStringBuffer append(const OUStringBuffer str)
{
if(str.getLength() 0)
{
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index e02bd93..09b55c6 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -181,7 +181,6 @@ void test::oustring::StringLiterals::checkBuffer()
buf.insert( 3, baz );
CPPUNIT_ASSERT_EQUAL( rtl::OUString( foobazbar ), buf.toString());
char d[] = d;
-CPPUNIT_ASSERT( !VALID_CONVERSION( buf.append( d )));
CPPUNIT_ASSERT( !VALID_CONVERSION( buf.insert( 0, d )));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libxmlsec/ExternalProject_xmlsec.mk
libxmlsec/ExternalProject_xmlsec.mk |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit 91b8f74987996a7dbc7d9c6b97a4bbdcfe3c2652 Author: Tor Lillqvist t...@iki.fi Date: Sat Dec 1 10:54:12 2012 +0200 Fix OS X build at least with current tool-chain Pass correct -I flag to acloal in the ACLOCAL environemnt variable, and set that environment variable for the running of autoreconf for it it to have any effect. Change-Id: I64238b6b96539dff28c2ddc16cc17f18ebb22129 diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index 5b310e6..5c188b5 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -44,10 +44,9 @@ else $(call gb_ExternalProject_get_state_target,xmlsec,build) : cd $(EXTERNAL_WORKDIR) \ -autoreconf \ -$(if $(filter MACOSX,$(OS)),ACLOCAL=aclocal -I $(EXTERNAL_WORKDIR)/m4/mac) \ - ./configure \ - --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \ +$(if $(filter MACOSX,$(OS)),ACLOCAL=aclocal -I $(SRCDIR)/m4/mac) autoreconf \ +./configure \ + --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \ $(if $(filter ANDROID,$(OS)),--with-openssl=$(OUTDIR),--without-openssl) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ $(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: autogen.sh
autogen.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b8f3214f5ce0c6ac3eaab30abf2d281dbd1f6fd7
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Nov 30 23:42:36 2012 +0200
Don't require configure to appear executable
Makes autogen.sh work on Cygwin when the build directory is on a
vmware Shared Folder volume.
diff --git a/autogen.sh b/autogen.sh
index 8884d5f..04d87c0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -157,7 +157,7 @@ $ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if
(!($system eq 'Darwi
system ($aclocal $aclocal_flags) die Failed to run aclocal;
unlink (configure);
system (autoconf) die Failed to run autoconf;
-die failed to generate configure if (! -x configure);
+die failed to generate configure if (! -f configure);
if (defined $ENV{NOCONFIGURE}) {
print Skipping configure process.;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: random number generators for calc
the header is sal/inc/rtl/random.h (which is apparently a C interface).
Exactly, the C++ interface is missing. Also, the source doesn't have
any comments to say what algorithm is implemented etc. Do you know?
but why do we need a wrapper around boost in sal? i mean i haven't
looked at the boost random stuff but unless its interface is horrible
(always a possibility with boost i guess) _and_ there are multiple
places where we'd want to call it, then why not use it directly from
Calc's formula implementation?
I guess that's for someone more experienced to comment on. My simple
reason was rtl::math seems a good collection of maths functions this
may fit in, and there's no decision yet if RANDNORMAL() etc should be
implemented in sc or scaddins (or at all?).
The boost code would look something like this:
#include boost/random.hpp
// the underlying random number generator as global variable
// using Mersenne twister algorithm
#define BOOST_RNG_ALGO boost::mt19937
BOOST_RNG_ALGO global_rng;
// set initial state of generator
void rand_set(int i){
global_rng.seed(i);
}
// rand from a discrete uniform (same as RANDBETWEEN())
int rand_uniform_int(int from, int to){
assert(fromto);
static boost::variate_generatorBOOST_RNG_ALGO,
boost::random::uniform_int_distribution
myrand(global_rng,
boost::random::uniform_int_distribution());
myrand.distribution().param(
boost::random::uniform_int_distribution::param_type(from,to));
return myrand();
}
// rand from a Chi-squared Chi^2(k) distribution
double rand_chisq(int k) {
assert(k0);
static boost::variate_generatorBOOST_RNG_ALGO,
boost::random::chi_squared_distribution
myrand(global_rng,
boost::random::chi_squared_distribution());
myrand.distribution().param(
boost::random::chi_squared_distribution::param_type(k));
return myrand();
}
...
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On Fri, 2012-11-30 at 21:50 +0100, Mat M wrote: What You do not know what every LO contributor is currently working on ?! What a shame! :-D Heh :-) Well, actually, I put a nice [1] for reference, but not the link, so: https://bugs.freedesktop.org/show_bug.cgi?id=56902#c1 Oh - cool - looking forward to seeing that land. Nice work, 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] .: libxmlsec/xmlsec1-configure.patch
libxmlsec/xmlsec1-configure.patch | 14 ++ 1 file changed, 14 insertions(+) New commits: commit 127a00a46358673047790b83a8433b909b46412c Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Sat Dec 1 13:45:31 2012 +0100 our xmlsec setup calls autoreconf, so patch Makefile.am too Should fix release tinderboxes. Change-Id: I90fc650dc089e94328ecb9d526f0905f5be5ce3c diff --git a/libxmlsec/xmlsec1-configure.patch b/libxmlsec/xmlsec1-configure.patch index 40a7175..ead9050 100644 --- a/libxmlsec/xmlsec1-configure.patch +++ b/libxmlsec/xmlsec1-configure.patch @@ -1,3 +1,17 @@ +--- misc/xmlsec1-1.2.14/Makefile.am misc/build/xmlsec1-1.2.14/Makefile.am +@@ -1,8 +1,9 @@ + NULL = + + SAFE_VERSION = @XMLSEC_VERSION_SAFE@ +-SUBDIRS = include src apps man docs +-TEST_APP = apps/xmlsec1$(EXEEXT) ++#Do not build xmlsec1 app. It is not needed. Also the libtool includes ++#a -L/path_to_lib_dir which may contain an incompatible lixbml2. ++SUBDIRS = include src man docs + DEFAULT_CRYPTO= @XMLSEC_CRYPTO@ + + bin_SCRIPTS = xmlsec1-config --- misc/xmlsec1-1.2.14/Makefile.in2009-06-25 22:53:34.0 +0200 +++ misc/build/xmlsec1-1.2.14/Makefile.in 2009-10-01 10:32:48.708515261 +0200 @@ -341,8 +341,9 @@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 31cb1067c0b387646ef45b54e628d81ffb64105b Author: Andras Timar ati...@suse.com Date: Sat Dec 1 07:51:02 2012 +0100 Updated core Project: translations 965f3562a25b75fc3401d3b44ed96e2e5093ed72 generate filelist of pot files diff --git a/translations b/translations index e1891b8..965f356 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit e1891b8f9c50ca687723f1afc13fbef209475875 +Subproject commit 965f3562a25b75fc3401d3b44ed96e2e5093ed72 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: CustomTarget_translate.mk
CustomTarget_translate.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 965f3562a25b75fc3401d3b44ed96e2e5093ed72 Author: Andras Timar ati...@suse.com Date: Sat Dec 1 07:51:02 2012 +0100 generate filelist of pot files Change-Id: I105e36536ac06f6fdbe6457afa9c19ff32524841 diff --git a/CustomTarget_translate.mk b/CustomTarget_translate.mk index bcdcda8..562b6b3 100644 --- a/CustomTarget_translate.mk +++ b/CustomTarget_translate.mk @@ -38,6 +38,7 @@ $(translations_DIR)/pot.done : $(foreach exec,cfgex helpex localize transex3 \ $(call gb_Output_announce,$(subst .pot,,$(subst $(WORKDIR)/,,$@)),$(true),POT,1) $(call gb_Helper_abbreviate_dirs, \ mkdir -p $(dir $@) $(call gb_Helper_execute,localize) $(SRCDIR) $(dir $@)/pot) \ +find $(dir $@)/pot -type f -printf %P\n | sed -e s/\.pot/.po/ $(dir $@)/LIST \ touch $@ # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sal/qa
sal/qa/rtl/strings/test_ostring_stringliterals.cxx |2 -- sal/qa/rtl/strings/test_oustring_stringliterals.cxx |2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 214bfee28551ca6aaa9e70f2b2838faf536f06d9 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Sat Dec 1 09:00:12 2012 +0100 unused variables Change-Id: Ia8b2ac25d3949508b132d1b0b05e5384633d935f diff --git a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx index 877c45e..8a78b89 100644 --- a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx +++ b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx @@ -165,7 +165,6 @@ void test::ostring::StringLiterals::checkUsage() rtl::OString FooBaRfoo( FooBaRfoo ); rtl::OString FooBaR( FooBaR ); rtl::OString bar( bar ); -rtl::OString test( test ); rtl_string_unittest_const_literal = false; // start checking for OString conversions rtl_string_unittest_non_const_literal_function = false; // and check for non-const variants @@ -232,7 +231,6 @@ void test::ostring::StringLiterals::checkNonConstUsage() rtl::OString FooBaRfoo( FooBaRfoo ); rtl::OString FooBaR( FooBaR ); rtl::OString bar( bar ); -rtl::OString test( test ); char foo_c[] = foo; char bar_c[] = bar; char fOo_c[] = fOo; commit 0222bdb752fef6363c5118efdf30b59817f4445e Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Sat Dec 1 08:58:08 2012 +0100 but back a unittest check about invalid char[] - OUString(Buffer) conversion It's invalid, so the additional ambiguity here doesn't matter, but I'd still prefer to check that it remains invalid. Change-Id: Ie05d393ad7f51738383bb98b911938506abd64fc diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx index 09b55c6..8d82543 100644 --- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx +++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx @@ -181,6 +181,8 @@ void test::oustring::StringLiterals::checkBuffer() buf.insert( 3, baz ); CPPUNIT_ASSERT_EQUAL( rtl::OUString( foobazbar ), buf.toString()); char d[] = d; +CPPUNIT_ASSERT( !VALID_CONVERSION( buf.append( rtl::OUString( d ; +CPPUNIT_ASSERT( !VALID_CONVERSION( buf.append( rtl::OUStringBuffer( d ; CPPUNIT_ASSERT( !VALID_CONVERSION( buf.insert( 0, d ))); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/tabpages/numfmt.cxx |4 ++--
cui/source/tabpages/page.cxx|2 +-
cui/source/tabpages/tpcolor.cxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 399b92edc74cc06f800b17cd96059aa1f58e6501
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sat Dec 1 00:52:57 2012 +0100
OUString::valueOf ambiguous overloads
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 7bd349b..12c267b 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1036,8 +1036,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool
bCheckCatChange /*= sa
aEdLeadZeroes .Disable();
aBtnNegRed .Disable();
aBtnThousand.Disable();
-aEdDecimals .SetText( OUString::valueOf( 0 ) );
-aEdLeadZeroes .SetText( OUString::valueOf( 0 ) );
+aEdDecimals .SetText( OUString::valueOf(
static_castsal_Int32(0) ) );
+aEdLeadZeroes .SetText( OUString::valueOf(
static_castsal_Int32(0) ) );
aBtnNegRed .Check( sal_False );
aBtnThousand.Check( sal_False );
}
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index b29d37b..50b6a57 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -944,7 +944,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl)
{
aName = aPaperBin;
aName.Append( sal_Unicode(' ') );
-aName.Append( OUString::valueOf( i+1 ) );
+aName.Append( OUString::valueOf( static_castsal_Int32(i+1) ) );
}
nEntryPos = aPaperTrayBox.InsertEntry( aName );
aPaperTrayBox.SetEntryData( nEntryPos, (void*)(sal_uLong)i );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 6893994..9f4f98d 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -1223,7 +1223,7 @@ sal_uInt16 SvxColorTabPage::PercentToColor_Impl(
sal_uInt16 nPercent )
void SvxColorTabPage::FillUserData()
{
// the color model is saved in the Ini-file
-SetUserData( OUString::valueOf( eCM ) );
+SetUserData( OUString::valueOf( static_castsal_Int32(eCM) ) );
}
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libxmlsec/ExternalPackage_xmlsec.mk
libxmlsec/ExternalPackage_xmlsec.mk |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 4cdce3d614eb9850e3f4596a5233464e8b4d5163 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Sat Dec 1 13:56:17 2012 +0100 fix libxmlsec delivering with mingw diff --git a/libxmlsec/ExternalPackage_xmlsec.mk b/libxmlsec/ExternalPackage_xmlsec.mk index a553159..eebc541 100644 --- a/libxmlsec/ExternalPackage_xmlsec.mk +++ b/libxmlsec/ExternalPackage_xmlsec.mk @@ -13,8 +13,10 @@ $(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec)) ifeq ($(OS),WNT) ifeq ($(COM),GCC) -$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.dll.a,src/nss/.libs/libxmlsec1-nss.dll.a)) -$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.dll,src/nss/.libs/libxmlsec1-nss.dll)) +$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.dll.a,src/.libs/libxmlsec1.dll.a)) +$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.dll,src/.libs/libxmlsec1.dll)) +$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.dll.a,src/nss/.libs/libxmlsec1-nss.dll.a)) +$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.dll,src/nss/.libs/libxmlsec1-nss.dll)) else $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec-mscrypto.lib,win32/binaries/libxmlsec-mscrypto.lib)) $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec.lib,win32/binaries/libxmlsec.lib)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - libxmlsec/xmlsec1-mingw32.patch solenv/gbuild
libxmlsec/xmlsec1-mingw32.patch |4 ++-- solenv/gbuild/UnpackedTarball.mk |8 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit dfe4dec45fd9fc346614a30aed11a1b3ad117c58 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Sat Dec 1 10:17:48 2012 +0100 fix patch to apply after gbuild changes diff --git a/libxmlsec/xmlsec1-mingw32.patch b/libxmlsec/xmlsec1-mingw32.patch index 8aa8644..720af73 100644 --- a/libxmlsec/xmlsec1-mingw32.patch +++ b/libxmlsec/xmlsec1-mingw32.patch @@ -140,7 +140,7 @@ }; +#ifndef __MINGW32__ - /** + /** * xmlSecNssTransformKWAes128GetKlass: * @@ -1160,6 +1161,7 @@ @@ -156,7 +156,7 @@ }; +#ifndef __MINGW32__ - /** + /** * xmlSecNssTransformKWDes3GetKlass: * @@ -1208,6 +1211,7 @@ commit 083ef62d1342d1c4418d568ebb3f189debcc3851 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Sat Dec 1 10:17:00 2012 +0100 files need to be added before patches are applied xmlsec1-mingw32.patch patches keywrapers.c diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index 046c7d1..6e0fa28 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -131,6 +131,10 @@ $(call gb_Output_announce,$(2),$(true),PAT,2) $(call gb_Helper_abbreviate_dirs,\ ( \ cd $(3) \ + $(if $(UNPACKED_FILES),\ + mkdir -p $(sort $(dir $(UNPACKED_DESTFILES))) \ + $(call gb_UnpackedTarball__copy_files,$(UNPACKED_FILES),$(UNPACKED_DESTFILES)) \ + ) \ $(foreach file,$(UNPACKED_FIX_EOL),$(call gb_UnpackedTarball_CONVERTTOUNIX,$(file)) ) \ $(if $(UNPACKED_PATCHES),\ for p in $(UNPACKED_PATCHES); do \ @@ -141,10 +145,6 @@ $(call gb_Helper_abbreviate_dirs,\ done \ ) \ $(foreach file,$(UNPACKED_FIX_EOL),$(call gb_UnpackedTarball_CONVERTTODOS,$(file)) ) \ - $(if $(UNPACKED_FILES),\ - mkdir -p $(sort $(dir $(UNPACKED_DESTFILES))) \ - $(call gb_UnpackedTarball__copy_files,$(UNPACKED_FILES),$(UNPACKED_DESTFILES)) \ - ) \ $(if $(UNPACKED_SUBDIRS),\ cp -rf $(UNPACKED_SUBDIRS) $(gb_EXTERNAL_HEADERS_DIR) \ ) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libxmlsec/ExternalProject_xmlsec.mk
libxmlsec/ExternalProject_xmlsec.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e1083e6656a378c2c37b6701b59c3fc2d10450d9 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Sat Dec 1 11:30:36 2012 +0100 fix(?) libxmlsec build with mingw for some reason there was an infinite loop during build, not sure why this makes a difference, but surely making it consistent with the other cases can't hurt diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index 5c188b5..e5ed276 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -26,8 +26,8 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : $(if $(filter NO,$(SYSTEM_NSS)),--disable-pkgconfig) \ CC=$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc) \ LDFLAGS=-Wl,--no-undefined $(ILIB:;= -L) \ - LIBS=$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED__LIBSTDCPP)) - $(MAKE) \ + LIBS=$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED__LIBSTDCPP)) \ +$(MAKE) \ touch $@ else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.top
Makefile.top |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c8c72d903a9e2ea81cf8511cbfc292c832b04609 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Dec 1 11:35:05 2012 +0100 oops, fix typo for ./download Change-Id: I85a6e503ae8eb45c36ff6696426e3a1d18fef5bb diff --git a/Makefile.top b/Makefile.top index 3cd9034..a5f73ae 100644 --- a/Makefile.top +++ b/Makefile.top @@ -197,7 +197,7 @@ endif # TODO: This should be really in external/ module, I think. $(SRCDIR)/src.downloaded : $(SRCDIR)/download $(SRCDIR)/config_host.mk | download -ifneq ($(COM),MSC) +ifeq ($(COM),MSC) $ touch $@ endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-3-6]: fdo#57708 fix fake page break problem during RTF import
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1214 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/1214/1 fdo#57708 fix fake page break problem during RTF import The core of this change is: so far the continous section break at the end of the document was sent as a normal section break. This was introduced in commit 892d33c8d5033b4f8f7889bf91d257f55adf0e1f, probably as a workaround (sadly it's not documented and I no longer remember). Don't do this, since it causes additional page breaks during import. Instead, fix properly whatever was broken after getting rid of this workaround. (cherry picked from commits b836bf389d1150c9cafbb0aefa641af2316e536c and 3f13a8255be93cd3b697f42d691b35418eb87114) Conflicts: writerfilter/source/dmapper/PropertyMap.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx writerfilter/source/rtftok/rtfdocumentimpl.hxx Change-Id: I28c372d539c150fe21ff9db31209f9935a5e9063 --- M writerfilter/source/dmapper/PropertyMap.cxx M writerfilter/source/rtftok/rtfdocumentimpl.cxx M writerfilter/source/rtftok/rtfdocumentimpl.hxx 3 files changed, 51 insertions(+), 35 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1214 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I28c372d539c150fe21ff9db31209f9935a5e9063 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#57708 fix RTF import of pictures right before text frame...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1215 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/1215/1 fdo#57708 fix RTF import of pictures right before text frames Change-Id: Ibfeaadd5b48fd48c2c1f20de5dc272d9a326bfc4 (cherry picked from commit 8063e36115a11ddf3db05928db9287947beee74d) --- M writerfilter/source/rtftok/rtfdocumentimpl.cxx M writerfilter/source/rtftok/rtfdocumentimpl.hxx 2 files changed, 10 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1215 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfeaadd5b48fd48c2c1f20de5dc272d9a326bfc4 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source
sd/source/core/stlsheet.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1c6b63fa9aac2a80ca952e98678e186b9097db50
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Dec 1 14:06:57 2012 +0100
WaE : declaration of âbHiddenâ shadows a member of 'this'
Change-Id: I524691b2f27ac1d57a1a1704b12aed44fb326c16
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 13d1a5e..5705164 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -1032,12 +1032,12 @@ sal_Bool SAL_CALL SdStyleSheet::isHidden()
throw(RuntimeException)
return IsHidden();
}
-void SAL_CALL SdStyleSheet::setHidden( sal_Bool bHidden )
throw(RuntimeException)
+void SAL_CALL SdStyleSheet::setHidden( sal_Bool rbHidden )
throw(RuntimeException)
{
SolarMutexGuard aGuard;
throwIfDisposed();
-return SetHidden( bHidden );
+return SetHidden( rbHidden );
}
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Styles preview removed ???
Hi Kendy, Cédric, In my last build of master (Version 4.0.0.0.alpha1+ (Build ID: 9bfa09273ea0b7c9a351802d105230930951b90)), the styles preview does not work anymore. It worked yesterday. Perhaps some side effect of a recent commit. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Insert Table Dialog: Rename button back to AutoFormat, Acc...
Change it to Table format? AutoFormat sounds too stupid (not to mention the missing space makes it look like an accidentally extracted constant) and it would be a good thing to get rid of it. On Sat, Dec 1, 2012 at 1:03 PM, Samuel Mehrbrodt (via Code Review) ger...@gerrit.libreoffice.org wrote: Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1217 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/corerefs/changes/17/1217/1 Insert Table Dialog: Rename button back to AutoFormat, Accelerators changed As requested in here: http://lists.freedesktop.org/archives/libreoffice/2012-November/041788.html http://lists.freedesktop.org/archives/libreoffice-ux-advise/2012-November/001597.html Change-Id: I2cd3f4422dcbd62b1e72661d1df890bd0202c1ef --- M sw/uiconfig/swriter/ui/inserttable.ui 1 file changed, 3 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1217 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2cd3f4422dcbd62b1e72661d1df890bd0202c1ef Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com ___ 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
[Libreoffice-commits] .: unotools/inc
unotools/inc/unotools/historyoptions.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a1c05acd19482b5da1f71ac03071d70277568766
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Sat Dec 1 01:15:21 2012 +0100
fix SAL_WARN_UNUSED placement
Change-Id: Icd320e2a7459b1850de42c83854ab8a905d97a56
diff --git a/unotools/inc/unotools/historyoptions.hxx
b/unotools/inc/unotools/historyoptions.hxx
index 425aa90..a3f664d 100644
--- a/unotools/inc/unotools/historyoptions.hxx
+++ b/unotools/inc/unotools/historyoptions.hxx
@@ -67,7 +67,7 @@ class SvtHistoryOptions_Impl;
@devstatus ready to use
*//*-*/
-class UNOTOOLS_DLLPUBLIC SvtHistoryOptions SAL_WARN_UNUSED : public
utl::detail::Options
+class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtHistoryOptions : public
utl::detail::Options
{
public:
/*-//**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/CustomTarget_source.mk writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/CustomTarget_source.mk | 15 +-- writerfilter/Library_writerfilter.mk | 21 - writerfilter/source/doctok/qnametostr.xsl|6 + writerfilter/source/ooxml/qnametostr.xsl |7 + writerfilter/source/resourcemodel/qnametostrcore.cxx | 76 +++ writerfilter/source/resourcemodel/qnametostrfooter | 24 -- writerfilter/source/resourcemodel/qnametostrheader | 57 -- 7 files changed, 97 insertions(+), 109 deletions(-) New commits: commit 81026d7e1a27c12f376796890daef01b0e0af615 Author: Caolán McNamara caol...@redhat.com Date: Fri Nov 23 09:42:39 2012 + split qnametostr up to try and make .o's small enough for ppc64 i.e. relocation truncated to fix: R_PPC64_TOC16_DS while I'm at it merge the standalone header/footer files into the .xslt and simplify the makefile. (cherry picked from commit 4ee0ee4971119b0460fc3e7819a23acd34202dc4) Conflicts: writerfilter/CustomTarget_source.mk writerfilter/source/resourcemodel/qnametostrfooter Change-Id: Iee0e9b5dd96868f49f1bed22fb5dc6d28c8cef81 Reviewed-on: https://gerrit.libreoffice.org/1201 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index 0edbc27..0a7fd19 100644 --- a/writerfilter/CustomTarget_source.mk +++ b/writerfilter/CustomTarget_source.mk @@ -157,8 +157,8 @@ wf_GEN_rtftok_scanner_cxx=$(writerfilter_WORK)/RTFScanner.cxx # resourcemodel -wf_GEN_model_QNameToStr_cxx=$(writerfilter_WORK)/qnametostr.cxx -wf_GEN_ooxml_QNameToStr_tmp=$(writerfilter_WORK)/OOXMLqnameToStr.tmp +wf_GEN_doctok_QNameToStr_cxx=$(writerfilter_WORK)/doctok/qnametostr.cxx +wf_GEN_ooxml_QNameToStr_cxx=$(writerfilter_WORK)/ooxml/qnametostr.cxx wf_GEN_model_SprmCodeToStr_cxx=$(writerfilter_WORK)/sprmcodetostr.cxx wf_GEN_model_SprmCodeToStr_tmp=$(writerfilter_WORK)/sprmcodetostr.tmp wf_GEN_doctok_QnameToStr_tmp=$(writerfilter_WORK)/DOCTOKqnameToStr.tmp @@ -170,18 +170,14 @@ wf_GEN_ooxml_Namespacesmap_xsl=$(writerfilter_WORK)/namespacesmap.xsl wf_DEP_ooxml_namespaces_txt=$(OUTDIR)/inc/oox/namespaces.txt wf_GEN_ooxml_preprocess_xsl=$(writerfilter_WORK)/modelpreprocess.xsl -$(wf_GEN_ooxml_QNameToStr_tmp): $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed) +$(wf_GEN_ooxml_QNameToStr_cxx): $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed) $(wf_SRC_ooxml_FactoryTools_xsl) $(call gb_Output_announce,$@,build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)) $@ -$(wf_GEN_doctok_QnameToStr_tmp): $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model) | $(writerfilter_WORK)/.dir +$(wf_GEN_doctok_QNameToStr_cxx): $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model) $(wf_SRC_doctok_ResourceTools_xsl) | $(writerfilter_WORK)/.dir $(call gb_Output_announce,$@,build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model)) $@ -$(wf_GEN_model_QNameToStr_cxx): $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(writerfilter_SRC)/resourcemodel/qnametostrheader $(writerfilter_SRC)/resourcemodel/qnametostrfooter $(wf_SRC_ooxml_FactoryTools_xsl) $(wf_SRC_doctok_ResourceTools_xsl) - $(call gb_Output_announce,$@,build,CAT,1) - cat $(writerfilter_SRC)/resourcemodel/qnametostrheader $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(writerfilter_SRC)/resourcemodel/qnametostrfooter $@ - $(wf_GEN_model_SprmCodeToStr_tmp) : $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model) | $(writerfilter_WORK)/.dir $(call gb_Output_announce,$@,build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model)) $@ @@ -218,7 +214,8 @@ wf_all := \ $(wf_GEN_ooxml_FastTokens_hxx) \ $(wf_GEN_ooxml_GperfFastToken_hxx) \ $(wf_GEN_ooxml_NamespaceIds_hxx) \ - $(wf_GEN_model_QNameToStr_cxx) \ + $(wf_GEN_doctok_QNameToStr_cxx) \ + $(wf_GEN_ooxml_QNameToStr_cxx) \ $(wf_GEN_model_SprmCodeToStr_cxx) \ $(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.hxx,$(WRITERFILTER_OOXMLNAMESPACES)) \ $(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.cxx,$(WRITERFILTER_OOXMLNAMESPACES)) \ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index f157ae1..c1201e6 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -162,6 +162,7 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/resourcemodel/TagLogger \ writerfilter/source/resourcemodel/WW8Analyzer \ writerfilter/source/resourcemodel/XPathLogger \ +
[PUSHED] OUStringBuffer constructor from OUStringBuffer should use co...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1209 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1209 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9f9e072c0a7ebde2de9be811f2378143b2b7abc6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: split qnametostr up to try and make .o's small enough for pp...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1201 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1201 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee0e9b5dd96868f49f1bed22fb5dc6d28c8cef81 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/mork/MNSFolders.cxx|2 +-
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ea5a96a5c771ee2c2ebbe4c12c4e7f3b1cba29a7
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Dec 1 15:17:49 2012 +0100
Lacking / at the end of .icedove
Change-Id: Iabdce8e6032889034e265d3df331452b273e5ed1
diff --git a/connectivity/source/drivers/mork/MNSFolders.cxx
b/connectivity/source/drivers/mork/MNSFolders.cxx
index e0da768..ccebd62 100644
--- a/connectivity/source/drivers/mork/MNSFolders.cxx
+++ b/connectivity/source/drivers/mork/MNSFolders.cxx
@@ -76,7 +76,7 @@ namespace
#else
{ .mozilla/seamonkey/, NULL, NULL, NULL },
{ .mozilla/firefox/, NULL, NULL, NULL },
-{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/,
.icedove }
+{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/,
.icedove/ }
#endif
};
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index e0da768..ccebd62 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -76,7 +76,7 @@ namespace
#else
{ .mozilla/seamonkey/, NULL, NULL, NULL },
{ .mozilla/firefox/, NULL, NULL, NULL },
-{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/,
.icedove }
+{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/,
.icedove/ }
#endif
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/ExtensionTarget.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit cca017e1e00f5029dcc261c7c9cc9017f514c108 Author: Zolnai Tamás zolnaitamas2...@gmail.com Date: Sat Dec 1 15:03:12 2012 +0100 Not make qtz properties in release build Change-Id: Ib012faeb3eb1bfd10cfce20426afa138a2ed8d34 diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index b679cca..25d415a 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -236,8 +236,10 @@ endef # source file is copied to $(WORKDIR) define gb_ExtensionTarget_localize_properties ifneq ($(filter-out en-US,$(gb_ExtensionTarget_ALL_LANGS)),) +ifneq ($(ENABLE_RELEASE_BUILD),TRUE) $(call gb_ExtensionTarget_localize_properties_onelang,$(1),$(subst en_US,qtz,$(2)),$(3),qtz,$(firstword $(filter-out en-US,$(gb_ExtensionTarget_ALL_LANGS endif +endif $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS),\ $(call gb_ExtensionTarget_localize_properties_onelang,$(1),$(subst en_US,$(subst -,_,$(lang)),$(2)),$(3),$(lang))) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/dlg/paramdialog.cxx | 16
dbaccess/source/ui/dlg/sqlmessage.cxx |4 ++--
dbaccess/source/ui/inc/paramdialog.hxx |2 +-
dbaccess/source/ui/inc/sqlmessage.hxx |6 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit dd4edd93696140b7fae61268511886845d777645
Author: Ricardo Montania rica...@linuxafundo.com.br
Date: Fri Nov 30 18:01:26 2012 -0200
fdo##38838 UniString Removal in dbaccess
Change-Id: I6c4f8e9834fdd78851f5274ce2b141cfb49e6458
Reviewed-on: https://gerrit.libreoffice.org/1208
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx
b/dbaccess/source/ui/dlg/paramdialog.cxx
index 1453c84..694cdea 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -110,7 +110,7 @@ DBG_NAME(OParameterDialog)
if (!pValues-Value.hasValue())
// it won't have a value, 'cause it's default constructed.
But may be later we support
// initializing this dialog with values
-pValues-Value = makeAny(::rtl::OUString());
+pValues-Value = makeAny( OUString() );
// default the values to an empty string
m_aVisitedParams.push_back(0);
@@ -182,14 +182,14 @@ DBG_NAME(OParameterDialog)
}
// transform the current string according to the param field type
-::rtl::OUString sTransformedText(m_aParam.GetText());
+OUString sTransformedText(m_aParam.GetText());
Reference XPropertySet xParamAsSet;
m_xParams-getByIndex(m_nCurrentlySelected) = xParamAsSet;
if (xParamAsSet.is())
{
if (m_xConnection.is() m_xFormatter.is())
{
-::rtl::OUString sParamValue( m_aParam.GetText() );
+OUString sParamValue( m_aParam.GetText() );
sal_Bool bValid = m_aPredicateInput.normalizePredicateString(
sParamValue, xParamAsSet );
m_aParam.SetText( sParamValue );
if ( bValid )
@@ -205,7 +205,7 @@ DBG_NAME(OParameterDialog)
m_bNeedErrorOnCurrent = sal_False; // will be reset in
OnValueModified
-::rtl::OUString sName;
+OUString sName;
try
{
sName =
::comphelper::getString(xParamAsSet-getPropertyValue(PROPERTY_NAME));
@@ -220,7 +220,7 @@ DBG_NAME(OParameterDialog)
LocalResourceAccess aDummy(DLG_PARAMETERS,
RSC_MODALDIALOG);
sMessage =
String(ModuleRes(STR_COULD_NOT_CONVERT_PARAM));
}
-sMessage.SearchAndReplaceAll(rtl::OUString($name$),
sName);
+sMessage.SearchAndReplaceAll( OUString($name$), sName );
ErrorBox(NULL, WB_OK, sMessage).Execute();
m_aParam.GrabFocus();
return 1L;
@@ -265,9 +265,9 @@ DBG_NAME(OParameterDialog)
Reference XPropertySet xParamAsSet;
m_xParams-getByIndex(i) = xParamAsSet;
-::rtl::OUString sValue;
+OUString sValue;
pValues-Value = sValue;
-pValues-Value = ::rtl::OUString(
m_aPredicateInput.getPredicateValue( sValue, xParamAsSet, sal_False ) );
+pValues-Value = OUString(
m_aPredicateInput.getPredicateValue( sValue, xParamAsSet, sal_False ) );
}
}
catch(Exception)
@@ -324,7 +324,7 @@ DBG_NAME(OParameterDialog)
return 1L;
}
-m_aFinalValues[m_nCurrentlySelected].Value =
::rtl::OUString(m_aParam.GetText());
+m_aFinalValues[m_nCurrentlySelected].Value =
OUString(m_aParam.GetText());
}
// initialize the controls with the new values
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx
b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 210d5e6..9c3ecc8 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -716,7 +716,7 @@ OSQLMessageBox::OSQLMessageBox(Window* _pParent, const
SQLExceptionInfo _rExcep
}
//--
-OSQLMessageBox::OSQLMessageBox( Window* _pParent, const UniString _rTitle,
const UniString _rMessage, WinBits _nStyle, MessageType _eType, const
::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo )
+OSQLMessageBox::OSQLMessageBox( Window* _pParent, const OUString _rTitle,
const OUString _rMessage, WinBits _nStyle, MessageType _eType, const
::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo )
:ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG )
[PUSHED] fdo##38838 UniString Removal in dbaccess
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1208 Approvals: Olivier Hallot: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1208 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c4f8e9834fdd78851f5274ce2b141cfb49e6458 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: Olivier Hallot olivier.hal...@alta.org.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: io/source
io/source/connector/connector.cxx | 40 ++---
io/source/connector/connector.hxx | 12 +--
io/source/connector/ctr_pipe.cxx |2 -
io/source/connector/ctr_socket.cxx | 10 -
4 files changed, 28 insertions(+), 36 deletions(-)
New commits:
commit 8967f80a50cd59199cf77d3b2eccdc57095d8c02
Author: José Guilherme Vanz guilherme@gmail.com
Date: Fri Nov 30 22:53:43 2012 -0200
Removal ::rtl:: prefixes and macros in IO
This commit removes some ::rtl:: prefixes and RTL_CONSTASCII_STRINGPARAM,
RTL_CONSTASCII_USTRINGPARAM macros in IO.
Change-Id: I9446ddf13ba18d2d80639afc9e1b61234945b115
Signed-off-by: José Guilherme Vanz guilherme@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1200
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br
diff --git a/io/source/connector/connector.cxx
b/io/source/connector/connector.cxx
index 9ba335b..38c2aee 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -94,9 +94,7 @@ namespace stoc_connector
Reference XConnection r;
if ( aDesc.getName() == pipe )
{
-rtl::OUString aName(
-aDesc.getParameter(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(name;
+OUString aName(aDesc.getParameter(name));
PipeConnection *pConn = new PipeConnection(
sConnectionDescription );
@@ -106,43 +104,37 @@ namespace stoc_connector
}
else
{
-OUString sMessage =
OUString(RTL_CONSTASCII_USTRINGPARAM(Connector : couldn't connect to pipe ));
+OUString sMessage(Connector : couldn't connect to pipe );
sMessage += aName;
-sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM(());
+sMessage += (;
sMessage += OUString::valueOf( (sal_Int32 )
pConn-m_pipe.getError() );
-sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM()));
+sMessage += );
delete pConn;
throw NoConnectException( sMessage ,Reference XInterface
() );
}
}
else if ( aDesc.getName() == socket )
{
-rtl::OUString aHost;
-if (aDesc.hasParameter(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(host
-aHost = aDesc.getParameter(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(host)));
+OUString aHost;
+if (aDesc.hasParameter(host))
+aHost = aDesc.getParameter(host);
else
-aHost = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- localhost));
+aHost = localhost;
sal_uInt16 nPort = static_cast sal_uInt16 (
-aDesc.getParameter(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(port))).
+aDesc.getParameter(port).
toInt32());
bool bTcpNoDelay
-= aDesc.getParameter(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- tcpnodelay))).toInt32() != 0;
+= aDesc.getParameter(tcpnodelay).toInt32() != 0;
SocketConnection *pConn = new SocketConnection(
sConnectionDescription);
SocketAddr AddrTarget( aHost.pData, nPort );
if(pConn-m_socket.connect(AddrTarget) != osl_Socket_Ok)
{
-OUString sMessage =
OUString(RTL_CONSTASCII_USTRINGPARAM(Connector : couldn't connect to socket
());
+OUString sMessage(Connector : couldn't connect to socket
();
OUString sError = pConn-m_socket.getErrorAsString();
sMessage += sError;
-sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM()));
+sMessage += );
delete pConn;
throw NoConnectException( sMessage, Reference XInterface
() );
}
@@ -157,7 +149,7 @@ namespace stoc_connector
}
else
{
-OUString delegatee =
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.connection.Connector.));
+OUString delegatee(com.sun.star.connection.Connector.);
delegatee += aDesc.getName();
OSL_TRACE(
@@ -169,7 +161,7 @@ namespace stoc_connector
if(!xConnector.is())
{
-OUString message(RTL_CONSTASCII_USTRINGPARAM(Connector:
unknown delegatee ));
+
Re: [PATCH] Insert Table Dialog: Rename button back to AutoFormat, Acc...
Am 01.12.2012 14:12, schrieb khagaroth: Change it to Table format? AutoFormat sounds too stupid (not to mention the missing space makes it look like an accidentally extracted constant) and it would be a good thing to get rid of it. I also don't like that. Please try and convince the UX guys. Thanks Samuel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Removal ::rtl:: prefixes and macros in IO
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1200 Approvals: Olivier Hallot: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1200 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9446ddf13ba18d2d80639afc9e1b61234945b115 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: José Guilherme Vanz guilherme@gmail.com Gerrit-Reviewer: José Guilherme Vanz guilherme@gmail.com Gerrit-Reviewer: Olivier Hallot olivier.hal...@alta.org.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: io/source
io/source/TextInputStream/TextInputStream.cxx |6 +++---
io/source/TextOutputStream/TextOutputStream.cxx |6 +++---
io/source/stm/odata.cxx | 16
io/source/stm/omark.cxx | 18 +-
io/source/stm/opipe.cxx | 18 +-
io/source/stm/opump.cxx | 10 +-
6 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit f73201e54af8c3e36342811653dd5fbcafb291fb
Author: José Guilherme Vanz guilherme@gmail.com
Date: Fri Nov 30 22:00:48 2012 -0200
Removal ::rtl:: prefixes and macros in IO
This commit removes some ::rtl:: prefixes and RTL_CONSTASCII_STRINGPARAM,
RTL_CONSTASCII_USTRINGPARAM macros in IO.
Change-Id: I410016990579e4a05843cfe396832a5fc8435e70
Signed-off-by: José Guilherme Vanz guilherme@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1210
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br
diff --git a/io/source/TextInputStream/TextInputStream.cxx
b/io/source/TextInputStream/TextInputStream.cxx
index 5e87cf6..a2fe774 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -180,7 +180,7 @@ OUString OTextInputStream::implReadString( const Sequence
sal_Unicode Delimi
OUString aRetStr;
if( !mbEncodingInitialized )
{
-OUString aUtf8Str( RTL_CONSTASCII_USTRINGPARAM(utf8) );
+OUString aUtf8Str(utf8);
setEncoding( aUtf8Str );
}
if( !mbEncodingInitialized )
@@ -439,13 +439,13 @@ Reference XInterface SAL_CALL
TextInputStream_CreateInstance(
OUString TextInputStream_getImplementationName()
{
-return OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+return OUString ( IMPLEMENTATION_NAME );
}
Sequence OUString TextInputStream_getSupportedServiceNames()
{
Sequence OUString seqNames(1);
-seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(
SERVICE_NAME ) );
+seqNames.getArray()[0] = SERVICE_NAME;
return seqNames;
}
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx
b/io/source/TextOutputStream/TextOutputStream.cxx
index beabc01..a9916b6 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -167,7 +167,7 @@ void OTextOutputStream::writeString( const OUString
aString )
{
if( !mbEncodingInitialized )
{
-OUString aUtf8Str( RTL_CONSTASCII_USTRINGPARAM(utf8) );
+OUString aUtf8Str(utf8);
setEncoding( aUtf8Str );
}
if( !mbEncodingInitialized )
@@ -236,14 +236,14 @@ Reference XInterface SAL_CALL
TextOutputStream_CreateInstance(
OUString TextOutputStream_getImplementationName() SAL_THROW( () )
{
-return OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+return OUString( IMPLEMENTATION_NAME );
}
Sequence OUString TextOutputStream_getSupportedServiceNames()
{
Sequence OUString seqNames(1);
-seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(
SERVICE_NAME ) );
+seqNames.getArray()[0] = SERVICE_NAME;
return seqNames;
}
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index 51c7d39..c928de0 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -496,13 +496,13 @@ Reference XInterface SAL_CALL
ODataInputStream_CreateInstance(
OUString ODataInputStream_getImplementationName()
{
-return OUString( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.comp.io.stm.DataInputStream ) );
+return OUString(com.sun.star.comp.io.stm.DataInputStream);
}
SequenceOUString ODataInputStream_getSupportedServiceNames(void)
{
SequenceOUString aRet(1);
-aRet.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.io.DataInputStream ) );
+aRet.getArray()[0] = com.sun.star.io.DataInputStream;
return aRet;
}
@@ -904,13 +904,13 @@ Reference XInterface SAL_CALL
ODataOutputStream_CreateInstance(
OUString ODataOutputStream_getImplementationName()
{
-return OUString(RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.comp.io.stm.DataOutputStream ) );
+return OUString(com.sun.star.comp.io.stm.DataOutputStream);
}
SequenceOUString ODataOutputStream_getSupportedServiceNames(void)
{
SequenceOUString aRet(1);
-aRet.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.io.DataOutputStream ) );
+aRet.getArray()[0] = com.sun.star.io.DataOutputStream;
return aRet;
}
@@ -1182,13 +1182,13 @@ Reference XInterface SAL_CALL
OObjectOutputStream_CreateInstance(
OUString OObjectOutputStream_getImplementationName()
{
-return OUString( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.comp.io.stm.ObjectOutputStream ) );
+return OUString(com.sun.star.comp.io.stm.ObjectOutputStream);
}
[PATCH for 3.6] Lacking / with .icedove prevents to use Icedove addressbook
Hello, Reading https://bugs.freedesktop.org/show_bug.cgi?id=57419, I found there was a missing / at the end of .icedove in connectivity/source/drivers/mork/MNSFolders.cxx, line 88 It's my fault (see http://cgit.freedesktop.org/libreoffice/core/commit/?id=8d7e1a6e13008bd7d35896e676796196038f1105). It worked for me because I had let a link .thunderbird to .icedove. Here's the straightforward patch: 0001-Fix-lacking-on-.icedove.patch http://nabble.documentfoundation.org/file/n4021928/0001-Fix-lacking-on-.icedove.patch Julien -- View this message in context: http://nabble.documentfoundation.org/PATCH-for-3-6-Lacking-with-icedove-prevents-to-use-Icedove-addressbook-tp4021928.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
[PUSHED] Removal ::rtl:: prefixes and macros in IO
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1210 Approvals: Olivier Hallot: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1210 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I410016990579e4a05843cfe396832a5fc8435e70 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: José Guilherme Vanz guilherme@gmail.com Gerrit-Reviewer: Olivier Hallot olivier.hal...@alta.org.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oox/source
oox/source/drawingml/chart/axiscontext.cxx |2 +-
oox/source/drawingml/chart/axisconverter.cxx|4 ++--
oox/source/drawingml/chart/chartconverter.cxx | 10 +-
oox/source/drawingml/chart/chartdrawingfragment.cxx |2 +-
oox/source/drawingml/chart/chartspaceconverter.cxx |4 ++--
oox/source/drawingml/chart/chartspacefragment.cxx |2 +-
oox/source/drawingml/chart/converterbase.cxx|2 +-
oox/source/drawingml/chart/datasourcecontext.cxx|2 +-
oox/source/drawingml/chart/datasourceconverter.cxx |2 +-
oox/source/drawingml/chart/modelbase.cxx|2 +-
oox/source/drawingml/chart/objectformatter.cxx |8
oox/source/drawingml/chart/plotareaconverter.cxx|6 +++---
oox/source/drawingml/chart/seriescontext.cxx|2 +-
oox/source/drawingml/chart/seriesconverter.cxx |2 +-
oox/source/drawingml/chart/titlecontext.cxx |2 +-
oox/source/drawingml/chart/titleconverter.cxx |2 +-
oox/source/drawingml/chart/typegroupconverter.cxx |2 +-
17 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 3066167ff05cc78ac21dbb9173264dda3f91550e
Author: José Guilherme Vanz guilherme@gmail.com
Date: Fri Nov 30 22:28:09 2012 -0200
Removal ::rtl:: prefixes and macros in oxx
This commit removes some ::rtl:: prefixes and RTL_CONSTASCII_STRINGPARAM,
RTL_CONSTASCII_USTRINGPARAM macros in oxx.
Change-Id: I1139b10256387bb71e8a425153d46add181538bc
Signed-off-by: José Guilherme Vanz guilherme@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1212
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br
diff --git a/oox/source/drawingml/chart/axiscontext.cxx
b/oox/source/drawingml/chart/axiscontext.cxx
index 944d09c..1b21d78 100644
--- a/oox/source/drawingml/chart/axiscontext.cxx
+++ b/oox/source/drawingml/chart/axiscontext.cxx
@@ -32,7 +32,7 @@ namespace chart {
using ::oox::core::ContextHandlerRef;
using ::oox::core::ContextHandler2Helper;
-using ::rtl::OUString;
+using OUString;
//
diff --git a/oox/source/drawingml/chart/axisconverter.cxx
b/oox/source/drawingml/chart/axisconverter.cxx
index 0371e53..97f64d4 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::chart2;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
+using OUString;
//
@@ -360,4 +360,4 @@ void AxisConverter::convertFromModel( const Reference
XCoordinateSystem rxCo
} // namespace drawingml
} // namespace oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:n:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/chartconverter.cxx
b/oox/source/drawingml/chart/chartconverter.cxx
index 3e7469a..1f46cb8 100644
--- a/oox/source/drawingml/chart/chartconverter.cxx
+++ b/oox/source/drawingml/chart/chartconverter.cxx
@@ -27,7 +27,7 @@
using ::oox::drawingml::chart::DataSequenceModel;
using ::com::sun::star::uno::Any;
-using ::rtl::OUStringBuffer;
+using OUStringBuffer;
namespace oox {
namespace drawingml {
namespace chart {
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::uno;
using ::oox::core::XmlFilterBase;
-using ::rtl::OUString;
+using OUString;
//
@@ -60,7 +60,7 @@ static OUString lclGenerateApiString( const OUString rString
)
return OUStringBuffer().append( sal_Unicode( '' ) ).append( aRetString
).append( sal_Unicode( '' ) ).makeStringAndClear();
}
-static ::rtl::OUString lclGenerateApiArray( const Matrix Any rMatrix )
+static OUString lclGenerateApiArray( const Matrix Any rMatrix )
{
OSL_ENSURE( !rMatrix.empty(), ChartConverter::lclGenerateApiArray -
missing matrix values );
OUStringBuffer aBuffer;
@@ -72,7 +72,7 @@ static ::rtl::OUString lclGenerateApiArray( const Matrix Any
rMatrix )
for( Matrix Any ::const_iterator aBeg = rMatrix.row_begin( nRow ),
aIt = aBeg, aEnd = rMatrix.row_end( nRow ); aIt != aEnd; ++aIt )
{
double fValue = 0.0;
-::rtl::OUString aString;
+OUString aString;
if( aIt != aBeg )
aBuffer.append( API_TOKEN_ARRAY_COLSEP );
if( *aIt = fValue )
@@ -127,7 +127,7 @@ Reference XDataSequence
ChartConverter::createDataSequence( const Reference
Reference XDataSequence xDataSeq;
if( rxDataProvider.is() )
{
-::rtl::OUString aRangeRep;
+OUString aRangeRep;
if( !rDataSeq.maData.empty() )
{
[PUSHED] Removal ::rtl:: prefixes and macros in oxx
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1212 Approvals: Olivier Hallot: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1212 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1139b10256387bb71e8a425153d46add181538bc Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: José Guilherme Vanz guilherme@gmail.com Gerrit-Reviewer: Olivier Hallot olivier.hal...@alta.org.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: solenv/bin
solenv/bin/build.pl | 31 +++
1 file changed, 3 insertions(+), 28 deletions(-)
New commits:
commit b30bfddc2b75aa5a540c4eadfc4f7eca90a8d67f
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Sat Dec 1 11:43:10 2012 +0100
do not redirect output in build.pl, i.e. dump build_error.log and other logs
Given that nowadays almost everything builds inside tail_build, this
feature is somewhat
pointless, as this almost everything is in that one tail_build log.
Moreover:
- stdout is never a tty, breaking compiler output colorization
- for some obscure reason I do not get, this makes 'make python3.all' work
with msvc2010,
whereas previously the invocation of MSBuild.exe somehow prevented the
rest of make
rules from running. Plain 'make python3' that does not go via build.pl
works though.
No idea if the problem is in gbuild, build.pl, cygwin, make, MSBuild.exe
or somewhere else,
Change-Id: Ibe6e11109e2eefaa65646071c2db01871e5e751f
Reviewed-on: https://gerrit.libreoffice.org/1216
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index c8e62ee..5893669 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1570,11 +1570,9 @@ sub cancel_build {
print STDERR please re-run build inside each one to isolate the
problem.\n;
} else {
print STDERR it seems that the error is inside '$module', please
re-run build\n;
-print STDERR inside this module to isolate the error and/or test
your fix:\n;
+print STDERR inside this module to isolate the error and/or test
your fix.\n;
}
print STDERR \n;
-print STDERR build_error.log should contain the captured output of the
failed module(s)\n;
-print STDERR \n;
print STDERR
---\n;
print STDERR To rebuild a specific module:\n;
print STDERR \n;
@@ -1887,10 +1885,6 @@ sub run_job {
chdir $path;
getcwd();
-my $log_file = $jobs_hash{$registered_name}-{LONG_LOG_PATH};
-
-my $log_dir = File::Basename::dirname($log_file);
-
if ( $source_config-is_gbuild($jobs_hash{$registered_name}-{MODULE}) )
{
if ( $job eq 'deliver' )
@@ -1900,7 +1894,6 @@ sub run_job {
else
{
return 1 if (! $path =~ /prj$/ );
-mkpath($workdir/Logs);
my $gbuild_flags = '-j' . $ENV{PARALLELISM};
my $gbuild_target = 'all slowcheck';
if ($registered_name =~ /tail_build\/prj$/ )
@@ -1916,26 +1909,8 @@ sub run_job {
print gbuild module $make_path: $job_to_do\n;
}
}
-else
-{
-if (!-d $log_dir)
-{
-system($perl $mkout);
-};
-}
-open (MAKE, $job_to_do 21 |) or return 8;
-open (LOGFILE, $log_file) or return 8;
-while (MAKE) { print LOGFILE $_; print $_ }
-close MAKE;
-$error_code = $?;
-close LOGFILE;
-if ( $error_code != 0)
-{
-system(echo \log for $path\ $build_error_log);
-system(cat $log_file $build_error_log);
-}
-
-return $error_code;
+system($job_to_do);
+return $?;
};
sub do_custom_job {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] do not redirect output in build.pl, i.e. dump build_error.lo...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1216 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1216 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe6e11109e2eefaa65646071c2db01871e5e751f Gerrit-PatchSet: 1 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
[Libreoffice-commits] .: oox/source
oox/source/core/binarycodec.cxx | 20 ++--
oox/source/core/filterdetect.cxx | 30 +++---
oox/source/core/fragmenthandler2.cxx |2 +-
oox/source/core/xmlfilterbase.cxx|8
4 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 1611806226329e5532e6393d0ac2275d7e99eb61
Author: José Guilherme Vanz guilherme@gmail.com
Date: Fri Nov 30 22:24:01 2012 -0200
Removal ::rtl:: prefixes and macros in oxx
This commit removes some ::rtl:: prefixes and RTL_CONSTASCII_STRINGPARAM,
RTL_CONSTASCII_USTRINGPARAM macros in oxx.
Change-Id: I12bfb2528e8a9aaf3f119a1e6f0ae0246d16a772
Signed-off-by: José Guilherme Vanz guilherme@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1211
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br
diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx
index 70dc48e..04ef753 100644
--- a/oox/source/core/binarycodec.cxx
+++ b/oox/source/core/binarycodec.cxx
@@ -179,15 +179,15 @@ bool BinaryCodec_XOR::initCodec( const uno::Sequence
beans::NamedValue aData
bool bResult = sal_False;
::comphelper::SequenceAsHashMap aHashData( aData );
-uno::Sequence sal_Int8 aKey = aHashData.getUnpackedValueOrDefault(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XOR95EncryptionKey ) ),
uno::Sequence sal_Int8 () );
+uno::Sequence sal_Int8 aKey =
aHashData.getUnpackedValueOrDefault(XOR95EncryptionKey, uno::Sequence
sal_Int8 () );
if ( aKey.getLength() == 16 )
{
(void)memcpy( mpnKey, aKey.getConstArray(), 16 );
bResult = sal_True;
-mnBaseKey = (sal_uInt16)aHashData.getUnpackedValueOrDefault(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XOR95BaseKey ) ), (sal_Int16)0
);
-mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XOR95PasswordHash ) ),
(sal_Int16)0 );
+mnBaseKey =
(sal_uInt16)aHashData.getUnpackedValueOrDefault(XOR95BaseKey, (sal_Int16)0 );
+mnHash =
(sal_uInt16)aHashData.getUnpackedValueOrDefault(XOR95PasswordHash,
(sal_Int16)0 );
}
else
OSL_FAIL( Unexpected key size!\n );
@@ -198,9 +198,9 @@ bool BinaryCodec_XOR::initCodec( const uno::Sequence
beans::NamedValue aData
uno::Sequence beans::NamedValue BinaryCodec_XOR::getEncryptionData()
{
::comphelper::SequenceAsHashMap aHashData;
-aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
XOR95EncryptionKey ) ) ] = uno::Sequencesal_Int8( (sal_Int8*)mpnKey, 16 );
-aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XOR95BaseKey )
) ] = (sal_Int16)mnBaseKey;
-aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
XOR95PasswordHash ) ) ] = (sal_Int16)mnHash;
+aHashData[ OUString(XOR95EncryptionKey) ] = uno::Sequencesal_Int8(
(sal_Int8*)mpnKey, 16 );
+aHashData[ OUString(XOR95BaseKey) ] = (sal_Int16)mnBaseKey;
+aHashData[ OUString(XOR95PasswordHash) ] = (sal_Int16)mnHash;
return aHashData.getAsConstNamedValueList();
}
@@ -286,12 +286,12 @@ bool BinaryCodec_RCF::initCodec( const uno::Sequence
beans::NamedValue aData
bool bResult = sal_False;
::comphelper::SequenceAsHashMap aHashData( aData );
-uno::Sequence sal_Int8 aKey = aHashData.getUnpackedValueOrDefault(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STD97EncryptionKey ) ),
uno::Sequence sal_Int8 () );
+uno::Sequence sal_Int8 aKey =
aHashData.getUnpackedValueOrDefault(STD97EncryptionKey, uno::Sequence
sal_Int8 () );
if ( aKey.getLength() == RTL_DIGEST_LENGTH_MD5 )
{
(void)memcpy( mpnDigestValue, aKey.getConstArray(),
RTL_DIGEST_LENGTH_MD5 );
-uno::Sequence sal_Int8 aUniqueID =
aHashData.getUnpackedValueOrDefault( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( STD97UniqueID ) ), uno::Sequence sal_Int8 () );
+uno::Sequence sal_Int8 aUniqueID =
aHashData.getUnpackedValueOrDefault(STD97UniqueID, uno::Sequence sal_Int8
() );
if ( aUniqueID.getLength() == 16 )
{
(void)memcpy( mpnUnique, aUniqueID.getConstArray(), 16 );
@@ -309,8 +309,8 @@ bool BinaryCodec_RCF::initCodec( const uno::Sequence
beans::NamedValue aData
uno::Sequence beans::NamedValue BinaryCodec_RCF::getEncryptionData()
{
::comphelper::SequenceAsHashMap aHashData;
-aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
STD97EncryptionKey ) ) ] = uno::Sequence sal_Int8 (
(sal_Int8*)mpnDigestValue, RTL_DIGEST_LENGTH_MD5 );
-aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STD97UniqueID )
) ] = uno::Sequence sal_Int8 ( (sal_Int8*)mpnUnique, 16 );
+aHashData[ OUString(STD97EncryptionKey) ] = uno::Sequence sal_Int8 (
(sal_Int8*)mpnDigestValue, RTL_DIGEST_LENGTH_MD5 );
+aHashData[ OUString(STD97UniqueID) ] = uno::Sequence sal_Int8 (
(sal_Int8*)mpnUnique, 16 );
return
[Libreoffice-commits] .: cui/source
cui/source/tabpages/numfmt.cxx |4 ++--
cui/source/tabpages/numpages.cxx |8
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 02a236be613b5b5fae1412bb01e28c0ba1d6b725
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat Dec 1 19:07:45 2012 +0400
fix String-OUString conversion
OUString::valueOf(sal_uInt16) means OUString::valueOf(sal_Unicode),
we want OUString::valueOf(sal_Int32)
regression from 2cb8883cfd1c6ffe293497f064f90f76d12eff32
Change-Id: Ie1ea4de258b9f94f1c0cfec4335512e15be02e68
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 12c267b..fd4cd15 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1014,8 +1014,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool
bCheckCatChange /*= sa
aEdLeadZeroes.Enable();
aBtnNegRed.Enable();
aBtnThousand.Enable();
-aEdDecimals .SetText( OUString::valueOf( nDecimals ) );
-aEdLeadZeroes.SetText( OUString::valueOf( nZeroes ) );
+aEdDecimals .SetText( OUString::valueOf(
static_castsal_Int32(nDecimals) ) );
+aEdLeadZeroes.SetText( OUString::valueOf(
static_castsal_Int32(nZeroes) ) );
aBtnNegRed .Check( bNegRed );
aBtnThousand .Check( bThousand );
break;
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 05efd95..e1f3f82 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1280,11 +1280,11 @@ voidSvxNumOptionsTabPage::Reset( const SfxItemSet
rSet )
if(!aLevelLB.GetEntryCount())
{
for(sal_uInt16 i = 1; i = pSaveNum-GetLevelCount(); i++)
-aLevelLB.InsertEntry( OUString::valueOf(i));
+aLevelLB.InsertEntry(
OUString::valueOf(static_castsal_Int32(i)));
if(pSaveNum-GetLevelCount() 1)
{
OUString sEntry( 1 - );
-sEntry += OUString::valueOf( pSaveNum-GetLevelCount() );
+sEntry += OUString::valueOf(
static_castsal_Int32(pSaveNum-GetLevelCount()) );
aLevelLB.InsertEntry(sEntry);
aLevelLB.SelectEntry(sEntry);
}
@@ -3044,11 +3044,11 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet
rSet )
if(!aLevelLB.GetEntryCount())
{
for(sal_uInt16 i = 1; i = pSaveNum-GetLevelCount(); i++)
-aLevelLB.InsertEntry( OUString::valueOf(i) );
+aLevelLB.InsertEntry( OUString::valueOf(static_castsal_Int32(i))
);
if(pSaveNum-GetLevelCount() 1)
{
OUString sEntry( 1 - );
-sEntry += OUString::valueOf( pSaveNum-GetLevelCount() );
+sEntry += OUString::valueOf(
static_castsal_Int32(pSaveNum-GetLevelCount()) );
aLevelLB.InsertEntry(sEntry);
aLevelLB.SelectEntry(sEntry);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Removal ::rtl:: prefixes and macros in oxx
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1211 Approvals: Olivier Hallot: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1211 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I12bfb2528e8a9aaf3f119a1e6f0ae0246d16a772 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: José Guilherme Vanz guilherme@gmail.com Gerrit-Reviewer: Olivier Hallot olivier.hal...@alta.org.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - src/docrecord.py src/docsprm.py src/docstream.py
src/docrecord.py | 119 ---
src/docsprm.py | 63 +
src/docstream.py | 12 -
3 files changed, 151 insertions(+), 43 deletions(-)
New commits:
commit 7f649c24775cc5b306b6f19a5529e05b538ba54d
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Dec 1 16:35:42 2012 +0100
dump Sepx
diff --git a/src/docrecord.py b/src/docrecord.py
index 9d19602..4232517 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -197,6 +197,22 @@ class PlcPcd(DOCDirStream, PLC):
print '/aCP'
print '/plcPcd'
+class Sepx(DOCDirStream):
+The Sepx structure specifies an array of Prl structures and the size of
the array.
+def __init__(self, sed):
+DOCDirStream.__init__(self, sed.plcfSed.mainStream.bytes)
+self.pos = sed.fcSepx
+
+def dump(self):
+print 'sepx type=Sepx offset=%d' % self.pos
+self.printAndSet(cb, self.readInt16())
+pos = self.pos
+while (self.cb - (pos - self.pos)) 0:
+prl = Prl(self.bytes, pos)
+prl.dump()
+pos += prl.getSize()
+print '/sepx'
+
class Sed(DOCDirStream):
The Sed structure specifies the location of the section properties.
size = 12 # defined by 2.8.26
@@ -209,6 +225,7 @@ class Sed(DOCDirStream):
print 'aSed type=Sed offset=%d size=%d bytes' % (self.pos,
Sed.size)
self.printAndSet(fn, self.readuInt16())
self.printAndSet(fcSepx, self.readuInt32())
+Sepx(self).dump()
self.printAndSet(fnMpr, self.readuInt16())
self.printAndSet(fcMpr, self.readuInt32())
print '/aSed'
@@ -286,6 +303,7 @@ class Sprm(DOCDirStream):
nameMap = {
1: docsprm.parMap,
2: docsprm.chrMap,
+4: docsprm.secMap,
5: docsprm.tblMap,
}
print 'sprm value=%s name=%s ispmd=%s fSpec=%s sgc=%s
spra=%s operandSize=%s operand=%s/' % (
diff --git a/src/docsprm.py b/src/docsprm.py
index 4108809..fcd01de 100644
--- a/src/docsprm.py
+++ b/src/docsprm.py
@@ -5,6 +5,69 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+# see 2.6.4 of the spec
+secMap = {
+0x3000: sprmScnsPgn,
+0x3001: sprmSiHeadingPgn,
+0xF203: sprmSDxaColWidth,
+0xF204: sprmSDxaColSpacing,
+0x3005: sprmSFEvenlySpaced,
+0x3006: sprmSFProtected,
+0x5007: sprmSDmBinFirst,
+0x5008: sprmSDmBinOther,
+0x3009: sprmSBkc,
+0x300A: sprmSFTitlePage,
+0x500B: sprmSCcolumns,
+0x900C: sprmSDxaColumns,
+0x300E: sprmSNfcPgn,
+0x3011: sprmSFPgnRestart,
+0x3012: sprmSFEndnote,
+0x3013: sprmSLnc,
+0x5015: sprmSNLnnMod,
+0x9016: sprmSDxaLnn,
+0xB017: sprmSDyaHdrTop,
+0xB018: sprmSDyaHdrBottom,
+0x3019: sprmSLBetween,
+0x301A: sprmSVjc,
+0x501B: sprmSLnnMin,
+0x501C: sprmSPgnStart97,
+0x301D: sprmSBOrientation,
+0xB01F: sprmSXaPage,
+0xB020: sprmSYaPage,
+0xB021: sprmSDxaLeft,
+0xB022: sprmSDxaRight,
+0x9023: sprmSDyaTop,
+0x9024: sprmSDyaBottom,
+0xB025: sprmSDzaGutter,
+0x5026: sprmSDmPaperReq,
+0x3228: sprmSFBiDi,
+0x322A: sprmSFRTLGutter,
+0x702B: sprmSBrcTop80,
+0x702C: sprmSBrcLeft80,
+0x702D: sprmSBrcBottom80,
+0x702E: sprmSBrcRight80,
+0x522F: sprmSPgbProp,
+0x7030: sprmSDxtCharSpace,
+0x9031: sprmSDyaLinePitch,
+0x5032: sprmSClm,
+0x5033: sprmSTextFlow,
+0xD234: sprmSBrcTop,
+0xD235: sprmSBrcLeft,
+0xD236: sprmSBrcBottom,
+0xD237: sprmSBrcRight,
+0x3239: sprmSWall,
+0x703A: sprmSRsid,
+0x303B: sprmSFpc,
+0x303C: sprmSRncFtn,
+0x303E: sprmSRncEdn,
+0x503F: sprmSNFtn,
+0x5040: sprmSNfcFtnRef,
+0x5041: sprmSNEdn,
+0x5042: sprmSNfcEdnRef,
+0xD243: sprmSPropRMark,
+0x7044: sprmSPgnStart,
+}
+
# see 2.6.3 of the spec
tblMap = {
0x5400: sprmTJc90,
commit 93899d59903ae1253ae5d821914c05bbd03cecdf
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Dec 1 15:09:58 2012 +0100
dump PlcfSed
diff --git a/src/docrecord.py b/src/docrecord.py
index 30e169f..9d19602 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -197,6 +197,49 @@ class PlcPcd(DOCDirStream, PLC):
print '/aCP'
print '/plcPcd'
+class Sed(DOCDirStream):
+The Sed structure specifies the location of the section properties.
+size = 12 # defined by 2.8.26
+def __init__(self, plcfSed, offset):
+DOCDirStream.__init__(self, plcfSed.bytes)
+self.pos = offset
+self.plcfSed = plcfSed
+
+def dump(self):
+print 'aSed type=Sed offset=%d size=%d bytes' % (self.pos,
Sed.size)
+self.printAndSet(fn, self.readuInt16())
+self.printAndSet(fcSepx, self.readuInt32())
+self.printAndSet(fnMpr, self.readuInt16())
+self.printAndSet(fcMpr, self.readuInt32())
+print '/aSed'
+
+class
[Libreoffice-commits] .: oox/source
oox/source/drawingml/chart/axiscontext.cxx |1 -
oox/source/drawingml/chart/axisconverter.cxx|2 --
oox/source/drawingml/chart/chartconverter.cxx |2 --
oox/source/drawingml/chart/chartdrawingfragment.cxx |2 --
oox/source/drawingml/chart/chartspaceconverter.cxx |3 ---
oox/source/drawingml/chart/chartspacefragment.cxx |2 --
oox/source/drawingml/chart/converterbase.cxx|1 -
oox/source/drawingml/chart/datasourcecontext.cxx|1 -
oox/source/drawingml/chart/datasourceconverter.cxx |2 --
oox/source/drawingml/chart/modelbase.cxx|5 -
oox/source/drawingml/chart/objectformatter.cxx |5 +
oox/source/drawingml/chart/plotareaconverter.cxx|2 --
oox/source/drawingml/chart/seriescontext.cxx|1 -
oox/source/drawingml/chart/seriesconverter.cxx |2 --
oox/source/drawingml/chart/titlecontext.cxx |1 -
oox/source/drawingml/chart/titleconverter.cxx |1 -
oox/source/drawingml/chart/typegroupconverter.cxx |2 --
17 files changed, 1 insertion(+), 34 deletions(-)
New commits:
commit 3321acda38866be7bd45e70c0f1e674d093b7f30
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat Dec 1 19:39:07 2012 +0400
oox: fix build
Change-Id: Ic0fc64b94d27e1de4d2241f960b0d4f3ae1762d3
diff --git a/oox/source/drawingml/chart/axiscontext.cxx
b/oox/source/drawingml/chart/axiscontext.cxx
index 1b21d78..cf023f2 100644
--- a/oox/source/drawingml/chart/axiscontext.cxx
+++ b/oox/source/drawingml/chart/axiscontext.cxx
@@ -32,7 +32,6 @@ namespace chart {
using ::oox::core::ContextHandlerRef;
using ::oox::core::ContextHandler2Helper;
-using OUString;
//
diff --git a/oox/source/drawingml/chart/axisconverter.cxx
b/oox/source/drawingml/chart/axisconverter.cxx
index 97f64d4..bf4b4f8 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -45,8 +45,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::chart2;
using namespace ::com::sun::star::uno;
-using OUString;
-
//
namespace {
diff --git a/oox/source/drawingml/chart/chartconverter.cxx
b/oox/source/drawingml/chart/chartconverter.cxx
index 1f46cb8..07226f0 100644
--- a/oox/source/drawingml/chart/chartconverter.cxx
+++ b/oox/source/drawingml/chart/chartconverter.cxx
@@ -27,7 +27,6 @@
using ::oox::drawingml::chart::DataSequenceModel;
using ::com::sun::star::uno::Any;
-using OUStringBuffer;
namespace oox {
namespace drawingml {
namespace chart {
@@ -41,7 +40,6 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::uno;
using ::oox::core::XmlFilterBase;
-using OUString;
//
diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx
b/oox/source/drawingml/chart/chartdrawingfragment.cxx
index be7e8b3..be05de9 100644
--- a/oox/source/drawingml/chart/chartdrawingfragment.cxx
+++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx
@@ -36,8 +36,6 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::uno;
using namespace ::oox::core;
-using OUString;
-
//
ShapeAnchor::ShapeAnchor( bool bRelSize ) :
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx
b/oox/source/drawingml/chart/chartspaceconverter.cxx
index b06d9ae..10e9e6a 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -32,7 +32,6 @@
#include oox/drawingml/chart/plotareaconverter.hxx
#include oox/drawingml/chart/titleconverter.hxx
-using OUString;
using ::com::sun::star::awt::Point;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Exception;
@@ -60,8 +59,6 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
-using OUString;
-
//
ChartSpaceConverter::ChartSpaceConverter( const ConverterRoot rParent,
ChartSpaceModel rModel ) :
diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx
b/oox/source/drawingml/chart/chartspacefragment.cxx
index c70f591..2e717a8 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -33,8 +33,6 @@ namespace chart {
using namespace ::oox::core;
-using OUString;
-
//
ChartSpaceFragment::ChartSpaceFragment( XmlFilterBase rFilter, const
OUString rFragmentPath, ChartSpaceModel rModel ) :
diff --git a/oox/source/drawingml/chart/converterbase.cxx
[Libreoffice-commits] .: 4 commits - src/docrecord.py src/docstream.py
src/docrecord.py | 168 +++ src/docstream.py | 13 +++- 2 files changed, 132 insertions(+), 49 deletions(-) New commits: commit 7ad6658a750bdbb7183df2b301d56bf4c9b42696 Author: Miklos Vajna vmik...@suse.cz Date: Sat Dec 1 17:42:40 2012 +0100 doc: no more asserts with hardcoded numbers diff --git a/src/docrecord.py b/src/docrecord.py index c7dc5bd..0da17f8 100644 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -786,6 +786,7 @@ class GRFSTD(DOCDirStream): class DopBase(DOCDirStream): The DopBase structure contains document and compatibility settings. +size = 84 def __init__(self, dop): DOCDirStream.__init__(self, dop.bytes) self.pos = dop.pos @@ -896,6 +897,8 @@ class DopBase(DOCDirStream): self.printAndSet(unused16, self.getBit(buf, 14)) self.printAndSet(iGutterPos, self.getBit(buf, 15)) print '/dopBase' +assert self.pos == self.dop.pos + DopBase.size +self.dop.pos = self.pos class Copts80(DOCDirStream): The Copts80 structure specifies compatibility options. @@ -931,12 +934,14 @@ class Copts80(DOCDirStream): class Copts(DOCDirStream): A structure that specifies compatibility options. +size = 32 def __init__(self, dop): DOCDirStream.__init__(self, dop.bytes) self.pos = dop.pos +self.dop = dop def dump(self): -print 'copts type=Copts offset=%d size=32 bytes' % self.pos +print 'copts type=Copts offset=%d size=%d bytes' % (self.pos, Copts.size) Copts80(self).dump() self.pos += 4 @@ -989,9 +994,12 @@ class Copts(DOCDirStream): self.printAndSet(empty5, self.readuInt32()) self.printAndSet(empty6, self.readuInt32()) print '/copts' +assert self.pos == self.dop.pos + Copts.size +self.dop.pos = self.pos class Dop95(DOCDirStream): The Dop95 structure contains document and compatibility settings. +size = 88 def __init__(self, dop): DOCDirStream.__init__(self, dop.bytes) self.pos = dop.pos @@ -1001,17 +1009,19 @@ class Dop95(DOCDirStream): print 'dop95 type=Dop95 offset=%d size=88 bytes' % self.pos dopBase = DopBase(self) dopBase.dump() -assert dopBase.pos == self.pos + 84 -self.pos += 84 Copts80(self).dump() self.pos += 4 print '/dop95' +assert self.pos == self.dop.pos + Dop95.size +self.dop.pos = self.pos class DopTypography(DOCDirStream): The DopTypography structure contains East Asian language typography settings. +size = 310 def __init__(self, dop): DOCDirStream.__init__(self, dop.bytes) self.pos = dop.pos +self.dop = dop def dump(self): print 'dopTypography type=DopTypography offset=%d size=310 bytes' % self.pos @@ -1036,15 +1046,19 @@ class DopTypography(DOCDirStream): else: self.pos += 102 print '/dopTypography' +assert self.pos == self.dop.pos + DopTypography.size +self.dop.pos = self.pos class Dogrid(DOCDirStream): The Dogrid structure specifies parameters for the drawn object properties of the document. +size = 10 def __init__(self, dop): DOCDirStream.__init__(self, dop.bytes) self.pos = dop.pos +self.dop = dop def dump(self): -print 'dogrid type=Dogrid offset=%d size=10 bytes' % self.pos +print 'dogrid type=Dogrid offset=%d size=%d bytes' % (self.pos, Dogrid.size) self.printAndSet(xaGrid, self.readuInt16()) self.printAndSet(yaGrid, self.readuInt16()) self.printAndSet(dxaGrid, self.readuInt16()) @@ -1058,6 +1072,8 @@ class Dogrid(DOCDirStream): self.printAndSet(dxGridDisplay, (buf 0x7f)) # 1..7th bits self.printAndSet(fFollowMargins, self.getBit(buf, 7)) print '/dogrid' +assert self.pos == self.dop.pos + Dogrid.size +self.dop.pos = self.pos class Asumyi(DOCDirStream): The Asumyi structure specifies AutoSummary state information @@ -1081,27 +1097,22 @@ class Asumyi(DOCDirStream): class Dop97(DOCDirStream): The Dop97 structure contains document and compatibility settings. +size = 500 def __init__(self, dop): DOCDirStream.__init__(self, dop.bytes) self.pos = dop.pos self.dop = dop def dump(self): -print 'dop97 type=Dop97 offset=%d size=500 bytes' % self.pos +print 'dop97 type=Dop97 offset=%d size=%d bytes' % (self.pos, Dop97.size) dop95 = Dop95(self) dop95.dump() -assert dop95.pos == self.pos + 88 -self.pos += 88 self.printAndSet(adt, self.readuInt16()) dopTypography = DopTypography(self) dopTypography.dump() -assert dopTypography.pos == self.pos + 310 -self.pos += 310 dogrid = Dogrid(self) dogrid.dump()
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on|50774 | -- 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] .: src/docrecord.py src/docstream.py
src/docrecord.py | 42 ++
src/docstream.py |5 -
2 files changed, 46 insertions(+), 1 deletion(-)
New commits:
commit 346d0818aad449cf541001a25492eb0c493e3350
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Dec 1 18:09:05 2012 +0100
dump SttbfAssoc
diff --git a/src/docrecord.py b/src/docrecord.py
index 0da17f8..ebbdfdf 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -1500,6 +1500,48 @@ class SttbfFfn(DOCDirStream):
print '/cchData'
print '/sttbfFfn'
+class SttbfAssoc(DOCDirStream):
+The SttbfAssoc structure is an STTB that contains strings which are
associated with this document.
+def __init__(self, mainStream):
+DOCDirStream.__init__(self,
mainStream.doc.getDirectoryStreamByName(1Table).bytes)
+self.pos = mainStream.fcSttbfAssoc
+self.size = mainStream.lcbSttbfAssoc
+self.mainStream = mainStream
+
+def dump(self):
+indexMap = {
+0x00: Unused. MUST be ignored.,
+0x01: The path of the associated document template (2), if it
is not the default Normal template.,
+0x02: The title of the document.,
+0x03: The subject of the document.,
+0x04: Key words associated with the document.,
+0x05: Unused. This index MUST be ignored.,
+0x06: The author of the document.,
+0x07: The user who last revised the document.,
+0x08: The path of the associated mail merge data source.,
+0x09: The path of the associated mail merge header document.,
+0x0A: Unused. This index MUST be ignored.,
+0x0B: Unused. This index MUST be ignored.,
+0x0C: Unused. This index MUST be ignored.,
+0x0D: Unused. This index MUST be ignored.,
+0x0E: Unused. This index MUST be ignored.,
+0x0F: Unused. This index MUST be ignored.,
+0x10: Unused. This index MUST be ignored.,
+0x11: The write-reservation password of the document.,
+}
+print 'sttbfAssoc type=SttbfAssoc offset=%d size=%d bytes' %
(self.pos, self.size)
+self.printAndSet(fExtend, self.readuInt16())
+self.printAndSet(cData, self.readuInt16())
+self.printAndSet(cbExtra, self.readuInt16())
+for i in range(self.cData):
+cchData = self.readuInt16()
+print 'cchData index=%s meaning=%s offset=%d size=%d
bytes' % (hex(i), indexMap[i], self.pos, cchData)
+print 'string value=%s/' %
globals.encodeName(self.bytes[self.pos:self.pos+2*cchData].decode('utf-16'),
lowOnly = True)
+self.pos += 2*cchData
+print '/cchData'
+assert self.pos == self.mainStream.fcSttbfAssoc + self.size
+print '/sttbfAssoc'
+
class ATNBE(DOCDirStream):
The ATNBE structure contains information about an annotation bookmark
in the document.
size = 10 # in bytes, see 2.9.4
diff --git a/src/docstream.py b/src/docstream.py
index da069b2..b410e9b 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -268,7 +268,7 @@ class WordDocumentStream(DOCDirStream):
[fcDop],
[lcbDop, self.handleDop],
[fcSttbfAssoc],
-[lcbSttbfAssoc],
+[lcbSttbfAssoc, self.handleLcbSttbfAssoc],
[fcClx],
[lcbClx, self.handleLcbClx],
[fcPlcfPgdFtn],
@@ -483,6 +483,9 @@ class WordDocumentStream(DOCDirStream):
def handleLcbWss(self):
docrecord.Selsf(self).dump()
+def handleLcbSttbfAssoc(self):
+docrecord.SttbfAssoc(self).dump()
+
def dumpFibRgFcLcb97(self, name):
print '%s type=FibRgFcLcb97 size=744 bytes' % name
self.__dumpFibRgFcLcb97()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Styles preview removed ???
Le 01/12/2012 07:03, Jean-Baptiste Faure a écrit : Hi Kendy, Cédric, In my last build of master (Version 4.0.0.0.alpha1+ (Build ID: 9bfa09273ea0b7c9a351802d105230930951b90)), the styles preview does not work anymore. It worked yesterday. Perhaps some side effect of a recent commit. Oops, sorry, my mistake. In fact the style preview is inactive in the default new document until you inserted some text. As soon as you have typed some text and applied a style like Heading 1, the styles preview works. I do not know if we can see that as a bug. If you open an existing document, styles preview works as expected. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LibreOffice 3.6.4 RC3 available
Dear Community, The Document Foundation is happy to announce the third release candidate of LibreOffice 3.6.4. The upcoming 3.6.4 will be the fifth in a series of frequent bugfix releases for our 3.6 code line. Please be aware that LibreOffice 3.6.4 RC3 is not yet ready for production use, you should continue to use LibreOffice 3.6.3 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the beta quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test (and the announcement mail: http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html) For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/developers-2/ translate LibreOffice to your language: http://wiki.documentfoundation.org/Translation_for_3.6 or help with funding our operations: http://donate.libreoffice.org A list of known issues and fixed bugs with 3.6.4 RC3 is available from our wiki: http://wiki.documentfoundation.org/Releases/3.6.4/RC3 Please find the list of changes here: http://download.documentfoundation.org/libreoffice/src/commit-log-libreoffice-3-6-4-release-3.6.4.3.log Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove useless getpid implementation on Linux.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1219 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/19/1219/1 Remove useless getpid implementation on Linux. The new minimal target have a proper getpid implementation. Change-Id: I1cf209d8b4cb651866287c3a682ebd0806ab35b9 --- M sal/osl/unx/system.c 1 file changed, 0 insertions(+), 34 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1219 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1cf209d8b4cb651866287c3a682ebd0806ab35b9 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - connectivity/source
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fec0849d12998f4d35bf9b84fad2c9bdfb5a7697
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Dec 1 15:32:38 2012 +0100
Fix lacking / on .icedove
It would prevent to find icedove addressbook if there's no link
.thunderbird to .icedove
I already did the same on master sources, see:
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=ea5a96a5c771ee2c2ebbe4c12c4e7f3b1cba29a7
Change-Id: I24d1ff9b4af327a810997b97b0cf4112eba21e64
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index c613faa..17de26b 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -85,7 +85,7 @@ namespace
#else
{ .mozilla/seamonkey/, NULL, NULL, NULL },
{ .mozilla/firefox/, NULL, NULL, NULL },
-{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/,
.icedove }
+{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/,
.icedove/ }
#endif
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH for 3.6][PUSHED 3-6] Lacking / with .icedove prevents to use Icedove addressbook
On Sat, 2012-12-01 at 06:46 -0800, julien2412 wrote: Hello, Reading https://bugs.freedesktop.org/show_bug.cgi?id=57419, I found there was a missing / at the end of .icedove in connectivity/source/drivers/mork/MNSFolders.cxx, line 88 Here's the straightforward patch: No problem, pushed to 3-6. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/uiconfig
sw/uiconfig/swriter/ui/inserttable.ui |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit c140d0a585dd82af370c7310b57f56392b3889e1 Author: Samuel Mehrbrodt s.mehrbr...@gmail.com Date: Sat Dec 1 13:01:14 2012 +0100 Insert Table Dialog: Rename button back to AutoFormat, Accelerators changed As requested in here: http://lists.freedesktop.org/archives/libreoffice/2012-November/041788.html http://lists.freedesktop.org/archives/libreoffice-ux-advise/2012-November/001597.html Change-Id: I2cd3f4422dcbd62b1e72661d1df890bd0202c1ef Reviewed-on: https://gerrit.libreoffice.org/1217 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/sw/uiconfig/swriter/ui/inserttable.ui b/sw/uiconfig/swriter/ui/inserttable.ui index 56043c0..9cf3cdc 100644 --- a/sw/uiconfig/swriter/ui/inserttable.ui +++ b/sw/uiconfig/swriter/ui/inserttable.ui @@ -170,7 +170,7 @@ property name=can_focusFalse/property property name=margin_left6/property property name=xalign0/property -property name=label translatable=yesRows /property +property name=label translatable=yes_Rows/property /object packing property name=left_attach2/property @@ -346,7 +346,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=margin_left5/property -property name=label translatable=yesHeading _Rows/property +property name=label translatable=yesHeading Ro_ws/property /object packing property name=left_attach0/property @@ -394,7 +394,7 @@ property name=left_padding12/property child object class=GtkButton id=autoformat -property name=label translatable=yesTable St_yles/property +property name=label translatable=yesAuto_Format/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH][RESOLVED] New Layout for 'Insert Table' Dialog
On Sat, 2012-12-01 at 13:05 +0100, Samuel Mehrbrodt wrote: I've commited a patch for this: https://gerrit.libreoffice.org/1217/ merged now FWIW. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Insert Table Dialog: Rename button back to AutoFormat, Acc...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1217 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1217 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2cd3f4422dcbd62b1e72661d1df890bd0202c1ef Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] LibreOffice 3.6.4 RC3 available
Hi Fridrich, Le 01/12/2012 21:20, Fridrich Strba a écrit : Dear Community, The Document Foundation is happy to announce the third release candidate of LibreOffice 3.6.4. The upcoming 3.6.4 will be the fifth in a series of frequent bugfix releases for our 3.6 code line. Please be aware that LibreOffice 3.6.4 RC3 is not yet ready for production use, you should continue to use LibreOffice 3.6.3 for that. [...] Please find the list of changes here: http://download.documentfoundation.org/libreoffice/src/commit-log-libreoffice-3-6-4-release-3.6.4.3.log This last link gives an error 404. At the moment it seems that the correct link is : http://download.documentfoundation.org/libreoffice/src/commit-log-tag-libreoffice-3.6.4.3-release-3.6.4.3.log Best regards JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |9 -
writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 ++
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit fb17de573c582eca7548bf8cd0a0ea86cfad17df
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Nov 30 16:32:56 2012 +0100
fdo#57708 fix RTF import of pictures right before text frames
Change-Id: Ibfeaadd5b48fd48c2c1f20de5dc272d9a326bfc4
(cherry picked from commit 8063e36115a11ddf3db05928db9287947beee74d)
Reviewed-on: https://gerrit.libreoffice.org/1215
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 3ebb8da..a910401 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -280,7 +280,8 @@
RTFDocumentImpl::RTFDocumentImpl(uno::Referenceuno::XComponentContext const x
m_aHexBuffer(),
m_bIgnoreNextContSectBreak(false),
m_bNeedSect(true),
-m_bWasInFrame(false)
+m_bWasInFrame(false),
+m_bHadPicture(false)
{
OSL_ASSERT(xInputStream.is());
m_pInStream.reset(utl::UcbStreamHelper::CreateStream(xInputStream,
sal_True));
@@ -480,6 +481,8 @@ void RTFDocumentImpl::parBreak()
Mapper().endCharacterGroup();
Mapper().endParagraphGroup();
+m_bHadPicture = false;
+
// start new one
Mapper().startParagraphGroup();
}
@@ -789,6 +792,8 @@ int RTFDocumentImpl::resolvePict(bool bInline)
m_pCurrentBuffer-push_back(make_pair(BUFFER_PROPS, pValue));
}
+// Make sure we don't loose these properties with a too early reset.
+m_bHadPicture = true;
return 0;
}
@@ -1926,6 +1931,8 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
}
break;
case RTF_PARD:
+if (m_bHadPicture)
+dispatchSymbol(RTF_PAR);
m_aStates.top().aParagraphSprms = m_aDefaultState.aParagraphSprms;
m_aStates.top().aParagraphAttributes =
m_aDefaultState.aParagraphAttributes;
m_aStates.top().resetFrame();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index d36a5ec..5e88ef8 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -520,6 +520,8 @@ namespace writerfilter {
bool m_bNeedSect;
/// If aFrame.inFrame() was true in the previous state.
bool m_bWasInFrame;
+/// A picture was seen in the current paragraph.
+bool m_bHadPicture;
};
} // namespace rtftok
} // namespace writerfilter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - i18npool/source
i18npool/source/localedata/data/tr_TR.xml | 20 +--- 1 file changed, 17 insertions(+), 3 deletions(-) New commits: commit bc19a37be6a6c8538d8a7b07adedd754db17f1df Author: Eike Rathke er...@redhat.com Date: Thu Nov 29 17:10:12 2012 +0100 resolved fdo#57668 additional date formats using '/' separator Change-Id: Ib71fb25b8d5411b83f55649d9a18833470647eb3 Reviewed-on: https://gerrit.libreoffice.org/1196 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/i18npool/source/localedata/data/tr_TR.xml b/i18npool/source/localedata/data/tr_TR.xml index ca2d1ab..45ce90f 100644 --- a/i18npool/source/localedata/data/tr_TR.xml +++ b/i18npool/source/localedata/data/tr_TR.xml @@ -37,7 +37,9 @@ LC_FORMAT DateAcceptancePatternD.M/DateAcceptancePattern DateAcceptancePatternD/M/DateAcceptancePattern +DateAcceptancePatternD/M/Y/DateAcceptancePattern DateAcceptancePatternD-M/DateAcceptancePattern +DateAcceptancePatternD-M-Y/DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement @@ -90,12 +92,12 @@ FormatCodeDD.MM.YY/FormatCode /FormatElement FormatElement msgid=DateFormatskey9 default=true type=long usage=DATE formatindex=19 - FormatCodeDD.MM.YY/FormatCode + FormatCodeD../FormatCode /FormatElement -FormatElement msgid=DateFormatskey8 default=true type=medium usage=DATE formatindex=20 +FormatElement msgid=DateFormatskey8 default=false type=medium usage=DATE formatindex=20 FormatCodeDD.MM.YY/FormatCode /FormatElement -FormatElement msgid=DateFormatskey7 default=false type=medium usage=DATE formatindex=21 +FormatElement msgid=DateFormatskey7 default=true type=medium usage=DATE formatindex=21 FormatCodeDD.MM./FormatCode /FormatElement FormatElement msgid=DateFormatskey10 default=false type=long usage=DATE formatindex=22 @@ -177,6 +179,18 @@ FormatElement msgid=DateTimeFormatskey2 default=false type=medium usage=DATE_TIME formatindex=47 FormatCodeDD.MM. HH:MM:SS/FormatCode /FormatElement +FormatElement msgid=DateFormatskey22 default=false type=medium usage=DATE formatindex=51 + FormatCodeDD/MM//FormatCode +/FormatElement +FormatElement msgid=DateFormatskey23 default=false type=short usage=DATE formatindex=52 + FormatCodeDD/MM/YY/FormatCode +/FormatElement +FormatElement msgid=DateFormatskey24 default=false type=long usage=DATE formatindex=53 + FormatCodeDD/MMM//FormatCode +/FormatElement +FormatElement msgid=DateTimeFormatskey3 default=false type=medium usage=DATE_TIME formatindex=54 + FormatCodeDD/MM/ HH:MM:SS/FormatCode +/FormatElement /LC_FORMAT 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
[PUSHED] Change in core[libreoffice-3-6]: fdo#57708 fix fake page break problem during RTF import
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1214 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1214 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I28c372d539c150fe21ff9db31209f9935a5e9063 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fdo#57708 fix RTF import of pictures right before text frame...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1215 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1215 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibfeaadd5b48fd48c2c1f20de5dc272d9a326bfc4 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: resolved fdo#57668 additional date formats using '/' separat...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1196 Approvals: Caolán McNamara: Verified; Looks good to me, approved Björn Michaelsen: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/1196 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib71fb25b8d5411b83f55649d9a18833470647eb3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Class MediaDescriptorHelper don't need virtual destructor.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1220 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/20/1220/1 Class MediaDescriptorHelper don't need virtual destructor. Change-Id: I6711ef712a8a04d6fc8991f7056d1440964832ef --- M chart2/source/inc/MediaDescriptorHelper.hxx 1 file changed, 1 insertion(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1220 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6711ef712a8a04d6fc8991f7056d1440964832ef Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sal/osl
sal/osl/unx/system.c | 34 --
1 file changed, 34 deletions(-)
New commits:
commit 04962221c3a0be2ef46fcc9b8f4da58b9947a6ee
Author: Arnaud Versini arnaud.vers...@gmail.com
Date: Sat Dec 1 20:42:50 2012 +0100
Remove useless getpid implementation on Linux.
The new minimal target have a proper getpid implementation.
Change-Id: I1cf209d8b4cb651866287c3a682ebd0806ab35b9
Reviewed-on: https://gerrit.libreoffice.org/1219
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 328f4fc..fca7655 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -207,40 +207,6 @@ int macxp_resolveAlias(char *path, int buflen)
#endif /* NO_PTHREAD_RTL */
-#if defined(LINUX) defined (__GLIBC__) __GLIBC__ == 2 __GLIBC_MINOR__
4
-/* The linux kernel 2.4 getpid implemention always return the pid of the
- thread subprocess and not of the main process, the NPTL implementation
- with a Linux kernel 2.6 kernel return the pid. So when possibly
- there is the wrong implementation of getpid, we save the pid at startup.
- FIXME: when our Linux base-line is above:
-+ Linux kernel version 2.6 or higher; - clone() for NTPL
-+ glibc2 version 2.4 or higher; - No longer LinuxThreads, only NPTL
- Then we get a working getpid() and can remove this hack.
- FIXME: getppid is also wrong in this situation
-*/
-
-// Directly from libc.so.6, obviously missing from some unistd.h:
-extern __pid_t __getpid(void);
-
-static pid_t pid = -1;
-
-static void savePid(void) __attribute__((constructor));
-
-static void savePid(void)
-{
-if (pid == -1)
-pid = __getpid();
-}
-
-pid_t getpid(void)
-{
-if (pid == -1)
-savePid();
-
-return (pid);
-}
-#endif /* defined LINUX */
-
#ifdef NO_PTHREAD_SEMAPHORES
int sem_init(sem_t* sem, int pshared, unsigned int value)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Remove useless getpid implementation on Linux.
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1219 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1219 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1cf209d8b4cb651866287c3a682ebd0806ab35b9 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com Gerrit-Reviewer: Arnaud Versini arnaud.vers...@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Bug 34465 - get rid of all calls to virtual const SfxPoolItem* Put( const SfxPoolItem, USHORT nWhich)
On 30/11/12 15:19, Maciej Rumianowski wrote: Hi Bjoern, thanks for reply :) So, to change the conditionals, we need to make sure the state is consistent. Thus: - adding the asserts Do you mean DBG_ASSERT or real assert? if the goal is to track down client code that is making erroneous calls to an internal interface, assert() is clearly the way to go: it will abort the program when built in any debug mode (e.g. --enable-debug or --enable-dbgutil) and makes any unit test that triggers such an erroneous call fail, which is what you want to track those down. DBG_ASSERT is only active with --enable-dbgutil, and just prints a message that is easily ignored. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: random number generators for calc
On 01/12/12 12:22, tino wrote: the header is sal/inc/rtl/random.h (which is apparently a C interface). Exactly, the C++ interface is missing. but that isn't really a problem, is it? using it is as simple as: static rtlRandomPool aPool = rtl_random_createPool(); sal_Int32 nRandom; rtl_random_getBytes(aPool, nRandom, sizeof(nRandom)); of course it doesn't have fancy features like ranges or non-uniform distribution... Also, the source doesn't have any comments to say what algorithm is implemented etc. Do you know? actually i don't know much about random numbers, except that C standard library implementations thereof may be of arbitrarily bad quality, so one shouldn't use them in portable code. i bet whatever rtlRandomPool uses is better than a worst case rand() implementation, otherwise it wouldn't exist. but likely whatever fancy thing boost implements is better still, though it is unclear whether it is better in a way that makes a difference in practice (while apparently actual users do complain about rand()). ... looking at random.cxx it appears to use a MD5 hash to generate the random bytes; initialization is via seconds/nanoseconds of current time and thread-id. since the cryptographic hash implementations in sal/rtl don't look heavily optimized this is likely not be the fastest way to generate random numbers, if that is a concern... #define RTL_RANDOM_DIGEST rtl_Digest_AlgorithmMD5 but why do we need a wrapper around boost in sal? i mean i haven't looked at the boost random stuff but unless its interface is horrible (always a possibility with boost i guess) _and_ there are multiple places where we'd want to call it, then why not use it directly from Calc's formula implementation? I guess that's for someone more experienced to comment on. My simple reason was rtl::math seems a good collection of maths functions this may fit in, and there's no decision yet if RANDNORMAL() etc should be implemented in sc or scaddins (or at all?). The boost code would look something like this: well that looks reasonably simple; my concern is more that rtl/math.hxx is part of the stable URE interface so once something is added there it can't be removed, so better get the interface right if you want to add it there (also, you have to edit sal/util/sal.map file to get it exported which is annoying). does anybody have an opinion whether we want this functionality in rtl/math.hxx or not? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: chart2/source
chart2/source/inc/MediaDescriptorHelper.hxx |1 -
chart2/source/tools/MediaDescriptorHelper.cxx |5 -
2 files changed, 6 deletions(-)
New commits:
commit 82949bd170719fcdfaff4a53809551ceb5136da3
Author: Arnaud Versini arnaud.vers...@gmail.com
Date: Sat Dec 1 21:54:31 2012 +0100
Class MediaDescriptorHelper doesn't need virtual destructor.
Change-Id: I6711ef712a8a04d6fc8991f7056d1440964832ef
Reviewed-on: https://gerrit.libreoffice.org/1220
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx
b/chart2/source/inc/MediaDescriptorHelper.hxx
index fbbe42c..0976b13 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -50,7 +50,6 @@ private:
public:
MediaDescriptorHelper( const ::com::sun::star::uno::Sequence
::com::sun::star::beans::PropertyValue
rMediaDescriptor );
-virtual ~MediaDescriptorHelper();
::com::sun::star::uno::Sequence
::com::sun::star::beans::PropertyValue getReducedForModel();
diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx
b/chart2/source/tools/MediaDescriptorHelper.cxx
index 6cddc11..ae00aac 100644
--- a/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -198,11 +198,6 @@ void MediaDescriptorHelper::impl_init()
ISSET_Stream = sal_False;
}
-MediaDescriptorHelper::~MediaDescriptorHelper()
-{
-
-}
-
uno::Sequence beans::PropertyValue MediaDescriptorHelper
::getReducedForModel()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Class MediaDescriptorHelper doesn't need virtual destructor.
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1220 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1220 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6711ef712a8a04d6fc8991f7056d1440964832ef Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com Gerrit-Reviewer: Arnaud Versini arnaud.vers...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove unused method from desktop
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1221 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/1221/1 Remove unused method from desktop Change-Id: I17b269c70bbf82aa5a4345d488777ac98d1d6938 Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- M desktop/source/deployment/inc/lockfile.hxx M desktop/source/deployment/misc/lockfile.cxx M unusedcode.easy 3 files changed, 0 insertions(+), 13 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1221 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17b269c70bbf82aa5a4345d488777ac98d1d6938 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: readlicense_oo/CustomTarget_readme.mk solenv/gbuild
readlicense_oo/CustomTarget_readme.mk |4 ++--
solenv/gbuild/AllLangResTarget.mk |2 +-
solenv/gbuild/Configuration.mk |7 ---
solenv/gbuild/ExtensionTarget.mk | 12 ++--
solenv/gbuild/InstallModuleTarget.mk |7 ---
solenv/gbuild/UI.mk|7 ---
solenv/gbuild/extensions/pre_SharedLangList.mk |4
7 files changed, 25 insertions(+), 18 deletions(-)
New commits:
commit fbb7f5f010aed4084c5c4c42ceba8ecbbd1a8faf
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Sun Dec 2 04:06:48 2012 +0100
Make qtz work in UI
Change-Id: Iced0b874405942782574fe46b58c3caafb2deeb4
diff --git a/readlicense_oo/CustomTarget_readme.mk
b/readlicense_oo/CustomTarget_readme.mk
index d653aa9..50c2b09 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -36,12 +36,12 @@ readlicense_oo_README_XRM :=
$(readlicense_oo_DIR)/readme.xrm
$(readlicense_oo_DIR)/readme.xrm : \
$(SRCDIR)/readlicense_oo/docs/readme.xrm \
$(readlicense_XRMEXTARGET) \
- $(foreach lang,$(filter-out
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po) \
+ $(foreach lang,$(filter-out qtz,$(filter-out
en-US,$(gb_WITH_LANG))),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po) \
| $(readlicense_oo_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XRM,1)
$(call gb_Helper_abbreviate_dirs, \
MERGEINPUT=`$(gb_MKTEMP)` \
-echo $(foreach lang,$(filter-out
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po)
$${MERGEINPUT} \
+echo $(foreach lang,$(filter-out qtz,$(filter-out
en-US,$(gb_WITH_LANG))),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po)
$${MERGEINPUT} \
$(readlicense_XRMEXCOMMAND) \
-p readlicense_oo \
-i $ \
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index 1715fba..f56bbf9 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -73,7 +73,7 @@ $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/%
$(gb_Helper_MISCDUMMY)
mkdir -p $(dir $@) cp $ $@)
define gb_SrsPartMergeTarget_SrsPartMergeTarget
-$(call gb_SrsPartMergeTarget__SrsPartMergeTarget_impl,$(1),$(if $(2),$(foreach
lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst
%/,%,$(dir $(1))).po)))
+$(call gb_SrsPartMergeTarget__SrsPartMergeTarget_impl,$(1),$(if $(2),$(foreach
lang,$(filter-out qtz,$(filter-out
en-US,$(gb_WITH_LANG))),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po)))
endef
define gb_SrsPartMergeTarget__SrsPartMergeTarget_impl
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 84b9fab..1de28ad 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -247,6 +247,7 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) :
gb_XcuMergeTarget_CFGEXTARGET := $(call
gb_Executable_get_target_for_build,cfgex)
gb_XcuMergeTarget_CFGEXCOMMAND := $(gb_Helper_set_ld_path)
$(gb_XcuMergeTarget_CFGEXTARGET)
+gb_XcuMergeTarget_LANGS := $(filter-out qtz,$(filter-out
en-US,$(gb_WITH_LANG)))
# PRJNAME is computed from the stem (parameter $(2))
define gb_XcuMergeTarget__command
@@ -279,10 +280,10 @@ $(call gb_XcuMergeTarget_get_clean_target,%) :
define gb_XcuMergeTarget_XcuMergeTarget
$(call gb_XcuMergeTarget_get_target,$(1)) : \
$(call gb_Configuration__get_source,$(2),$(3)/$(4)) \
- $(wildcard $(foreach lang,$(filter-out
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po))
+ $(wildcard $(foreach
lang,$(gb_XcuMergeTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po))
$(call gb_XcuMergeTarget_get_target,$(1)) : \
- POFILES := $(foreach lang,$(filter-out
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
-$(foreach lang,$(filter-out
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po) :
+ POFILES := $(foreach
lang,$(gb_XcuMergeTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po)
+$(foreach
lang,$(gb_XcuMergeTarget_TRANS_LANG),$(gb_POLOCATION)/$(lang)/$(patsubst
%/,%,$(dir $(1))).po) :
endef
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 25d415a..ff5b790 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -148,10 +148,10 @@ $(call
gb_ExtensionTarget_get_workdir,$(1))/description.xml :| \
ifneq ($(strip $(gb_WITH_LANG)),)
$(call gb_ExtensionTarget_get_target,$(1)) : \
- POFILES := $(foreach
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
+ POFILES := $(foreach lang,$(filter-out
[Libreoffice-commits] .: l10ntools/inc l10ntools/source
l10ntools/inc/export.hxx |5 +++--
l10ntools/source/helpex.cxx|5 +++--
l10ntools/source/lngmerge.cxx |2 +-
l10ntools/source/merge.cxx |5 +++--
l10ntools/source/propmerge.cxx |3 ++-
l10ntools/source/treemerge.cxx |2 +-
6 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 05ac3878bba25f39077b98ad2ac2fee908aea265
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Sun Dec 2 05:07:46 2012 +0100
Ignore qtz in ulfex and some other places
Installation not works well with qtz so ignore
it in ulf files.
In those executables which work with one lang at
a time it is unwanted to store the useless qtz strings
at all call.
Change-Id: I1d65ec340da1832404001ad18820407e56615db6
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 28807f6..af94c17 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -460,8 +460,9 @@ class MergeDataFile
const rtl::OString rQHTEXT, const rtl::OString rTITLE,
const rtl::OString sFilename, bool bCaseSensitive);
public:
-explicit MergeDataFile(const rtl::OString rFileName,
-const rtl::OString rFile, bool bCaseSensitive);
+explicit MergeDataFile(
+const rtl::OString rFileName, const rtl::OString rFile,
+bool bCaseSensitive, bool bWithQtz = true );
~MergeDataFile();
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index 7ab581a..21a8b9d 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -81,7 +81,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
std::cerr Helpex error: cannot open input file\n;
return 1;
}
-MergeDataFile aMergeDataFile( aArgs.m_sMergeSrc, OString(), false);
+MergeDataFile aMergeDataFile(
+aArgs.m_sMergeSrc, OString(), false, false );
std::string sTemp;
aInput sTemp;
while( !aInput.eof() )
@@ -104,7 +105,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
{
HelpParser aParser( aArgs.m_sInputFile );
MergeDataFile aMergeDataFile(
-aArgs.m_sMergeSrc, aArgs.m_sInputFile, false );
+aArgs.m_sMergeSrc, aArgs.m_sInputFile, false, false );
hasNoError =
aParser.Merge(
aArgs.m_sMergeSrc, aArgs.m_sOutputFile,
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 7294e27..9da45b6 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -184,7 +184,7 @@ sal_Bool LngParser::Merge(
}
nError = LNG_OK;
-MergeDataFile aMergeDataFile( rSDFFile, sSource, false );
+MergeDataFile aMergeDataFile( rSDFFile, sSource, false, false );
rtl::OString sTmp( Export::sLanguages );
if( sTmp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(ALL)) )
Export::SetLanguages( aMergeDataFile.GetLanguages() );
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 98334be..4f065fb 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -151,7 +151,7 @@ sal_Bool MergeData::operator==( ResData *pData )
MergeDataFile::MergeDataFile(
const rtl::OString rFileName, const rtl::OString rFile,
-bool bCaseSensitive)
+bool bCaseSensitive, bool bWithQtz )
{
std::ifstream aInputStream( rFileName.getStr() );
if ( !aInputStream.is_open() )
@@ -261,7 +261,8 @@ MergeDataFile::MergeDataFile(
aActPo.getLocalId(), sHack, sLang, sText,
sQHText, sTitle, aActPo.getSourceFile(), bCaseSensitive );
-if( bFirstLang ( strcmp(getenv(ENABLE_RELEASE_BUILD),TRUE)
) )
+if( bFirstLang bWithQtz
+( strcmp(getenv(ENABLE_RELEASE_BUILD),TRUE) ) )
{
aLanguageSet.insert(qtz);
InsertEntry(
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index a4440e9..79c737e 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -180,7 +180,8 @@ void PropParser::Merge( const OString rMergeSrc, const
OString rDestinationFil
return;
}
-MergeDataFile aMergeDataFile( rMergeSrc, m_sSource, false );
+MergeDataFile aMergeDataFile(
+rMergeSrc, m_sSource, false, m_sLang == qtz );
const std::vectorOString vLanguages = aMergeDataFile.GetLanguages();
if( m_sLang != qtz vLanguages.size()=2
diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx
index bc9596c..8f022de 100644
--- a/l10ntools/source/treemerge.cxx
+++ b/l10ntools/source/treemerge.cxx
@@ -280,7 +280,7 @@ void TreeParser::Merge(
else
{
MergeDataFile aMergeDataFile(
-rMergeSrc, static_castOString( m_pSource-name ), false );
+rMergeSrc, static_castOString( m_pSource-name
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/extensions/pre_SharedLangList.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 2291423c5e37c0c6de177880384b119dcad2b261 Author: Zolnai Tamás zolnaitamas2...@gmail.com Date: Sun Dec 2 05:32:12 2012 +0100 No lang no qtz Change-Id: I6b5649077fda265a2aff253b5e2534bfd818b3bc diff --git a/solenv/gbuild/extensions/pre_SharedLangList.mk b/solenv/gbuild/extensions/pre_SharedLangList.mk index 06113a5..40c9467 100644 --- a/solenv/gbuild/extensions/pre_SharedLangList.mk +++ b/solenv/gbuild/extensions/pre_SharedLangList.mk @@ -27,7 +27,9 @@ gb_WITH_LANG=$(completelangiso) endif ifneq ($(ENABLE_RELEASE_BUILD),TRUE) +ifneq ($(WITH_LANG),) gb_WITH_LANG += qtz endif +endif # vim: set noet ts=4 sw=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - sc/inc sc/source
sc/inc/colorscale.hxx |2
sc/inc/sc.hrc |7 -
sc/source/core/data/colorscale.cxx | 129 ++
sc/source/filter/inc/orcusinterface.hxx| 23 +++
sc/source/filter/orcus/interface.cxx | 101 +-
sc/source/ui/condformat/condformatdlg.cxx |9 +
sc/source/ui/condformat/condformatdlgentry.cxx | 172 +
sc/source/ui/inc/condformatdlg.hrc |7 +
sc/source/ui/inc/condformatdlgentry.hxx| 40 +
sc/source/ui/src/condformatdlg.src | 71 ++
sc/source/ui/view/output.cxx | 121 -
11 files changed, 547 insertions(+), 135 deletions(-)
New commits:
commit 704fdf2b23d0e0480f29e0e56f631c2835eed02b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Dec 2 05:57:33 2012 +0100
create icon sets in UI
Change-Id: I6c55cc1d1a1dbd4839b823df08f8c42a7b880132
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 3d41971..86dec0d 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1259,6 +1259,40 @@
ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pPar
FreeResource();
}
+ScColorScaleEntry*
ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::CreateEntry(ScDocument* pDoc, const
ScAddress rPos) const
+{
+sal_Int32 nPos = maLbEntryType.GetSelectEntryPos();
+rtl::OUString aText = maEdEntry.GetText();
+ScColorScaleEntry* pEntry = new ScColorScaleEntry();
+
+sal_uInt32 nIndex = 0;
+double nVal = 0;
+SvNumberFormatter* pNumberFormatter = pDoc-GetFormatTable();
+pNumberFormatter-IsNumberFormat(aText, nIndex, nVal);
+pEntry-SetValue(nVal);
+
+switch(nPos)
+{
+case 0:
+pEntry-SetType(COLORSCALE_VALUE);
+break;
+case 1:
+pEntry-SetType(COLORSCALE_PERCENT);
+break;
+case 2:
+pEntry-SetType(COLORSCALE_PERCENTILE);
+break;
+case 3:
+pEntry-SetType(COLORSCALE_FORMULA);
+pEntry-SetFormula(aText, pDoc, rPos, pDoc-GetGrammar());
+break;
+default:
+assert(false);
+}
+
+return pEntry;
+}
+
ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc,
const ScAddress rPos, const ScIconSetFormat* pFormat ):
ScCondFrmtEntry( pParent, pDoc, rPos ),
maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ),
@@ -1317,7 +1351,7 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl )
OUString ScIconSetFrmtEntry::GetExpressionString()
{
-return OUString();
+return ScCondFormatHelper::GetExpression(ICONSET, 0);
}
void ScIconSetFrmtEntry::SetActive()
@@ -1348,7 +1382,18 @@ void ScIconSetFrmtEntry::SetInactive()
ScFormatEntry* ScIconSetFrmtEntry::GetEntry() const
{
-return NULL;
+ScIconSetFormat* pFormat = new ScIconSetFormat(mpDoc);
+
+ScIconSetFormatData* pData = new ScIconSetFormatData;
+pData-eIconSetType =
static_castScIconSetType(maLbIconSetType.GetSelectEntryPos());
+for(ScIconSetFrmtDateEntriesType::const_iterator itr = maEntries.begin(),
+itrEnd = maEntries.end(); itr != itrEnd; ++itr)
+{
+pData-maEntries.push_back(itr-CreateEntry(mpDoc, maPos));
+}
+pFormat-SetIconSetData(pData);
+
+return pFormat;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx
b/sc/source/ui/inc/condformatdlgentry.hxx
index 7017cd9..99d602c 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -258,6 +258,8 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry
public:
ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType,
sal_Int32 i, const ScColorScaleEntry* pEntry = NULL );
+
+ScColorScaleEntry* CreateEntry(ScDocument* pDoc, const ScAddress
rPos) const;
};
typedef boost::ptr_vectorScIconSetFrmtDataEntry
ScIconSetFrmtDateEntriesType;
ScIconSetFrmtDateEntriesType maEntries;
commit f7cd8c619ef3db4b3a41b25eb9c4e5e798f2c155
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Dec 2 04:25:27 2012 +0100
correctly show existing icon sets in the UI
Change-Id: I8970d3b0cc3263f46cfda45ae3b919a441bc0228
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index b039493..3d41971 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1224,7 +1224,7 @@ IMPL_LINK_NOARG( ScDateFrmtEntry, StyleSelectHdl )
return 0;
}
-ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window*
pParent, ScIconSetType eType, sal_Int32 i ):
Re: random number generators for calc
On Sat, Dec 01, 2012 at 10:17:31PM +0100, Michael Stahl wrote: On 01/12/12 12:22, tino wrote: the header is sal/inc/rtl/random.h (which is apparently a C interface). Exactly, the C++ interface is missing. but that isn't really a problem, is it? using it is as simple as: static rtlRandomPool aPool = rtl_random_createPool(); sal_Int32 nRandom; rtl_random_getBytes(aPool, nRandom, sizeof(nRandom)); of course it doesn't have fancy features like ranges or non-uniform distribution... Also, the source doesn't have any comments to say what algorithm is implemented etc. Do you know? actually i don't know much about random numbers, except that C standard library implementations thereof may be of arbitrarily bad quality, so one shouldn't use them in portable code. i bet whatever rtlRandomPool uses is better than a worst case rand() implementation, otherwise it wouldn't exist. but likely whatever fancy thing boost implements is better still, though it is unclear whether it is better in a way that makes a difference in practice (while apparently actual users do complain about rand()). ... looking at random.cxx it appears to use a MD5 hash to generate the random bytes; initialization is via seconds/nanoseconds of current time and thread-id. since the cryptographic hash implementations in sal/rtl don't look heavily optimized this is likely not be the fastest way to generate random numbers, if that is a concern... #define RTL_RANDOM_DIGEST rtl_Digest_AlgorithmMD5 but why do we need a wrapper around boost in sal? i mean i haven't looked at the boost random stuff but unless its interface is horrible (always a possibility with boost i guess) _and_ there are multiple places where we'd want to call it, then why not use it directly from Calc's formula implementation? I guess that's for someone more experienced to comment on. My simple reason was rtl::math seems a good collection of maths functions this may fit in, and there's no decision yet if RANDNORMAL() etc should be implemented in sc or scaddins (or at all?). The boost code would look something like this: Personally I prefer to implement useful functions inside ScInterpreter and not in scaddins. Eike might have better comments for one or the other way. well that looks reasonably simple; my concern is more that rtl/math.hxx is part of the stable URE interface so once something is added there it can't be removed, so better get the interface right if you want to add it there (also, you have to edit sal/util/sal.map file to get it exported which is annoying). does anybody have an opinion whether we want this functionality in rtl/math.hxx or not? We should not implement them in rtl/math.hxx until there are more users than calc's interpreter that need it. Lets not overcomplicate this stuff as long as it is not necessary. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/filter/orcus/interface.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e93dd02e30fa6b06a04dcd83a1403a655cf08041
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Dec 2 08:23:37 2012 +0100
workaround broken WaE eGrammar may be used uninitialized
diff --git a/sc/source/filter/orcus/interface.cxx
b/sc/source/filter/orcus/interface.cxx
index 52072ad..2e99eaa 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -89,7 +89,7 @@ void ScOrcusSheet::set_formula(
row_t row, col_t col, formula_grammar_t grammar, const char* p, size_t n)
{
OUString aFormula(p, n, RTL_TEXTENCODING_UTF8);
-formula::FormulaGrammar::Grammar eGrammar;
+formula::FormulaGrammar::Grammar eGrammar =
formula::FormulaGrammar::GRAM_ODFF;
switch(grammar)
{
case orcus::spreadsheet::ods:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/com_MSC_defs.mk | 14 ++ 1 file changed, 14 insertions(+) New commits: commit afa3ed9eafd50de4fa07b37acd4a317d515bf09d Author: Tor Lillqvist tlillqv...@suse.com Date: Sun Dec 2 09:25:56 2012 +0200 Disable MSVC warning C4986 This is a new warning in Visual Studio 2012. Otherwise, when using /Wall (as we do), you get tons of warnings from the compiler's own headers: .../crtdbg.h(1041) : warning C4986: 'operator new[]': exception specification does not match previous declaration .../new(79) : see declaration of 'operator new[]' It seems to be generally recommended not to use /Wall with MSVC (that option does not really have the same intended use as gcc's -Wall, people say), but use /W4 instead: http://stackoverflow.com/a/4001759/259398 So maybe we should change that -Wall to -W4? Also, we should go over the long list of -wd options and check each whether we really want it or not. Maybe, while at it, add a comment for each giving its one-line meaning. diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index aca825c..5017283 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -184,6 +184,20 @@ gb_CXXFLAGS := \ -Zc:forScope,wchar_t- \ -Zm500 \ +# New warning(s) in Visual Studio 2012, let's try disabling these only +# for that specific compiler version, in case a later one will not +# need them disabled. +ifeq ($(VCVER),110) + +# C4986: 'function': exception specification does not match previous +# declaration. This warning is generated by VS2012 headers (!), and is +# C++-only. + +gb_CXXFLAGS += \ + -wd4986 \ + +endif + gb_STDLIBS := \ advapi32.lib \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/com_MSC_defs.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 09849846eec9531bc48fa547b5c24c550b34 Author: Tor Lillqvist tlillqv...@suse.com Date: Sun Dec 2 09:52:53 2012 +0200 Argh, I meant Visual Studio 2010 diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 5017283..e867e98 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -184,10 +184,10 @@ gb_CXXFLAGS := \ -Zc:forScope,wchar_t- \ -Zm500 \ -# New warning(s) in Visual Studio 2012, let's try disabling these only +# New warning(s) in Visual Studio 2010, let's try disabling these only # for that specific compiler version, in case a later one will not # need them disabled. -ifeq ($(VCVER),110) +ifeq ($(VCVER),100) # C4986: 'function': exception specification does not match previous # declaration. This warning is generated by VS2012 headers (!), and is ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] [libreoffice-design] Send Feedback Option
Hello, I think there should be link to http://www.libreoffice.org/get-involved/too, to get more manpower for libreoffice. (And Get involved page must be redesigned in future - less text, more action...). Some get involved pages: https://www.mozilla.org/en-US/contribute/ http://www.gnome.org/get-involved/ Medieval 2012/11/30 Stefan Knorr (Astron) heinzless...@gmail.com Hi all, Rainer wrote this: I like it! And I have some proposals for additions. Very helpful, thanks. I think I included a bit of almost everything you said when I updated the page. On 29 November 2012 21:23, Michael Meeks michael.me...@suse.com wrote: Hah :-) so - JFYI - when people click on send-feedback, we now have more details about their systems: the exact version of the software they're running, the platform, the component (writer, base etc.) and more. That would need propagating to file a bug of course; Sure. Keep in mind, what I did is intended as a mockup, not as a final implementation. I think I left out everything that was harder to do, for Rob. I didn't know we add version strings to the feedback URL now, though. That's definitely nice progress. I wonder - Mozilla have done a lot of this work before us - can we re-use their backend infrastructure and share development work on that ? it'd suck to re-invent all their data analytics / query processing etc. ? Here's how I think Twitter v/ Mozilla's system stack up: Twitter: * no need to set up a new hardware/etc. (at least for collecting feedback; analysing feedback without hardware might be harder) * verified users = less spam (?) * many people have Twitter accounts already, so not such a high hurdle * possible to follow up with users, creating actual contact between developers/designers/QA'ers/marketeers/... and users * people might expect us to follow up with them, and when we don't they become angry (?) * data becomes Twitter's property not ours * dependent on Twitter's general mood and API * probably hard to annotate tweets with LibO/OS version i.m.o: * need to set up hardware * lots and lots of spam and gibberish * no hurdle but clicking the Send Feedback button * impossible to follow up with users * posts are automatically tagged with LibO/OS version * data is our property The (supposed) ease of use (both to us and the user) and the promise of having less spam make Twitter seem attractive to me, still. is prolly beyond us ATM, but ... perhaps worth collecting if someone will do real analytics on it. I personally think the feedback is mostly useful for collecting real-world thumbs-ups/thumbs-downs by region and time.[1] As you said, actual text analysis is hard, especially if you have to take into account that our users speak so many languages. Astron. [1] There might be the psychological effect that people feel heard, too. -- Unsubscribe instructions: E-mail to design+h...@global.libreoffice.org Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://listarchives.libreoffice.org/global/design/ All messages sent to this list will be publicly archived and cannot be deleted ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [ANN] LibreOffice 3.6.4 RC3 available
Hi Fridrich, Le 01/12/2012 21:20, Fridrich Strba a écrit : Dear Community, The Document Foundation is happy to announce the third release candidate of LibreOffice 3.6.4. The upcoming 3.6.4 will be the fifth in a series of frequent bugfix releases for our 3.6 code line. Please be aware that LibreOffice 3.6.4 RC3 is not yet ready for production use, you should continue to use LibreOffice 3.6.3 for that. [...] Please find the list of changes here: http://download.documentfoundation.org/libreoffice/src/commit-log-libreoffice-3-6-4-release-3.6.4.3.log This last link gives an error 404. At the moment it seems that the correct link is : http://download.documentfoundation.org/libreoffice/src/commit-log-tag-libreoffice-3.6.4.3-release-3.6.4.3.log Best regards JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] mailing list administration
Today I increased maximum Size for attachments from 64kB to 100kB to avoid problems with attached Bug statistics. CU Rainer P.S.: This thread should keep you up to date, discussion if desired please in extra threads to keep this one clear and short. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 57731] UI: Clicking a slide moves it around
https://bugs.freedesktop.org/show_bug.cgi?id=57731 Urmas davian...@gmail.com changed: What|Removed |Added Summary|Clicking at a Foil moves |UI: Clicking a slide moves |it around (UI-Problem) |it around -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 57768] Insert Frame - CRASH
https://bugs.freedesktop.org/show_bug.cgi?id=57768 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Version|Master old -3.6|4.0.0.0.alpha0+ Master -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 57766] FILEOPEN: .docx file makes LO hang if renamed to .doc
https://bugs.freedesktop.org/show_bug.cgi?id=57766 Milan Bouchet-Valat nalimi...@club.fr changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #3 from Milan Bouchet-Valat nalimi...@club.fr --- OK, let's start again with two separate reports. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 36019] Security improvement: Add some way to dynamically enable/disable extension installation.
https://bugs.freedesktop.org/show_bug.cgi?id=36019 sasha.libreoff...@gmail.com changed: What|Removed |Added Summary|Add some way to dynamically |Security improvement: Add |enable/disable extension|some way to dynamically |installation. |enable/disable extension ||installation. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 57767] New: FILEOPEN: numbering in attached .rtf file saved from Abiword makes LO hang
https://bugs.freedesktop.org/show_bug.cgi?id=57767 Priority: medium Bug ID: 57767 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILEOPEN: numbering in attached .rtf file saved from Abiword makes LO hang Severity: major Classification: Unclassified OS: All Reporter: nalimi...@club.fr Hardware: x86-64 (AMD64) Status: NEW Version: 3.5.6.2 release Component: Writer Product: LibreOffice Created attachment 70865 -- https://bugs.freedesktop.org/attachment.cgi?id=70865action=edit Test case RTF saved from Abiword The very short attached test case makes LO 3.5.7.2 and 3.6.3.2 (tested on Linux for the first, on Mac OS X for the second) hang when opening it. This file was saved from Abiword, and I could determine the problem happens only when a numbering is included in the file. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 57665] UI: Excess scrolling area on the main slide (Normal) view
https://bugs.freedesktop.org/show_bug.cgi?id=57665 --- Comment #5 from Emir Sarı emir_s...@msn.com --- No problem at all, after the input of the UX team, the fate of these spaces can be decided. :) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 57725] Libre page break
https://bugs.freedesktop.org/show_bug.cgi?id=57725 Mirosław Zalewski mini...@poczta.onet.pl changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #1 from Mirosław Zalewski mini...@poczta.onet.pl --- Could you attach image showing expected result? Also, you did attach file in DOCX format. Is this problem related to reading DOCX (created by MSO), writing DOCX (created by LO) or was this not intended? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 36017] Security improving: Make Extension manager the only way to install addons (Not directly from file manager, not directly from browser)
https://bugs.freedesktop.org/show_bug.cgi?id=36017 sasha.libreoff...@gmail.com changed: What|Removed |Added Summary|Make Extension manager the |Security improving: Make |only way to install addons |Extension manager the only |(Not directly from file |way to install addons (Not |manager, not directly from |directly from file manager, |browser)|not directly from browser) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
