[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - svtools/source
svtools/source/edit/editsyntaxhighlighter.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 02da63878e7cfbc85e6bce74e1b7b0fb71a8ebec
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 16 13:40:04 2013 +0100
Resolves: fdo#47209 and rhbz#927223 syntax highlighter crash
when trying to parse empty lines looking for the matching
bracket
Change-Id: I3961a3d0e804d136de286e21934c6ba5ab0496cf
(cherry picked from commit 02917cb57e2c2e9fcab2db8f72960023f3e4edaf)
Reviewed-on: https://gerrit.libreoffice.org/3415
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx
b/svtools/source/edit/editsyntaxhighlighter.cxx
index 20749db..28cbcd5 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -98,6 +98,10 @@ void
MultiLineEditSyntaxHighlight::DoBracketHilight(sal_uInt16 aKey)
continue;
String aLine( GetTextEngine()-GetText( aPara ) );
+
+if (aLine.Len() == 0)
+continue;
+
for (sal_uInt16 i = ((unsigned long)aPara==nStartPara) ?
aStartPos-1 : (sal_uInt16)(aLine.Len()-1); i0; --i)
{
if (aLine.GetChar(i)==aChar)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - svtools/source
svtools/source/control/inettbc.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 9b068e5433a101b4fe3e936fdd4b9ae425c49423
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 11 15:58:46 2013 +0100
rhbz#915743: Avoid potentially blocking autocompletion for non file URLs
In theory, the logic of how SvtMatchContext_Impl threads are used to obtain
autocompletion information could probably be improved so that long-latency
scenarios would only block the ultimate closing of the dialog, if anything
at
all. In practice, this is probably not worth it, as users likely do not
expect
an autocompletion feature for remote content, anyway. (And previous commits
like 260afe56fd6b2f34de8290f3cdb7d1df5b88f8a8 neon commands cannot be
aborted
make it questionable whether any remaining blocking upon closing of the
dialog
could be bounded in a reasonable manner.)
Change-Id: Ie82b9a70285b30fe88cf4c40992710087e86815e
(cherry picked from commit c6dfb3825cad9c8f6f87f4afc8fdbc386919e640)
Reviewed-on: https://gerrit.libreoffice.org/2670
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index 0656158..78fb4e2 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -595,7 +595,14 @@ void SvtMatchContext_Impl::doExecute()
{
INetURLObject aURLObject( aMatch );
String aMainURL( aURLObject.GetMainURL(
INetURLObject::NO_DECODE ) );
-if ( aMainURL.Len() )
+// Disable autocompletion for anything but the (local) file
+// system (for which access is hopefully fast), as the logic of
+// how SvtMatchContext_Impl is used requires this code to run
to
+// completion before further user input is processed, and even
+// SvtMatchContext_Impl::Stop does not guarantee a speedy
+// return:
+if ( aMainURL.Len()
+ aURLObject.GetProtocol() == INET_PROT_FILE )
{
// if text input is a directory, it must be part of the
match list! Until then it is scanned
if ( UCBContentHelper::IsFolder( aMainURL )
aURLObject.hasFinalSlash() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - svtools/source
svtools/source/config/colorcfg.cxx | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit f10bb02eb3083a089e3ca28c45983e616ef84d58
Author: Benjamin Drung bdr...@debian.org
Date: Fri Jun 8 00:19:25 2012 +0200
fdo#35365 Set the default font color to black and the document color to
white.
The font and document color of a Writer document or an Impress presentation
should not be derived from a desktop theme. A Writer documents needs to look
good on paper. An Impress presentation may have it's own theme. The
appearance
of a document should not change by changing the desktop theme.
With this change a document looks the same on any computer if the user do
not
change the default colors.
Change-Id: Ia42ca7882f0d2dd1f2a304db5e4b5aaba23244fc
Reviewed-on: https://gerrit.libreoffice.org/2156
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/svtools/source/config/colorcfg.cxx
b/svtools/source/config/colorcfg.cxx
index abdb852..4f899af 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -412,12 +412,12 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry
eEntry)
{
static const sal_Int32 aAutoColors[] =
{
-0, // DOCCOLOR
+COL_WHITE, // DOCCOLOR
0xc0c0c0, // DOCBOUNDARIES
0x808080, // APPBACKGROUND
0xc0c0c0, // OBJECTBOUNDARIES
0xc0c0c0, // TABLEBOUNDARIES
-0, // FONTCOLOR
+COL_BLACK, // FONTCOLOR
0xcc, // LINKS
0x80, // LINKSVISITED
0xff, // SPELL
@@ -462,18 +462,10 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry
eEntry)
Color aRet;
switch(eEntry)
{
-case DOCCOLOR :
-aRet =
Application::GetSettings().GetStyleSettings().GetWindowColor();
-break;
-
case APPBACKGROUND :
aRet =
Application::GetSettings().GetStyleSettings().GetWorkspaceColor();
break;
-case FONTCOLOR :
-aRet =
Application::GetSettings().GetStyleSettings().GetWindowTextColor();
-break;
-
case LINKS :
aRet =
Application::GetSettings().GetStyleSettings().GetLinkColor();
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
