LibreOffice Gerrit News 2013-10-14
Moin! * Open changes on master for project core changed in the last 25 hours: + Change sal_Bool to bool in viewfunc.cxx (Calc) in https://gerrit.libreoffice.org/6203 from Laurent BP + fdo#69762 Scientific number AutoCorrect as ordinal in https://gerrit.libreoffice.org/6204 from Laurent BP + fdo#61950 De-extensionize presentation minimizer in https://gerrit.libreoffice.org/6143 from David Ostrovsky + fdo#70371: Initial perl script in https://gerrit.libreoffice.org/6238 from Jelle van der Waa + fdo#7 add support for COVARIANCE.P and COVARIANCE.S functions in https://gerrit.libreoffice.org/6135 from Winfried Donkers * Merged changes on master for project core changed in the last 25 hours: + Access2Base store (wizards + scp2) in https://gerrit.libreoffice.org/6232 from Jean-Pierre ledure + Prefer OUString primitives to handwritten code in https://gerrit.libreoffice.org/5965 from Matteo Casalin + Introduce unit test in replace functionnality in Writer in https://gerrit.libreoffice.org/6184 from Arnaud Versini + hide program modules in Custom Install panel of Windows installer in https://gerrit.libreoffice.org/6235 from Andras Timar * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt + Remove obsolete MIME associatons on MAC OS in https://gerrit.libreoffice.org/6103 from Samuel Mehrbrodt + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + fdo#69407 Putting no fill frame color instead of transparent by default in https://gerrit.libreoffice.org/5996 from matthieu gay + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + fix polygon rendering with clip area of one line only in https://gerrit.libreoffice.org/5709 from Tsahi Glik @ CloudOn + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 70371] Identify unused headers
https://bugs.freedesktop.org/show_bug.cgi?id=70371 --- Comment #7 from Thomas Arnhold tho...@arnhold.org --- Yes, there shouldn't be many of them, because I did a cleanup some month ago. See 0f11f30ea96fcec8d7c648089fc223a6fbed6aef, bbac35af148ed6c9f19386e4721fa38b500f45a1, and more... I searched for all *.h and *.hxx files and grepped if they are included or referenced in any way - if not I removed them. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ATTENTION, creators of mysql-connector-ooo.oxt (--enable-ext-mariadb-connector)
Good morning Alexander, *, On Sonntag, 13. Oktober 2013 20:52 Alex Thurgood wrote: On 12/10/2013 15:03, Thomas Hackert wrote: just out of interest: For which OS/archticture did you build your extension? If you have one for Debian/AMD64, I can help to test it a little bit (but have to add, that I am using MariaDB here, if this does make any difference ... ;) ). https://sourceforge.net/projects/lomysqlconnectorextension/files/4.2/Linux64/ thank you very much :) It installs fine, but I have to RTFM on how I do create a database and connect to it first ... ;) Thanks again Thomas. -- * wolfie ponders how many debianites it takes to screw in a lightbulb Viiru wolfie: Somewhere around 600? One screw's the bulb, and the rest flame him for doing it wrong. part wolfie: is the bulb free software? Tv Can we vote on whether to screw it or not? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Development wiki spring (autumn) cleanup
On Fri, Oct 11, 2013 at 12:01:20PM +0200, bjoern bjoern.michael...@canonical.com wrote: orphaned development pages (never linked to from anywhere in the wiki: ... Development/Writer I just added an Applications list to the Development page, linking Writer, Calc and Impress Development pages. HTH, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/misc/syntaxhighlight.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ec16bfc22a6d5ee6084a1762ed5cb77886a2fb40
Author: Tor Lillqvist t...@collabora.com
Date: Mon Oct 14 12:04:36 2013 +0300
Probably best to use extern C here
Change-Id: I9fac782e29566d3652f9e903ed22abdb6531f883
diff --git a/comphelper/source/misc/syntaxhighlight.cxx
b/comphelper/source/misc/syntaxhighlight.cxx
index c1f4ca5..1995cd4 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -224,7 +224,7 @@ static const char* strListSqlKeyWords[] = {
};
-static int compare_strings( const void *arg1, const void *arg2 )
+extern C int compare_strings( const void *arg1, const void *arg2 )
{
return strcmp( (char *)arg1, *(char **)arg2 );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - svx/source
svx/source/svdraw/svdotext.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit d4e8b7f28eee6854642252c797351978adca4547
Author: Laurent Godard lgodard.li...@laposte.net
Date: Mon Oct 14 11:08:59 2013 +0200
Only adjust TextFrame if in Edit Mode - avoid notes import bottleneck
Change-Id: Ib8bedb624351c48b6c53a4d5c01f03105405662e
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index feefd80..69baa31 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1380,7 +1380,9 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText(
OutlinerParaObject* pTextObjec
}
SetTextSizeDirty();
-if (IsTextFrame() (IsAutoGrowHeight() || IsAutoGrowWidth()))
+
+bool bIsEditMode = IsInEditMode(); // Only adjust TextFrame if in Edit
Mode - avoid notes import bottleneck
+if (IsTextFrame() bIsEditMode (IsAutoGrowHeight() ||
IsAutoGrowWidth()))
{ // adapt text frame!
NbcAdjustTextFrameWidthAndHeight();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - sc/source
sc/source/core/data/column2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b7f8c0d9a9e7002ec869c9c3c43bf21e1c5d30ba
Author: Laurent Godard lgodard.li...@laposte.net
Date: Mon Oct 14 11:20:33 2013 +0200
the caption pos should be up to date in pNote
Change-Id: I346ea3a21318bca8cfd68c6b0676ef8b63dca676
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index cf66f14..2516112 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1870,7 +1870,7 @@ const ScPostIt* ScColumn::GetCellNote(SCROW nRow) const
void ScColumn::SetCellNote(SCROW nRow, ScPostIt* pNote)
{
-pNote-UpdateCaptionPos(ScAddress(nCol, nRow, nTab));
+//pNote-UpdateCaptionPos(ScAddress(nCol, nRow, nTab)); // TODO notes
usefull ? slow import with many notes
maCellNotes.set(nRow, pNote);
}
void ScColumn::DeleteCellNote(SCROW nRow)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/saxparser' - 3 commits - include/oox oox/source sax/source
include/oox/token/tokenmap.hxx |1 +
oox/source/token/tokenmap.cxx| 14 ++
sax/source/fastparser/fastparser.cxx | 32 +++-
sax/source/fastparser/fastparser.hxx | 14 +++---
4 files changed, 45 insertions(+), 16 deletions(-)
New commits:
commit 75329f3c8668e06f0829c4c29c8ea3138790d547
Author: Michael Meeks michael.me...@collabora.com
Date: Fri Oct 11 22:51:44 2013 +0100
oox: special-case single-character a-z token mapping.
Change-Id: I58a810cc6062d5b42558dd5c0f37426a8a210f40
diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx
index 84dc70d..fb9ebc5 100644
--- a/include/oox/token/tokenmap.hxx
+++ b/include/oox/token/tokenmap.hxx
@@ -58,6 +58,7 @@ private:
typedef ::std::vector TokenName TokenNameVector;
TokenNameVector maTokenNames;
+sal_Int32 mnAlphaTokens[26];
};
//
diff --git a/oox/source/token/tokenmap.cxx b/oox/source/token/tokenmap.cxx
index 5460b7c..ea3e621e 100644
--- a/oox/source/token/tokenmap.cxx
+++ b/oox/source/token/tokenmap.cxx
@@ -79,6 +79,13 @@ TokenMap::TokenMap() :
append( nToken ).append( , ' ).append( aUtf8Name ).append( '\''
).getStr() );
}
#endif
+
+for (unsigned char c = 'a'; c = 'z'; c++)
+{
+struct xmltoken* pToken = Perfect_Hash::in_word_set(
+reinterpret_cast const char* ( c ), 1 );
+mnAlphaTokens[ c - 'a' ] = pToken ? pToken-nToken : XML_TOKEN_INVALID;
+}
}
TokenMap::~TokenMap()
@@ -108,6 +115,13 @@ Sequence sal_Int8 TokenMap::getUtf8TokenName( sal_Int32
nToken ) const
sal_Int32 TokenMap::getTokenFromUtf8( const Sequence sal_Int8 rUtf8Name )
const
{
+// 50% of OOXML tokens are primarily 1 lower-case character, a-z
+if( rUtf8Name.getLength() == 1)
+{
+sal_Char c = rUtf8Name[0];
+if (c = 'a' c = 'z')
+return mnAlphaTokens[ c - 'a' ];
+}
struct xmltoken* pToken = Perfect_Hash::in_word_set(
reinterpret_cast const char* ( rUtf8Name.getConstArray() ),
rUtf8Name.getLength() );
return pToken ? pToken-nToken : XML_TOKEN_INVALID;
commit 44b99d6e145df911b026213c581624bdcc2a70f5
Author: Michael Meeks michael.me...@collabora.com
Date: Fri Oct 11 21:46:45 2013 +0100
fastparser: cache default namespace token for ooxml.
Change-Id: Iee98ec92380d6d0404ab236e062ddbc2378cda43
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index a114c4e..de16108 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -486,10 +486,8 @@ OUString FastSaxParser::GetNamespaceURL( const
sal_Char*pPrefix, int nPrefixLen
//
-sal_Int32 FastSaxParser::GetTokenWithNamespaceURL( const OUString
rNamespaceURL, const sal_Char* pName, int nNameLen )
+sal_Int32 FastSaxParser::GetTokenWithContextNamespace( sal_Int32
nNamespaceToken, const sal_Char* pName, int nNameLen )
{
-sal_Int32 nNamespaceToken = GetNamespaceToken( rNamespaceURL );
-
if( nNamespaceToken != FastToken::DONTKNOW )
{
sal_Int32 nNameToken = GetToken( pName, nNameLen );
@@ -958,10 +956,14 @@ void FastSaxParser::callbackStartElement( const XML_Char*
pwName, const XML_Char
sal_Int32 nNameLen, nPrefixLen;
const XML_Char *pName;
const XML_Char *pPrefix;
-OUString aNamespace;
+OUString sNamespace;
+sal_Int32 nNamespaceToken = FastToken::DONTKNOW;
FastAttributeList *pAttributes = new FastAttributeList(
rEntity.mxTokenHandler );
if (!rEntity.maNamespaceStack.empty())
-aNamespace = rEntity.maNamespaceStack.top();
+{
+sNamespace = rEntity.maNamespaceStack.top().msName;
+nNamespaceToken = rEntity.maNamespaceStack.top().mnToken;
+}
try
{
@@ -987,8 +989,9 @@ void FastSaxParser::callbackStartElement( const XML_Char*
pwName, const XML_Char
{
if( (nNameLen == 5) (strcmp( pName, xmlns ) == 0) )
{
-// namespace of the element found
-aNamespace = OUString( awAttributes[i+1], strlen(
awAttributes[i+1] ), RTL_TEXTENCODING_UTF8 );
+// default namespace is the attribute value
+sNamespace = OUString( awAttributes[i+1], strlen(
awAttributes[i+1] ), RTL_TEXTENCODING_UTF8 );
+nNamespaceToken = GetNamespaceToken( sNamespace );
}
}
}
@@ -1026,17 +1029,20 @@ void FastSaxParser::callbackStartElement( const
XML_Char* pwName, const XML_Char
splitName( pwName, pPrefix, nPrefixLen, pName, nNameLen );
if( nPrefixLen 0 )
nElementToken = GetTokenWithPrefix( pPrefix, nPrefixLen, pName,
nNameLen );
-else if( !aNamespace.isEmpty() )
-
[Libreoffice-commits] core.git: include/svtools svtools/source
include/svtools/htmlkywd.hxx | 47 - include/svtools/htmltokn.h | 58 ++--- svtools/source/svhtml/htmlkywd.cxx | 48 -- 3 files changed, 4 insertions(+), 149 deletions(-) New commits: commit a979956012a277c9cb85147605b9671ace12aa0a Author: Thomas Arnhold tho...@arnhold.org Date: Thu Oct 10 22:12:46 2013 +0200 html: remove unused options Change-Id: If8a6d5136e9e397f5f9b2b49bd9aaf4a7e6bfc17 diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx index 1b53f89..b6ce25a 100644 --- a/include/svtools/htmlkywd.hxx +++ b/include/svtools/htmlkywd.hxx @@ -403,57 +403,37 @@ // HTML Attribut-Token (=Optionen) // Attribute ohne Wert -#define OOO_STRING_SVTOOLS_HTML_O_box box #define OOO_STRING_SVTOOLS_HTML_O_checked checked #define OOO_STRING_SVTOOLS_HTML_O_compact compact -#define OOO_STRING_SVTOOLS_HTML_O_continue continue -#define OOO_STRING_SVTOOLS_HTML_O_controls controls #define OOO_STRING_SVTOOLS_HTML_O_declare declare #define OOO_STRING_SVTOOLS_HTML_O_disabled disabled -#define OOO_STRING_SVTOOLS_HTML_O_folded folded #define OOO_STRING_SVTOOLS_HTML_O_ismap ismap #define OOO_STRING_SVTOOLS_HTML_O_mayscript mayscript #define OOO_STRING_SVTOOLS_HTML_O_multiple multiple -#define OOO_STRING_SVTOOLS_HTML_O_noflow noflow #define OOO_STRING_SVTOOLS_HTML_O_nohref nohref #define OOO_STRING_SVTOOLS_HTML_O_noresize noresize #define OOO_STRING_SVTOOLS_HTML_O_noshade noshade #define OOO_STRING_SVTOOLS_HTML_O_nowrap nowrap -#define OOO_STRING_SVTOOLS_HTML_O_plain plain #define OOO_STRING_SVTOOLS_HTML_O_sdfixed sdfixed #define OOO_STRING_SVTOOLS_HTML_O_selected selected -#define OOO_STRING_SVTOOLS_HTML_O_shapes shapes // Attribute mit einem String als Wert -#define OOO_STRING_SVTOOLS_HTML_O_above above #define OOO_STRING_SVTOOLS_HTML_O_accesskey accesskey #define OOO_STRING_SVTOOLS_HTML_O_accept accept -#define OOO_STRING_SVTOOLS_HTML_O_add_date add_date #define OOO_STRING_SVTOOLS_HTML_O_alt alt -#define OOO_STRING_SVTOOLS_HTML_O_axes axes #define OOO_STRING_SVTOOLS_HTML_O_axis axis -#define OOO_STRING_SVTOOLS_HTML_O_below below #define OOO_STRING_SVTOOLS_HTML_O_char char #define OOO_STRING_SVTOOLS_HTML_O_class class -#define OOO_STRING_SVTOOLS_HTML_O_clip clip #define OOO_STRING_SVTOOLS_HTML_O_code code #define OOO_STRING_SVTOOLS_HTML_O_codetype codetype -#define OOO_STRING_SVTOOLS_HTML_O_colspec colspec #define OOO_STRING_SVTOOLS_HTML_O_content content #define OOO_STRING_SVTOOLS_HTML_O_coords coords -#define OOO_STRING_SVTOOLS_HTML_O_dp dp #define OOO_STRING_SVTOOLS_HTML_O_enctype enctype -#define OOO_STRING_SVTOOLS_HTML_O_error error #define OOO_STRING_SVTOOLS_HTML_O_face face #define OOO_STRING_SVTOOLS_HTML_O_frameborder frameborder #define OOO_STRING_SVTOOLS_HTML_O_httpequiv http-equiv #define OOO_STRING_SVTOOLS_HTML_O_language language -#define OOO_STRING_SVTOOLS_HTML_O_last_modified last_modified -#define OOO_STRING_SVTOOLS_HTML_O_last_visit last_visit -#define OOO_STRING_SVTOOLS_HTML_O_md md -#define OOO_STRING_SVTOOLS_HTML_O_n n #define OOO_STRING_SVTOOLS_HTML_O_name name -#define OOO_STRING_SVTOOLS_HTML_O_notation notation #define OOO_STRING_SVTOOLS_HTML_O_prompt prompt #define OOO_STRING_SVTOOLS_HTML_O_shape shape #define OOO_STRING_SVTOOLS_HTML_O_standby standby @@ -468,11 +448,9 @@ #define OOO_STRING_SVTOOLS_HTML_O_sdaddparam sdaddparam- // Attribute mit einem SGML-Identifier als Wert -#define OOO_STRING_SVTOOLS_HTML_O_from from #define OOO_STRING_SVTOOLS_HTML_O_id id #define OOO_STRING_SVTOOLS_HTML_O_target target #define OOO_STRING_SVTOOLS_HTML_O_to to -#define OOO_STRING_SVTOOLS_HTML_O_until until // Attribute mit einem URI als Wert #define OOO_STRING_SVTOOLS_HTML_O_action action @@ -481,19 +459,11 @@ #define OOO_STRING_SVTOOLS_HTML_O_classid classid #define OOO_STRING_SVTOOLS_HTML_O_codebase codebase #define OOO_STRING_SVTOOLS_HTML_O_data data -#define OOO_STRING_SVTOOLS_HTML_O_dynsrc dynsrc -#define OOO_STRING_SVTOOLS_HTML_O_dynsync dynsync -#define OOO_STRING_SVTOOLS_HTML_O_imagemap imagemap #define OOO_STRING_SVTOOLS_HTML_O_href href -#define OOO_STRING_SVTOOLS_HTML_O_lowsrc lowsrc #define OOO_STRING_SVTOOLS_HTML_O_script script #define OOO_STRING_SVTOOLS_HTML_O_src src #define OOO_STRING_SVTOOLS_HTML_O_usemap usemap -// Attribute mit Entity-Namen als Wert -#define OOO_STRING_SVTOOLS_HTML_O_dingbat dingbat -#define OOO_STRING_SVTOOLS_HTML_O_sym sym - // Attribute mit einer Farbe als Wert (alle Netscape) #define OOO_STRING_SVTOOLS_HTML_O_alink alink #define OOO_STRING_SVTOOLS_HTML_O_bgcolor bgcolor @@ -513,39 +483,24 @@ #define OOO_STRING_SVTOOLS_HTML_O_colspan colspan #define OOO_STRING_SVTOOLS_HTML_O_framespacing framespacing #define OOO_STRING_SVTOOLS_HTML_O_gutter gutter -#define OOO_STRING_SVTOOLS_HTML_O_indent indent #define OOO_STRING_SVTOOLS_HTML_O_height height #define
[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - 3 commits - svx/source
svx/source/svdraw/svdotext.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit fcfba9d67d2f1e3f390e376ba36346e991e03854
Author: Laurent Godard lgodard.li...@laposte.net
Date: Mon Oct 14 11:53:30 2013 +0200
revert previous commit : EditMode fails for sd import unit test
Change-Id: Ifcd570f756fc0b9dbd5fe3cd35b59b1be4574b0a
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 69baa31..12f76dd 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1381,8 +1381,7 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText(
OutlinerParaObject* pTextObjec
SetTextSizeDirty();
-bool bIsEditMode = IsInEditMode(); // Only adjust TextFrame if in Edit
Mode - avoid notes import bottleneck
-if (IsTextFrame() bIsEditMode (IsAutoGrowHeight() ||
IsAutoGrowWidth()))
+if (IsTextFrame() (IsAutoGrowHeight() || IsAutoGrowWidth()))
{ // adapt text frame!
NbcAdjustTextFrameWidthAndHeight();
}
commit 806d9337398d1e416a680d014e948883695fae5b
Author: Laurent Godard lgodard.li...@laposte.net
Date: Mon Oct 14 11:41:44 2013 +0200
Revert Revert Only adjust TextFrame if in Edit Mode - avoid notes import
bottleneck
This reverts commit f431ff6456ecaa1b26592e60a49e36a722099c9e.
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index feefd80..69baa31 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1380,7 +1380,9 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText(
OutlinerParaObject* pTextObjec
}
SetTextSizeDirty();
-if (IsTextFrame() (IsAutoGrowHeight() || IsAutoGrowWidth()))
+
+bool bIsEditMode = IsInEditMode(); // Only adjust TextFrame if in Edit
Mode - avoid notes import bottleneck
+if (IsTextFrame() bIsEditMode (IsAutoGrowHeight() ||
IsAutoGrowWidth()))
{ // adapt text frame!
NbcAdjustTextFrameWidthAndHeight();
}
commit f431ff6456ecaa1b26592e60a49e36a722099c9e
Author: Laurent Godard lgodard.li...@laposte.net
Date: Mon Oct 14 11:41:26 2013 +0200
Revert Only adjust TextFrame if in Edit Mode - avoid notes import
bottleneck
This reverts commit d4e8b7f28eee6854642252c797351978adca4547.
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 69baa31..feefd80 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1380,9 +1380,7 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText(
OutlinerParaObject* pTextObjec
}
SetTextSizeDirty();
-
-bool bIsEditMode = IsInEditMode(); // Only adjust TextFrame if in Edit
Mode - avoid notes import bottleneck
-if (IsTextFrame() bIsEditMode (IsAutoGrowHeight() ||
IsAutoGrowWidth()))
+if (IsTextFrame() (IsAutoGrowHeight() || IsAutoGrowWidth()))
{ // adapt text frame!
NbcAdjustTextFrameWidthAndHeight();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/regression-hotspots.py
scripts/regression-hotspots.py | 69 +
1 file changed, 69 insertions(+)
New commits:
commit fc7dcf4ebef84c66f59f7188d02c8706a0993b51
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Mon Oct 14 12:03:28 2013 +0200
fdo#66750: identify regression hotspots
diff --git a/scripts/regression-hotspots.py b/scripts/regression-hotspots.py
new file mode 100755
index 000..0b94792
--- /dev/null
+++ b/scripts/regression-hotspots.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+#
+# 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/.
+#
+
+import sys
+import re
+import sh
+from urllib.request import urlopen, URLError
+from io import BytesIO
+
+def get_fixed_regression_bugs():
+url =
'https://bugs.freedesktop.org/buglist.cgi?bug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=RESOLVEDbug_status=VERIFIEDbug_status=CLOSEDbug_status=NEEDINFObug_status=PLEASETESTcolumnlist=keywords=regression%2C%20keywords_type=allwordslimit=0list_id=354018product=LibreOfficequery_format=advancedresolution=FIXEDctype=csvhuman=0'
+try:
+resp = urlopen(url)
+except URLError:
+sys.stderr.write('Error fetching {}'.format(url))
+sys.exit(1)
+bug_ids=[]
+for line in [raw.decode('utf-8').strip('\n') for raw in
BytesIO(resp.read())][1:]:
+bug_ids.append(int(line))
+return bug_ids
+
+def get_dir_counts(file_counts, level):
+dir_counts = {}
+for (filename, count) in file_counts.items():
+fileparts = filename.split('/')
+if len(fileparts) level:
+dirpart = '/'.join(fileparts[:level])
+if dirpart in dir_counts:
+dir_counts[dirpart]+=1
+else:
+dir_counts[dirpart]=1
+return dir_counts
+
+def print_counts(counts):
+printorder = reversed(sorted((count, name) for (name, count) in
counts.items()))
+for count in printorder:
+print('%5d %s' % (count[0], count[1]))
+
+if __name__ == '__main__':
+file_counts = {}
+statregex = re.compile('^ ([^ ]+) \|')
+fixed_regression_ids = get_fixed_regression_bugs()
+sys.stderr.write('found %d fixed regressions: %s\n' %
(len(fixed_regression_ids), fixed_regression_ids))
+for bug_id in fixed_regression_ids:
+sys.stderr.write('working on bug %d\n' % bug_id)
+logstat = sh.git('--no-pager', 'log', '--grep', 'fdo#%d' % bug_id,
'--stat')
+for line in logstat:
+match = statregex.search(line)
+if match and match.group(1):
+filename = match.group(1)
+sys.stderr.write('regression fix touched file: %s\n' %
filename)
+if filename in file_counts:
+file_counts[filename]+=1
+else:
+file_counts[filename]=1
+print('top level dirs:')
+print_counts(get_dir_counts(file_counts, 1))
+print('\nsecond level dirs:')
+print_counts(get_dir_counts(file_counts, 2))
+print('\nthird level dirs:')
+print_counts(get_dir_counts(file_counts, 3))
+print('\nfiles:')
+print_counts(file_counts)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 66750] Identify regression hotspots
https://bugs.freedesktop.org/show_bug.cgi?id=66750 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Björn Michaelsen bjoern.michael...@canonical.com --- done with http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/commit/?id=fc7dcf4ebef84c66f59f7188d02c8706a0993b51 script is at: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/diff/scripts/regression-hotspots.py?id=fc7dcf4ebef84c66f59f7188d02c8706a0993b51 it currently takes ~200 minutes to run completely. One note -- it is still buggy in that git log --stat prints incomplete filepaths a la /foo/baz.cxx if the filename is too long, but it already gives a good hint on the hotspots. -- 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] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/ui/shells/textsh1.cxx | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 02a4d733ef24f4350f65179f46d144de7b948799
Author: Michael Stahl mst...@redhat.com
Date: Fri Oct 11 18:36:47 2013 +0200
fdo#67796: sw: fix table cursor when setting language in status bar
Unfortunately it turns out that the neat hack in commit
b227a8e4d65e4bbfe991aed9342fe3e30eca8639 does not work unless something
actually _deletes_ the current m_pTblCrsr between Push() and Pop(),
e.g. by calling SwCrsrShell::ClearMark() or KillPams().
It would be possible to do some invalidation of m_pTblCrsr in
SwCrsrShell::ClearUpCrsrs() or UpdateCrsr(), to set it's bChg flag
or perhaps call ParkTblCrsr(); not sure if doing that is an improvement;
certainly it shouldn't be tried in a 4.0.6 backport.
So work around the problem locally in SwTextShell::Execute().
Conflicts:
sw/source/ui/shells/textsh1.cxx
(cherry picked from commit 9533e01713c0170bdae030429de38756d9c5ca74)
Change-Id: I2981506b3065e824532deda28d21dad4a5734a8c
Reviewed-on: https://gerrit.libreoffice.org/6212
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 25976e9..b019604 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -328,8 +328,6 @@ void SwTextShell::Execute(SfxRequest rReq)
rWrtSh.StartAction();
// prevent view from jumping because of (temporary) selection
changes
rWrtSh.LockView( sal_True );
-// save selection for later restoration
-rWrtSh.Push();
// setting the new language...
if (aNewLangTxt.Len() 0)
@@ -369,6 +367,12 @@ void SwTextShell::Execute(SfxRequest rReq)
bForSelection = false;
}
+if (bForParagraph || !bForSelection)
+{
+rWrtSh.Push(); // save selection for later restoration
+rWrtSh.ClearMark(); // fdo#67796: invalidate table crsr
+}
+
if (bForParagraph)
SwLangHelper::SelectCurrentPara( rWrtSh );
@@ -383,10 +387,12 @@ void SwTextShell::Execute(SfxRequest rReq)
SwLangHelper::ResetLanguages( rWrtSh, bForSelection );
else
SwLangHelper::SetLanguage( rWrtSh, aNewLangTxt,
bForSelection, aCoreSet );
-}
-// restore selection...
-rWrtSh.Pop( sal_False );
+if (bForParagraph || !bForSelection)
+{
+rWrtSh.Pop(false); // restore selection...
+}
+}
rWrtSh.LockView( sal_False );
rWrtSh.EndAction();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/core/crsr/findtxt.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 386d0c5d663fe50295be3714977a54b86212f766
Author: Michael Stahl mst...@redhat.com
Date: Sat Oct 12 01:53:51 2013 +0200
fdo#64495: sw: fix regex search for soft hyphen \xAD
The problem is that the soft hyphen apparently needs special handling,
and SwPaM::DoSearch() looked for the no longer supported legacy syntax,
not for any of the unicode character syntax that ICU regex supports.
Change-Id: I754296d2cf9286242e083cc7906ce3b8fda78dd5
(cherry picked from commit dca5163b6ef206ceb1f2d56feb7546c1929afe60)
Reviewed-on: https://gerrit.libreoffice.org/6229
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index cb6ec35..eb66500 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -420,9 +420,14 @@ bool SwPaM::DoSearch( const SearchOptions rSearchOpt,
utl::TextSearch rSTxt,
bool bRemoveSoftHyphens = true;
if ( bRegSearch )
{
-const OUString a00AD(\\x00AD);
-if ( -1 != rSearchOpt.searchString.indexOf( a00AD ) )
+if ( -1 != rSearchOpt.searchString.indexOf(\\xAD)
+|| -1 != rSearchOpt.searchString.indexOf(\\x{00AD})
+|| -1 != rSearchOpt.searchString.indexOf(\\u00AD)
+|| -1 != rSearchOpt.searchString.indexOf(\\U00AD)
+|| -1 != rSearchOpt.searchString.indexOf(\\N{SOFT HYPHEN}))
+{
bRemoveSoftHyphens = false;
+}
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/core/crsr/findtxt.cxx | 16
1 file changed, 16 deletions(-)
New commits:
commit a6e066e3aa1fdf0e9001e4721171b523ac39d8d8
Author: Michael Stahl mst...@redhat.com
Date: Sat Oct 12 01:54:37 2013 +0200
sw: fix regex search/replace of $ in selection
SwView::Replace() nowadays first searches for the to-be-replaced text in
the current selection, which does not work in the corner case of $
when the selection starts at end of a paragraph, as it will when
clicking Find to look for $ and then clicking Replace.
The problem is that there is some antique code in SwPaM::Find() to
move the cursor forward if it's at the end of a paragraph, which is
presumably some pointless micro-optimization; the result is that
Replace does not replace the selected paragraph break but the
one in the following paragraph.
(regression from 68a014dbca8bbd25056f75ef551fb81a0dbfb1b7)
Conflicts:
sw/source/core/crsr/findtxt.cxx
(cherry picked from commit b60ce8465c8f01242354abccebe00742d164af60)
Change-Id: I5aae9c272d102a48166c63e01775dc6322f9f02d
Reviewed-on: https://gerrit.libreoffice.org/6230
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index eb66500..f4d3408 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -226,22 +226,6 @@ sal_uInt8 SwPaM::Find( const SearchOptions rSearchOpt,
sal_Bool bSearchInNotes
SwNodeIndex rNdIdx = pPam-GetPoint()-nNode;
SwIndex rCntntIdx = pPam-GetPoint()-nContent;
-// If a beginning/end, from out of node; stop if empty node
-if( bSrchForward
-? ( rCntntIdx.GetIndex() == pPam-GetCntntNode()-Len()
-rCntntIdx.GetIndex() )
-: !rCntntIdx.GetIndex() pPam-GetCntntNode()-Len() )
-{
-if( !(*fnMove-fnNds)( rNdIdx, sal_False ))
-{
-delete pPam;
-return sal_False;
-}
-SwCntntNode *pNd = rNdIdx.GetNode().GetCntntNode();
-xub_StrLen nTmpPos = bSrchForward ? 0 : pNd-Len();
-rCntntIdx.Assign( pNd, nTmpPos );
-}
-
// If bFound is true then the string was found and is between nStart and
nEnd
sal_Bool bFound = sal_False;
// start position in text or initial position
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - svtools/source
svtools/source/contnr/imivctl1.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2d4814ca36e52da3681fb369277243ae193085cc Author: Eike Rathke er...@redhat.com Date: Mon Oct 7 21:51:26 2013 +0200 WaE [-Wstrict-overflow] assuming signed overflow does not occur ... when assuming that (X - c) = X is always true ... or that (X + c) X is always false Change-Id: Ib2313827cd6358ced0141b41cba753896b676e28 (cherry picked from commit ca576e0804324bbb36b697543cbe992e34d4b951) Reviewed-on: https://gerrit.libreoffice.org/6159 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com (cherry picked from commit 5e259fb8bb36d287e8986cf0c9695bcb75b9e70c) Reviewed-on: https://gerrit.libreoffice.org/6222 Reviewed-by: Eike Rathke er...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index f363a0f..9d5478d 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2710,9 +2710,9 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcFocusRect( SvxIconChoiceCtrlEntry* pEntry Rectangle aFocusRect( aBoundRect.Left(), aBmpRect.Top() - 1, aBoundRect.Right() - 4, aTextRect.Bottom() + 1 ); // the focus rectangle should not touch the text -if( aFocusRect.Left() - 1 = pEntry-aRect.Left() ) +if( aFocusRect.Left() ::std::numeric_limitslong::min() aFocusRect.Left() - 1 = pEntry-aRect.Left() ) aFocusRect.Left()--; -if( aFocusRect.Right() + 1 = pEntry-aRect.Right() ) +if( aFocusRect.Right() ::std::numeric_limitslong::max() aFocusRect.Right() + 1 = pEntry-aRect.Right() ) aFocusRect.Right()++; return aFocusRect; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/core/crsr/findtxt.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 6add0104e250fd8653a93450d371404aa3ff3a6c
Author: Michael Stahl mst...@redhat.com
Date: Sat Oct 12 01:53:51 2013 +0200
fdo#64495: sw: fix regex search for soft hyphen \xAD
The problem is that the soft hyphen apparently needs special handling,
and SwPaM::DoSearch() looked for the no longer supported legacy syntax,
not for any of the unicode character syntax that ICU regex supports.
Conflicts:
sw/source/core/crsr/findtxt.cxx
Change-Id: I754296d2cf9286242e083cc7906ce3b8fda78dd5
(cherry picked from commit dca5163b6ef206ceb1f2d56feb7546c1929afe60)
Reviewed-on: https://gerrit.libreoffice.org/6228
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 427c4fa..6b55cea 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -416,9 +416,14 @@ bool SwPaM::DoSearch( const SearchOptions rSearchOpt,
utl::TextSearch rSTxt,
bool bRemoveSoftHyphens = true;
if ( bRegSearch )
{
-const rtl::OUString a00AD(RTL_CONSTASCII_USTRINGPARAM(\\x00AD));
-if ( -1 != rSearchOpt.searchString.indexOf( a00AD ) )
+if ( -1 != rSearchOpt.searchString.indexOf(\\xAD)
+|| -1 != rSearchOpt.searchString.indexOf(\\x{00AD})
+|| -1 != rSearchOpt.searchString.indexOf(\\u00AD)
+|| -1 != rSearchOpt.searchString.indexOf(\\U00AD)
+|| -1 != rSearchOpt.searchString.indexOf(\\N{SOFT HYPHEN}))
+{
bRemoveSoftHyphens = false;
+}
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools sw/source tools/source vcl/win
include/tools/string.hxx|2
sw/source/core/crsr/crstrvl.cxx | 27 +++
sw/source/core/doc/doc.cxx | 14 +--
sw/source/core/doc/docglbl.cxx |6 -
sw/source/core/doc/doctxm.cxx | 20 ++---
sw/source/core/text/EnhancedPDFExportHelper.cxx |4 -
sw/source/core/unocore/unochart.cxx | 20 ++---
sw/source/filter/html/htmlfld.cxx |8 +-
sw/source/filter/html/htmlform.cxx |5 -
sw/source/filter/ww8/docxattributeoutput.cxx|6 -
sw/source/filter/ww8/wrtw8esh.cxx |8 --
sw/source/filter/ww8/wrtw8nds.cxx | 25 +++---
sw/source/filter/ww8/wrtww8gr.cxx |6 -
sw/source/filter/ww8/ww8atr.cxx | 79 ++
sw/source/filter/ww8/ww8par5.cxx| 11 +--
sw/source/ui/dbui/mmlayoutpage.cxx | 51 ++
sw/source/ui/docvw/SidebarTxtControl.cxx|7 -
sw/source/ui/envelp/label1.cxx | 12 +--
sw/source/ui/envelp/labelexp.cxx|4 -
sw/source/ui/index/cnttab.cxx |4 -
sw/source/ui/shells/textsh1.cxx |4 -
sw/source/ui/table/tautofmt.cxx |6 -
sw/source/ui/uiview/view2.cxx | 26 +++
tools/source/string/strascii.cxx| 86
vcl/win/source/window/salframe.cxx | 10 +-
25 files changed, 172 insertions(+), 279 deletions(-)
New commits:
commit 7e7a487e904143cbc282a2b90c4cb3918bfa151f
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 14 09:54:50 2013 +0100
Related: fdo#38838 remove UniString::AppendAscii
Change-Id: I0f929843d73eb445c8b1aa56d59cbbce844b9008
diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 3ab5532..74288fbf 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -196,8 +196,6 @@ public:
UniString Append( sal_Unicode c );
inline UniString Append(char c) // ...but allow Append('a')
{ return Append(static_cast sal_Unicode (c)); }
-UniString AppendAscii( const sal_Char* pAsciiStr );
-UniString AppendAscii( const sal_Char* pAsciiStr, xub_StrLen
nLen );
UniString operator +=( const UniString rStr )
{ return Append( rStr ); }
UniString operator +=( const OUString rStr )
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 02372e0..b47597d 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1453,20 +1453,20 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point rPt,
rCntntAtPos.sStr = Pos: (;
rCntntAtPos.sStr += OUString::number( aPos.nNode.GetIndex());
-rCntntAtPos.sStr += ':';
+rCntntAtPos.sStr += :;
rCntntAtPos.sStr += OUString::number(
aPos.nContent.GetIndex());
-rCntntAtPos.sStr += ')';
-rCntntAtPos.sStr.AppendAscii(
-RTL_CONSTASCII_STRINGPARAM( \nAbs.Vorl.:
)); // translation *might be* paragraph template
+rCntntAtPos.sStr += );
+rCntntAtPos.sStr += \nAbs.Vorl.: ; // translation *might be*
paragraph template
rCntntAtPos.sStr += pTxtNd-GetFmtColl()-GetName();
if( pTxtNd-GetCondFmtColl() )
-rCntntAtPos.sStr.AppendAscii(
-RTL_CONSTASCII_STRINGPARAM( \nBed.Vorl.: ))
// translation *might be* conditional template
-+= pTxtNd-GetCondFmtColl()-GetName();
+{
+ // translation *might be* conditional template
+rCntntAtPos.sStr += \nBed.Vorl.: +
pTxtNd-GetCondFmtColl()-GetName();
+}
if( aSet.Count() )
{
-String sAttrs;
+OUString sAttrs;
SfxItemIter aIter( aSet );
const SfxPoolItem* pItem = aIter.FirstItem();
while( true )
@@ -1477,22 +1477,19 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point rPt,
GetDoc()-GetAttrPool().GetPresentation( *pItem,
SFX_ITEM_PRESENTATION_COMPLETE,
SFX_MAPUNIT_CM, aStr );
-if( sAttrs.Len() )
-sAttrs.AppendAscii(
-RTL_CONSTASCII_STRINGPARAM( , ));
+if (!sAttrs.isEmpty())
+sAttrs += , ;
sAttrs += aStr;
}
if( aIter.IsAtEnd() )
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - vcl/source
vcl/source/fontsubset/sft.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit d6c7bbf152112aadb70f5bf66c4c9f036790d12d
Author: Herbert Dürr h...@apache.org
Date: Fri Oct 4 15:14:22 2013 +
Resolves: #i123417# handle subsetting of empty ttf compound glyphs
gracefully
(cherry picked from commit d519b07ecd4b67cedf1fe3e1860ef33a48a01ae4)
Signed-off-by: Caolán McNamara caol...@redhat.com
Conflicts:
vcl/source/fontsubset/sft.cxx
Change-Id: I51d4a97f1f01be49cb5ab058019cd153e23437bd
(cherry picked from commit 6489f97fc428446c53c17f885963776cdcc21490)
Signed-off-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit d4b7546df3f9650b1773b9ad0cdd93aa01ae1097)
Reviewed-on: https://gerrit.libreoffice.org/6219
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index e110c12..a8e8e00 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -745,7 +745,10 @@ static int GetCompoundTTOutline(TrueTypeFont *ttf,
sal_uInt32 glyphID, ControlPo
} while (flags MORE_COMPONENTS);
-
+// #i123417# some fonts like IFAOGrec have no outline points in some
compound glyphs
+// so this unlikely but possible scenario should be handled gracefully
+if( myPoints.empty() )
+return 0;
np = myPoints.size();
@@ -2620,7 +2623,7 @@ GlyphData *GetTTRawGlyphData(TrueTypeFont *ttf,
sal_uInt32 glyphID)
/* now calculate npoints and ncontours */
ControlPoint *cp;
n = GetTTGlyphPoints(ttf, glyphID, cp);
-if (n != -1)
+if (n 0)
{
int m = 0;
for (int i = 0; i n; i++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/ui/shells/textsh1.cxx | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit e3fdff9d00c9ef598210853f7094e8f986586e0b
Author: Michael Stahl mst...@redhat.com
Date: Fri Oct 11 18:36:47 2013 +0200
fdo#67796: sw: fix table cursor when setting language in status bar
Unfortunately it turns out that the neat hack in commit
b227a8e4d65e4bbfe991aed9342fe3e30eca8639 does not work unless something
actually _deletes_ the current m_pTblCrsr between Push() and Pop(),
e.g. by calling SwCrsrShell::ClearMark() or KillPams().
It would be possible to do some invalidation of m_pTblCrsr in
SwCrsrShell::ClearUpCrsrs() or UpdateCrsr(), to set it's bChg flag
or perhaps call ParkTblCrsr(); not sure if doing that is an improvement;
certainly it shouldn't be tried in a 4.0.6 backport.
So work around the problem locally in SwTextShell::Execute().
Conflicts:
sw/source/ui/shells/textsh1.cxx
Change-Id: I2981506b3065e824532deda28d21dad4a5734a8c
(cherry picked from commit 9533e01713c0170bdae030429de38756d9c5ca74)
Reviewed-on: https://gerrit.libreoffice.org/6213
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index c351e38..373731e 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -311,8 +311,6 @@ void SwTextShell::Execute(SfxRequest rReq)
rWrtSh.StartAction();
// prevent view from jumping because of (temporary) selection
changes
rWrtSh.LockView( sal_True );
-// save selection for later restoration
-rWrtSh.Push();
// setting the new language...
if (aNewLangTxt.Len() 0)
@@ -352,6 +350,12 @@ void SwTextShell::Execute(SfxRequest rReq)
bForSelection = false;
}
+if (bForParagraph || !bForSelection)
+{
+rWrtSh.Push(); // save selection for later restoration
+rWrtSh.ClearMark(); // fdo#67796: invalidate table crsr
+}
+
if (bForParagraph)
SwLangHelper::SelectCurrentPara( rWrtSh );
@@ -366,10 +370,12 @@ void SwTextShell::Execute(SfxRequest rReq)
SwLangHelper::ResetLanguages( rWrtSh, bForSelection );
else
SwLangHelper::SetLanguage( rWrtSh, aNewLangTxt,
bForSelection, aCoreSet );
-}
-// restore selection...
-rWrtSh.Pop( sal_False );
+if (bForParagraph || !bForSelection)
+{
+rWrtSh.Pop(false); // restore selection...
+}
+}
rWrtSh.LockView( sal_False );
rWrtSh.EndAction();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] mso-dumper.git: src/docrecord.py
src/docrecord.py | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) New commits: commit 01f7b8a16a32916f8fc984b2f66b69f53ed4068d Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Oct 14 12:58:32 2013 +0200 LFO: make it easier to spot PlfLfo.rgLfo in the dump The spec refers to the list override table with this name. diff --git a/src/docrecord.py b/src/docrecord.py index 58625e6..04cf8c0 100644 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -3580,12 +3580,14 @@ class PlfLst(DOCDirStream): class LFO(DOCDirStream): The LFO structure specifies the LSTF element that corresponds to a list that contains a paragraph. -def __init__(self, plfLfo): +def __init__(self, plfLfo, name, index): DOCDirStream.__init__(self, plfLfo.bytes) self.pos = plfLfo.pos +self.name = name +self.index = index def dump(self): -print 'lfo type=LFO offset=%d' % self.pos +print '%s type=LFO index=%s offset=%d' % (self.name, self.index, self.pos) self.printAndSet(lsid, self.readInt32()) self.printAndSet(unused1, self.readuInt32()) self.printAndSet(unused2, self.readuInt32()) @@ -3593,7 +3595,7 @@ class LFO(DOCDirStream): self.printAndSet(ibstFltAutoNum, self.readuInt8()) Grfhic(self).dump() self.printAndSet(unused3, self.readuInt8()) -print '/lfo' +print '/%s' % self.name class LFOData(DOCDirStream): The LFOData structure contains the Main Document CP of the corresponding LFO. @@ -3621,7 +3623,7 @@ class PlfLfo(DOCDirStream): self.printAndSet(lfoMac, self.readInt32()) lfos = [] for i in range(self.lfoMac): -lfo = LFO(self) +lfo = LFO(self, rgLfo, i) lfos.append(lfo) lfo.dump() self.pos = lfo.pos ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - sw/source
sw/source/core/doc/docedt.cxx | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit bb90748abbe4196bf0bca324b979fcc44bd643a2
Author: Arnaud Versini arnaud.vers...@libreoffice.org
Date: Mon Oct 7 21:09:26 2013 +0200
fdo#70143: fix SwDoc::ReplaceRangeImpl()
Fix fdo#70143 by reporting swaping of positions
(regression from 6b08fe833186a04f9aef698a540d3a7493ac4519,
which changed SwUndoReplace::Impl::SetEnd to use the wrongly set end
position in rPam)
Change-Id: I14c6f58bc5c1418c69eb565d42f1829856eed58c
(cherry picked from commit 9685d20f2a0526a4c454cea1bd947eccbaeefa84)
Fixes regex replace of $ with nothing (to delete line
breaks).
Change-Id: If7ec1e5f524f7bb308a2949ace16cb8aa6989106
(cherry picked from commit f011a5c5071ed4a60f0ee7117608b72cecbb958d)
Reviewed-on: https://gerrit.libreoffice.org/6176
Reviewed-by: Arnaud Versini arnaud.vers...@libreoffice.org
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit f431f2fbaad8098870b1f9bdb71b6db514d2cbda)
Reviewed-on: https://gerrit.libreoffice.org/6214
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 6d34685..52b0b40 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -2469,17 +2469,23 @@ SetRedlineMode( eOld );
}
}
-*rPam.GetMark() = *aDelPam.GetMark();
-
+*rPam.GetPoint() = *aDelPam.GetMark();
++aPtNd;
rPam.GetMark()-nNode = aPtNd;
rPam.GetMark()-nContent.Assign( aPtNd.GetNode().GetCntntNode(),
nPtCnt );
-if (bJoinTxt !bJoinPrev)
+if (bJoinTxt)
{
+assert(rPam.GetPoint() == rPam.End());
+// move so that SetEnd remembers position after sw_JoinText
rPam.Move(fnMoveBackward);
}
+else if (aDelPam.GetPoint() == pStt) // backward selection?
+{
+assert(*rPam.GetMark() = *rPam.GetPoint());
+rPam.Exchange(); // swap so that rPam is backwards
+}
if( pUndoRpl )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - sw/source
sw/source/core/crsr/findtxt.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 730c5696c6c668c88ed071fed6f3598f0b4a2aa1
Author: Michael Stahl mst...@redhat.com
Date: Sat Oct 12 01:53:51 2013 +0200
fdo#64495: sw: fix regex search for soft hyphen \xAD
The problem is that the soft hyphen apparently needs special handling,
and SwPaM::DoSearch() looked for the no longer supported legacy syntax,
not for any of the unicode character syntax that ICU regex supports.
Conflicts:
sw/source/core/crsr/findtxt.cxx
Change-Id: I754296d2cf9286242e083cc7906ce3b8fda78dd5
(cherry picked from commit dca5163b6ef206ceb1f2d56feb7546c1929afe60)
Reviewed-on: https://gerrit.libreoffice.org/6227
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 427c4fa..6b55cea 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -416,9 +416,14 @@ bool SwPaM::DoSearch( const SearchOptions rSearchOpt,
utl::TextSearch rSTxt,
bool bRemoveSoftHyphens = true;
if ( bRegSearch )
{
-const rtl::OUString a00AD(RTL_CONSTASCII_USTRINGPARAM(\\x00AD));
-if ( -1 != rSearchOpt.searchString.indexOf( a00AD ) )
+if ( -1 != rSearchOpt.searchString.indexOf(\\xAD)
+|| -1 != rSearchOpt.searchString.indexOf(\\x{00AD})
+|| -1 != rSearchOpt.searchString.indexOf(\\u00AD)
+|| -1 != rSearchOpt.searchString.indexOf(\\U00AD)
+|| -1 != rSearchOpt.searchString.indexOf(\\N{SOFT HYPHEN}))
+{
bRemoveSoftHyphens = false;
+}
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-3' - mysqlc/source
mysqlc/source/mysqlc.component|2 +-
mysqlc/source/mysqlc_services.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dd7c746c184de38104aa1f057886d7c538e2e0b2
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Oct 11 14:57:32 2013 +0200
Extension shared library components must not use the prefix feature
...at least no non-bundled ones, see
9dfcee9266c9769153444cdcd4ab0e6e636c3eb6
Not being able to honor a 'prefix' is a rather hard error and the
description
there how that can lead to a crash when using mysql-connector-ooo.oxt:
'rm -rf
instdir/*/share/extensions/mysql-connector-ooo', 'instdir/*/program/soffice
workdir/*/Extension/mysql-connector.oxt', install the [extension] per-user,
then
'File - New - Database - Connect to an existing database: MySQL - Next -
Connect directly - Next - Database name: foo - Server / Port - Server:
bar -
Next - Test Connection', crash.
This is a partial revert of cd79d51420b90117d0f3e1d5f3cdf9187bd61b88
prefix all
component_getFactory methods.
Change-Id: Ia7a6272eb0597e3b3bbf4ab333174b3232448539
(cherry picked from commit 3bafe5f5f529f6539363c5a291dd13ef1e2cbbde)
Reviewed-on: https://gerrit.libreoffice.org/6210
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/mysqlc/source/mysqlc.component b/mysqlc/source/mysqlc.component
index ae16484..e429511 100644
--- a/mysqlc/source/mysqlc.component
+++ b/mysqlc/source/mysqlc.component
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
--
-component xmlns=http://openoffice.org/2010/uno-components; prefix=mysqlc
+component xmlns=http://openoffice.org/2010/uno-components;
loader=com.sun.star.loader.SharedLibrary
implementation name=com.sun.star.comp.sdbc.mysqlc.MysqlCDriver
service name=com.sun.star.sdbc.Driver/
diff --git a/mysqlc/source/mysqlc_services.cxx
b/mysqlc/source/mysqlc_services.cxx
index cc7e8e0..af1cabe 100644
--- a/mysqlc/source/mysqlc_services.cxx
+++ b/mysqlc/source/mysqlc_services.cxx
@@ -76,7 +76,7 @@ struct ProviderRequest
/* {{{ component_getFactory -I- */
-extern C SAL_DLLPUBLIC_EXPORT void* SAL_CALL mysqlc_component_getFactory(
+extern C SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char * pImplementationName,
void * pServiceManager,
void * /* pRegistryKey */)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [BUILD] Which license do I need to build a professional edition of LibreOffice (4.0.x/4.1.x) of windows ?
Hi *, On Fri, Oct 11, 2013 at 9:57 AM, Gay, Matthieu matthieu@capgemini.com wrote: I have another (and last I hope) question: Here there are a lot of version of MVSC 2010, http://msdn.microsoft.com/fr-fr/vstudio/dd582936(en-us).aspx I suppose I have to download Visual Studio 2010 Professional but can you confirm it? Answered on IRC already, but for the archives: Yes, to use atl/activex, you need at least Pro version. (For builds without those, i.e. for regular hacking, the Express variant is sufficient) ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 63315] sign windows binaries during build
https://bugs.freedesktop.org/show_bug.cgi?id=63315 Christian Lohmaier lohma...@gmx.de changed: What|Removed |Added CC||lohma...@gmx.de --- Comment #2 from Christian Lohmaier lohma...@gmx.de --- This one has been fixed already. (signing the msi during the build was an extra step, but http://cgit.freedesktop.org/libreoffice/core/commit/?id=125769a4a15cf6f4b9ef9d0e757ac55bd9e26509 made that part of the build) Now for signing the dlls right after they are created: I don't think this is a good idea, in fact IMHO it is a rather bad idea. Creating processes in windows is slow as fu^Whell, so anything that can be grouped into one invocation, should be grouped into one invocation. The build is already slowed down so much by all those I built a file, so I need to touch a marker-file stuff and copying every bit individually instead of copying whole directory trees... -- 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] core.git: sw/source
sw/source/core/access/acccontext.cxx | 10 --
sw/source/core/access/accframe.cxx |4 ++--
sw/source/core/access/accframe.hxx |4 ++--
sw/source/core/access/accnotextframe.cxx |6 +++---
4 files changed, 11 insertions(+), 13 deletions(-)
New commits:
commit 9e208f28255eab69ee2ef372df90b1b636d97e0a
Author: Chr. Rossmanith chrrossman...@gmx.de
Date: Thu Oct 10 22:05:23 2013 +0200
fdo#38838 use OUString instead of String
Change-Id: I281bd6872e44a122556462afd20a2af75c8b04fe
Reviewed-on: https://gerrit.libreoffice.org/6195
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/access/acccontext.cxx
b/sw/source/core/access/acccontext.cxx
index e664fbf..88f5ddd 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -1393,7 +1393,7 @@ OUString SwAccessibleContext::GetResource( sal_uInt16
nResId,
const OUString *pArg1,
const OUString *pArg2 )
{
-String sStr;
+OUString sStr;
{
SolarMutexGuard aGuard;
@@ -1402,16 +1402,14 @@ OUString SwAccessibleContext::GetResource( sal_uInt16
nResId,
if( pArg1 )
{
-sStr.SearchAndReplace( OUString($(ARG1)),
- String( *pArg1 ) );
+sStr = sStr.replaceFirst( OUString($(ARG1)), *pArg1 );
}
if( pArg2 )
{
-sStr.SearchAndReplace( OUString($(ARG2)),
- String( *pArg2 ) );
+sStr = sStr.replaceFirst( OUString($(ARG2)), *pArg2 );
}
-return OUString( sStr );
+return sStr;
}
void SwAccessibleContext::RemoveFrmFromAccessibleMap()
diff --git a/sw/source/core/access/accframe.cxx
b/sw/source/core/access/accframe.cxx
index 4d4e4d7..154cd7d 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -427,7 +427,7 @@ const SwFrm* SwAccessibleFrame::GetParent( const
SwAccessibleChild rFrmOrObj,
return rFrmOrObj.GetParent( bInPagePreview );
}
-String SwAccessibleFrame::GetFormattedPageNumber() const
+OUString SwAccessibleFrame::GetFormattedPageNumber() const
{
sal_uInt16 nPageNum = GetFrm()-GetVirtPageNum();
sal_uInt32 nFmt = GetFrm()-FindPageFrm()-GetPageDesc()
@@ -435,7 +435,7 @@ String SwAccessibleFrame::GetFormattedPageNumber() const
if( SVX_NUM_NUMBER_NONE == nFmt )
nFmt = SVX_NUM_ARABIC;
-String sRet( FormatNumber( nPageNum, nFmt ) );
+OUString sRet( FormatNumber( nPageNum, nFmt ) );
return sRet;
}
diff --git a/sw/source/core/access/accframe.hxx
b/sw/source/core/access/accframe.hxx
index 77093d1..b435b93 100644
--- a/sw/source/core/access/accframe.hxx
+++ b/sw/source/core/access/accframe.hxx
@@ -23,7 +23,7 @@
#include swrect.hxx
#include sal/types.h
-#include tools/string.hxx
+#include rtl/ustring.hxx
#include list
#include accfrmobj.hxx
@@ -140,7 +140,7 @@ protected:
return maVisArea;
}
-String GetFormattedPageNumber() const;
+OUString GetFormattedPageNumber() const;
};
inline sal_Bool SwAccessibleFrame::IsShowing( const SwRect rFrm ) const
diff --git a/sw/source/core/access/accnotextframe.cxx
b/sw/source/core/access/accnotextframe.cxx
index 9277c72..d2af5ba 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -95,9 +95,9 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem*
pOld, const SfxPoolItem
// #i73249#
case RES_TITLE_CHANGED:
{
-const String sOldTitle(
+const OUString sOldTitle(
dynamic_castconst
SwStringMsgPoolItem*(pOld)-GetString() );
-const String sNewTitle(
+const OUString sNewTitle(
dynamic_castconst
SwStringMsgPoolItem*(pNew)-GetString() );
if ( sOldTitle == sNewTitle )
{
@@ -106,7 +106,7 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem*
pOld, const SfxPoolItem
msTitle = sNewTitle;
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::NAME_CHANGED;
-aEvent.OldValue = OUString( sOldTitle );
+aEvent.OldValue = sOldTitle;
aEvent.NewValue = msTitle;
FireAccessibleEvent( aEvent );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70448] Write more unittests for regression hotspots
https://bugs.freedesktop.org/show_bug.cgi?id=70448 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Whiteboard||EasyHack DifficultyBeginner ||SkillCpp TopicQA CC||libreoffice@lists.freedeskt ||op.org See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=48024, ||https://bugs.freedesktop.or ||g/show_bug.cgi?id=39625, ||https://bugs.freedesktop.or ||g/show_bug.cgi?id=39748, ||https://bugs.freedesktop.or ||g/show_bug.cgi?id=46723 Depends on||66750 Ever confirmed|0 |1 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 66750] Identify regression hotspots
https://bugs.freedesktop.org/show_bug.cgi?id=66750 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Blocks||70448 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 48024] Convert C++ unit test from JUnit to CppUnit
https://bugs.freedesktop.org/show_bug.cgi?id=48024 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=70448 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 39625] Make existing cppunittests work
https://bugs.freedesktop.org/show_bug.cgi?id=39625 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=70448 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 46723] enable configmgr unit tests ...
https://bugs.freedesktop.org/show_bug.cgi?id=46723 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=70448 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 38879] Add git history/log parser for tinderbox
https://bugs.freedesktop.org/show_bug.cgi?id=38879 Christian Lohmaier lohma...@gmx.de changed: What|Removed |Added Severity|normal |minor Priority|medium |low --- Comment #6 from Christian Lohmaier lohma...@gmx.de --- While it is true that the revision that was built is not part of the required parameters, most tinderboxes do use the scripts that add them (and it could be made mandatory). But since onegit, this isn't necessary. For tinderbox purposes one can assume that the timestamp reflects the tip of the tree when the build started, and not some revision in the past. So tinderbox server could take an educated guess by time. So tinderbox server could git pull every 15 minutes/whatever the minimum display-interval is, and store the time and the corresponding git-hash of the branches. When a tinderbox doesn't supply the built hash as additional info, tinderbox will assign the corresponding rev that was stored with the timestamp older than the build-start date. And yes, obviously tinderbox needs to store info per build-entry and also per tinderbox slave (and it does so already, sample for the per-build data is the core-revision for example, and example for per-builder info is the average (mean) buildtime. But with the automatic mails to committers since last successful build on failure of the tinderboxes, this is of lower prio than when it was initially filed... -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 --- Comment #74 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Chr. Rossmanith committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=9e208f28255eab69ee2ef372df90b1b636d97e0a fdo#38838 use OUString instead of String The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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
regression hotspots (was: minutes of ESC call ...)
On Thu, Oct 10, 2013 at 05:09:34PM +0100, Michael Meeks wrote: AI: + create easy-hack to indentify the above (Bjoern) + https://bugs.freedesktop.org/show_bug.cgi?id=66750 done As you likely noted from the Easy Hack notifications, the script is now there, the output is dumped to the wiki at: https://wiki.documentfoundation.org/Development/RegressionHotspots and a follow up Easy Hack for writing the tests has been created. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/drawfont.hxx |1 - sw/source/core/inc/noteurl.hxx |2 -- sw/source/core/inc/pamtyp.hxx |1 - sw/source/core/inc/txtfrm.hxx |1 - sw/source/core/inc/wrong.hxx|1 - sw/source/core/txtnode/txatritr.cxx |1 - sw/source/filter/html/htmlfldw.cxx |1 - sw/source/filter/html/svxcss1.hxx |1 - sw/source/filter/ww8/ww8struc.hxx |1 - 9 files changed, 10 deletions(-) New commits: commit 17760f023d3e2e8e012ddd7b1427d0063229 Author: Chr. Rossmanith chrrossman...@gmx.de Date: Fri Oct 11 21:44:05 2013 +0200 don't include unused tools/string.hxx Change-Id: I8a079f788204fc80c14a037b035ecf2690e18efd Reviewed-on: https://gerrit.libreoffice.org/6206 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index c61ae9f..ff776fa 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -21,7 +21,6 @@ #define _DRAWFONT_HXX #include tools/solar.h -#include tools/string.hxx #include tools/debug.hxx class SwTxtFrm; diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx index 4c6f26c..779f67a 100644 --- a/sw/source/core/inc/noteurl.hxx +++ b/sw/source/core/inc/noteurl.hxx @@ -20,8 +20,6 @@ #ifndef _NOTEURL_HXX #define _NOTEURL_HXX - -#include tools/string.hxx #include swrect.hxx #include boost/ptr_container/ptr_vector.hpp diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx index 5fda2c6..647596e 100644 --- a/sw/source/core/inc/pamtyp.hxx +++ b/sw/source/core/inc/pamtyp.hxx @@ -22,7 +22,6 @@ #include unotools/textsearch.hxx #include node.hxx -#include tools/string.hxx class SwpHints; struct SwPosition; diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 8d4a3e0..3f3a277 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -20,7 +20,6 @@ #define SW_TXTFRM_HXX #include tools/mempool.hxx -#include tools/string.hxx #include cntfrm.hxx #include ndtxt.hxx diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 77a78f0..4cc95dd 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -28,7 +28,6 @@ #include vector -#include tools/string.hxx #include tools/color.hxx #include viewopt.hxx diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx index 7763728..6223046 100644 --- a/sw/source/core/txtnode/txatritr.cxx +++ b/sw/source/core/txtnode/txatritr.cxx @@ -20,7 +20,6 @@ #include txatritr.hxx #include com/sun/star/i18n/ScriptType.hpp -#include tools/string.hxx #include fchrfmt.hxx #include charfmt.hxx #include breakit.hxx diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index e13818b..ceca418 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -19,7 +19,6 @@ #include com/sun/star/i18n/ScriptType.hpp #include comphelper/string.hxx -#include tools/string.hxx #include svtools/htmlkywd.hxx #include svtools/htmlout.hxx #include svtools/htmltokn.h diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx index fa3bac9..687e8a9 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -19,7 +19,6 @@ #ifndef _SVXCSS1_HXX #define _SVXCSS1_HXX -#include tools/string.hxx #include svl/itemset.hxx #include editeng/svxenum.hxx #include rtl/textenc.h diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index eb6948c..285cec9 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -21,7 +21,6 @@ #define _WW8STRUC_HXX #include osl/endian.h -#include tools/string.hxx #include rtl/ustring.hxx #include sal/config.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 48024] Convert C++ unit test from JUnit to CppUnit
https://bugs.freedesktop.org/show_bug.cgi?id=48024 --- Comment #7 from Stephan Bergmann sberg...@redhat.com --- (In reply to comment #6) I would like to look into this issue. Can someone give some pointers? new to this The most obvious approach would be to translate individual so-called complex tests (see comment 1) from Java to C++. Those are largely self-contained tests that start and connect against an soffice instance (via Java org.openoffice.test.OfficeConnection; the C++ equivalent is in include/unotest/officeconnection.hxx) and then use remote UNO to trigger the code under test in the running soffice. The test code is typically located in */qa/complex/ directories (e.g., sw/qa/complex/checkColor/CheckChangeColor.java), and often makes use of helper functionality from qadevOOo/runner/util/ (for which there may or may not be C++ equivalents). Both building and running the tests is triggered by */JunitTest_*_complex.mk makefiles (e.g., sw/JunitTeste_sw_complex.mk). In a first approximation, a corresponding CppunitTest would still connect to an soffice process and access it via remote UNO, though in the long run it is of course more desirable to have the code under test small and self-contained enough so that it can run directly in the cppunit process. -- 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] core.git: sw/source
sw/source/core/text/porlay.hxx |1 - sw/source/core/tox/toxhlp.cxx |1 - sw/source/filter/ww8/styles.cxx |3 +-- sw/source/filter/ww8/ww8par.hxx |1 - 4 files changed, 1 insertion(+), 5 deletions(-) New commits: commit 349af6ea58ba4e2df4a1732d941acd4098c7bd87 Author: Chr. Rossmanith chrrossman...@gmx.de Date: Sat Oct 12 21:09:38 2013 +0200 don't include unused tools/string.hxx Change-Id: Ia7ac4594c1b9cb853b5f8f5bf76864703376710e Reviewed-on: https://gerrit.libreoffice.org/6236 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx index 1d6e252..8635645 100644 --- a/sw/source/core/text/porlay.hxx +++ b/sw/source/core/text/porlay.hxx @@ -19,7 +19,6 @@ #ifndef _PORLAY_HXX #define _PORLAY_HXX -#include tools/string.hxx #include tools/fract.hxx #include scriptinfo.hxx diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx index 317813f..442edf1 100644 --- a/sw/source/core/tox/toxhlp.cxx +++ b/sw/source/core/tox/toxhlp.cxx @@ -20,7 +20,6 @@ #include com/sun/star/lang/XMultiServiceFactory.hpp #include comphelper/processfactory.hxx #include com/sun/star/i18n/IndexEntrySupplier.hpp -#include tools/string.hxx #include toxwrap.hxx #include sal/log.hxx diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx index b3fce48..8bcec46 100644 --- a/sw/source/filter/ww8/styles.cxx +++ b/sw/source/filter/ww8/styles.cxx @@ -22,8 +22,7 @@ #include functional //std::unary_function #include algorithm//std::find_if -#include tools/string.hxx //do we have to... - +#include rtl/ustring.hxx #include staticassert.hxx //StaticAssert namespace diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 38d8d53..8deec29 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -20,7 +20,6 @@ #ifndef _WW8PAR_HXX #define _WW8PAR_HXX -#include tools/string.hxx #include rtl/ustring.hxx #include filter/msfilter/msdffimp.hxx #include filter/msfilter/util.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 66750] Identify regression hotspots
https://bugs.freedesktop.org/show_bug.cgi?id=66750 Stephan Bergmann sberg...@redhat.com changed: What|Removed |Added CC||sberg...@redhat.com --- Comment #4 from Stephan Bergmann sberg...@redhat.com --- (In reply to comment #3) it currently takes ~200 minutes to run completely. Could you make available the output (or the top N lines of output), so one gets an idea what that looks like in under 200 minutes? -- 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] core.git: sw/source
sw/source/filter/ww1/w1class.cxx |4 ++--
sw/source/filter/ww1/w1class.hxx |2 +-
sw/source/ui/dialog/swabstdlg.cxx |3 +--
sw/source/ui/dialog/swdialmgr.cxx |4
4 files changed, 4 insertions(+), 9 deletions(-)
New commits:
commit 646ce81d1c1623feb5414cd248860b143fd2cd6b
Author: Chr. Rossmanith chrrossman...@gmx.de
Date: Sat Oct 12 21:35:25 2013 +0200
fdo#38838 use OUString instead of String
Change-Id: I0c94a9ee10bd66422abd9526fcc9a9ce61d9a096
Reviewed-on: https://gerrit.libreoffice.org/6237
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index 7a6552e..72de563 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -154,11 +154,11 @@ sal_uInt16 Ww1Style::ReadName( sal_uInt8*p, sal_uInt16
rnCountBytes, sal_uInt1
pStr = ?;
else
pStr = names[nSize-222];
-SetName(String(pStr, RTL_TEXTENCODING_MS_1252));
+SetName(OUString(pStr, strlen(pStr), RTL_TEXTENCODING_MS_1252));
}
else if( 255 nCountBytes ) // unused
{
-SetName( String( (sal_Char*)p, nCountBytes, RTL_TEXTENCODING_MS_1252
));
+SetName( OUString( (sal_Char*)p, nCountBytes, RTL_TEXTENCODING_MS_1252
));
p += nCountBytes;
OSL_ENSURE(rnCountBytes=nCountBytes, Ww1Style);
rnCountBytes = rnCountBytes - nCountBytes;
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index c0824e2..2e01242 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.hxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include tools/string.hxx
+#include rtl/ustring.hxx
// local
#include w1struct.hxx
diff --git a/sw/source/ui/dialog/swabstdlg.cxx
b/sw/source/ui/dialog/swabstdlg.cxx
index 5a28bc3..64da0e3 100644
--- a/sw/source/ui/dialog/swabstdlg.cxx
+++ b/sw/source/ui/dialog/swabstdlg.cxx
@@ -21,7 +21,6 @@
#include swabstdlg.hxx
#include osl/module.hxx
-#include tools/string.hxx
#include vcl/unohelp.hxx
typedef SwAbstractDialogFactory* (SAL_CALL *SwFuncPtrCreateDialogFactory)();
@@ -42,7 +41,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
SwFuncPtrCreateDialogFactory fp = 0;
static ::osl::Module aDialogLibrary;
static const OUString sLibName(::vcl::unohelper::CreateLibraryName(swui,
sal_True));
-if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( thisModule,
String( sLibName ),
+if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( thisModule,
sLibName,
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
fp = ( SwAbstractDialogFactory* (SAL_CALL*)() )
aDialogLibrary.getFunctionSymbol( OUString(CreateDialogFactory));
diff --git a/sw/source/ui/dialog/swdialmgr.cxx
b/sw/source/ui/dialog/swdialmgr.cxx
index fe14678..fb6ed35 100644
--- a/sw/source/ui/dialog/swdialmgr.cxx
+++ b/sw/source/ui/dialog/swdialmgr.cxx
@@ -18,13 +18,9 @@
*/
#include dialmgr.hxx
-#include tools/string.hxx
#include sfx2/app.hxx
#ifndef DISABLE_DYNLOADING
-//copy from core\bastyp\swtypes.cxx
-String aEmptyStr; // constant strings
-
ResMgr* pSwResMgr=0;
#else
static ResMgr *pSwResMgr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70373] Identify unused source files
https://bugs.freedesktop.org/show_bug.cgi?id=70373 --- Comment #2 from Björn Michaelsen bjoern.michael...@canonical.com --- @Varadharajan: Well, since somebody already provided a script at https://bugs.freedesktop.org/show_bug.cgi?id=70371 -- you need to get your build going e.g. as per https://wiki.documentfoundation.org/Development/BuildingOnLinux and then modify the script to scan for source files, not headers. In general please dont ask for please guide in general, but with a concrete question, so we can help you. Also chat (libreoffice-dev on freenode) is a better medium for this as we can help you interactively: http://webchat.freenode.net/?channels=libreoffice-dev -- 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] core.git: sc/source
sc/source/ui/view/viewfunc.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 086c52d28d863bd2ad488e3d6d5e871f8f4fcc91
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date: Thu Oct 10 10:42:18 2013 +0200
String to OUString in viewfunc (Calc)
Conflicts:
sc/source/ui/view/viewfunc.cxx
Change-Id: If82a7c6e58af1cbba3748e42bf8ecce75cbebf18
Reviewed-on: https://gerrit.libreoffice.org/6202
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index ff08741..8dc61aa 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -650,9 +650,9 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB
nTab,
if ( !bSimple aEngine.GetParagraphCount() == 1 )
{
-OUString aParStr = aEngine.GetText( 0 );
+OUString aParStr(aEngine.GetText( 0 ));
if ( aParStr[0] == '=' )
-bSimple = sal_True;
+bSimple = true;
}
if (bCommon)// attribute for tab
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 --- Comment #75 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Chr. Rossmanith committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=646ce81d1c1623feb5414cd248860b143fd2cd6b fdo#38838 use OUString instead of String The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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] core.git: sc/source
sc/source/ui/inc/viewfunc.hxx | 44 +++ sc/source/ui/view/viewfunc.cxx | 226 - 2 files changed, 135 insertions(+), 135 deletions(-) New commits: commit 241454c424b31aa9810b95072122d629fe3a9b8f Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net Date: Thu Oct 10 19:26:07 2013 +0200 Change sal_Bool to bool in viewfunc.cxx (Calc) Change-Id: Ia65cffbf49929f44607c227a5c6167f4ca581e8a Reviewed-on: https://gerrit.libreoffice.org/6203 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index c48834b..0e28bb5 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -157,59 +157,59 @@ public: voidCreateNames( sal_uInt16 nFlags ); sal_uInt16 GetCreateNameFlags(); voidInsertNameList(); -sal_BoolInsertName( const OUString rName, const OUString rSymbol, +boolInsertName( const OUString rName, const OUString rSymbol, const OUString rType ); voidApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet, -sal_Bool bRecord = sal_True ); +bool bRecord = true ); voidApplyAttr( const SfxPoolItem rAttrItem ); voidApplySelectionPattern( const ScPatternAttr rAttr, -sal_Bool bRecord = sal_True, -sal_Bool bCursorOnly = false ); +bool bRecord = true, +bool bCursorOnly = false ); voidApplyPatternLines( const ScPatternAttr rAttr, const SvxBoxItem* pNewOuter, -const SvxBoxInfoItem* pNewInner, sal_Bool bRecord = sal_True ); +const SvxBoxInfoItem* pNewInner, bool bRecord = true ); voidApplyUserItemSet( const SfxItemSet rItemSet ); const SfxStyleSheet*GetStyleSheetFromMarked(); voidSetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, -sal_Bool bRecord = sal_True ); +bool bRecord = true ); voidRemoveStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet ); voidUpdateStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet ); voidSetNumberFormat( short nFormatType, sal_uLong nAdd = 0 ); voidSetNumFmtByStr( const OUString rCode ); -voidChangeNumFmtDecimals( sal_Bool bIncrement ); +voidChangeNumFmtDecimals( bool bIncrement ); voidSetValidation( const ScValidationData rNew ); -voidChangeIndent( sal_Bool bIncrement ); +voidChangeIndent( bool bIncrement ); voidProtectSheet( SCTAB nTab, const ScTableProtection rProtect ); voidProtect( SCTAB nTab, const OUString rPassword ); -sal_BoolUnprotect( SCTAB nTab, const OUString rPassword ); +boolUnprotect( SCTAB nTab, const OUString rPassword ); -voidDeleteCells( DelCellCmd eCmd, sal_Bool bRecord = sal_True ); -sal_BoolInsertCells( InsCellCmd eCmd, sal_Bool bRecord = sal_True, sal_Bool bPartOfPaste = false ); -voidDeleteMulti( sal_Bool bRows, sal_Bool bRecord = sal_True ); +voidDeleteCells( DelCellCmd eCmd, bool bRecord = true ); +boolInsertCells( InsCellCmd eCmd, bool bRecord = true, bool bPartOfPaste = false ); +voidDeleteMulti( bool bRows, bool bRecord = true ); -voidDeleteContents( sal_uInt16 nFlags, sal_Bool bRecord = sal_True ); +voidDeleteContents( sal_uInt16 nFlags, bool bRecord = true ); -voidSetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges, +voidSetWidthOrHeight( bool bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges, ScSizeMode eMode, sal_uInt16 nSizeTwips, -sal_Bool bRecord = sal_True, sal_Bool bPaint = sal_True, +bool bRecord = true, bool bPaint = true, ScMarkData* pMarkData = NULL ); -voidSetMarkedWidthOrHeight( sal_Bool bWidth, ScSizeMode eMode, sal_uInt16 nSizeTwips, -sal_Bool bRecord = sal_True, sal_Bool bPaint = sal_True ); +voidSetMarkedWidthOrHeight( bool
[Bug 66750] Identify regression hotspots
https://bugs.freedesktop.org/show_bug.cgi?id=66750 --- Comment #5 from Björn Michaelsen bjoern.michael...@canonical.com --- see follow-up Easy Hack 70448: https://wiki.documentfoundation.org/Development/RegressionHotspots https://bugs.freedesktop.org/show_bug.cgi?id=70448 -- 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] core.git: sal/qa sal/rtl
sal/qa/rtl/math/test-rtl-math.cxx | 12
sal/rtl/math.cxx |6 ++
2 files changed, 18 insertions(+)
New commits:
commit f20feba4c43c34fd2ee05b4658b0de0248c08eb9
Author: Eike Rathke er...@redhat.com
Date: Mon Oct 14 14:55:23 2013 +0200
resolved fdo#70319 exponent must be followed by at least one digit
Change-Id: Icdd22fa0f1efcdd18cfea7cb48e1cbf2cf8d3533
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx
b/sal/qa/rtl/math/test-rtl-math.cxx
index c156c37..3ebdb15 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -72,9 +72,21 @@ public:
CPPUNIT_ASSERT_EQUAL(0.0, res);
}
+void test_stringToDouble_exponent_without_digit() {
+rtl_math_ConversionStatus status;
+sal_Int32 end;
+double res = rtl::math::stringToDouble(
+rtl::OUString(1e),
+sal_Unicode('.'), sal_Unicode(','), status, end);
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(1)), end);
+CPPUNIT_ASSERT_EQUAL(1.0, res);
+}
+
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(test_stringToDouble_good);
CPPUNIT_TEST(test_stringToDouble_bad);
+CPPUNIT_TEST(test_stringToDouble_exponent_without_digit);
CPPUNIT_TEST_SUITE_END();
};
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 590ea0e..f66039a 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -799,6 +799,7 @@ inline double stringToDouble(CharT const * pBegin, CharT
const * pEnd,
// Exponent
if (p != p0 p != pEnd (*p == CharT('E') || *p == CharT('e')))
{
+CharT const * const pExponent = p;
++p;
bool bExpSign;
if (p != pEnd *p == CharT('-'))
@@ -812,6 +813,7 @@ inline double stringToDouble(CharT const * pBegin, CharT
const * pEnd,
if (p != pEnd *p == CharT('+'))
++p;
}
+CharT const * const pFirstExpDigit = p;
if ( fVal == 0.0 )
{ // no matter what follows, zero stays zero, but carry on the
// offset
@@ -857,6 +859,10 @@ inline double stringToDouble(CharT const * pBegin, CharT
const * pEnd,
else
fVal = rtl::math::pow10Exp( fVal, nExp ); // normal
}
+else if (p == pFirstExpDigit)
+{ // no digits in exponent, reset end of scan
+p = pExponent;
+}
}
}
else if (p - p0 == 2 p != pEnd p[0] == CharT('#')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/saxparser' - 3 commits - sax/source
sax/source/fastparser/fastparser.cxx | 74 +++
sax/source/fastparser/fastparser.hxx | 28 +
2 files changed, 35 insertions(+), 67 deletions(-)
New commits:
commit b19ca9b8da5e269b25f86e0510eecb91d726489f
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Oct 14 13:22:15 2013 +0200
fix FIXME: use static const.. in class
Should be done in 0bb5dfba049b085619e3b6c14fefb8ef3e69133a
Change-Id: Ic68a2edc3a74dcf0b49f786667eb1ea1ac9445d2
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 9918a8a..8941b0e 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -773,21 +773,18 @@ void FastSaxParser::deleteUsedEvents()
}
}
-// FIXME: make this a static const size_t in the class ...
-#define SIZE 1000
-
void FastSaxParser::produce(const Event aEvent)
{
Entity rEntity = getEntity();
if (!rEntity.mpProducedEvents)
{
rEntity.mpProducedEvents = new EventList();
-rEntity.mpProducedEvents-reserve(SIZE);
+rEntity.mpProducedEvents-reserve(rEntity.mnEventListSize);
}
rEntity.mpProducedEvents-push_back( aEvent );
if (aEvent.maType == CallbackType::DONE ||
aEvent.maType == CallbackType::EXCEPTION ||
-rEntity.mpProducedEvents-size() == SIZE)
+rEntity.mpProducedEvents-size() == rEntity.mnEventListSize)
{
osl::ResettableMutexGuard aGuard(rEntity.maEventProtector);
diff --git a/sax/source/fastparser/fastparser.hxx
b/sax/source/fastparser/fastparser.hxx
index 6f04500..184f4ef 100644
--- a/sax/source/fastparser/fastparser.hxx
+++ b/sax/source/fastparser/fastparser.hxx
@@ -108,6 +108,8 @@ struct Entity : public ParserData
static const size_t mnEventLowWater = 4;
static const size_t mnEventHighWater = 8;
+// Amount of work producer sends to consumer in one iteration:
+static const size_t mnEventListSize = 1000;
osl::Condition maConsumeResume;
osl::Condition maProduceResume;
commit a56398bcb3d3b4605b175615593e986e5d963d18
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Oct 14 13:14:53 2013 +0200
FastSaxParser: free memory in ParserThread as much as possible
To avoid leaks, last few (one?) EventLists are freed in main thread
after parsing is finished.
Change-Id: I9b82107584e1f6b2fe1d4d035b7771ac604a86df
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 13451db..9918a8a 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -588,6 +588,7 @@ void FastSaxParser::parseStream( const InputSource
maStructSource) throw (SAXEx
}
} while (!done);
xParser-join();
+deleteUsedEvents();
// finish document
if( entity.mxDocumentHandler.is() )
@@ -772,12 +773,8 @@ void FastSaxParser::deleteUsedEvents()
}
}
-// freeing in producer thread will leak one EventList
-
// FIXME: make this a static const size_t in the class ...
#define SIZE 1000
-// FIXME: kill this - it should be in the parse thread I'm convinced :-)
-#define FREE_IN_MAIN_THREAD 0
void FastSaxParser::produce(const Event aEvent)
{
@@ -809,9 +806,7 @@ void FastSaxParser::produce(const Event aEvent)
rEntity.maConsumeResume.set();
-#if !FREE_IN_MAIN_THREAD
deleteUsedEvents();
-#endif
}
}
@@ -862,9 +857,6 @@ bool FastSaxParser::consume(EventList *pEventList)
}
}
rEntity.maUsedEvents.push(pEventList);
-#if FREE_IN_MAIN_THREAD
-deleteUsedEvents();
-#endif
return !bIsParserFinished;
}
@@ -916,9 +908,6 @@ void FastSaxParser::parse()
}
while( nRead 0 );
produce(Event( CallbackType::DONE ));
-#if !FREE_IN_MAIN_THREAD
-deleteUsedEvents();
-#endif
}
//--
commit 5610ad37c25c8cbc5923171efe271a0ec8ddc589
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Oct 14 12:51:34 2013 +0200
FastSaxParser: change EventList to be vector of Events, not pointers
So that EventList::reserve makes more sense.
Also use boost::optional in Event instead of pointers.
It's much faster this way - not sure which part helped more.
Change-Id: I6560b7c7f50d62b7ec83f432bed2550a5a546db6
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index de16108..13451db 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -80,7 +80,7 @@ private:
}
catch (const SAXParseException e)
{
-mpParser-produce(new Event( CallbackType::EXCEPTION ));
+mpParser-produce(Event( CallbackType::EXCEPTION ));
}
}
};
@@ -191,34 +191,25 @@ OUString SAL_CALL FastLocatorImpl::getSystemId(void)
throw (RuntimeException)
//
[Libreoffice-commits] dev-tools.git: 2 commits - scripts/regression-hotspots.py
scripts/regression-hotspots.py |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 074351bdad0574e9e13f89dcc63a5b3ab7c6f526
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Mon Oct 14 15:14:53 2013 +0200
fdo#66750: add hint on --numstat
diff --git a/scripts/regression-hotspots.py b/scripts/regression-hotspots.py
index 952a1c2..95eb89f 100755
--- a/scripts/regression-hotspots.py
+++ b/scripts/regression-hotspots.py
@@ -49,6 +49,7 @@ if __name__ == '__main__':
sys.stderr.write('found %d fixed regressions: %s\n' %
(len(fixed_regression_ids), fixed_regression_ids))
for bug_id in fixed_regression_ids:
sys.stderr.write('working on bug %d\n' % bug_id)
+# FIXME: use --numstat instead, which does not abbreviate filenames
logstat = sh.git('--no-pager', 'log', '--grep', 'fdo#%d' % bug_id,
'--stat')
for line in logstat:
match = statregex.search(line)
commit b55faba01ae8a7e8d452861a8b9c348f7d2d6b4a
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Mon Oct 14 15:13:30 2013 +0200
fdo#66750: fix dir counts
diff --git a/scripts/regression-hotspots.py b/scripts/regression-hotspots.py
index 0b94792..952a1c2 100755
--- a/scripts/regression-hotspots.py
+++ b/scripts/regression-hotspots.py
@@ -32,9 +32,9 @@ def get_dir_counts(file_counts, level):
if len(fileparts) level:
dirpart = '/'.join(fileparts[:level])
if dirpart in dir_counts:
-dir_counts[dirpart]+=1
+dir_counts[dirpart]+=count
else:
-dir_counts[dirpart]=1
+dir_counts[dirpart]=count
return dir_counts
def print_counts(counts):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 48024] Convert C++ unit test from JUnit to CppUnit
https://bugs.freedesktop.org/show_bug.cgi?id=48024 --- Comment #8 from DavidO d.ostrov...@gmx.de --- (In reply to comment #7) (In reply to comment #6) I would like to look into this issue. Can someone give some pointers? new to this The most obvious approach would be to translate individual so-called complex tests (see comment 1) from Java to C++. Those are largely self-contained tests that start and connect against an soffice instance (via Java org.openoffice.test.OfficeConnection; the C++ equivalent is in include/unotest/officeconnection.hxx) and then use remote UNO to trigger the code under test in the running soffice. The test code is typically located in */qa/complex/ directories (e.g., sw/qa/complex/checkColor/CheckChangeColor.java), and often makes use of helper functionality from qadevOOo/runner/util/ (for which there may or may not be C++ equivalents). Both building and running the tests is triggered by */JunitTest_*_complex.mk makefiles (e.g., sw/JunitTeste_sw_complex.mk). In a first approximation, a corresponding CppunitTest would still connect to an soffice process and access it via remote UNO, though in the long run it is of course more desirable to have the code under test small and self-contained enough so that it can run directly in the cppunit process. To be fair, it can be already done directly with in process python unit tests, see: https://wiki.documentfoundation.org/Development/Python_Unit_Tests -- 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] core.git: basic/qa
basic/qa/cppunit/test_scanner.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 472ad8ba7ef99982025b37aba562f2135ca8a999 Author: Eike Rathke er...@redhat.com Date: Mon Oct 14 15:57:36 2013 +0200 work around crappy SbiScanner::NextSym(), fdo#70319 just to make test not fail that was wrong anyway Change-Id: Ibbb8214b64be0e9a82e2bde406abdcfd2e84c734 diff --git a/basic/qa/cppunit/test_scanner.cxx b/basic/qa/cppunit/test_scanner.cxx index 9c8d388..acf740fb 100644 --- a/basic/qa/cppunit/test_scanner.cxx +++ b/basic/qa/cppunit/test_scanner.cxx @@ -647,6 +647,8 @@ namespace CPPUNIT_ASSERT(symbols[1].text == cr); CPPUNIT_ASSERT(errors == 0); +/* FIXME: SbiScanner::NextSym() is total crap, the result of scanning + * 12e++3 should be something different than this.. */ symbols = getSymbols(source12, errors); CPPUNIT_ASSERT(symbols.size() == 4); CPPUNIT_ASSERT(symbols[0].number == 12); @@ -655,7 +657,7 @@ namespace CPPUNIT_ASSERT(symbols[2].number == 3); CPPUNIT_ASSERT(symbols[2].type == SbxINTEGER); CPPUNIT_ASSERT(symbols[3].text == cr); -CPPUNIT_ASSERT(errors == 0); +CPPUNIT_ASSERT(errors == 1); symbols = getSymbols(source13, errors); CPPUNIT_ASSERT(symbols.size() == 2); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 12 --- source/text/shared/optionen/01041100.xhp | 33 +++ 2 files changed, 17 insertions(+), 28 deletions(-) New commits: commit f83bc661383a6ec845b6e8e8b9b388d0ec02c5e0 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 14 15:07:01 2013 +0100 update help ids for autocaption options page .ui conversion Change-Id: Ib5f65200e63471ce2f134ad288669eedd03afb8a diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 0c79ce1..7bbd213 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2565,8 +2565,6 @@ HID_OFA_HYPERLINK_TARGET,35053, HID_OFA_HYPERLINK_URL,35081, HID_OFA_TP_VIEW,35057, HID_OLE_TOOLBOX,54831, -HID_OPTCAPTION_CLB,53801, -HID_OPTCAPTION_PAGE,53229, HID_OPTCREATEFAX,41150, HID_OPTIONS_COLOR,33808, HID_OPTIONS_COLORCONFIG_NAME_SCHEME,39875, @@ -7201,7 +7199,6 @@ sw_CheckBox_TP_LINENUMBERING_CB_COUNT_EMPTYLINES,878887956, sw_CheckBox_TP_LINENUMBERING_CB_COUNT_FRAMELINES,878887957, sw_CheckBox_TP_LINENUMBERING_CB_NUMBERING_ON,878887937, sw_CheckBox_TP_LINENUMBERING_CB_RESTART_PAGE,878887959, -sw_CheckBox_TP_OPTCAPTION_PAGE_CB_APPLYBORDER,878937117, sw_CheckBox_TP_OPTSHDWCRSR_CB_ALLOW_IN_PROT,878806028, sw_CheckBox_TP_OPTSHDWCRSR_CB_BREAK,878806027, sw_CheckBox_TP_OPTSHDWCRSR_CB_CHAR_HIDDEN,878806077, @@ -7220,7 +7217,6 @@ sw_CheckBox_TP_TABLE_TEXTFLOW_CB_KEEP,878511248, sw_CheckBox_TP_TABLE_TEXTFLOW_CB_PAGEBREAK,878511235, sw_CheckBox_TP_TABLE_TEXTFLOW_CB_PAGECOLL,878511240, sw_CheckBox_TP_TABLE_TEXTFLOW_CB_SPLIT,878511249, -sw_ComboBox_TP_OPTCAPTION_PAGE_BOX_CATEGORY,878940174, sw_Edit_DLG_BIB_BASE_ED_NAME,1428719626, sw_Edit_DLG_GLOSSARY_ED_NAME,1428637700, sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698, @@ -7232,9 +7228,6 @@ sw_Edit_DLG_MM_OUTPUT_PAGE_ED_ATTACHMENT,898304052, sw_Edit_DLG_MM_OUTPUT_PAGE_ED_SUBJECT,898304035, sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319, sw_Edit_TP_LINENUMBERING_ED_DIVISOR,87975, -sw_Edit_TP_OPTCAPTION_PAGE_EDT_TEXT,878938130, -sw_Edit_TP_OPTCAPTION_PAGE_ED_NUM_SEP,878938147, -sw_Edit_TP_OPTCAPTION_PAGE_ED_SEPARATOR,878938137, sw_FI_PREVIEW_DLG_MM_GREETINGS_PAGE,898252800, sw_FT_BODY_DLG_MM_MAILBODY,1435402240, sw_ImageButton_DLG_MM_ADDRESSBLOCK_PAGE_IB_NEXTSET,898248204, @@ -7268,11 +7261,6 @@ sw_ListBox_TP_LINENUMBERING_LB_FORMAT,878890501, sw_ListBox_TP_LINENUMBERING_LB_POS,878890503, sw_ListBox_TP_NUMPARA_LB_NUMBER_STYLE,878857729, sw_ListBox_TP_NUMPARA_LB_OUTLINE_LEVEL,878857741, -sw_ListBox_TP_OPTCAPTION_PAGE_BOX_FORMAT,878939664, -sw_ListBox_TP_OPTCAPTION_PAGE_BOX_POS,878939668, -sw_ListBox_TP_OPTCAPTION_PAGE_LB_CHARSTYLE,878939676, -sw_ListBox_TP_OPTCAPTION_PAGE_LB_LEVEL,878939671, -sw_ListBox_TP_OPTCAPTION_PAGE_LB_ORDER,878939680, sw_ListBox_TP_OPTCOMPATIBILITY_PAGE_LB_FORMATTING,879349260, sw_ListBox_TP_TABLE_TEXTFLOW_LB_PAGECOLL,878513801, sw_ListBox_TP_TABLE_TEXTFLOW_LB_TEXTORIENTATION,878513708, diff --git a/source/text/shared/optionen/01041100.xhp b/source/text/shared/optionen/01041100.xhp index b79a969..fb83ee2 100644 --- a/source/text/shared/optionen/01041100.xhp +++ b/source/text/shared/optionen/01041100.xhp @@ -39,6 +39,7 @@ bookmark_valuecaptions;automatic captions (Writer)/bookmark_value /bookmark commentmw deleted adding;/comment + bookmark xml-lang=en-US branch=hid/modules/swriter/ui/optcaptionpage/OptCaptionPage id=bm_id1826838 localize=false/ paragraph xml-lang=en-US id=par_idN10561 role=heading level=1 l10n=NEWlink href=text/shared/optionen/01041100.xhpAutoCaption/link/paragraph paragraph xml-lang=en-US id=par_idN10571 role=paragraph l10n=NEWSpecifies the settings for captions that are automatically added to inserted objects./paragraph @@ -49,44 +50,44 @@ /section -bookmark xml-lang=en-US branch=hid/SW_HID_OPTCAPTION_CLB id=bm_id1826837 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/optcaptionpage/objects id=bm_id1826837 localize=false/ paragraph xml-lang=en-US id=par_idN10588 role=heading level=2 l10n=NEWAdd captions automatically when inserting/paragraph paragraph xml-lang=en-US id=par_idN1058C role=paragraph l10n=NEWahelp hid=.Select the object type for which the AutoCaption settings are to be valid./ahelp/paragraph paragraph xml-lang=en-US id=par_idN1058F role=heading level=2 l10n=NEWCaption/paragraph paragraph xml-lang=en-US id=par_idN10593 role=paragraph l10n=NEWDefines the options to be applied to the selected object type. These options are identical to those in the emphInsert - Caption/emph menu, which is available when an object is selected. Below the settings is a preview of the object category, together with numbering type./paragraph -bookmark xml-lang=en-US branch=hid/sw:ComboBox:TP_OPTCAPTION_PAGE:BOX_CATEGORY id=bm_id3156330 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/optcaptionpage/category id=bm_id3156330 localize=false/ paragraph xml-lang=en-US
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 884c01bf0d04340984a6579b69988290e5b864af Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 14 15:07:01 2013 +0100 Updated core Project: help f83bc661383a6ec845b6e8e8b9b388d0ec02c5e0 diff --git a/helpcontent2 b/helpcontent2 index 9d3ffe0..f83bc66 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9d3ffe07f19282e1485f3312690727dbd5e53b09 +Subproject commit f83bc661383a6ec845b6e8e8b9b388d0ec02c5e0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/helpid.h |1 - sw/source/ui/config/optload.cxx |2 -- 2 files changed, 3 deletions(-) New commits: commit d17698acc7e5b0fde24b704760a533511d868b3d Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 14 15:07:14 2013 +0100 drop unnecessary helpds Change-Id: I0c39f08183d03be80c628cae9b6bffa614977ca7 diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 549685e..1651804 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -277,7 +277,6 @@ #define HID_LINGU_IGNORE_SELECTION SW_HID_LINGU_IGNORE_SELECTION// grammar check context menu // More Help-IDs -#define HID_OPTCAPTION_CLB SW_HID_OPTCAPTION_CLB #define HID_EDIT_FORMULA SW_HID_EDIT_FORMULA #define HID_INSERT_FILE SW_HID_INSERT_FILE #define HID_FORMAT_PAGE SW_HID_FORMAT_PAGE diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index a093d00..f5569c1 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -468,8 +468,6 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet rSet ) m_pLbLevel-SelectEntryPos( nLvl MAXLEVEL ? nLvl + 1 : 0 ); m_pEdDelim-SetText( sDelim ); -m_pCheckLB-SetHelpId(HID_OPTCAPTION_CLB); - Link aLk = LINK( this, SwCaptionOptPage, ModifyHdl ); m_pCategoryBox-SetModifyHdl( aLk ); m_pNumberingSeparatorED-SetModifyHdl( aLk ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60698] kill pointless one-file library ...
https://bugs.freedesktop.org/show_bug.cgi?id=60698 --- Comment #2 from Marcos Souza marcos.souza@gmail.com --- Maybe fileaccess module is another candidate for this bug? marcos@jedi:~/gitroot/core$ ls -R fileaccess/ fileaccess/: Library_fileacc.mk Makefile Module_fileaccess.mk README source fileaccess/source: fileacc.component FileAccess.cxx This have just one file for this module, -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 70373] Identify unused source files
https://bugs.freedesktop.org/show_bug.cgi?id=70373 --- Comment #3 from Varadharajan Chandran raju_7...@yahoo.com --- Okay thanks for the pointer. I have already got my build going. will look into the script provided (In reply to comment #2) @Varadharajan: Well, since somebody already provided a script at https://bugs.freedesktop.org/show_bug.cgi?id=70371 -- you need to get your build going e.g. as per https://wiki.documentfoundation.org/Development/BuildingOnLinux and then modify the script to scan for source files, not headers. In general please dont ask for please guide in general, but with a concrete question, so we can help you. Also chat (libreoffice-dev on freenode) is a better medium for this as we can help you interactively: http://webchat.freenode.net/?channels=libreoffice-dev -- 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] core.git: Branch 'feature/sc-notes-storage' - sc/qa
sc/qa/unit/ucalc.cxx | 86 ---
sc/qa/unit/ucalc.hxx |2 -
2 files changed, 88 deletions(-)
New commits:
commit 0ee6f9d57b27bd366cac629933e1dfe2a28d4820
Author: Laurent Godard lgodard.li...@laposte.net
Date: Mon Oct 14 16:49:18 2013 +0200
remove unsused test
Change-Id: I9adb3c1d6ced23523c35658df7f7102b66c81fe8
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 500894c..72f1492 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4184,92 +4184,6 @@ void Test::testAerasWithNotes()
pDoc-DeleteTab(0);
}
-/* TODO : notes - these are private methods :(
-
-void Test::testSwapCells()
-{
-ScDocument* pDoc = getDocShell().GetDocument();
-OUString aSheet1(Sheet1);
-pDoc-InsertTab(0, aSheet1);
-
-OUString aString;
-
-OUString aStringA1(originally A1);
-OUString aStringA2(originally A2);
-OUString aStringA3(originally A3);
-OUString aStringB1(originally B1);
-OUString aStringB2(originally B2);
-OUString aStringB3(originally B3);
-
-
-m_pDoc-SetString(0, 0, 0, aStringA1);
-m_pDoc-SetString(0, 1, 0, aStringA2);
-m_pDoc-SetString(0, 2, 0, aStringA3);
-
-m_pDoc-SetString(1, 0, 0, aStringB1);
-m_pDoc-SetString(1, 1, 0, aStringB2);
-m_pDoc-SetString(1, 2, 0, aStringB3);
-
-ScTable* pTab = pDoc-GetTable[0];
-
-// swap rows
-pTab-SwapRow(0,1);
-
-aString = m_pDoc-GetString(0,0,0);
-CPPUNIT_ASSERT_MESSAGE(A1 should contain aStringA2, aString ==
aStringA2);
-aString = m_pDoc-GetString(0,1,0);
-CPPUNIT_ASSERT_MESSAGE(A2 should contain aStringA1, aString ==
aStringA1);
-aString = m_pDoc-GetString(1,0,0);
-CPPUNIT_ASSERT_MESSAGE(B1 should contain aStringB2, aString ==
aStringB2);
-aString = m_pDoc-GetString(1,1,0);
-CPPUNIT_ASSERT_MESSAGE(B2 should contain aStringB1, aString ==
aStringB1);
-aString = m_pDoc-GetString(0,2,0);
-CPPUNIT_ASSERT_MESSAGE(A3 should contain aStringA3, aString ==
aStringA3);
-
-// back to orginal state
-pTab-SwapRow(1,0);
-
-aString = m_pDoc-GetString(0,0,0);
-CPPUNIT_ASSERT_MESSAGE(A1 should contain aStringA1, aString ==
aStringA1);
-aString = m_pDoc-GetString(0,1,0);
-CPPUNIT_ASSERT_MESSAGE(A2 should contain aStringA1, aString ==
aStringA2);
-aString = m_pDoc-GetString(1,0,0);
-CPPUNIT_ASSERT_MESSAGE(B1 should contain aStringB1, aString ==
aStringB1);
-aString = m_pDoc-GetString(1,1,0);
-CPPUNIT_ASSERT_MESSAGE(B2 should contain aStringB2, aString ==
aStringB2);
-aString = m_pDoc-GetString(0,2,0);
-CPPUNIT_ASSERT_MESSAGE(A3 should contain aStringA3, aString ==
aStringA3);
-
-// swap cols
-pTab-SwapCol(0,1);
-
-aString = m_pDoc-GetString(0,0,0);
-CPPUNIT_ASSERT_MESSAGE(A1 should contain aStringB1, aString ==
aStringB1);
-aString = m_pDoc-GetString(1,0,0);
-CPPUNIT_ASSERT_MESSAGE(B1 should contain aStringA1, aString ==
aStringA1);
-aString = m_pDoc-GetString(0,1,0);
-CPPUNIT_ASSERT_MESSAGE(A2 should contain aStringB2, aString ==
aStringB2);
-aString = m_pDoc-GetString(1,1,0);
-CPPUNIT_ASSERT_MESSAGE(B2 should contain aStringA2, aString ==
aStringA2);
-aString = m_pDoc-GetString(0,2,0);
-CPPUNIT_ASSERT_MESSAGE(A3 should contain aStringA3, aString ==
aStringA3);
-
-// back to orginal state
-pTab-SwapRow(1,0);
-
-aString = m_pDoc-GetString(0,0,0);
-CPPUNIT_ASSERT_MESSAGE(A1 should contain aStringA1, aString ==
aStringA1);
-aString = m_pDoc-GetString(0,1,0);
-CPPUNIT_ASSERT_MESSAGE(A2 should contain aStringA1, aString ==
aStringA2);
-aString = m_pDoc-GetString(1,0,0);
-CPPUNIT_ASSERT_MESSAGE(B1 should contain aStringB1, aString ==
aStringB1);
-aString = m_pDoc-GetString(1,1,0);
-CPPUNIT_ASSERT_MESSAGE(B2 should contain aStringB2, aString ==
aStringB2);
-aString = m_pDoc-GetString(0,2,0);
-CPPUNIT_ASSERT_MESSAGE(A3 should contain aStringA3, aString ==
aStringA3);
-
-}
-*/
void Test::testAnchoredRotatedShape()
{
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index e8a976b..6e262ad 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -270,7 +270,6 @@ public:
void testNoteDeleteRow();
void testNoteDeleteCol();
void testAerasWithNotes();
-//void testSwapCells();
void testAnchoredRotatedShape();
void testCellTextWidth();
void testEditTextIterator();
@@ -374,7 +373,6 @@ public:
CPPUNIT_TEST(testNoteDeleteRow);
CPPUNIT_TEST(testNoteDeleteCol);
CPPUNIT_TEST(testAerasWithNotes);
-//CPPUNIT_TEST(testSwapCells);
CPPUNIT_TEST(testAnchoredRotatedShape);
CPPUNIT_TEST(testCellTextWidth);
CPPUNIT_TEST(testEditTextIterator);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - sc/inc
sc/inc/mtvelements.hxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit ecee2e23df131f9ce34c97cc0e4ecbd2e2c76b07
Author: Laurent Godard lgodard.li...@laposte.net
Date: Mon Oct 14 16:51:29 2013 +0200
coding style
Change-Id: I2351414ee8ff1ac5b2948c018a9fc1b93cfef14e
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 818be1b..f7dd3cb 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -118,7 +118,6 @@ struct ColumnBlockPosition
CellStoreType::iterator miCellPos;
ColumnBlockPosition(): miCellPos() {}
-
};
struct ColumnBlockConstPosition
@@ -129,7 +128,6 @@ struct ColumnBlockConstPosition
CellStoreType::const_iterator miCellPos;
ColumnBlockConstPosition(): miCellPos() {}
-
};
class ColumnBlockPositionSet
@@ -144,7 +142,6 @@ public:
ColumnBlockPositionSet(ScDocument rDoc);
ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol);
-
};
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cmis' - sfx2/source
sfx2/source/doc/objserv.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 72d4ce6f24383176d923b8d7088e3bbe58e3c623
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Mon Oct 14 16:51:32 2013 +0200
CMIS: fixed regression for Checkin/out entries in Files menu
Change-Id: I6ba77175dc650230039da60a4baee20e0801cc5e
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 5e04bb6..8e0026f 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -953,10 +953,12 @@ void SfxObjectShell::GetState_Impl(SfxItemSet rSet)
sal_Bool bCheckedOut = sal_False;
for ( sal_Int32 i = 0; i aCmisProperties.getLength()
!bFoundCheckedout; ++i )
{
-if ( aCmisProperties[i].Name ==
cmis:isVersionSeriesCheckedOut )
+if ( aCmisProperties[i].Id ==
cmis:isVersionSeriesCheckedOut )
{
bFoundCheckedout = true;
-aCmisProperties[i].Value = bCheckedOut;
+uno::Sequence sal_Bool aValues;
+aCmisProperties[i].Value = aValues;
+bCheckedOut = aValues.getLength() 0
aValues[0];
}
}
bShow = !bCheckedOut;
@@ -984,10 +986,12 @@ void SfxObjectShell::GetState_Impl(SfxItemSet rSet)
sal_Bool bCheckedOut = sal_False;
for ( sal_Int32 i = 0; i aCmisProperties.getLength()
!bFoundCheckedout; ++i )
{
-if ( aCmisProperties[i].Name ==
cmis:isVersionSeriesCheckedOut )
+if ( aCmisProperties[i].Id ==
cmis:isVersionSeriesCheckedOut )
{
bFoundCheckedout = true;
-aCmisProperties[i].Value = bCheckedOut;
+uno::Sequence sal_Bool aValues;
+aCmisProperties[i].Value = aValues;
+bCheckedOut = aValues.getLength() 0
aValues[0];
}
}
bShow = bCheckedOut;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk vcl/source
sw/UIConfig_swriter.mk |1
sw/inc/dbui.hrc|1
sw/inc/helpid.h|1
sw/source/ui/dbui/mailmergechildwindow.cxx | 37 ++
sw/source/ui/dbui/mailmergechildwindow.hrc |6 ---
sw/source/ui/dbui/mailmergechildwindow.src | 48
sw/source/ui/dbui/mmoutputpage.hrc |4 --
sw/uiconfig/swriter/ui/warnemaildialog.ui | 57 +
vcl/source/window/layout.cxx |1
9 files changed, 71 insertions(+), 85 deletions(-)
New commits:
commit a5598cf00a49469b14492b9c9c6a82d8f8e04c42
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 14 16:29:46 2013 +0100
convert warn email's can't be sent dialog to .ui
Change-Id: I611c5cb7ab140a04e7ee4a78b6d828ca199c5624
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index c588dd0..c346962 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -206,6 +206,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/tokenwidget \
sw/uiconfig/swriter/ui/viewoptionspage \
sw/uiconfig/swriter/ui/warndatasourcedialog \
+ sw/uiconfig/swriter/ui/warnemaildialog \
sw/uiconfig/swriter/ui/wordcount \
sw/uiconfig/swriter/ui/wrapdialog \
sw/uiconfig/swriter/ui/wrappage \
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 057375e..0e6a220 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -46,7 +46,6 @@
#define DLG_MM_MAILBODY (RC_DBUI_BEGIN + 24)
#define DLG_MM_SENDMAILS (RC_DBUI_BEGIN + 25)
#define DLG_MAILMERGECHILD(RC_DBUI_BEGIN + 26)
-#define DLG_MM_SENDWARNING(RC_DBUI_BEGIN + 29)
#define DLG_MM_CREATIONMONITOR(RC_DBUI_BEGIN + 30)
// Strings --
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 1651804..7284fdb 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -383,7 +383,6 @@
#define HID_MAILMERGECHILD
SW_HID_MAILMERGECHILD
#define HID_MM_MAILSTATUS_TLB
SW_HID_MM_MAILSTATUS_TLB
#define HID_RETURN_TO_MAILMERGE
SW_HID_RETURN_TO_MAILMERGE
-#define HID_MM_SENDWARNING
SW_HID_MM_SENDWARNING
#define HID_NID_TBL
SW_HID_NID_TBL
#define HID_NID_FRM
SW_HID_NID_FRM
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx
b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 2b9e2eb..0216245 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -24,6 +24,7 @@
#include swmodule.hxx
#include view.hxx
#include edtwin.hxx
+#include vcl/layout.hxx
#include vcl/svapp.hxx
#include mailmergechildwindow.hxx
#include mmoutputpage.hxx
@@ -241,36 +242,21 @@ void SwMailDispatcherListener_Impl::DeleteAttachments(
uno::Reference mail::XMa
}
}
-class SwSendWarningBox_Impl : public ModalDialog
+class SwSendWarningBox_Impl : public MessageDialog
{
-FixedImage aWarningImageIM;
-FixedInfo aWarningFI;
-FixedText aDetailFT;
-MultiLineEdit aDetailED;
-FixedLine aSeparatorFL;
-OKButtonaOKPB;
-
+VclMultiLineEdit *m_pDetailED;
public:
SwSendWarningBox_Impl(Window* pParent, const String rDetails);
-~SwSendWarningBox_Impl();
};
-SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const String
rDetails) :
-ModalDialog(pParent, SW_RES( DLG_MM_SENDWARNING )),
-aWarningImageIM(this, SW_RES( IM_WARNING )),
-aWarningFI( this, SW_RES( FI_WARNING )),
-aDetailFT( this, SW_RES( FT_DETAILS )),
-aDetailED( this, SW_RES( ED_DETAILS )),
-aSeparatorFL( this, SW_RES( FL_SEPARATOR )),
-aOKPB( this, SW_RES(PB_OK))
-{
-FreeResource();
-aWarningImageIM.SetImage(WarningBox::GetStandardImage());
-aDetailED.SetText(rDetails);
-}
-
-SwSendWarningBox_Impl::~SwSendWarningBox_Impl()
+SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const String
rDetails)
+: MessageDialog(pParent, WarnEmailDialog,
modules/swriter/ui/warnemaildialog.ui)
{
+get(m_pDetailED, errors);
+m_pDetailED-SetMaxTextWidth(80 * m_pDetailED-approximate_char_width());
+m_pDetailED-set_width_request(80 * m_pDetailED-approximate_char_width());
+m_pDetailED-set_height_request(8 * m_pDetailED-GetTextHeight());
+m_pDetailED-SetText(rDetails);
}
#define ITEMID_TASK 1
@@ -655,7 +641,8 @@ void SwSendMailDialog::DocumentSent( uno::Reference
mail::XMailMessage xMessag
++m_nErrorCount;
UpdateTransferStatus( );
-if(pError)
+
+if (pError)
{
SwSendWarningBox_Impl* pDlg = new
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |3 --- 1 file changed, 3 deletions(-) New commits: commit 826848d005ee8d2af1b11f662f15bc3c083dde76 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 14 16:31:53 2013 +0100 drop unused help ids Change-Id: Id7df00a1b08eeae458eb911029af5bb7eb3d62e3 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 7bbd213..18e6b24 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2421,8 +2421,6 @@ HID_MM_SELECTDBTABLEDDIALOG,54963, HID_MM_SELECTDBTABLEDDIALOG_LISTBOX,54964, HID_MM_SENDMAILS,54983, HID_MM_SENDMAILS_STATUSLB,54984, -HID_MM_SENDWARNING,54992, -HID_MM_TESTACCOUNTSETTINGS,54979, HID_MNU_FUNC_AVG,34036, HID_MNU_FUNC_COUNT,34038, HID_MNU_FUNC_COUNT2,34037, @@ -7295,7 +7293,6 @@ sw_MetricField_TP_TABLE_COLUMN_ED_SPACE,888494718, sw_ModalDialog_DLG_CHANGE_DB,1419591680, sw_ModalDialog_DLG_DBSELECTION,1435009024, sw_ModalDialog_DLG_MAILMERGEWIZARD,1435058176, -sw_MultiLineEdit_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDWARNING_ED_DETAILS,1972357645, sw_MultiLineEdit_DLG_MM_MAILBODY_MLE_BODY,1435404831, sw_MultiLineEdit_TP_LAB_LAB_EDT_WRITING,909691395, sw_NumericField_DLG_MAILMERGE_NF_FROM,1446615045, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c3174b7d5d419b7db20c4d30137f7c0d150d0d1c Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 14 16:31:53 2013 +0100 Updated core Project: help 826848d005ee8d2af1b11f662f15bc3c083dde76 diff --git a/helpcontent2 b/helpcontent2 index f83bc66..826848d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f83bc661383a6ec845b6e8e8b9b388d0ec02c5e0 +Subproject commit 826848d005ee8d2af1b11f662f15bc3c083dde76 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sd/source
sd/source/ui/dlg/RemoteDialog.cxx |2 +-
sd/source/ui/dlg/RemoteDialogClientBox.cxx |7 +++
sd/source/ui/dlg/RemoteDialogClientBox.hxx |8 ++--
sd/source/ui/remotecontrol/AvahiNetworkService.cxx | 10 ++
sd/source/ui/remotecontrol/BluetoothServer.cxx |8
5 files changed, 24 insertions(+), 11 deletions(-)
New commits:
commit 0f1357200ee710e84389e927859eac75d24323d3
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 14 17:46:57 2013 +0200
D-Bus is not thread safe
...so it could happen that both the main thread at
internal_bus_get
dbus_bus_get_private
avahi_dbus_bus_get
avahi_client_new
sd::AvahiNetworkService::setup
sd::DiscoveryService::DiscoveryService
sd::DiscoveryService::setup
SdDLL::RegisterRemotes
[...]
as well as the thread
internal_bus_get
dbus_bus_get
dbusConnectToNameOnBus
sd::BluetoothServer::run
threadFunc
osl_thread_start_Impl
start_thread
spawned from the main thread at
sd::BluetoothServer::setup
sd::RemoteServer::setup
SdDLL::RegisterRemotes
[...]
are in D-Bus's internal_bus_get simultaneously (with disastrous
consequences,
like SEGV) despite the _DBUS_LOCK(bus) there, unless you previously called
dbus_threads_init_default. (Which the D-Bus documentation makes you
believe can
be called from multiple threads, though a look at the implemenation makes it
clear that it really should be called from the main thread before any other
threads are created---which we still don't do; oh my.)
Other places that (indirectly) use D-Bus
(tubes/source/file-transfer-helper.c,
vcl/generic/fontmanager/fontconfig.cxx, vcl/unx/gtk/window/gtksalframe.cxx
might
need this, too.
Change-Id: I912829c615b46b05a89c07bd044b04f1e5f5e7ba
diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
index 8fc4eb7..34b94a3 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
@@ -8,6 +8,7 @@
*/
#include time.h
#include iostream
+#include new
#include stdlib.h
#include assert.h
@@ -20,6 +21,8 @@
#include avahi-common/timeval.h
#include avahi-common/thread-watch.h
+#include dbus/dbus.h
+
#include sal/log.hxx
#include AvahiNetworkService.hxx
@@ -149,6 +152,13 @@ static void client_callback(AvahiClient *c,
AvahiClientState state, AVAHI_GCC_UN
}
void AvahiNetworkService::setup() {
+// Avahi internally uses D-Bus, which requires the following in order to be
+// thread-safe (and we potentially access D-Bus from different threads in
+// different places of the code base):
+if (!dbus_threads_init_default()) {
+throw std::bad_alloc();
+}
+
int error = 0;
avahiService = this;
if (!(threaded_poll = avahi_threaded_poll_new())) {
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index ccdf03f..1deab3c 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -11,6 +11,7 @@
#include iostream
#include iomanip
+#include new
#include sal/log.hxx
@@ -586,6 +587,13 @@ BluetoothServer::BluetoothServer(
std::vectorCommunicator** pCommunicators )
mpCommunicators( pCommunicators )
{
#ifdef LINUX_BLUETOOTH
+// D-Bus requires the following in order to be thread-safe (and we
+// potentially access D-Bus from different threads in different places of
+// the code base):
+if (!dbus_threads_init_default()) {
+throw std::bad_alloc();
+}
+
mpImpl.reset(new BluetoothServer::Impl());
#endif
}
commit e202ea3ab830f64b1305b6a6031a807a2c12ebdc
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 14 15:23:05 2013 +0200
Remove unused/null sd::ClientBox::m_pServer
Change-Id: I5d79bcd75088d5ba2aa773ebf0809281cab07924
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx
b/sd/source/ui/dlg/RemoteDialog.cxx
index 8aec838..5da2882 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -22,7 +22,7 @@ RemoteDialog::RemoteDialog( Window *pWindow ) :
ModalDialog( pWindow, SdResId( DLG_PAIR_REMOTE ) ),
mButtonConnect( this, SdResId( BTN_CONNECT ) ),
mButtonCancel( this, SdResId( BTN_CANCEL ) ),
-mClientBox( this, NULL, SdResId( LB_SERVERS ) )
+mClientBox( this, SdResId( LB_SERVERS ) )
{
FreeResource();
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index bce4935..f1eef9d 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -21,6 +21,7 @@
#include RemoteDialogClientBox.hxx
#include RemoteDialog.hrc
+#include
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/source
svtools/source/graphic/grfmgr.cxx | 63 --
1 file changed, 40 insertions(+), 23 deletions(-)
New commits:
commit 2104f864ec0cf0989e962c045ee69010e3505f3e
Author: Armin Le Grand a...@apache.org
Date: Mon Oct 14 15:01:00 2013 +
i123438 Corrected crop for clipboard mitmap data preparations
diff --git a/svtools/source/graphic/grfmgr.cxx
b/svtools/source/graphic/grfmgr.cxx
index 425fe8b..59dc21b 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -946,23 +946,25 @@ Graphic GraphicObject::GetTransformedGraphic( const Size
rDestSize, const MapMo
if( aMapGraph == MAP_PIXEL )
{
-aCropLeftTop = Application::GetDefaultDevice()-LogicToPixel(
Size( rAttr.GetLeftCrop(),
-
rAttr.GetTopCrop() ),
-
aMap100 );
-aCropRightBottom = Application::GetDefaultDevice()-LogicToPixel(
Size( rAttr.GetRightCrop(),
-
rAttr.GetBottomCrop() ),
-
aMap100 );
+// crops are in 1/100th mm - to aMapGraph - to MAP_PIXEL
+aCropLeftTop = Application::GetDefaultDevice()-LogicToPixel(
+Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+aMap100);
+aCropRightBottom = Application::GetDefaultDevice()-LogicToPixel(
+Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+aMap100);
}
else
{
-aCropLeftTop = OutputDevice::LogicToLogic( Size(
rAttr.GetLeftCrop(),
-
rAttr.GetTopCrop() ),
- aMap100,
- aMapGraph );
-aCropRightBottom = OutputDevice::LogicToLogic( Size(
rAttr.GetRightCrop(),
-
rAttr.GetBottomCrop() ),
- aMap100,
- aMapGraph );
+// crops are in GraphicObject units - to aMapGraph
+aCropLeftTop = OutputDevice::LogicToLogic(
+Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+aMap100,
+aMapGraph);
+aCropRightBottom = OutputDevice::LogicToLogic(
+Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+aMap100,
+aMapGraph);
}
// #104115# If the metafile is cropped, give it a special
@@ -1012,15 +1014,29 @@ Graphic GraphicObject::GetTransformedGraphic( const
Size rDestSize, const MapMo
BitmapEx aBitmapEx( aTransGraphic.GetBitmapEx() );
Rectangle aCropRect;
-// convert crops to pixel (crops are always in GraphicObject units)
+// convert crops to pixel
if(rAttr.IsCropped())
{
-aCropLeftTop = Application::GetDefaultDevice()-LogicToPixel(
-Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
-aMapGraph);
-aCropRightBottom = Application::GetDefaultDevice()-LogicToPixel(
-Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
-aMapGraph);
+if( aMapGraph == MAP_PIXEL )
+{
+// crops are in 1/100th mm - to MAP_PIXEL
+aCropLeftTop = Application::GetDefaultDevice()-LogicToPixel(
+Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+aMap100);
+aCropRightBottom =
Application::GetDefaultDevice()-LogicToPixel(
+Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+aMap100);
+}
+else
+{
+// crops are in GraphicObject units - to MAP_PIXEL
+aCropLeftTop = Application::GetDefaultDevice()-LogicToPixel(
+Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+aMapGraph);
+aCropRightBottom =
Application::GetDefaultDevice()-LogicToPixel(
+Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+aMapGraph);
+}
// convert from prefmapmode to pixel
Size aSrcSizePixel(
@@ -1040,8 +1056,9 @@ Graphic GraphicObject::GetTransformedGraphic( const Size
rDestSize, const MapMo
// another possibility is to adapt the values created so far
with a factor; this
// will keep the original Bitmap untouched and thus quality
will not change
-const double fFactorX(aBitmapEx.GetSizePixel().Width() /
slideshow / canvas rework (was: Re: draw a graphic::XGraphic on a rendering::XCanvas ?)
I wrote: Caolan McNamara wrote: Does seem a bit odd that we seem to have so much parallel stacks of drawing infrastructures. Yeah. Let me see to get some convergence started; next week is HackWeek here at SUSE. ;) So. Branch feature/slideshowprimitives has a ~working canvas primitive renderer (with a number of obvious optimization points, and one glaringly inefficient bitmap blending place that needs moving into XCanvas). As for parallel stacks, cppcanvas looks like a worthy target for the next technical debt payoff craze. Again, feature/slideshowprimitives has a go at it, via converting slideshow over to drawinglayer primitives (in-progress, non-building state on my disk currently). Once that's done, there's only one valuable piece left in cppcanvas, which is the emf+ renderer - that would need someone willing to dabble in primitives to adopt convert over (in much the same way the svg import is implemented now). With that out of the way, some 8+ kloc of code could go. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
opengl canvas landed in master last week
Hi guys, come suse hackweek, I finally managed to land $subject in master (thanks to Cloph, Caolan and Stephan for cleaning up after me btw). I would not call it production-ready yet (therefore it's listed far down in the config xml factory list of canvas implementations), but it showcases some interesting features. First of all, it does not use any of the tricks the older hw-accelerated canvas implementations use [1], to get the pixels to the screen - every drawing operation that touches pixel is native opengl, with a fair amount of pixel shaders e.g. for gradient fills. As such, most of the bottlenecks of cairo or gdi+ should be gone. Of course, input data that is already a bitmap (e.g. a png) stays that, but it simply gets loaded into a texture w/o pixel processing. It does that by recording display lists of rendering operations [2], that client code calls at the XCanvas interface (conceptually not too dissimilar from the venerable metafile approach) Every re-paint of the screen, e.g. because something moved in slideshow, is then a plain re-display of a slightly modified list of already-existing display primitives, pretty much exactly what a game does for every frame. [1] both cairocanvas and directx canvas are software renderers at the bottom, just using the hardware to composite already-rendered content on the screen. hardly an efficient use of today's gpu capabilities. [2] there is an obvious duality here between drawinglayer primitives aka scene graph, and the procedural XCanvas interface, that makes converting from primitives to canvas to opengl scene graph a bit of a waste. I'm aware of that, might be another interesting future project. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/inc/dbui.hrc|8 --
sw/source/ui/dbui/dbui.cxx | 30 +++
sw/source/ui/dbui/dbui.src | 83
sw/source/ui/inc/dbui.hxx | 11 +-
sw/uiconfig/swriter/ui/mmcreatingdialog.ui | 116 +
6 files changed, 134 insertions(+), 115 deletions(-)
New commits:
commit 33450a258a92986c25923d37d033c948b702c585
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 14 20:28:47 2013 +0100
convert creating document mail merge dialog to .ui
Change-Id: Ibcb82ba8204fe94d31e32c74d8c2ade3228ff4f8
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index c346962..c3fff9b 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -160,6 +160,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/querydefaultcompatdialog \
sw/uiconfig/swriter/ui/querysavelabeldialog \
sw/uiconfig/swriter/ui/queryshowchangesdialog \
+ sw/uiconfig/swriter/ui/mmcreatingdialog \
sw/uiconfig/swriter/ui/mmoutputtypepage \
sw/uiconfig/swriter/ui/mmselectpage \
sw/uiconfig/swriter/ui/paradialog \
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 0e6a220..a988946 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -46,7 +46,6 @@
#define DLG_MM_MAILBODY (RC_DBUI_BEGIN + 24)
#define DLG_MM_SENDMAILS (RC_DBUI_BEGIN + 25)
#define DLG_MAILMERGECHILD(RC_DBUI_BEGIN + 26)
-#define DLG_MM_CREATIONMONITOR(RC_DBUI_BEGIN + 30)
// Strings --
#define SA_ADDRESS_HEADER (RC_DBUI_BEGIN + 1)
@@ -75,19 +74,12 @@
#define ST_DRAGSALUTATION (RC_DBUI_BEGIN + 24)
#define ST_TITLE_EDIT (RC_DBUI_BEGIN + 25)
-
// Elements -
#define BTN_OK 2
#define BTN_CANCEL 3
#define BTN_HELP4
-#define PB_CANCELPRNMON 9
-#define FT_STATUS 12
-#define FT_CREATEDOCUMENTS 13
-#define FT_PROGRESS 14
-#define FT_COUNTING 15
-
#define MM_PART_TITLE 0
#define MM_PART_FIRSTNAME 1
#define MM_PART_LASTNAME2
diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx
index f1b58e2..fd45bbc 100644
--- a/sw/source/ui/dbui/dbui.cxx
+++ b/sw/source/ui/dbui/dbui.cxx
@@ -46,22 +46,18 @@ PrintMonitor::PrintMonitor(Window *pParent,
PrintMonitorType eType )
// Progress Indicator for Creation of personalized Mail Merge documents:
CreateMonitor::CreateMonitor( Window *pParent )
-: ModelessDialog( pParent, SW_RES(DLG_MM_CREATIONMONITOR) ),
-m_aStatus (this, SW_RES( FT_STATUS )),
-m_aProgress (this, SW_RES( FT_PROGRESS )),
-m_aCreateDocuments (this, SW_RES( FT_CREATEDOCUMENTS )),
-m_aCounting (this, SW_RES( FT_COUNTING )),
-m_aCancelButton (this, SW_RES( PB_CANCELPRNMON )),
-m_sCountingPattern(),
-m_sVariable_Total( OUString(%Y) ),
-m_sVariable_Position( OUString(%X) ),
-m_nTotalCount(0),
-m_nCurrentPosition(0)
+: ModelessDialog(pParent, MMCreatingDialog,
+modules/swriter/ui/mmcreatingdialog.ui)
+, m_sCountingPattern()
+, m_sVariable_Total(%Y)
+, m_sVariable_Position(%X)
+, m_nTotalCount(0)
+, m_nCurrentPosition(0)
{
-FreeResource();
-
-m_sCountingPattern = m_aCounting.GetText();
-m_aCounting.SetText(OUString(...));
+get(m_pCancelButton, cancel);
+get(m_pCounting, progress);
+m_sCountingPattern = m_pCounting-GetText();
+m_pCounting-SetText(...);
}
void CreateMonitor::UpdateCountingText()
@@ -69,7 +65,7 @@ void CreateMonitor::UpdateCountingText()
OUString sText(m_sCountingPattern);
sText = sText.replaceAll( m_sVariable_Total, OUString::number(
m_nTotalCount ) );
sText = sText.replaceAll( m_sVariable_Position, OUString::number(
m_nCurrentPosition ) );
-m_aCounting.SetText(sText);
+m_pCounting-SetText(sText);
}
void CreateMonitor::SetTotalCount( sal_Int32 nTotal )
@@ -86,7 +82,7 @@ void CreateMonitor::SetCurrentPosition( sal_Int32 nCurrent )
void CreateMonitor::SetCancelHdl( const Link rLink )
{
-m_aCancelButton.SetClickHdl( rLink );
+m_pCancelButton-SetClickHdl( rLink );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src
index 51ee91a..5ff7097 100644
--- a/sw/source/ui/dbui/dbui.src
+++ b/sw/source/ui/dbui/dbui.src
@@ -85,87 +85,4 @@ String STR_FILTER_ACCDB
Text [ en-US ] = Microsoft Access 2007 (*.accdb) ;
};
- // DLG_MM_CREATIONMONITOR
--
-ModelessDialog DLG_MM_CREATIONMONITOR
-{
-SVLOOK = TRUE ;
-HIDE = TRUE ;
-OUTPUTSIZE = TRUE ;
-_WHMAPMODE
[Libreoffice-commits] core.git: svtools/source
svtools/source/graphic/grfmgr.cxx | 63 --
1 file changed, 40 insertions(+), 23 deletions(-)
New commits:
commit 29991e23bc883a3965614269f90cd8bed75a567b
Author: Armin Le Grand a...@apache.org
Date: Mon Oct 14 15:01:00 2013 +
Resolves: #i123438# Corrected crop for clipboard bitmap data preparations
(cherry picked from commit 2104f864ec0cf0989e962c045ee69010e3505f3e)
Change-Id: I3376d72317f27bfe7898e515ce1d2788761d1422
diff --git a/svtools/source/graphic/grfmgr.cxx
b/svtools/source/graphic/grfmgr.cxx
index 85f0d0b..96408bf 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -757,23 +757,25 @@ Graphic GraphicObject::GetTransformedGraphic( const Size
rDestSize, const MapMo
if( aMapGraph == MAP_PIXEL )
{
-aCropLeftTop = Application::GetDefaultDevice()-LogicToPixel(
Size( rAttr.GetLeftCrop(),
-
rAttr.GetTopCrop() ),
-
aMap100 );
-aCropRightBottom = Application::GetDefaultDevice()-LogicToPixel(
Size( rAttr.GetRightCrop(),
-
rAttr.GetBottomCrop() ),
-
aMap100 );
+// crops are in 1/100th mm - to aMapGraph - to MAP_PIXEL
+aCropLeftTop = Application::GetDefaultDevice()-LogicToPixel(
+Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+aMap100);
+aCropRightBottom = Application::GetDefaultDevice()-LogicToPixel(
+Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+aMap100);
}
else
{
-aCropLeftTop = OutputDevice::LogicToLogic( Size(
rAttr.GetLeftCrop(),
-
rAttr.GetTopCrop() ),
- aMap100,
- aMapGraph );
-aCropRightBottom = OutputDevice::LogicToLogic( Size(
rAttr.GetRightCrop(),
-
rAttr.GetBottomCrop() ),
- aMap100,
- aMapGraph );
+// crops are in GraphicObject units - to aMapGraph
+aCropLeftTop = OutputDevice::LogicToLogic(
+Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+aMap100,
+aMapGraph);
+aCropRightBottom = OutputDevice::LogicToLogic(
+Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+aMap100,
+aMapGraph);
}
// #104115# If the metafile is cropped, give it a special
@@ -823,15 +825,29 @@ Graphic GraphicObject::GetTransformedGraphic( const Size
rDestSize, const MapMo
BitmapEx aBitmapEx( aTransGraphic.GetBitmapEx() );
Rectangle aCropRect;
-// convert crops to pixel (crops are always in GraphicObject units)
+// convert crops to pixel
if(rAttr.IsCropped())
{
-aCropLeftTop = Application::GetDefaultDevice()-LogicToPixel(
-Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
-aMapGraph);
-aCropRightBottom = Application::GetDefaultDevice()-LogicToPixel(
-Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
-aMapGraph);
+if( aMapGraph == MAP_PIXEL )
+{
+// crops are in 1/100th mm - to MAP_PIXEL
+aCropLeftTop = Application::GetDefaultDevice()-LogicToPixel(
+Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+aMap100);
+aCropRightBottom =
Application::GetDefaultDevice()-LogicToPixel(
+Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+aMap100);
+}
+else
+{
+// crops are in GraphicObject units - to MAP_PIXEL
+aCropLeftTop = Application::GetDefaultDevice()-LogicToPixel(
+Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+aMapGraph);
+aCropRightBottom =
Application::GetDefaultDevice()-LogicToPixel(
+Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+aMapGraph);
+}
// convert from prefmapmode to pixel
Size aSrcSizePixel(
@@ -851,8 +867,9 @@ Graphic GraphicObject::GetTransformedGraphic( const Size
rDestSize, const MapMo
// another possibility is to adapt the values created so far
with a factor; this
// will keep
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 21/04f864ec0cf0989e962c045ee69010e3505f3e
21/04f864ec0cf0989e962c045ee69010e3505f3e |1 + 1 file changed, 1 insertion(+) New commits: commit 8ea02886bb5a2c9a68a1351f02561bbb29d8eca1 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 14 20:31:35 2013 +0100 Notes added by 'git notes add' diff --git a/21/04f864ec0cf0989e962c045ee69010e3505f3e b/21/04f864ec0cf0989e962c045ee69010e3505f3e new file mode 100644 index 000..4aaef68 --- /dev/null +++ b/21/04f864ec0cf0989e962c045ee69010e3505f3e @@ -0,0 +1 @@ +merged as: 29991e23bc883a3965614269f90cd8bed75a567b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 315ef3e2aeb6689a26b34e8100033e486a832b0f
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Oct 14 21:30:52 2013 +0200
writerfilter: fix dbglevel=2 build
Change-Id: Icc20bb1de73c119efdb9dd80f35cdb9f2d342529
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index b3d1412..f18c329 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -55,11 +55,11 @@ static void lcl_printProperties( PropertyMapPtr pProps )
PropertyNameSupplier rPropSupplier =
PropertyNameSupplier::GetPropertyNameSupplier();
for( ; aMapIter != aEndIter; ++aMapIter )
{
-SAL_INFO(writerfilter,
rPropSupplier.GetName(aMapIter-first.eId));
+SAL_INFO(writerfilter, rPropSupplier.GetName(aMapIter-first));
table::BorderLine2 aLine;
sal_Int32 nColor;
-if ( aMapIter-second = aLine )
+if ( aMapIter-second.getValue() = aLine )
{
dmapper_logger-startElement(borderline);
dmapper_logger-attribute(color, aLine.Color);
@@ -67,7 +67,7 @@ static void lcl_printProperties( PropertyMapPtr pProps )
dmapper_logger-attribute(outer, aLine.OuterLineWidth);
dmapper_logger-endElement();
}
-else if ( aMapIter-second = nColor )
+else if ( aMapIter-second.getValue() = nColor )
{
dmapper_logger-startElement(color);
dmapper_logger-attribute(number, nColor);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - writerfilter/source
writerfilter/source/doctok/Dff.cxx | 20 --
writerfilter/source/doctok/Dff.hxx |5 ---
writerfilter/source/doctok/WW8FontTable.cxx | 22
writerfilter/source/doctok/WW8LFOTable.cxx | 32 ---
writerfilter/source/doctok/WW8ListTable.cxx | 37 ---
writerfilter/source/doctok/WW8StyleSheet.cxx | 16 ---
writerfilter/source/doctok/resources.xsl | 14 --
writerfilter/source/doctok/resourcesimpl.xsl | 34
8 files changed, 180 deletions(-)
New commits:
commit 7bb5ae7ca6e8900286202475a1e5c9fed3995242
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Oct 14 21:42:15 2013 +0200
writerfilter: unused initChildren/Payload methods in doctok
Change-Id: I6b8d728011c2b70061dbdcdc3daba37422f99306
diff --git a/writerfilter/source/doctok/Dff.cxx
b/writerfilter/source/doctok/Dff.cxx
index e66d716..026e92f 100644
--- a/writerfilter/source/doctok/Dff.cxx
+++ b/writerfilter/source/doctok/Dff.cxx
@@ -42,17 +42,11 @@ DffRecord::DffRecord(WW8StructBase * pParent, sal_uInt32
nOffset,
Records_t::iterator DffRecord::begin()
{
-if (! bInitialized)
-initChildren();
-
return mRecords.begin();
}
Records_t::iterator DffRecord::end()
{
-if (! bInitialized)
-initChildren();
-
return mRecords.end();
}
@@ -105,10 +99,6 @@ sal_uInt32 DffRecord::getRecordType() const
return getU16(0x2);
}
-void DffRecord::initChildren()
-{
-}
-
Records_t DffRecord::findRecords(sal_uInt32 nType, bool bRecursive, bool bAny)
{
Records_t aResult;
@@ -353,10 +343,6 @@ DffBlock::DffBlock(const DffBlock rSrc)
{
}
-void DffBlock::initChildren()
-{
-}
-
Records_t DffBlock::findRecords(sal_uInt32 nType, bool bRecursive, bool bAny)
{
Records_t aResult;
@@ -447,17 +433,11 @@ DffRecord::Pointer_t DffBlock::getBlip(sal_uInt32 nBlip)
Records_t::iterator DffBlock::begin()
{
-if (! bInitialized)
-initChildren();
-
return mRecords.begin();
}
Records_t::iterator DffBlock::end()
{
-if (! bInitialized)
-initChildren();
-
return mRecords.end();
}
diff --git a/writerfilter/source/doctok/Dff.hxx
b/writerfilter/source/doctok/Dff.hxx
index 62b8ef6..7225367 100644
--- a/writerfilter/source/doctok/Dff.hxx
+++ b/writerfilter/source/doctok/Dff.hxx
@@ -42,8 +42,6 @@ protected:
typedef vectorPointer_t Records_t;
Records_t mRecords;
-void initChildren();
-
public:
DffRecord(WW8Stream rStream, sal_uInt32 nOffset, sal_uInt32 nCount);
@@ -105,9 +103,6 @@ class DffBlock : public WW8StructBase,
Records_t mRecords;
-protected:
-void initChildren();
-
public:
typedef boost::shared_ptrDffBlock Pointer_t;
diff --git a/writerfilter/source/doctok/WW8FontTable.cxx
b/writerfilter/source/doctok/WW8FontTable.cxx
index 2ecfe15..95fc233 100644
--- a/writerfilter/source/doctok/WW8FontTable.cxx
+++ b/writerfilter/source/doctok/WW8FontTable.cxx
@@ -22,28 +22,6 @@
namespace writerfilter {
namespace doctok {
-void WW8FontTable::initPayload()
-{
-sal_uInt32 nCount = getU8(0);
-
-sal_uInt32 nOffset = 1;
-
-while (nCount 0)
-{
-entryOffsets.push_back(nOffset);
-
-sal_uInt32 nFFNSize = getU8(nOffset) + 1;
-
-if (nFFNSize 1)
-nCount--;
-
-nOffset += nFFNSize;
-}
-
-entryOffsets.push_back(nOffset);
-mnPlcfPayloadOffset = nOffset;
-}
-
sal_uInt32 WW8FontTable::getEntryCount()
{
return entryOffsets.size() - 1;
diff --git a/writerfilter/source/doctok/WW8LFOTable.cxx
b/writerfilter/source/doctok/WW8LFOTable.cxx
index 9f896bb..5c41219 100644
--- a/writerfilter/source/doctok/WW8LFOTable.cxx
+++ b/writerfilter/source/doctok/WW8LFOTable.cxx
@@ -22,38 +22,6 @@
namespace writerfilter {
namespace doctok {
-void WW8LFOTable::initPayload()
-{
-sal_uInt32 nCount = getEntryCount();
-
-sal_uInt32 nOffset = 4;
-sal_uInt32 nOffsetLFOData = mnPlcfPayloadOffset;
-
-for (sal_uInt32 n = 0; n nCount; ++n)
-{
-WW8LFO aLFO(this, nOffset);
-
-entryOffsets.push_back(nOffset);
-nOffset += WW8LFO::getSize();
-
-payloadOffsets.push_back(nOffsetLFOData);
-payloadIndices.push_back(n);
-
-nOffsetLFOData += 4;
-
-sal_uInt32 nLvls = aLFO.get_clfolvl();
-
-for (sal_uInt32 k = 0; k nLvls; ++k)
-{
-WW8LFOLevel aLevel(this, nOffsetLFOData);
-nOffsetLFOData += aLevel.calcSize();
-}
-}
-
-entryOffsets.push_back(nOffset);
-payloadOffsets.push_back(nOffsetLFOData);
-}
-
sal_uInt32 WW8LFOTable::getEntryCount()
{
return getU32(0);
diff --git a/writerfilter/source/doctok/WW8ListTable.cxx
b/writerfilter/source/doctok/WW8ListTable.cxx
index 3d6eb21..380c19d 100644
--- a/writerfilter/source/doctok/WW8ListTable.cxx
+++ b/writerfilter/source/doctok/WW8ListTable.cxx
@@ -23,43 +23,6 @@
namespace
Re: Development wiki spring (autumn) cleanup
On 9 okt. 2013, at 12:00, bjoern bjoern.michael...@canonical.com wrote: 26964 Development/Code Overview I tried to turn this into more than just a redirect to the code README page by adding some presentations from Mmeeks' blog. I'd love to also provide some talks/presentations (especially some LibOCon'13) but I was not successful in finding them. :( Maybe someone can show me where we put them? I also plan to add a navigation toolbar to the README script. Thanks, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 6 commits - formula/source lotuswordpro/source sw/source vcl/inc vcl/unx
formula/source/ui/dlg/parawin.cxx |8 +--
lotuswordpro/source/filter/lwpfrib.cxx | 12 -
sw/source/core/fields/chpfld.cxx | 11 -
vcl/inc/salwtype.hxx |9
vcl/unx/generic/app/i18n_cb.cxx| 67 -
vcl/unx/generic/window/salframe.cxx|2
6 files changed, 66 insertions(+), 43 deletions(-)
New commits:
commit 20528cb2702d7044734ec1f4a9af40804bce1c0e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 14 21:08:40 2013 +0100
CID#736176 aArgInput is only 4 items, what's with the loop over 5 elements
Change-Id: I16983832e5d12ae55a3db448bcef2550b000d496
diff --git a/formula/source/ui/dlg/parawin.cxx
b/formula/source/ui/dlg/parawin.cxx
index 1b0a6db..c209c37 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -513,7 +513,7 @@ IMPL_LINK( ParaWin, GetFxHdl, ArgInput*, pPtr )
{
sal_uInt16 nOffset = GetSliderPos();
nEdFocus=NOT_FOUND;
-for ( sal_uInt16 nPos=0; nPos5;nPos++)
+for (sal_uInt16 nPos=0; nPos SAL_N_ELEMENTS(aArgInput); ++nPos)
{
if(pPtr == aArgInput[nPos])
{
@@ -535,7 +535,7 @@ IMPL_LINK( ParaWin, GetFxFocusHdl, ArgInput*, pPtr )
{
sal_uInt16 nOffset = GetSliderPos();
nEdFocus=NOT_FOUND;
-for ( sal_uInt16 nPos=0; nPos5;nPos++)
+for (sal_uInt16 nPos=0; nPos SAL_N_ELEMENTS(aArgInput); ++nPos)
{
if(pPtr == aArgInput[nPos])
{
@@ -559,7 +559,7 @@ IMPL_LINK( ParaWin, GetEdFocusHdl, ArgInput*, pPtr )
{
sal_uInt16 nOffset = GetSliderPos();
nEdFocus=NOT_FOUND;
-for ( sal_uInt16 nPos=0; nPos5;nPos++)
+for (sal_uInt16 nPos=0; nPos SAL_N_ELEMENTS(aArgInput); ++nPos)
{
if(pPtr == aArgInput[nPos])
{
@@ -591,7 +591,7 @@ IMPL_LINK( ParaWin, ModifyHdl, ArgInput*, pPtr )
{
sal_uInt16 nOffset = GetSliderPos();
nEdFocus=NOT_FOUND;
-for ( sal_uInt16 nPos=0; nPos5;nPos++)
+for (sal_uInt16 nPos=0; nPos SAL_N_ELEMENTS(aArgInput); ++nPos)
{
if(pPtr == aArgInput[nPos])
{
commit eb0d268cdb71513b8ca36ce6582a06e34190c54d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 14 20:59:34 2013 +0100
CID#736192 out of bounds
Change-Id: I7ab1baa96e004122bd03d7b057effaf6b1ca7fe2
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index ddda6c4..7c1eb52 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -135,7 +135,16 @@ void SwChapterField::ChangeExpansion(const SwTxtNode
rTxtNd, sal_Bool bSrchNum)
if (rTxtNd.IsCountedInList() pRule)
{
sNumber = rTxtNd.GetNumString(false);
-const SwNumFmt rNFmt = pRule-Get(static_castunsigned
short(rTxtNd.GetActualListLevel()));
+
+int nListLevel = rTxtNd.GetActualListLevel();
+
+if (nListLevel 0)
+nListLevel = 0;
+
+if (nListLevel = MAXLEVEL)
+nListLevel = MAXLEVEL - 1;
+
+const SwNumFmt rNFmt = pRule-Get(static_castunsigned
short(nListLevel));
sPost = rNFmt.GetSuffix();
sPre = rNFmt.GetPrefix();
}
commit b8d18c1b27e97e14a83338c6b18239637b744834
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 14 20:51:54 2013 +0100
CID#738972 use after free
Change-Id: I3c1329a55b53365945406c515ff4e8e72792dcb6
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx
b/lotuswordpro/source/filter/lwpfrib.cxx
index 9ef736d..ca91ef9 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -255,8 +255,11 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
pStyle-SetStyleName(A2OUSTR());
pFont =
pFoundry-GetFontManger()-CreateOverrideFont(pCharStyle-GetFinalFontID(),m_pModifiers-FontID);
pStyle-SetFont(pFont);
-m_StyleName = pXFStyleManager-AddStyle(pStyle)-GetStyleName();
-}
+IXFStyle *pNewStyle = pXFStyleManager-AddStyle(pStyle);
+m_StyleName = pNewStyle-GetStyleName();
+if (pNewStyle != pStyle)
+pStyle = NULL;
+}
else
m_StyleName = pNamedStyle-GetStyleName();
}
@@ -267,7 +270,10 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
pStyle = new XFTextStyle();
pFont =
pFoundry-GetFontManger()-CreateFont(m_pModifiers-FontID);
pStyle-SetFont(pFont);
-m_StyleName = pXFStyleManager-AddStyle(pStyle)-GetStyleName();
+IXFStyle *pNewStyle = pXFStyleManager-AddStyle(pStyle);
+m_StyleName = pNewStyle-GetStyleName();
+if (pNewStyle != pStyle)
+pStyle = NULL;
}
}
commit 5d4c63c815c38106d1d80e817e96c5cb0fbaaccf
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 14 20:43:02 2013 +0100
CID#707595 uninitialized values
[Bug 60698] kill pointless one-file library ...
https://bugs.freedesktop.org/show_bug.cgi?id=60698 --- Comment #3 from Michael Meeks michael.me...@collabora.com --- yes; sounds like a good plan :-) reducing that madness would be wonderful. -- 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] core.git: shell/source
shell/source/win32/zipfile/zipfile.cxx | 64 +++--
1 file changed, 38 insertions(+), 26 deletions(-)
New commits:
commit d67cd21033877c9c09d9cc4f14c2c4658e973f57
Author: Mathieu Parent mathieu.par...@nantesmetropole.fr
Date: Mon Oct 14 22:23:05 2013 +0100
fdo#56007 - Read more bytes on Zip read (for thumbnails)
Change-Id: Ia8c6caa44ed8019a8139beb5a855f0f28805544d
diff --git a/shell/source/win32/zipfile/zipfile.cxx
b/shell/source/win32/zipfile/zipfile.cxx
index cf05a56..270fbe1 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -118,18 +118,42 @@ static unsigned char readByte(StreamInterface *stream)
static unsigned short readShort(StreamInterface *stream)
{
-unsigned short p0 = (unsigned short)readByte(stream);
-unsigned short p1 = (unsigned short)readByte(stream);
-return (unsigned short)(p0|(p18));
+if (!stream || stream-stell() == -1)
+throw IOException(-1);
+unsigned short tmpBuf;
+unsigned long numBytesRead = stream-sread(
+reinterpret_castunsigned char *( tmpBuf ), 2);
+if (numBytesRead != 2)
+throw IOException(-1);
+return tmpBuf;
}
static unsigned readInt(StreamInterface *stream)
{
-unsigned p0 = (unsigned)readByte(stream);
-unsigned p1 = (unsigned)readByte(stream);
-unsigned p2 = (unsigned)readByte(stream);
-unsigned p3 = (unsigned)readByte(stream);
-return (unsigned)(p0|(p18)|(p216)|(p324));
+if (!stream || stream-stell() == -1)
+throw IOException(-1);
+unsigned tmpBuf;
+unsigned long numBytesRead = stream-sread(
+reinterpret_castunsigned char *( tmpBuf ), 4);
+if (numBytesRead != 4)
+throw IOException(-1);
+return tmpBuf;
+}
+
+static std::string readString(StreamInterface *stream, unsigned long size)
+{
+if (!stream || stream-stell() == -1)
+throw IOException(-1);
+unsigned char *tmp = new unsigned char[size];
+if (!tmp)
+throw IOException(-1);
+unsigned long numBytesRead = stream-sread(tmp, size);
+if (numBytesRead != size)
+throw IOException(-1);
+
+std::string aStr((char *)tmp, size);
+delete [] tmp;
+return aStr;
}
static bool readCentralDirectoryEnd(StreamInterface *stream,
CentralDirectoryEnd end)
@@ -147,9 +171,7 @@ static bool readCentralDirectoryEnd(StreamInterface
*stream, CentralDirectoryEnd
end.cdir_size = readInt(stream);
end.cdir_offset = readInt(stream);
end.comment_size = readShort(stream);
-end.comment.clear();
-for (unsigned short i = 0; i end.comment_size; i++)
-end.comment.append(1,(char)readByte(stream));
+end.comment.assign(readString(stream, end.comment_size));
}
catch (...)
{
@@ -183,15 +205,9 @@ static bool readCentralDirectoryEntry(StreamInterface
*stream, CentralDirectoryE
entry.external_attr = readInt(stream);
entry.offset = readInt(stream);
unsigned short i = 0;
-entry.filename.clear();
-for (i=0; i entry.filename_size; i++)
-entry.filename.append(1,(char)readByte(stream));
-entry.extra_field.clear();
-for (i=0; i entry.extra_field_size; i++)
-entry.extra_field.append(1,(char)readByte(stream));
-entry.file_comment.clear();
-for (i=0; i entry.file_comment_size; i++)
-entry.file_comment.append(1,(char)readByte(stream));
+entry.filename.assign(readString(stream, entry.filename_size));
+entry.extra_field.assign(readString(stream, entry.extra_field_size));
+entry.file_comment.assign(readString(stream, entry.file_comment_size));
}
catch (...)
{
@@ -219,12 +235,8 @@ static bool readLocalFileHeader(StreamInterface *stream,
LocalFileHeader header
header.filename_size = readShort(stream);
header.extra_field_size = readShort(stream);
unsigned short i = 0;
-header.filename.clear();
-for (i=0; i header.filename_size; i++)
-header.filename.append(1,(char)readByte(stream));
-header.extra_field.clear();
-for (i=0; i header.extra_field_size; i++)
-header.extra_field.append(1,(char)readByte(stream));
+header.filename.assign(readString(stream, header.filename_size));
+header.extra_field.assign(readString(stream, header.extra_field_size));
}
catch (...)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/inc connectivity/inc cui/inc drawinglayer/inc framework/inc oox/inc sc/inc sd/inc sfx2/inc slideshow/inc svtools/inc svx/inc sw/inc vcl/inc writerfilter/inc xmlo
chart2/inc/pch/precompiled_chartcontroller.hxx|2 +- chart2/inc/pch/precompiled_chartcore.hxx |1 - connectivity/inc/pch/precompiled_file.hxx |2 ++ connectivity/inc/pch/precompiled_flat.hxx |1 + cui/inc/pch/precompiled_cui.hxx |1 + drawinglayer/inc/pch/precompiled_drawinglayer.hxx |1 + framework/inc/pch/precompiled_fwk.hxx |1 + oox/inc/pch/precompiled_oox.hxx |3 +++ sc/inc/pch/precompiled_sc.hxx |6 ++ sc/inc/pch/precompiled_scfilt.hxx | 18 +- sd/inc/pch/precompiled_sd.hxx | 16 ++-- sfx2/inc/pch/precompiled_sfx.hxx | 14 ++ slideshow/inc/pch/precompiled_slideshow.hxx |1 - svtools/inc/pch/precompiled_svt.hxx |6 -- svx/inc/pch/precompiled_svxcore.hxx |1 + sw/inc/pch/precompiled_msword.hxx |9 - sw/inc/pch/precompiled_sw.hxx |4 +++- vcl/inc/pch/precompiled_vcl.hxx |1 + writerfilter/inc/pch/precompiled_writerfilter.hxx |4 +--- xmloff/inc/pch/precompiled_xo.hxx |2 ++ 20 files changed, 41 insertions(+), 53 deletions(-) New commits: commit 0b0244183ab721ab0e55c42cb5cda841456c2586 Author: Thomas Arnhold tho...@arnhold.org Date: Tue Oct 15 05:20:47 2013 +0200 update pch Change-Id: I475bee35ca5d24903d85e7f2427fab0e47d8db4d diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index e39cd24..526cd26 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.hxx @@ -198,6 +198,7 @@ #include rtl/instance.hxx #include rtl/math.hxx #include rtl/ustrbuf.hxx +#include rtl/ustring.hxx #include rtl/uuid.h #include sfx2/dispatch.hxx #include sfx2/objsh.hxx @@ -299,7 +300,6 @@ #include toolkit/helper/vclunohelper.hxx #include tools/diagnose_ex.h #include tools/gen.hxx -#include tools/string.hxx #include unotools/configitem.hxx #include unotools/lingucfg.hxx #include unotools/pathoptions.hxx diff --git a/chart2/inc/pch/precompiled_chartcore.hxx b/chart2/inc/pch/precompiled_chartcore.hxx index 18a34ed..30deeb9 100644 --- a/chart2/inc/pch/precompiled_chartcore.hxx +++ b/chart2/inc/pch/precompiled_chartcore.hxx @@ -284,7 +284,6 @@ #include tools/debug.hxx #include tools/resmgr.hxx #include tools/solar.h -#include tools/string.hxx #include ucbhelper/content.hxx #include unotools/charclass.hxx #include unotools/configitem.hxx diff --git a/connectivity/inc/pch/precompiled_file.hxx b/connectivity/inc/pch/precompiled_file.hxx index 6132c9d..09c80b7 100644 --- a/connectivity/inc/pch/precompiled_file.hxx +++ b/connectivity/inc/pch/precompiled_file.hxx @@ -50,6 +50,7 @@ #include comphelper/types.hxx #include comphelper/uno3.hxx #include cppuhelper/propshlp.hxx +#include cppuhelper/supportsservice.hxx #include cppuhelper/typeprovider.hxx #include i18nlangtag/mslangid.hxx #include iterator @@ -62,6 +63,7 @@ #include tools/date.hxx #include tools/datetime.hxx #include tools/debug.hxx +#include tools/string.hxx #include tools/time.hxx #include tools/urlobj.hxx #include ucbhelper/content.hxx diff --git a/connectivity/inc/pch/precompiled_flat.hxx b/connectivity/inc/pch/precompiled_flat.hxx index b860a6b..d2ff669 100644 --- a/connectivity/inc/pch/precompiled_flat.hxx +++ b/connectivity/inc/pch/precompiled_flat.hxx @@ -41,6 +41,7 @@ #include comphelper/string.hxx #include comphelper/types.hxx #include cppuhelper/factory.hxx +#include cppuhelper/supportsservice.hxx #include ctype.h #include i18nlangtag/languagetag.hxx #include osl/thread.h diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index a1bc8d6..59c0dde 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -559,6 +559,7 @@ #include tools/resary.hxx #include tools/shl.hxx #include tools/stream.hxx +#include tools/string.hxx #include tools/time.hxx #include tools/urlobj.hxx #include ucbhelper/content.hxx diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx index 9dfb3b8..e316a1a 100644 --- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx +++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx @@ -81,6 +81,7 @@ #include comphelper/string.hxx #include cppuhelper/factory.hxx #include cppuhelper/implbase2.hxx +#include cppuhelper/supportsservice.hxx #include cstdio #include i18nlangtag/languagetag.hxx #include iostream diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index ecd512b..3e0a3b0 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.hxx @@ -260,6 +260,7 @@ #include comphelper/uno3.hxx #include config_features.h
[Libreoffice-qa] regression hotspots (was: minutes of ESC call ...)
On Thu, Oct 10, 2013 at 05:09:34PM +0100, Michael Meeks wrote: AI: + create easy-hack to indentify the above (Bjoern) + https://bugs.freedesktop.org/show_bug.cgi?id=66750 done As you likely noted from the Easy Hack notifications, the script is now there, the output is dumped to the wiki at: https://wiki.documentfoundation.org/Development/RegressionHotspots and a follow up Easy Hack for writing the tests has been created. Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 70431] One can only create headings through the Outline view
https://bugs.freedesktop.org/show_bug.cgi?id=70431 David Tardon dtar...@redhat.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTABUG CC||dtar...@redhat.com --- Comment #1 from David Tardon dtar...@redhat.com --- Pressing Enter creates an entry on _the same level_ as the previous one. To move it to another level, one can use AltShiftLeft / AltShiftRight (one can also use AltShiftUp / AltShiftDown to move entries in the outline). -- 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 64110] EDITING: Sort function disabled, not working
https://bugs.freedesktop.org/show_bug.cgi?id=64110 --- Comment #3 from Owen Genat owen.ge...@gmail.com --- Is this bug still evident? Under Crunchbang 11 running v4.1.2.2 Build: 281b75f427729060b6446ddb3777b32f957a8fb the Tools Sort... option works as expected when text is highlighted. Paragraphs are re-arranged into the required order. -- 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 54513] Label Horizontal Pitch Not to specific Label dimensions
https://bugs.freedesktop.org/show_bug.cgi?id=54513 --- Comment #16 from Winfried Donkers winfrieddonk...@libreoffice.org --- (In reply to comment #12) So, I believe the dimensions that Avery supplied as default for 8160 and 5160 are incorrect. This is further supported by the measurements that I made with my dial calipers. I am sorry that I didn't find this out earlier. Thank you for your efforts. I can change the label definitions in LibreOffice for Avery letter size labels 5160 and 8160, but I would like to get confirmation from someone else that your conclusions are correct. (Nothing peronal, but I don't change the code on unconfirmed bug reports). Living in Europe, I can't get at Avery letter size labels. I only can download the templates that Avery supplies for the labels, and these templates currently show the same dimensions as the current LibreOffice label definitions. Let's hope that someone else can confirm your findings. It's clear that we all want LibreOffice to conform to the actual Avery labels. -- 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 70400] Can't print with Lexmark printer
https://bugs.freedesktop.org/show_bug.cgi?id=70400 --- Comment #3 from Herb herbert_hornda...@web.de --- As I wrote: Other applications (firefox, Gedit, kate) does work with the Lexmark printers. If I should test any other programs or if you need any other informatioin let me know. Right now I'm not in the office. PS Of course the stated driver is only used for the E360dn and not for the c544. -- 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 64110] EDITING: Sort function disabled, not working
https://bugs.freedesktop.org/show_bug.cgi?id=64110 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME --- Comment #4 from ign_christian ign_christ...@yahoo.com --- WFM per comment 3. Not reproducible also on LO 4.0.6.1 (Win7 32bit) -- 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 61850] PDF: Exporting forms to PDF mis-formats in Adobe reader
https://bugs.freedesktop.org/show_bug.cgi?id=61850 --- Comment #18 from Paul Simmonds p...@digitaljingle.co.uk --- Created attachment 87579 -- https://bugs.freedesktop.org/attachment.cgi?id=87579action=edit Screen Cap of PDF-1A export (thus NO 'form enabled) Adobe Acrobat 11.0.5 screen cap showing text correctly formatted if you export from LO using the PDF-1A option - however this disables forms for these are not fillable fields. -- 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 61850] PDF: Exporting forms to PDF mis-formats in Adobe reader
https://bugs.freedesktop.org/show_bug.cgi?id=61850 --- Comment #19 from Paul Simmonds p...@digitaljingle.co.uk --- I would agree this is an edge case where it depends on the reader - however the majority use by Joe Public will be the Adobe Acrobat reader under Windows, so working on the latest version of AA (currently 11.0.5) must be the definitive test case! -- 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 61850] PDF: Exporting forms to PDF mis-formats in Adobe reader
https://bugs.freedesktop.org/show_bug.cgi?id=61850 --- Comment #20 from Paul Simmonds p...@digitaljingle.co.uk --- Since this worked fine in OpenOffice 3.2 and was broken thereafter, is it not possible to backtrack on the change logs between 3.2 and what came after to find out what was fixed (by fixed I'm assuming that fixing of enhancing something broke forms export unintentionally) and thus which code was changed?? BTW - I don't code - so apologies if this is teaching people to suck eggs. -- 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 70400] Can't print with Lexmark printer
https://bugs.freedesktop.org/show_bug.cgi?id=70400 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added CC||ign_christ...@yahoo.com --- Comment #4 from ign_christian ign_christ...@yahoo.com --- Hi Herb, did you get ppd from producer site? How about printing with driver provided by Ubuntu official repo? Have you tried printing with Postscript (level from driver) printer languange? Because there are several issues with PDF printer languange. To make sure: Uncheck PDF as Standard Print Job in: Tools Options Print -- 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 65323] Objects anchored as characters aren't treated as characters
https://bugs.freedesktop.org/show_bug.cgi?id=65323 --- Comment #4 from Dominique Boutry dominique.bout...@laposte.net --- I'm trying the sequence textspace(nBSFormulanBS)endOfParagraph where nBS=nonBreakingSpace The second nBS seems to failed, I manage to get: longTextspace(nBSFormulanBSEOL )endOfParagraph However, the following works well : - longTextspace(nBSnBS)endOfParagraph (EOL possible before ( and after )) - longTextspace(nBS++nBS)endOfParagraph (EOL possible before (, between the + and after )) - longTextspace(nBSnBS)endOfParagraph (EOL possible before ( and after )) Could it be another evidence of the bad qualification of the formulaAnchoredAsCharacter for breaking ? If that point was corrected, may the use of nBS satisfy your need ? -- 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 61850] PDF: Exporting forms to PDF mis-formats in Adobe reader
https://bugs.freedesktop.org/show_bug.cgi?id=61850 --- Comment #21 from ign_christian ign_christ...@yahoo.com --- Hi Paul, sorry I forgot that's all about form so using PDF/A-1a isn't a workaround. Perhaps the only workaround at the moment is using 3rd party PDF printer such as PDFcreator, etc. Tommy has marked this bug NEW so it's confirmed as a bug. Then someone with such expertise will track this problem with latest Adobe Acrobat 11.0.5. -- 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 70371] Identify unused headers
https://bugs.freedesktop.org/show_bug.cgi?id=70371 --- Comment #7 from Thomas Arnhold tho...@arnhold.org --- Yes, there shouldn't be many of them, because I did a cleanup some month ago. See 0f11f30ea96fcec8d7c648089fc223a6fbed6aef, bbac35af148ed6c9f19386e4721fa38b500f45a1, and more... I searched for all *.h and *.hxx files and grepped if they are included or referenced in any way - if not I removed them. -- 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 70443] New: Allow language-specific quote mark replacement in AutoCorrect
https://bugs.freedesktop.org/show_bug.cgi?id=70443 Priority: medium Bug ID: 70443 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Allow language-specific quote mark replacement in AutoCorrect Severity: enhancement Classification: Unclassified OS: All Reporter: mihh...@gmail.com Hardware: All Status: UNCONFIRMED Version: (See in Summary) Component: Linguistic Product: LibreOffice In the Replace and Exceptions tabs in the AutoCorrect dialog, users can choose the language the rules apply to (from top right of the dialog). On the Localized Options tab, they can't -- but it would be quite handy for automatic quote mark replacement for those who have to work with documents in several languages which happen to use different glyphs as quotation marks. For example, I regularly need „Estonian”, “English”, «Norwegian», ”Swedish”/»Swedish», »Danish«, sometimes also „German“ and ”Finnish”/»Finnish». My current workaround is a custom keyboard layout where I can enter all these glyphs directly -- but that only works until I have to use someone else's computer. Would it be possible to allow choosing the language also on the Localized Options tab page? -- 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 70446] FILEOPEN: Infinite loop (100% CPU usage) when opening http://www.3gpp.org/ftp/specs/archive/25_series/25.331/25331-b40.zip
https://bugs.freedesktop.org/show_bug.cgi?id=70446 Christophe Devine christophedev...@orange.fr changed: What|Removed |Added Hardware|Other |x86-64 (AMD64) Version|unspecified |4.1.0.4 release -- 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 70446] New: FILEOPEN: Infinite loop (100% CPU usage) when opening http://www.3gpp.org/ftp/specs/archive/25_series/25.331/25331-b40.zip
https://bugs.freedesktop.org/show_bug.cgi?id=70446 Priority: medium Bug ID: 70446 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILEOPEN: Infinite loop (100% CPU usage) when opening http://www.3gpp.org/ftp/specs/archive/25_series/25.331 /25331-b40.zip Severity: normal Classification: Unclassified OS: Linux (All) Reporter: christophedev...@orange.fr Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: unspecified Component: Writer Product: LibreOffice Problem description: Steps to reproduce: 1. download http://www.3gpp.org/ftp/specs/archive/25_series/25.331/25331-b40.zip 2. extract the archive contents 3. open 25331-b40.doc Current behavior: LibreOffice uses 100%, the GUI appears frozen. Expected behavior: The document is opened without issues. Operating System: Debian Version: unspecified -- 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 70447] New: CONFIGURATION: INSTALLATION WIZARD: Unselection Create a start link on desktop is ignored
https://bugs.freedesktop.org/show_bug.cgi?id=70447 Priority: medium Bug ID: 70447 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: CONFIGURATION: INSTALLATION WIZARD: Unselection Create a start link on desktop is ignored Severity: normal Classification: Unclassified OS: Windows (All) Reporter: rok...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.0.0.alpha0+ Master Component: Installation Product: LibreOffice Problem description: Steps to reproduce: 1. Run Installation Wizard, choose Typical Installation 2. Unselect Create a start link on desktop during installation 3. All other option of the Wizard are the default ones Current behavior: Shortcut on the desktop is created Expected behavior: It should not be created. This bug is present in the current (4.1.1) version too Operating System: Windows 7 Version: 4.2.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 70447] CONFIGURATION: INSTALLATION WIZARD: Unselection Create a start link on desktop is ignored
https://bugs.freedesktop.org/show_bug.cgi?id=70447 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from ign_christian ign_christ...@yahoo.com --- *** This bug has been marked as a duplicate of bug 65102 *** -- 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 63954] Problem in showing a special character in persian documents
https://bugs.freedesktop.org/show_bug.cgi?id=63954 --- Comment #6 from Tsu Jan tsujan2...@gmail.com --- The bug is fixed in LibreOffice 4.1.X. Thanks a lot! -- 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 63954] Problem in showing a special character in persian documents
https://bugs.freedesktop.org/show_bug.cgi?id=63954 Tsu Jan tsujan2...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED -- 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 60071] Copy table from Calc to HTML Editor (HTML tags - SDVAL)
https://bugs.freedesktop.org/show_bug.cgi?id=60071 --- Comment #5 from Thomas Arnhold tho...@arnhold.org --- Thanks Eike, I didn't see this case. I only thought about exporting the ods to html. I didn't know, that I can paste special with html code. So this patch isn't the solution. To remove those special fields we should probably add an option the the export dialog. -- 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 56707] Starting up LibO crashes in Windows XP Pro SP3
https://bugs.freedesktop.org/show_bug.cgi?id=56707 --- Comment #47 from Michael Meeks michael.me...@collabora.com --- Hi Ant; we're mainly interested in debugging the problem vs. 4.1.2 :-) Also, I got a lots of prompts about my missing Java since I don't have it installed. I said no to downloads. This shouldn't happen with a modern version of LibreOffice - at least, I hope not. Do you really get Java 'download' prompts ? and if so, can you get a screenshot of one of these for us ? :-) The Windbg trace was really perplexing from before. Then again, if it is crashing inside windows at startup, perhaps the Windbg can be configured to get symbols for the windows dll it crashes in and we could try to unwind what's going on there with those (?) -- 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 70438] VIEWING: Selected cell’s border in “Special Character” window isn’t drawn correctly
https://bugs.freedesktop.org/show_bug.cgi?id=70438 --- Comment #1 from Dominique Boutry dominique.bout...@laposte.net --- Reproductible. Cells are of different width (the first - the middle ones - the last), idem for height. Not very professionnal. Attachment : the second note (There's no border outside the whole character table) may be thought as of less importance than the first (the different sizes lead messy cell highlight). Note for cell highlight : a 3D effect only when the table is not selected ; a basic flat raw blue effect when the table is selected ; Surprising... -- 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 66750] Identify regression hotspots
https://bugs.freedesktop.org/show_bug.cgi?id=66750 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Björn Michaelsen bjoern.michael...@canonical.com --- done with http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/commit/?id=fc7dcf4ebef84c66f59f7188d02c8706a0993b51 script is at: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/diff/scripts/regression-hotspots.py?id=fc7dcf4ebef84c66f59f7188d02c8706a0993b51 it currently takes ~200 minutes to run completely. One note -- it is still buggy in that git log --stat prints incomplete filepaths a la /foo/baz.cxx if the filename is too long, but it already gives a good hint on the hotspots. -- 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 60071] Copy table from Calc to HTML Editor (HTML tags - SDVAL)
https://bugs.freedesktop.org/show_bug.cgi?id=60071 --- Comment #6 from Pawel pawel.sza...@tbhydro.com.pl --- @Eike, do you know why SDVAL is still present when value has already been deleted from cell? Because if it is not used for any purpose, the best patch to improve this would be removing SDVAL, when cell value is deleted. -- 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
