[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/svx svx/source
include/svx/numvset.hxx |1 -
svx/source/dialog/svxbmpnumvalueset.cxx | 11 +++
2 files changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 4a305d029116793f1e73019fa1242ded5f5236f2
Author: Maxim Monastirsky momonas...@gmail.com
Date: Thu Aug 27 21:18:58 2015 +0300
tdf#93558 Hardcode black text on white background
As agreed in the bug report, a preview shouldn't be
themed by the OS theme.
(cherry picked from commit fa1807ad5457d10f8fa073c209a27547e8922c8c)
Conflicts:
include/svx/numvset.hxx
svx/source/dialog/svxbmpnumvalueset.cxx
Change-Id: Icdc5021c3ac614fe1d490fd513a407a81dbc169e
Reviewed-on: https://gerrit.libreoffice.org/18068
Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com
Tested-by: Adolfo Jayme Barrientos fit...@ubuntu.com
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index aa4f8776..0d84894 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -49,7 +49,6 @@ struct SvxBmpItemInfo
class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
{
-Color aLineColor;
sal_uInt16 nPageType;
boolbHTMLMode;
Rectangle aOrgRect;
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx
b/svx/source/dialog/svxbmpnumvalueset.cxx
index 5c8157d..cbee541 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -141,9 +141,8 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent rUDEvt
)
25, 90,
};
-const StyleSettings rStyleSettings = GetSettings().GetStyleSettings();
-const Color aBackColor = rStyleSettings.GetFieldColor();
-const Color aTextColor = rStyleSettings.GetFieldTextColor();
+const Color aBackColor(COL_WHITE);
+const Color aTextColor(COL_BLACK);
vcl::RenderContext* pDev = rUDEvt.GetRenderContext();
Rectangle aRect = rUDEvt.GetRect();
@@ -187,10 +186,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent
rUDEvt )
pVDev-SetOutputSize( aRectSize );
aOrgRect = aRect;
pVDev-SetFillColor( aBackColor );
-
-if(aBackColor == aLineColor)
-aLineColor.Invert();
-pVDev-SetLineColor(aLineColor);
+pVDev-SetLineColor(COL_LIGHTGRAY);
// Draw line only once
if(nPageType != NUM_PAGETYPE_NUM)
{
@@ -402,7 +398,6 @@ VCL_BUILDER_FACTORY_ARGS(SvxNumValueSet, WB_TABSTOP)
void SvxNumValueSet::init(sal_uInt16 nType)
{
-aLineColor = COL_LIGHTGRAY;
nPageType = nType;
bHTMLMode = false;
pVDev = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93724] BASE: Insert Row in Filtered Form with Date/Time Fields results in Phantom zero date displayed instead of null, not saved
https://bugs.documentfoundation.org/show_bug.cgi?id=93724 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Keywords||regression Whiteboard||bibisectRequest -- 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 93724] BASE: Insert Row in Filtered Form with Date/Time Fields results in Phantom zero date displayed instead of null, not saved
https://bugs.documentfoundation.org/show_bug.cgi?id=93724 --- Comment #5 from Alex Thurgood ipla...@yahoo.co.uk --- To re-situate the context, that default 00/00/ displayed value was always the way that OpenOffice.org displayed null date values in forms, in which case, if I am to understsand Doug's comments correctly, even this would be incorrect for him, as he wants a completely blank control. As I recall, the zero date display was a much griped about feature of previous versions of OpenOffice.org, the only difference between then and now being that the controm field displays the default date of LibreOffice as the null date, i.e. 1/1/1800 as defined in Calc (go figure). So, the regression I refer to is not in the problem of the actually displaying a null value per se, but the fact that the previous zeroed out 00/00/ display now shows Calc's default date setting instead. -- 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
Re: Error while pushing commits for bug 93240
*./logerrit submit master* Counting objects: 64, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - refs/for/master (change 9724 closed) error: failed to push some refs to 'ssh://logerrit/core' On Fri, Aug 28, 2015 at 2:51 PM Samuel Mehrbrodt s.mehrbr...@gmail.com wrote: Try ./logerrit submit master Check https://wiki.documentfoundation.org/Development/gerrit for more information. Samuel Am 28.08.2015 um 10:58 schrieb Shreyansh Gandhi: Hi, I'm unable to figure out why my commits are not being pushed. *$ git push --set-upstream origin my_93240 * Counting objects: 61, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] my_93240 - my_93240 (prohibited by Gerrit) error: failed to push some refs to 'ssh://logerrit/core' How do I fix this? Regards, Shreyansh -- Regards, Shreyansh Gandhi ___ LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: use of xsltproc without '--nonet'
On Wed, 2015-08-26 at 08:33 +0200, Richard PALO wrote: No idea as to why it was left out, wherefore my inquiry. Perhaps worthwhile a build with these cases updated to use '--nonet' is in order. done now I believe as http://cgit.freedesktop.org/libreoffice/core/commit/?id=fe1eb8809d22bc8 7d9d636f6c084ed5249c7eb37 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 93679] Cannot open any LibreOffice files with Windows 10
https://bugs.documentfoundation.org/show_bug.cgi?id=93679 Paula paolaxpire...@gmail.com changed: What|Removed |Added Priority|medium |high --- Comment #3 from Paula paolaxpire...@gmail.com --- Bug 93679 - UNCONFIRMED None of the suggestions given so far (file association, antivirus) make sense, The only new thing is that I have Windows 10, and possibly this makes LO incompatible with the files. Can somebody please help, I have to print few documents and I'm stuck. -- 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 93529] OpenGL tracker bug ...
https://bugs.documentfoundation.org/show_bug.cgi?id=93529 Bug 93529 depends on bug 93735, which changed state. Bug 93735 Summary: should use GL debug messages to help API tracing https://bugs.documentfoundation.org/show_bug.cgi?id=93735 What|Removed |Added Status|NEW |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-commits] core.git: Branch 'libreoffice-5-0' - 19 commits - include/comphelper vcl/inc vcl/README.vars vcl/source vcl/win
include/comphelper/windowserrorstring.hxx | 46 +
vcl/README.vars | 23
vcl/inc/sft.hxx | 21
vcl/inc/win/salgdi.h | 14
vcl/source/fontsubset/sft.cxx | 23
vcl/source/gdi/pdfwriter_impl.cxx | 58 -
vcl/win/source/gdi/salgdi.cxx |5
vcl/win/source/gdi/salgdi3.cxx| 51 -
vcl/win/source/gdi/winlayout.cxx | 1346 +++---
vcl/win/source/gdi/winlayout.hxx | 88 -
10 files changed, 630 insertions(+), 1045 deletions(-)
New commits:
commit c7b4b5e6f5d7f6213ca06a1497816537f369d9c8
Author: Tor Lillqvist t...@collabora.com
Date: Mon Aug 24 18:08:08 2015 +0300
Don't attempt to cache glyphs that are vertical but the text direction isn't
That is a too complex and rare case to bother with, I think.
Change-Id: Ica6ef7fa05314d2367dcff32627c1aec6ba8f8df
Signed-off-by: Michael Meeks michael.me...@collabora.com
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 85b1e97..f26d3eb 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -353,6 +353,9 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex,
const WinLayout rLayou
aChunk.mbVertical = false;
}
+if (aChunk.mbVertical aLogfont.lfEscapement != 2700)
+return false;
+
OpenGLCompatibleDC aDC(rGraphics, 0, 0, nBitmapWidth, nBitmapHeight);
HFONT hNonAntialiasedFont = NULL;
commit 0f3c6f89b9819495a6268cf859e741e0e6d04f2c
Author: Tor Lillqvist t...@collabora.com
Date: Fri Aug 21 16:19:31 2015 +0300
Error handling
Change-Id: I46e5463aaa5cab41cd69c13314ee98a0c73e7ba2
Signed-off-by: Michael Meeks michael.me...@collabora.com
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 150bfa2..85b1e97 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -271,6 +271,8 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex,
const WinLayout rLayou
if (!GetCharABCWidthsI(hDC, 0, nCount, aGlyphIndices.data(), aABC.data()))
{
SAL_WARN(vcl.gdi, GetCharABCWidthsI failed:
WindowsErrorString(GetLastError()));
+SelectObject(hDC, hOrigFont);
+DeleteDC(hDC);
return false;
}
@@ -296,14 +298,34 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex,
const WinLayout rLayou
}
TEXTMETRICW aTextMetric;
-GetTextMetricsW(hDC, aTextMetric);
+if (!GetTextMetricsW(hDC, aTextMetric))
+{
+SAL_WARN(vcl.gdi, GetTextMetrics failed:
WindowsErrorString(GetLastError()));
+SelectObject(hDC, hOrigFont);
+DeleteDC(hDC);
+return false;
+}
aChunk.mnAscentPlusIntLeading = aTextMetric.tmAscent +
aTextMetric.tmInternalLeading;
LOGFONTW aLogfont;
-GetObjectW(rLayout.mhFont, sizeof(aLogfont), aLogfont);
+if (!GetObjectW(rLayout.mhFont, sizeof(aLogfont), aLogfont))
+{
+SAL_WARN(vcl.gdi, GetObject failed:
WindowsErrorString(GetLastError()));
+SelectObject(hDC, hOrigFont);
+DeleteDC(hDC);
+return false;
+}
wchar_t sFaceName[200];
int nFaceNameLen = GetTextFaceW(hDC, SAL_N_ELEMENTS(sFaceName), sFaceName);
+if (!nFaceNameLen)
+{
+SAL_WARN(vcl.gdi, GetTextFace failed:
WindowsErrorString(GetLastError()));
+SelectObject(hDC, hOrigFont);
+DeleteDC(hDC);
+return false;
+}
+
SAL_INFO(vcl.gdi.opengl, OUString(sFaceName, nFaceNameLen)
: Escapement= aLogfont.lfEscapement
Orientation= aLogfont.lfOrientation
commit eaf20241305b7f75e29a28d21ea2428e438f68ce
Author: Tor Lillqvist t...@collabora.com
Date: Fri Aug 21 16:04:07 2015 +0300
Make vertical fonts show up when using OpenGL glyph caching
Change-Id: I6b19873eef48b625dc3d4f7b3a9afdb348189b38
Signed-off-by: Michael Meeks michael.me...@collabora.com
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index d445506..150bfa2 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -65,6 +65,7 @@ struct OpenGLGlyphCacheChunk
std::vectorRectangle maLocation;
std::shared_ptrOpenGLTexture mpTexture;
int mnAscentPlusIntLeading;
+bool mbVertical;
};
// win32 specific physical font instance
@@ -130,13 +131,18 @@ OUString DumpGlyphBitmap(OpenGLGlyphCacheChunk rChunk,
HDC hDC)
}
std::cerr Bitmap hBitmap : aBitmap.bmWidth x
aBitmap.bmHeight : std::endl;
+
+// Print out start pos of each glyph only in the horizontal font case
int nPos = 0;
-for (int i = 1; i rChunk.mnGlyphCount nPos 75; i++)
+if (rChunk.mnGlyphCount 1 rChunk.maLocation[1].Left()
rChunk.maLocation[0].Left())
{
-for (int j = nPos; j rChunk.maLocation[i].Left(); j++)
-
[Libreoffice-bugs] [Bug 93713] Unable to Unprotect Protected cells in Writer Tables from 'Table' menu
https://bugs.documentfoundation.org/show_bug.cgi?id=93713 Charles tansta...@libertytrek.org changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|DUPLICATE |--- --- Comment #8 from Charles tansta...@libertytrek.org --- Re-opening, because bug 93714 is only a feature enhancement request to bring back the context menu choices for protecting/unprotecting cells that was apparently intentionally removed from the context menu. This bug is the report of the actual bug that there is now presently no way to unprotect a cell in a Writer Table once you have protected it. -- 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-commits] online.git: Branch 'distro/collabora/milestone-4' - 6 commits - loleaflet/Makefile loleaflet/src loolwsd/configure.ac loolwsd/LOOLSession.cpp
loleaflet/Makefile|2 +-
loleaflet/src/control/Control.PartsPreview.js |7 +++
loleaflet/src/layer/tile/TileLayer.js |6 ++
loolwsd/LOOLSession.cpp |3 ---
loolwsd/configure.ac |2 +-
5 files changed, 15 insertions(+), 5 deletions(-)
New commits:
commit 14de08084f55f5c64c411538656ddfc4e50370e6
Author: Andras Timar andras.ti...@collabora.com
Date: Fri Aug 28 10:24:14 2015 +0200
loleaflet: bump version after tarball
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 836e7ec..aa5021a 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# (micro) part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=1.1.36
+VERSION=1.1.37
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
commit 0a842c5c5d6b014f7a62bf642bf15fa1b3d967c1
Author: Andras Timar andras.ti...@collabora.com
Date: Fri Aug 28 10:24:03 2015 +0200
loleaflet: bump version before tarball
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index ec025f5..836e7ec 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# (micro) part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=1.1.35
+VERSION=1.1.36
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
commit a80b4aaeda42ac3494d63de5a1c83b3cf33853c4
Author: Andras Timar andras.ti...@collabora.com
Date: Fri Aug 28 10:23:16 2015 +0200
loolwsd: bump version after tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 907966e..d272fff 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.2.14], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.2.15], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit 8be3a8538e76d00262ca0bbeabca68c8684cbca9
Author: Andras Timar andras.ti...@collabora.com
Date: Fri Aug 28 10:22:36 2015 +0200
loolwsd: bump version before tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 07db4eb..907966e 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.2.13], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.2.14], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit 458f91e8a379b8f14373a6d8e3c63af4a0e127cf
Author: Henry Castro hcas...@collabora.com
Date: Fri Aug 28 01:40:55 2015 -0400
loleaflet: update images loaded asynchronously
(cherry picked from commit 0dc7dca0df8c3550b3adba608e64692a461bcabe)
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 4556111..b09e446 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -10,6 +10,7 @@ L.Control.PartsPreview = L.Control.extend({
this._partsPreviewCont = L.DomUtil.create('div',
'parts-preview', docContainer.parentElement);
map.on('updateparts', this._updateDisabled, this);
+ map.on('updatepart', this._updatePart, this);
map.on('tilepreview', this._updatePreview, this);
return document.createElement('div');
},
@@ -54,6 +55,12 @@ L.Control.PartsPreview = L.Control.extend({
}
},
+ _updatePart: function (e) {
+ if (e.docType === 'presentation') {
+ this._map.getPartPreview(e.part, e.part, 180, 180);
+ }
+ },
+
_updatePreview: function (e) {
var id = 'preview-tile' + e.id;
// the scrollbar has to be re-initialized here else it doesn't
work
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 833a252..afa9c05 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -68,6 +68,7 @@ L.TileLayer = L.GridLayer.extend({
// Position and size of the selection end.
this._textSelectionEnd = new L.LatLngBounds(new L.LatLng(0, 0),
new L.LatLng(0, 0));
+ this._lastValidPart = -1;
// Cursor marker
this._cursorMarker = null;
// Graphic marker
@@ -340,6 +341,11 @@ L.TileLayer = L.GridLayer.extend({
delete this._tileCache[key];
}
}
+ if ( command.part === this._currentPart
+command.part !== this._lastValidPart ) {
+ this._lastValidPart = command.part;
+ this._map.fire('updatepart', { part: command.part,
docType: this._docType });
+ }
}
else if
[Libreoffice-bugs] [Bug 93724] BASE: Insert Row in Filtered Form with Date/Time Fields results in Phantom zero date displayed instead of null, not saved
https://bugs.documentfoundation.org/show_bug.cgi?id=93724 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- 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
Re: Error while pushing commits for bug 93240
Try ./logerrit submit master Check https://wiki.documentfoundation.org/Development/gerrit for more information. Samuel Am 28.08.2015 um 10:58 schrieb Shreyansh Gandhi: Hi, I'm unable to figure out why my commits are not being pushed. *$ git push --set-upstream origin my_93240 * Counting objects: 61, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] my_93240 - my_93240 (prohibited by Gerrit) error: failed to push some refs to 'ssh://logerrit/core' How do I fix this? Regards, Shreyansh -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ad/2b967a33956c83cb081c1de3af81dea3eb9150
ad/2b967a33956c83cb081c1de3af81dea3eb9150 |1 + 1 file changed, 1 insertion(+) New commits: commit a0a29752a900c59efc0f4e72e0bf9137a7e0b4fd Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 10:36:09 2015 +0100 Notes added by 'git notes add' diff --git a/ad/2b967a33956c83cb081c1de3af81dea3eb9150 b/ad/2b967a33956c83cb081c1de3af81dea3eb9150 new file mode 100644 index 000..3e26f37 --- /dev/null +++ b/ad/2b967a33956c83cb081c1de3af81dea3eb9150 @@ -0,0 +1 @@ +prefer: 71dee2f153371c6dc0c1488aabf75711f9d53e2b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93719] MAILMERGE: Freezes On Step 5: Adjust Layout in OS X Or Does Not Show Preview on Windows 7
https://bugs.documentfoundation.org/show_bug.cgi?id=93719 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Priority|medium |high Severity|normal |major -- 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 93719] MAILMERGE: Freezes On Step 5: Adjust Layout in OS X Or Does Not Show Preview on Windows 7
https://bugs.documentfoundation.org/show_bug.cgi?id=93719 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Version|5.0.1.2 release |5.0.0.5 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-commits] core.git: include/vcl vcl/source
include/vcl/opengl/OpenGLHelper.hxx | 23 -
vcl/source/opengl/OpenGLContext.cxx |2 +
vcl/source/opengl/OpenGLHelper.cxx | 38
3 files changed, 62 insertions(+), 1 deletion(-)
New commits:
commit b051c3716a8275e8ce7cbc4ba233ad5a075d386f
Author: Michael Meeks michael.me...@collabora.com
Date: Fri Aug 28 11:28:13 2015 +0100
tdf#93529 - add glDebugMessageInsert wrappers to help with API tracing.
Change-Id: Icf75e0e477be1b2bbbe5095aee33e681d212be0b
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index 95c23c8..f2fb214 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -11,6 +11,7 @@
#define INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX
#include GL/glew.h
+#include sal/log.hxx
#include vcl/dllapi.h
#include vcl/bitmapex.hxx
@@ -22,6 +23,18 @@
# include postx.h
#endif
+/// Helper to do a SAL_INFO as well as a GL log.
+#if OSL_DEBUG_LEVEL 0
+# define VCL_GL_INFO(area,stream) \
+do {\
+::std::ostringstream detail_stream; \
+detail_stream stream;\
+OpenGLHelper::debugMsgStream((area),detail_stream); \
+} while (0)
+#else
+# define VCL_GL_INFO(area,stream)
+#endif
+
class VCL_DLLPUBLIC OpenGLHelper
{
public:
@@ -48,15 +61,23 @@ public:
static void createFramebuffer(long nWidth, long nHeight, GLuint
nFramebufferId,
GLuint nRenderbufferDepthId, GLuint nRenderbufferColorId, bool
bRenderbuffer = true);
-// Get OpenGL version (needs a context)
+/// Get OpenGL version (needs a context)
static float getGLVersion();
static void checkGLError(const char* aFile, size_t nLine);
/**
+ * Insert a glDebugMessage into the queue - helpful for debugging
+ * with apitrace to annotate the output and correlate it with code.
+ */
+static void debugMsgPrint(const char *pArea, const char *pFormat, ...);
+static void debugMsgStream(const char *pArea, std::ostringstream const
pStream);
+
+/**
* checks if the device/driver pair is on our OpenGL blacklist
*/
static bool isDeviceBlacklisted();
+
/**
* checks if the system supports all features that are necessary for the
OpenGL VCL support
*/
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index ff152d9..74b6f41 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1008,6 +1008,8 @@ void OpenGLContext::InitGLEWDebugging()
}
}
+// Test hooks for inserting tracing messages into the stream
+VCL_GL_INFO(vcl.opengl, LibreOffice GLContext initialized: this);
#endif
}
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 2e0dcfd..87fec55 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -23,6 +23,7 @@
#include com/sun/star/util/XFlushable.hpp
#include com/sun/star/configuration/theDefaultProvider.hpp
+#include stdarg.h
#include vector
#include opengl/zone.hxx
@@ -622,6 +623,43 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
return bRet;
}
+void OpenGLHelper::debugMsgStream(const char *pArea, std::ostringstream const
pStream)
+{
+debugMsgPrint(pArea, %s, pStream.str().c_str());
+}
+
+void OpenGLHelper::debugMsgPrint(const char *pArea, const char *pFormat, ...)
+{
+va_list aArgs;
+va_start (aArgs, pFormat);
+
+char pStr[1024];
+#ifdef _WIN32
+#define vsnprintf _vsnprintf
+#endif
+vsnprintf(pStr, sizeof(pStr), pFormat, aArgs);
+pStr[sizeof(pStr)-1] = '\0';
+
+SAL_INFO(pArea, pStr);
+
+OpenGLZone aZone;
+
+if (GLEW_KHR_debug)
+glDebugMessageInsert(GL_DEBUG_SOURCE_APPLICATION,
+ GL_DEBUG_TYPE_OTHER,
+ 1, // one[sic] id is as good as another ?
+ // GL_DEBUG_SEVERITY_NOTIFICATION for = GL4.3 ?
+ GL_DEBUG_SEVERITY_LOW,
+ strlen(pStr), pStr);
+else if (GLEW_AMD_debug_output)
+glDebugMessageInsertAMD(GL_DEBUG_CATEGORY_APPLICATION_AMD,
+GL_DEBUG_SEVERITY_LOW_AMD,
+1, // one[sic] id is as good as another ?
+strlen(pStr), pStr);
+
+va_end (aArgs);
+}
+
#if defined UNX !defined MACOSX !defined IOS !defined ANDROID
!defined(LIBO_HEADLESS)
bool OpenGLHelper::GetVisualInfo(Display* pDisplay, int nScreen, XVisualInfo
rVI)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/opengl
vcl/opengl/framebuffer.cxx |8 +++
vcl/opengl/gdiimpl.cxx | 46 ++---
2 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit 43cb8fe05bff630331c6137dc6c2b3f2d9df9e64
Author: Michael Meeks michael.me...@collabora.com
Date: Fri Aug 28 11:34:11 2015 +0100
tdf#93529 - use debug messages while rendering to break up the trace.
Change-Id: I56629a721202d7a04bd493d4604278dea85b4212
diff --git a/vcl/opengl/framebuffer.cxx b/vcl/opengl/framebuffer.cxx
index c4dfb05..87af985 100644
--- a/vcl/opengl/framebuffer.cxx
+++ b/vcl/opengl/framebuffer.cxx
@@ -22,7 +22,7 @@ OpenGLFramebuffer::OpenGLFramebuffer() :
mpNextFramebuffer( NULL )
{
glGenFramebuffers( 1, mnId );
-SAL_INFO( vcl.opengl, Created framebuffer (int)mnId );
+VCL_GL_INFO( vcl.opengl, Created framebuffer (int)mnId );
}
OpenGLFramebuffer::~OpenGLFramebuffer()
@@ -33,14 +33,14 @@ OpenGLFramebuffer::~OpenGLFramebuffer()
void OpenGLFramebuffer::Bind()
{
glBindFramebuffer( GL_FRAMEBUFFER, mnId );
-SAL_INFO( vcl.opengl, Binding framebuffer (int)mnId );
+VCL_GL_INFO( vcl.opengl, Binding framebuffer (int)mnId );
CHECK_GL_ERROR();
}
void OpenGLFramebuffer::Unbind()
{
glBindFramebuffer( GL_FRAMEBUFFER, 0 );
-SAL_INFO( vcl.opengl, Binding default framebuffer );
+VCL_GL_INFO( vcl.opengl, Binding default framebuffer );
CHECK_GL_ERROR();
}
@@ -59,7 +59,7 @@ void OpenGLFramebuffer::AttachTexture( const OpenGLTexture
rTexture )
if( rTexture.Id() == mnAttachedTexture )
return;
-SAL_INFO( vcl.opengl, Attaching texture rTexture.Id() to
framebuffer (int)mnId );
+VCL_GL_INFO( vcl.opengl, Attaching texture rTexture.Id() to
framebuffer (int)mnId );
mnAttachedTexture = rTexture.Id();
mnWidth = rTexture.GetWidth();
mnHeight = rTexture.GetHeight();
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index ac6624f..286fa7f 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -270,7 +270,7 @@ const vcl::Region OpenGLSalGraphicsImpl::getClipRegion()
const
bool OpenGLSalGraphicsImpl::setClipRegion( const vcl::Region rClip )
{
-SAL_INFO( vcl.opengl, ::setClipRegion rClip );
+VCL_GL_INFO( vcl.opengl, ::setClipRegion rClip );
maClipRegion = rClip;
mbUseStencil = false;
@@ -286,7 +286,7 @@ bool OpenGLSalGraphicsImpl::setClipRegion( const
vcl::Region rClip )
// set the clip region to empty
void OpenGLSalGraphicsImpl::ResetClipRegion()
{
-SAL_INFO( vcl.opengl, ::ResetClipRegion );
+VCL_GL_INFO( vcl.opengl, ::ResetClipRegion );
maClipRegion.SetEmpty();
mbUseScissor = false;
mbUseStencil = false;
@@ -1216,7 +1216,7 @@ void OpenGLSalGraphicsImpl::DrawRadialGradient( const
Gradient rGradient, const
// draw -- LineColor and FillColor and RasterOp and ClipRegion
void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY )
{
-SAL_INFO( vcl.opengl, ::drawPixel );
+VCL_GL_INFO( vcl.opengl, ::drawPixel );
if( mnLineColor != SALCOLOR_NONE )
{
PreDraw();
@@ -1228,7 +1228,7 @@ void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY )
void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY, SalColor nSalColor )
{
-SAL_INFO( vcl.opengl, ::drawPixel );
+VCL_GL_INFO( vcl.opengl, ::drawPixel );
if( nSalColor != SALCOLOR_NONE )
{
PreDraw();
@@ -1240,7 +1240,7 @@ void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY,
SalColor nSalColor )
void OpenGLSalGraphicsImpl::drawLine( long nX1, long nY1, long nX2, long nY2 )
{
-SAL_INFO( vcl.opengl, ::drawLine );
+VCL_GL_INFO( vcl.opengl, ::drawLine );
if( mnLineColor != SALCOLOR_NONE )
{
PreDraw();
@@ -1252,7 +1252,7 @@ void OpenGLSalGraphicsImpl::drawLine( long nX1, long nY1,
long nX2, long nY2 )
void OpenGLSalGraphicsImpl::drawRect( long nX, long nY, long nWidth, long
nHeight )
{
-SAL_INFO( vcl.opengl, ::drawRect );
+VCL_GL_INFO( vcl.opengl, ::drawRect );
PreDraw();
if( UseSolid( mnFillColor ) )
@@ -1286,7 +1286,7 @@ void OpenGLSalGraphicsImpl::drawRect( long nX, long nY,
long nWidth, long nHeigh
void OpenGLSalGraphicsImpl::drawPolyLine( sal_uInt32 nPoints, const SalPoint*
pPtAry )
{
-SAL_INFO( vcl.opengl, ::drawPolyLine );
+VCL_GL_INFO( vcl.opengl, ::drawPolyLine );
if( mnLineColor != SALCOLOR_NONE nPoints 1 )
{
@@ -1299,7 +1299,7 @@ void OpenGLSalGraphicsImpl::drawPolyLine( sal_uInt32
nPoints, const SalPoint* pP
void OpenGLSalGraphicsImpl::drawPolygon( sal_uInt32 nPoints, const SalPoint*
pPtAry )
{
-SAL_INFO( vcl.opengl, ::drawPolygon );
+VCL_GL_INFO( vcl.opengl, ::drawPolygon );
if( nPoints == 0 )
return;
if( nPoints == 1 )
@@ -1327,7 +1327,7 @@ void OpenGLSalGraphicsImpl::drawPolygon( sal_uInt32
nPoints, const SalPoint* pPt
void OpenGLSalGraphicsImpl::drawPolyPolygon( sal_uInt32 nPoly, const
[Libreoffice-bugs] [Bug 93529] OpenGL tracker bug ...
https://bugs.documentfoundation.org/show_bug.cgi?id=93529 --- Comment #2 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michael Meeks committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=b051c3716a8275e8ce7cbc4ba233ad5a075d386f tdf#93529 - add glDebugMessageInsert wrappers to help with API tracing. It will be available in 5.1.0. 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 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 85677] Dragging on a Windows touchscreen highlights instead of scrolling
https://bugs.documentfoundation.org/show_bug.cgi?id=85677 Patrick Smits batav...@gmail.com changed: What|Removed |Added CC||batav...@gmail.com --- Comment #2 from Patrick Smits batav...@gmail.com --- Same problem here under Windows 10. The only way to scroll through an open document is the little scroll bar on the right of the document's window, however this was designed to be accessed by a mouse/trackpad/trackball. It's a real pain to use by fingertip. Now that Windows 10 on 14 touch screens are the new standard, it would be nice if LibreOffice could distinguish between a swipe gesture to scroll a document up and down and a tap-hold-drag to select text within a document. -- 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-commits] core.git: Branch 'libreoffice-4-4' - sd/qa sd/source
sd/qa/unit/data/ppt/pass/hang-7.ppt |binary
sd/source/filter/ppt/propread.cxx |6 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit cc8814dd2aecdb88b6095ab350c7a43ea694a828
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 13:58:48 2015 +0100
check seek for success
Change-Id: I02420ffb3af009d08ce54a0932e2c7a287703a72
(cherry picked from commit 1830b4f2e324090962a993315ce76752d24d4088)
Reviewed-on: https://gerrit.libreoffice.org/18078
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/sd/qa/unit/data/ppt/pass/hang-7.ppt
b/sd/qa/unit/data/ppt/pass/hang-7.ppt
new file mode 100644
index 000..8c05271
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-7.ppt differ
diff --git a/sd/source/filter/ppt/propread.cxx
b/sd/source/filter/ppt/propread.cxx
index 722ab44..20e59df 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -414,7 +414,11 @@ void Section::Read( SvStorageStream *pStrm )
if ( nPropSize )
{
if ( ( nVectorCount - i ) 1 )
-pStrm-Seek( nPropOfs + nSecOfs + nPropSize );
+{
+nOffset = nPropOfs + nSecOfs + nPropSize;
+if (nOffset != pStrm-Seek(nOffset))
+break;
+}
}
else
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/core/data/ww8/pass/EDB-37910-1.doc |binary 1 file changed New commits: commit ca257c35e3c80a6b80332fc062444f24f115d1f0 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 12:00:52 2015 +0100 add EBD-37910-1 test case Change-Id: I45033100a39d3bc57bc9c72cb33952531808f069 diff --git a/sw/qa/core/data/ww8/pass/EDB-37910-1.doc b/sw/qa/core/data/ww8/pass/EDB-37910-1.doc new file mode 100644 index 000..6ed7912 Binary files /dev/null and b/sw/qa/core/data/ww8/pass/EDB-37910-1.doc differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93736] Bottom stroke line of a rectangle is half-drawn when using OpenGL
https://bugs.documentfoundation.org/show_bug.cgi?id=93736 --- Comment #2 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Tomaž Vajngerl committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=c9d39c37b2c186e2b9d9841b18ecc6aed4684f62 tdf#93736 need to create trapezoid from input polygon It will be available in 5.1.0. 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 the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: vcl/opengl
vcl/opengl/gdiimpl.cxx | 32 ++--
1 file changed, 18 insertions(+), 14 deletions(-)
New commits:
commit c9d39c37b2c186e2b9d9841b18ecc6aed4684f62
Author: Tomaž Vajngerl tomaz.vajng...@collabora.co.uk
Date: Fri Aug 28 19:32:35 2015 +0900
tdf#93736 need to create trapezoid from input polygon
Currently we draw the polyline from the input polygon, but we
should first create a trapezoid and draw its polygons when drawing
the hairline.
Change-Id: Idd850d18d05410c75a8a2c922338caf46158bfd4
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 286fa7f..97f2547 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1415,27 +1415,31 @@ bool OpenGLSalGraphicsImpl::drawPolyLine(
basegfx::B2DPolygon aPolygon = rPolygon;
const double fHalfWidth = 0.5 * rLineWidth.getX();
-// #i122456# This is probably thought to happen to align hairlines to
pixel positions, so
-// it should be a 0.5 translation, not more. It will definitely go wrong
with fat lines
-aPolygon.transform( basegfx::tools::createTranslateB2DHomMatrix(0.5, 0.5)
);
-
// shortcut for hairline drawing to improve performance
-//bool bDrawnOk = true;
if( bIsHairline )
{
-PreDraw();
-if( UseSolidAA( mnLineColor ) )
+basegfx::B2DTrapezoidVector aTrapezVector;
+basegfx::tools::createLineTrapezoidFromB2DPolygon(aTrapezVector,
aPolygon, rLineWidth.getX());
+if (aTrapezVector.size())
{
-sal_uInt32 nPoints = rPolygon.count();
-for (sal_uInt32 i = 0; i nPoints - 1; ++i)
+PreDraw();
+if (UseSolidAA(mnLineColor, fTransparency))
{
-const basegfx::B2DPoint rPt1 = rPolygon.getB2DPoint(i);
-const basegfx::B2DPoint rPt2 = rPolygon.getB2DPoint(i+1);
-DrawLineAA(rPt1.getX(), rPt1.getY(),
- rPt2.getX(), rPt2.getY());
+for (size_t i = 0; i aTrapezVector.size(); ++i)
+{
+const basegfx::B2DPolygon rTrapezPolygon =
aTrapezVector[i].getB2DPolygon();
+sal_uInt32 nPoints = rTrapezPolygon.count();
+for (sal_uInt32 j = 0; j nPoints - 1; ++j)
+{
+const basegfx::B2DPoint rPoint1 =
rTrapezPolygon.getB2DPoint(j);
+const basegfx::B2DPoint rPoint2 =
rTrapezPolygon.getB2DPoint(j + 1);
+DrawLineAA(rPoint1.getX(), rPoint1.getY(),
+ rPoint2.getX(), rPoint2.getY());
+}
+}
}
+PostDraw();
}
-PostDraw();
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93724] BASE: Insert Row in Filtered Form with Date/Time Fields results in Phantom zero date displayed instead of null, not saved
https://bugs.documentfoundation.org/show_bug.cgi?id=93724 --- Comment #6 from Doug dougt901-2...@yahoo.com --- Yes, I would like the blank date control before the InsertRow method to stay blank after the InsertRow method is executed. No reason why the InsertRow method should change the appearance or value of the date control in this situation. This is a bug for me because the zero date behavior is inconsistent, both with the way the form works when there is no filter, and inconsistent with the value actually reported back to the table. If you close and open the form again and browse back to the same record the date will be reported correctly as null, even though when it was recorded LO said it was a zero date. So if this was a limitation of how LO or OO works, that would be one thing, but instead it just seems like an anomaly. -- 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 93729] Styles and Formatting
https://bugs.documentfoundation.org/show_bug.cgi?id=93729 appsbugzi...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- 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 93730] New: Option VBASupport prevents calculation of functions
https://bugs.documentfoundation.org/show_bug.cgi?id=93730 Bug ID: 93730 Summary: Option VBASupport prevents calculation of functions Product: LibreOffice Version: 4.4.4.3 release Hardware: Other OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: BASIC Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: m...@heikowoehrle.de If Option VBASupport 1 is declared in files macro, functions doesn't calculate when the file is opended. Calculation works onlay after some editing in macros has taken place. if option vbasupport is commented out everything works as expected. -- 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 93578] Insufficient separation between Help and OK buttons when the dialog is small
https://bugs.documentfoundation.org/show_bug.cgi?id=93578 --- Comment #8 from Adolfo Jayme f...@libreoffice.org --- (In reply to dabisu from comment #7) Great argument: It's silly. We won't do. That is not what I said. -- 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 93724] BASE: Insert Row in Filtered Form with Date/Time Fields results in Phantom zero date displayed instead of null, not saved
https://bugs.documentfoundation.org/show_bug.cgi?id=93724 --- Comment #3 from Alex Thurgood ipla...@yahoo.co.uk --- The form appears to behave correctly in LibreOffice 3.3.0 OOO330m19 (Build:6) tag libreoffice-3.3.0.4 see attached screenshot == regression -- 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 93724] BASE: Insert Row in Filtered Form with Date/Time Fields results in Phantom zero date displayed instead of null, not saved
https://bugs.documentfoundation.org/show_bug.cgi?id=93724 --- Comment #4 from Alex Thurgood ipla...@yahoo.co.uk --- Created attachment 118241 -- https://bugs.documentfoundation.org/attachment.cgi?id=118241action=edit Correct display of values in LO330 -- 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 93733] New: Assertion failed when clear font size field in paragraph style
https://bugs.documentfoundation.org/show_bug.cgi?id=93733 Bug ID: 93733 Summary: Assertion failed when clear font size field in paragraph style Product: LibreOffice Version: 5.1.0.0.alpha0+ Master Hardware: x86 (IA32) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: rb.hensc...@t-online.de Open the dialog to modify a paragraph style. Goto Tab Font. Clear the field Size (for to enter a new value). I get this error message: Assertion failed! Program: C:\LO_buildDebug\core\instdirßprogram\svtlo.dll File: C:C\LO_buildDebug\core\include\rtl/ustring.hxx Line: 517 Expression: index =0 static_castsal_uInt32(index) static_castsal_uInt32(getLength()) I use a self-built debug build on 32-bit Windows7. Version: 5.1.0.0.alpha1+ Build ID: d3de490437df4c9093f32e97fc185066d64c0f46 Locale: de-DE (de_DE) -- 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-commits] core.git: 2 commits - extras/CustomTarget_autocorr.mk extras/CustomTarget_autotextshare.mk extras/CustomTarget_autotextuser.mk sd/qa sd/source solenv/gbuild
extras/CustomTarget_autocorr.mk |2 +-
extras/CustomTarget_autotextshare.mk |2 +-
extras/CustomTarget_autotextuser.mk |2 +-
sd/qa/unit/data/ppt/pass/hang-18.ppt |binary
sd/source/filter/ppt/propread.cxx| 25 +++--
solenv/gbuild/UIConfig.mk|2 +-
solenv/gbuild/platform/macosx.mk |2 +-
7 files changed, 24 insertions(+), 11 deletions(-)
New commits:
commit 580d3837b26f09ed02fe3583de40fa045a3fde0f
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 28 09:15:04 2015 +0100
clip strings to max available size
Change-Id: Icc1378c9c27b9b6d229bcffc6a63017f82be70d4
diff --git a/sd/qa/unit/data/ppt/pass/hang-18.ppt
b/sd/qa/unit/data/ppt/pass/hang-18.ppt
new file mode 100644
index 000..3b3e9f7
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-18.ppt differ
diff --git a/sd/source/filter/ppt/propread.cxx
b/sd/source/filter/ppt/propread.cxx
index 86195be4..64e3725 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -73,7 +73,7 @@ static sal_Int32 lcl_getMaxSafeStrLen(sal_uInt32 nSize)
bool PropItem::Read( OUString rString, sal_uInt32 nStringType, bool bAlign )
{
-sal_uInt32 i, nItemSize, nType, nItemPos;
+sal_uInt32 nType, nItemPos;
boolbRetValue = false;
nItemPos = Tell();
@@ -86,8 +86,8 @@ bool PropItem::Read( OUString rString, sal_uInt32
nStringType, bool bAlign )
else
nType = nStringType VT_TYPEMASK;
-nItemSize = 0; // Initialize in case stream fails.
-ReadUInt32( nItemSize );
+sal_uInt32 nItemSize(0); // Initialize in case stream fails.
+ReadUInt32(nItemSize);
switch( nType )
{
@@ -95,6 +95,12 @@ bool PropItem::Read( OUString rString, sal_uInt32
nStringType, bool bAlign )
{
if ( nItemSize )
{
+auto nMaxSizePossible = remainingSize();
+if (nItemSize nMaxSizePossible)
+{
+SAL_WARN(sd.filter, String of Len nItemSize
claimed, only nMaxSizePossible possible);
+nItemSize = nMaxSizePossible;
+}
try
{
sal_Char* pString = new sal_Char[ nItemSize ];
@@ -104,7 +110,7 @@ bool PropItem::Read( OUString rString, sal_uInt32
nStringType, bool bAlign )
if ( nItemSize 1 )
{
sal_Unicode* pWString =
reinterpret_castsal_Unicode*(pString);
-for ( i = 0; i nItemSize; i++ )
+for (sal_uInt32 i = 0; i nItemSize; ++i)
ReadUInt16( pWString[ i ] );
rString = OUString(pWString,
lcl_getMaxSafeStrLen(nItemSize));
}
@@ -140,12 +146,19 @@ bool PropItem::Read( OUString rString, sal_uInt32
nStringType, bool bAlign )
{
if ( nItemSize )
{
+auto nMaxSizePossible = remainingSize() / sizeof(sal_Unicode);
+if (nItemSize nMaxSizePossible)
+{
+SAL_WARN(sd.filter, String of Len nItemSize
claimed, only nMaxSizePossible possible);
+nItemSize = nMaxSizePossible;
+}
+
try
{
sal_Unicode* pString = new sal_Unicode[ nItemSize ];
-for ( i = 0; i nItemSize; i++ )
+for (sal_uInt32 i = 0; i nItemSize; ++i)
ReadUInt16( pString[ i ] );
-if ( pString[ i - 1 ] == 0 )
+if ( pString[ nItemSize - 1 ] == 0 )
{
if ( (sal_uInt16)nItemSize 1 )
rString = OUString(pString,
lcl_getMaxSafeStrLen(nItemSize));
commit fe1eb8809d22bc87d9d636f6c084ed5249c7eb37
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 28 09:56:12 2015 +0100
use nonet for xsltproc
Change-Id: I47f020722b46b727ad03a937f28f0b33033d61cb
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index b3c1ba5..9e5e9aa 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -257,7 +257,7 @@ $(call
gb_CustomTarget_get_workdir,extras/source/autocorr)/%/mimetype : $(SRCDIR
$(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%.xml :
$(SRCDIR)/extras/source/autocorr/lang/%.xml \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$*.xml,$(true),XSL,1)
- $(call gb_ExternalExecutable_get_command,xsltproc) -o $@
$(SRCDIR)/extras/util/compact.xsl $
+ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@
$(SRCDIR)/extras/util/compact.xsl $
$(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%.dat :
$(call
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 6f/473b19e436d6e0f9e212c5913c347c4e0efdb0 f6/bc2f21fee72a8b9c178ddd431ca3f05594f5e3
6f/473b19e436d6e0f9e212c5913c347c4e0efdb0 |1 + f6/bc2f21fee72a8b9c178ddd431ca3f05594f5e3 |1 + 2 files changed, 2 insertions(+) New commits: commit 8bb055dc0174b625820f8def5841885275e08bdf Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 10:37:07 2015 +0100 Notes added by 'git notes add' diff --git a/f6/bc2f21fee72a8b9c178ddd431ca3f05594f5e3 b/f6/bc2f21fee72a8b9c178ddd431ca3f05594f5e3 new file mode 100644 index 000..6123fd0 --- /dev/null +++ b/f6/bc2f21fee72a8b9c178ddd431ca3f05594f5e3 @@ -0,0 +1 @@ +prefer: b2462b3fea5f2477ceff51518070eeb64cea2bcf commit 8d6d6e4bba53a1fb0e500e9d758aade656691a6b Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 10:36:57 2015 +0100 Notes added by 'git notes add' diff --git a/6f/473b19e436d6e0f9e212c5913c347c4e0efdb0 b/6f/473b19e436d6e0f9e212c5913c347c4e0efdb0 new file mode 100644 index 000..6123fd0 --- /dev/null +++ b/6f/473b19e436d6e0f9e212c5913c347c4e0efdb0 @@ -0,0 +1 @@ +prefer: b2462b3fea5f2477ceff51518070eeb64cea2bcf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes7' - include/vcl vcl/osx vcl/source vcl/unx vcl/win
include/vcl/opengl/OpenGLHelper.hxx |3 ---
vcl/osx/salframe.cxx|5 -
vcl/source/opengl/OpenGLHelper.cxx |9 -
vcl/unx/generic/window/salframe.cxx |3 ---
vcl/unx/gtk/window/gtksalframe.cxx |3 ---
vcl/win/source/window/salframe.cxx |3 ---
6 files changed, 26 deletions(-)
New commits:
commit f762c8272fbbae81a1ec210b5d5f4b06788e1386
Author: László Németh laszlo.nem...@collabora.com
Date: Fri Aug 28 11:46:31 2015 +0200
Revert tdf#93530 - the VCL GDI flushing abstraction should glFlush too.
This reverts commit b05e77d3a9ea0ad3f39239dba3abf7a303226bf9.
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index d14df0d..95c23c8 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -67,9 +67,6 @@ public:
*/
static bool isVCLOpenGLEnabled();
-/// flush the OpenGL command queue - if OpenGL is enabled.
-static void flush();
-
#if defined UNX !defined MACOSX !defined IOS !defined ANDROID
!defined(LIBO_HEADLESS)
static bool GetVisualInfo(Display* pDisplay, int nScreen, XVisualInfo
rVI);
static GLXFBConfig GetPixmapFBConfig( Display* pDisplay, bool bInverted );
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 05957fc..251f5c3 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -27,7 +27,6 @@
#include vcl/window.hxx
#include vcl/syswin.hxx
#include vcl/settings.hxx
-#include vcl/opengl/OpenGLHelper.hxx
#include osx/saldata.hxx
#include quartz/salgdi.h
@@ -38,7 +37,6 @@
#include osx/a11yfactory.h
#include quartz/utils.h
-
#include salwtype.hxx
#include premac.h
@@ -882,7 +880,6 @@ void AquaSalFrame::Flush()
{
[mpNSView display];
}
-OpenGLHelper::flush();
}
void AquaSalFrame::Flush( const Rectangle rRect )
@@ -904,7 +901,6 @@ void AquaSalFrame::Flush( const Rectangle rRect )
{
[mpNSView display];
}
-OpenGLHelper::flush();
}
void AquaSalFrame::Sync()
@@ -917,7 +913,6 @@ void AquaSalFrame::Sync()
[mpNSView setNeedsDisplay: YES];
[mpNSView display];
}
-OpenGLHelper::flush();
}
void AquaSalFrame::SetInputContext( SalInputContext* pContext )
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 5cde27c..967d4c5 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -608,13 +608,4 @@ GLXFBConfig OpenGLHelper::GetPixmapFBConfig( Display*
pDisplay, bool bInverted
#endif
-void OpenGLHelper::flush()
-{
-if (!isVCLOpenGLEnabled())
-return;
-
-glFlush();
-CHECK_GL_ERROR();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/window/salframe.cxx
b/vcl/unx/generic/window/salframe.cxx
index 0cc6ee9..14e11d5 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -35,7 +35,6 @@
#include vcl/settings.hxx
#include vcl/bmpacc.hxx
#include vcl/opengl/OpenGLContext.hxx
-#include vcl/opengl/OpenGLHelper.hxx
#include prex.h
#include X11/Xatom.h
@@ -2453,13 +2452,11 @@ void X11SalFrame::SetTitle( const OUString rTitle )
void X11SalFrame::Flush()
{
XFlush( GetDisplay()-GetDisplay() );
-OpenGLHelper::flush();
}
void X11SalFrame::Sync()
{
XSync( GetDisplay()-GetDisplay(), False );
-OpenGLHelper::flush();
}
// Keyboard
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index f31d800..7f8570e 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -37,7 +37,6 @@
#include vcl/svapp.hxx
#include vcl/window.hxx
#include vcl/settings.hxx
-#include vcl/opengl/OpenGLHelper.hxx
#if !GTK_CHECK_VERSION(3,0,0)
# include unx/x11/xlimits.hxx
@@ -2897,13 +2896,11 @@ void GtkSalFrame::Flush()
#else
XFlush (GDK_DISPLAY_XDISPLAY (getGdkDisplay()));
#endif
-OpenGLHelper::flush();
}
void GtkSalFrame::Sync()
{
gdk_display_sync( getGdkDisplay() );
-OpenGLHelper::flush();
}
#ifndef GDK_Open
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index e97836e..f8e0b69 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -48,7 +48,6 @@
#include vcl/window.hxx
#include vcl/wrkwin.hxx
#include vcl/svapp.hxx
-#include vcl/opengl/OpenGLHelper.hxx
// Warning in SDK header
#ifdef _MSC_VER
@@ -2207,13 +2206,11 @@ void WinSalFrame::SetPointerPos( long nX, long nY )
void WinSalFrame::Flush()
{
GdiFlush();
-OpenGLHelper::flush();
}
void WinSalFrame::Sync()
{
GdiFlush();
-OpenGLHelper::flush();
}
static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext*
pContext )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 17/5afdcb151d9ce1238dc9fec59f2dfc2eb07345
17/5afdcb151d9ce1238dc9fec59f2dfc2eb07345 |1 + 1 file changed, 1 insertion(+) New commits: commit 9d6971f10f73fe5843004278c33f7b5e4f6ac589 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 10:47:38 2015 +0100 Notes added by 'git notes add' diff --git a/17/5afdcb151d9ce1238dc9fec59f2dfc2eb07345 b/17/5afdcb151d9ce1238dc9fec59f2dfc2eb07345 new file mode 100644 index 000..00a9493 --- /dev/null +++ b/17/5afdcb151d9ce1238dc9fec59f2dfc2eb07345 @@ -0,0 +1 @@ +merged as: 9e318c09778f0416143f211c5817536d5f1db3b7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93529] OpenGL tracker bug ...
https://bugs.documentfoundation.org/show_bug.cgi?id=93529 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Depends on||93735 -- 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 93735] New: should use GL debug messages to help API tracing
https://bugs.documentfoundation.org/show_bug.cgi?id=93735 Bug ID: 93735 Summary: should use GL debug messages to help API tracing Product: LibreOffice Version: unspecified Hardware: Other OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: graphics stack Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: michael.me...@collabora.com As above really; working on this: cf. https://www.opengl.org/sdk/docs/man/html/glDebugMessageInsert.xhtml :-) -- 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 93735] should use GL debug messages to help API tracing
https://bugs.documentfoundation.org/show_bug.cgi?id=93735 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Blocks||93529 Ever confirmed|0 |1 -- 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-commits] core.git: Branch 'libreoffice-5-0' - editeng/source include/editeng include/tools tools/source
editeng/source/editeng/editattr.cxx |6 -
editeng/source/items/textitem.cxx | 38 ++--
include/editeng/colritem.hxx|1
include/tools/color.hxx |2 -
tools/source/generic/color.cxx |2 -
5 files changed, 15 insertions(+), 34 deletions(-)
New commits:
commit da80db2298fd3f6b17629c7b20b9884d6307c1d9
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 12:21:37 2015 +0100
don't write SvxBackgroundColorItem via inherited SvxColorItem::Store
SvxBackgroundColorItem inherits from SvxColorItem and for backwards
compatibility with the StarOffice 5 binary file format (yes, really)
writes/reads only rgb and not the transparency value, so copying and pasting
text from a sidebar comment in writer to itself or another one results in a
black character background as the default COL_AUTO turns into black
Change-Id: I18b5105dd8e060b9e49dda6026e26d3a0f00d8f5
(cherry picked from commit 3bc69b1d0d8620afd89a993b5f6bc46a2ff5267f)
this farcical staroffice 5.0 related junk can at least be const
Change-Id: I096d98f6e0cb61cacd9cd82a623f832b88ded1e6
(cherry picked from commit 1e8b7cdbbd084a1e75f82bfff605321c8480b78d)
Reviewed-on: https://gerrit.libreoffice.org/18087
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/editeng/source/editeng/editattr.cxx
b/editeng/source/editeng/editattr.cxx
index dcb9fa0..46cc8cf 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -221,7 +221,6 @@ void EditCharAttribColor::SetFont( SvxFont rFont,
OutputDevice* )
{
Color aColor = static_castconst SvxColorItem*(GetItem())-GetValue();
rFont.SetColor( aColor);
-//fprintf(stderr, Called SetFont with Color %d\n, aColor.GetColor());
}
// class EditCharAttribBackgroundColor
@@ -238,14 +237,11 @@
EditCharAttribBackgroundColor::EditCharAttribBackgroundColor(
void EditCharAttribBackgroundColor::SetFont( SvxFont rFont, OutputDevice* )
{
Color aColor = static_castconst
SvxBackgroundColorItem*(GetItem())-GetValue();
-rFont.SetFillColor( aColor);
rFont.SetTransparent(false);
-
+rFont.SetFillColor(aColor);
}
-
// class EditCharAttribLanguage
-
EditCharAttribLanguage::EditCharAttribLanguage( const SvxLanguageItem rAttr,
sal_uInt16 _nStart, sal_uInt16 _nEnd )
: EditCharAttrib( rAttr, _nStart, _nEnd )
{
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index 40bf333..4289446 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1850,9 +1850,12 @@ SvxBackgroundColorItem::SvxBackgroundColorItem( const
Color rCol,
{
}
-SvxBackgroundColorItem:: SvxBackgroundColorItem( SvStream rStrm, const
sal_uInt16 Id ) :
-SvxColorItem( rStrm, Id )
+SvxBackgroundColorItem::SvxBackgroundColorItem(SvStream rStrm, const
sal_uInt16 nId)
+: SvxColorItem(nId)
{
+Color aColor;
+aColor.Read(rStrm);
+SetValue(aColor);
}
SvxBackgroundColorItem::SvxBackgroundColorItem( const SvxBackgroundColorItem
rCopy ) :
@@ -1862,9 +1865,14 @@ SvxBackgroundColorItem::SvxBackgroundColorItem( const
SvxBackgroundColorItem rC
SfxPoolItem* SvxBackgroundColorItem::Clone( SfxItemPool * ) const
{
-return new SvxBackgroundColorItem( *this );
+return new SvxBackgroundColorItem(*this);
}
+SvStream SvxBackgroundColorItem::Store(SvStream rStrm, sal_uInt16) const
+{
+GetValue().Write(rStrm);
+return rStrm;
+}
SfxPoolItem* SvxBackgroundColorItem::Create(SvStream rStrm, sal_uInt16 ) const
{
@@ -1918,23 +1926,18 @@ bool SvxBackgroundColorItem::PutValue( const uno::Any
rVal, sal_uInt8 nMemberId
}
// class SvxColorItem
-
SvxColorItem::SvxColorItem( const sal_uInt16 nId ) :
SfxPoolItem( nId ),
mColor( COL_BLACK )
{
}
-
-
SvxColorItem::SvxColorItem( const Color rCol, const sal_uInt16 nId ) :
SfxPoolItem( nId ),
mColor( rCol )
{
}
-
-
SvxColorItem::SvxColorItem( SvStream rStrm, const sal_uInt16 nId ) :
SfxPoolItem( nId )
{
@@ -1943,21 +1946,16 @@ SvxColorItem::SvxColorItem( SvStream rStrm, const
sal_uInt16 nId ) :
mColor = aColor;
}
-
-
SvxColorItem::SvxColorItem( const SvxColorItem rCopy ) :
SfxPoolItem( rCopy ),
mColor( rCopy.mColor )
{
}
-
-
SvxColorItem::~SvxColorItem()
{
}
-
sal_uInt16 SvxColorItem::GetVersion( sal_uInt16 nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
@@ -1967,8 +1965,6 @@ sal_uInt16 SvxColorItem::GetVersion( sal_uInt16 nFFVer )
const
return SOFFICE_FILEFORMAT_50 = nFFVer ? VERSION_USEAUTOCOLOR : 0;
}
-
-
bool SvxColorItem::operator==( const SfxPoolItem rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), unequal types );
@@ -1976,16 +1972,12 @@ bool SvxColorItem::operator==( const
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/source sd/qa sd/source
filter/source/msfilter/svdfppt.cxx | 18 +++---
sd/qa/unit/data/ppt/pass/hang-9.ppt |binary
sd/source/filter/ppt/pptin.cxx |8 +++-
3 files changed, 22 insertions(+), 4 deletions(-)
New commits:
commit b59eea60468fcf8c1f304e58a0e96ed8afcc3a3f
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 14:22:23 2015 +0100
avoid loops in atom chains
(cherry picked from commit de71eae5807ff94c8eace0eccaabf1ffa08e77b6)
Change-Id: Icc40c0ee6c7d8d305cf7cc60cbf3e511c763aedd
Reviewed-on: https://gerrit.libreoffice.org/18093
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 1e8f49d..d3bb6b7 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2552,11 +2552,17 @@ bool SdrPowerPointImport::GetColorFromPalette(
sal_uInt16 nNum, Color rColor )
while( ( pMasterPersist
pMasterPersist-aSlideAtom.nFlags 2 ) // it is possible that a masterpage
pMasterPersist-aSlideAtom.nMasterId )
// itself is following a master colorscheme
{
-sal_uInt16 nNextMaster = pMasterPages-FindPage(
pMasterPersist-aSlideAtom.nMasterId );
+auto nOrigMasterId =
pMasterPersist-aSlideAtom.nMasterId;
+sal_uInt16 nNextMaster =
pMasterPages-FindPage(nOrigMasterId);
if ( nNextMaster == PPTSLIDEPERSIST_ENTRY_NOTFOUND )
break;
else
pMasterPersist = (*pPageList2)[ nNextMaster ];
+if (pMasterPersist-aSlideAtom.nMasterId ==
nOrigMasterId)
+{
+SAL_WARN(filter.ms, loop in atom chain);
+break;
+}
}
}
if ( pMasterPersist )
@@ -2565,7 +2571,7 @@ bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16
nNum, Color rColor )
}
}
}
-// resgister current color scheme
+// register current color scheme
const_castSdrPowerPointImport*(this)-nPageColorsNum = nAktPageNum;
const_castSdrPowerPointImport*(this)-ePageColorsKind = eAktPageKind;
}
@@ -2789,11 +2795,17 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet,
const PptSlidePersistEntry*
PptSlidePersistEntry* pE =
(*pPageList)[ nMasterNum ];
while( ( pE-aSlideAtom.nFlags 4
) pE-aSlideAtom.nMasterId )
{
-sal_uInt16 nNextMaster =
pMasterPages-FindPage( pE-aSlideAtom.nMasterId );
+auto nOrigMasterId =
pE-aSlideAtom.nMasterId;
+sal_uInt16 nNextMaster =
pMasterPages-FindPage(nOrigMasterId);
if ( nNextMaster ==
PPTSLIDEPERSIST_ENTRY_NOTFOUND )
break;
else
pE = (*pPageList)[
nNextMaster ];
+if (pE-aSlideAtom.nMasterId
== nOrigMasterId)
+{
+SAL_WARN(filter.ms,
loop in atom chain);
+break;
+}
}
if ( pE-nBackgroundOffset )
{
diff --git a/sd/qa/unit/data/ppt/pass/hang-9.ppt
b/sd/qa/unit/data/ppt/pass/hang-9.ppt
new file mode 100644
index 000..97e0158
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-9.ppt differ
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 8651c68..7565fd4 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -726,11 +726,17 @@ bool ImplSdPPTImport::Import()
PptSlidePersistEntry* pE = pPersist;
while( ( pE-aSlideAtom.nFlags 4 )
pE-aSlideAtom.nMasterId )
{
-sal_uInt16 nNextMaster = pMasterPages-FindPage(
pE-aSlideAtom.nMasterId );
+auto nOrigMasterId = pE-aSlideAtom.nMasterId;
+sal_uInt16 nNextMaster =
pMasterPages-FindPage(nOrigMasterId);
if ( nNextMaster == PPTSLIDEPERSIST_ENTRY_NOTFOUND )
break;
else
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/qa sd/source
sd/qa/unit/data/ppt/pass/hang-5.ppt |binary
sd/source/filter/ppt/pptin.cxx |2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d269afa92d524eaf0e0236aadde9cea90ccaa18c
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 13:35:37 2015 +0100
avoid hang in certain ppts
Change-Id: Iedba71b72fc815b274ca5e0da0903a558947cb06
(cherry picked from commit 90dc4e38928fffc3ed5fcbed40109712eb97e203)
Reviewed-on: https://gerrit.libreoffice.org/18089
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/sd/qa/unit/data/ppt/pass/hang-5.ppt
b/sd/qa/unit/data/ppt/pass/hang-5.ppt
new file mode 100644
index 000..cfaa8f4
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-5.ppt differ
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index ddf80f1..8651c68 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2544,7 +2544,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream rSt,
DffObjData rObjData, voi
DffRecordHeader rHdClientData = *maShapeRecords.Current();
while( true )
{
-sal_uInt32 nClientDataLen = rHdClientData.GetRecEndFilePos();
+sal_uInt32 nClientDataLen = SanitizeEndPos(rSt,
rHdClientData.GetRecEndFilePos());
DffRecordHeader aHd;
do
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93714] Bring back [Un]Protect Cell context menu for protecting/unprotecting cells
https://bugs.documentfoundation.org/show_bug.cgi?id=93714 --- Comment #3 from Charles tansta...@libertytrek.org --- Hi Cor, These are two different issues... Bug 93713 that you closed as a duplicate of this one was an actual, genuine BUG. This bug is just a feature/enhancement request to bring back the context menu choices for protecting/unprotecting cells in Writer Tables, which were apparently intentionally removed for some reason. I think they should be kept separate, so I re-opened the bug reporting the actual bug. -- 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-commits] core.git: Branch 'libreoffice-5-0' - filter/source sd/qa
filter/source/msfilter/svdfppt.cxx |6 +-
sd/qa/unit/data/ppt/pass/hang-8.ppt |binary
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit d604263ea184c16ce2b23fd3fcfa823ab1ff62a5
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 14:06:04 2015 +0100
check stream state after read attempt
Change-Id: Ie3836f2e95acab963634181a07565343501f00f8
(cherry picked from commit 9a695e071020639926f8b038aba64eb016a1801a)
Reviewed-on: https://gerrit.libreoffice.org/18092
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 29f0b36..0ac8030 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5252,9 +5252,13 @@ void PPTStyleTextPropReader::Init( SvStream rIn, const
DffRecordHeader rTextHe
PPTCharPropSet aCharPropSet( nCurrentPara );
if ( bTextPropAtom )
+{
ReadCharProps( rIn, aCharPropSet, aString, nCharCount,
nCharAnzRead,
bTextPropAtom, nExtParaPos, aStyleTextProp9,
nExtParaFlags,
nBuBlip, nHasAnm, nAnmScheme );
+if (!rIn.good())
+break;
+}
else
nCharCount = nStringLen;
@@ -5330,7 +5334,7 @@ void PPTStyleTextPropReader::Init( SvStream rIn, const
DffRecordHeader rTextHe
break;
}
}
- }
+}
if ( !aCharPropList.empty() ( aCharPropList.back()-mnParagraph !=
nCurrentPara ) )
{
PPTCharPropSet* pCharPropSet = new PPTCharPropSet(
*aCharPropList.back(), nCurrentPara );
diff --git a/sd/qa/unit/data/ppt/pass/hang-8.ppt
b/sd/qa/unit/data/ppt/pass/hang-8.ppt
new file mode 100644
index 000..0f52bd5
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-8.ppt differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/ole/oleobjw.cxx |5 - extensions/source/ole/unoobjw.cxx |4 2 files changed, 9 deletions(-) New commits: commit 2de6bd04d9a40d746ebcd5d666efdbb30507623a Author: Tor Lillqvist t...@collabora.com Date: Fri Aug 28 14:31:29 2015 +0300 Bin a few leftover (?) stderr printouts If they are truly needed, use SAL_INFO then. diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 5f57dda..30910da 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -127,11 +127,6 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl() IT_Com it_c= ComPtrToWrapperMap.find( (sal_uInt32) m_spUnknown.p); if(it_c != ComPtrToWrapperMap.end()) ComPtrToWrapperMap.erase(it_c); - -#if OSL_DEBUG_LEVEL 0 -fprintf(stderr,[automation bridge] ComPtrToWrapperMap contains: %i \n, -ComPtrToWrapperMap.size()); -#endif } Any IUnknownWrapper_Impl::queryInterface(const Type t) diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 8286026..a8a45aa 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -99,10 +99,6 @@ InterfaceOleWrapper_Impl::~InterfaceOleWrapper_Impl() IT_Uno it= UnoObjToWrapperMap.find( (sal_uInt32) m_xOrigin.get()); if(it != UnoObjToWrapperMap.end()) UnoObjToWrapperMap.erase(it); -#if OSL_DEBUG_LEVEL 0 -fprintf(stderr,[automation bridge] UnoObjToWrapperMap contains: %i \n, -UnoObjToWrapperMap.size()); -#endif } STDMETHODIMP InterfaceOleWrapper_Impl::QueryInterface(REFIID riid, LPVOID FAR * ppv) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - filter/source sd/qa
filter/source/msfilter/svdfppt.cxx | 10 --
sd/qa/unit/data/ppt/pass/hang-6.ppt |binary
sd/qa/unit/data/ppt/pass/hang-8.ppt |binary
3 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 9becbb6a1bf32ab3fa0afeaa35bcdd0a0cd33116
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 14:06:04 2015 +0100
check stream state after read attempt
Change-Id: Ie3836f2e95acab963634181a07565343501f00f8
(cherry picked from commit 9a695e071020639926f8b038aba64eb016a1801a)
Reviewed-on: https://gerrit.libreoffice.org/18079
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 2eeb4b0..40c3349 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5245,9 +5245,13 @@ void PPTStyleTextPropReader::Init( SvStream rIn,
SdrPowerPointImport rMan, con
PPTCharPropSet aCharPropSet( nCurrentPara );
if ( bTextPropAtom )
+{
ReadCharProps( rIn, aCharPropSet, aString, nCharCount,
nCharAnzRead,
bTextPropAtom, nExtParaPos, aStyleTextProp9,
nExtParaFlags,
nBuBlip, nHasAnm, nAnmScheme );
+if (!rIn.good())
+break;
+}
else
nCharCount = nStringLen;
@@ -5314,7 +5318,7 @@ void PPTStyleTextPropReader::Init( SvStream rIn,
SdrPowerPointImport rMan, con
break;
}
}
- }
+}
if ( !aCharPropList.empty() ( aCharPropList.back()-mnParagraph !=
nCurrentPara ) )
{
PPTCharPropSet* pCharPropSet = new PPTCharPropSet(
*aCharPropList.back(), nCurrentPara );
diff --git a/sd/qa/unit/data/ppt/pass/hang-8.ppt
b/sd/qa/unit/data/ppt/pass/hang-8.ppt
new file mode 100644
index 000..0f52bd5
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-8.ppt differ
commit ec08cc64c8bbf7ff9dcbd4f4e660c42a7885947b
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 13:49:00 2015 +0100
check SeekToEndOfRecord for success
Change-Id: I7413a4e9e491b65122eaadb38ad574161f1aa943
(cherry picked from commit d417ffb7dd93306be7c89526a75acab53dbd8831)
Reviewed-on: https://gerrit.libreoffice.org/18077
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 8c41446..2eeb4b0 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2869,7 +2869,9 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet,
const PptSlidePersistEntry*
insertShapeId(
nShapeId, pObj );
}
}
-aShapeHd.SeekToEndOfRecord(
rStCtrl );
+bool bSuccess =
aShapeHd.SeekToEndOfRecord(rStCtrl);
+if (!bSuccess)
+break;
}
}
}
diff --git a/sd/qa/unit/data/ppt/pass/hang-6.ppt
b/sd/qa/unit/data/ppt/pass/hang-6.ppt
new file mode 100644
index 000..f5aa247
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-6.ppt differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93704] App crash when load any .ods files
https://bugs.documentfoundation.org/show_bug.cgi?id=93704 --- Comment #4 from Gianfranco L'Abbate jeawithl...@tin.it --- Sorry, the report is automatic inviated to Google, I don't know how save and attach this here. I have inviated on Google and indicate to associate it at this bug number :-/ -- 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-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx
vcl/unx/gtk3/app/gtk3gtkinst.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit b678e62b36418aa8dcac8fd268a31441434ec116
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 11:06:57 2015 +0100
gtk3: paste special empty
the paste special listener listens to owner changed, but expects
the owner changed event to contain the new contents, while the
original code expected getContents to be explicitly called to get
the new contents. So on owner changed always return the up to
date contents
Change-Id: Iaa7df2c01d360c3c5831b2258b4c2d41740fdffc
(cherry picked from commit 26786ae2e98cbe041766872e9aacce6d07e6a5c4)
Reviewed-on: https://gerrit.libreoffice.org/18054
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index 76b44da..d8614df 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -529,7 +529,6 @@ void VclGtkClipboard::setContents(
std::list Reference datatransfer::clipboard::XClipboardListener
xListeners( m_aListeners );
datatransfer::clipboard::ClipboardEvent aEv;
-aEv.Contents = m_aContents;
if (m_aContents.is())
{
@@ -579,6 +578,8 @@ void VclGtkClipboard::setContents(
m_aGtkTargets = aGtkTargets;
}
+aEv.Contents = getContents();
+
aGuard.clear();
if( xOldOwner.is() xOldOwner != xClipboardOwner )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93719] MAILMERGE: Freezes On Step 5: Adjust Layout in OS X Or Does Not Show Preview on Windows 7
https://bugs.documentfoundation.org/show_bug.cgi?id=93719 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added CC||caol...@redhat.com --- Comment #5 from Alex Thurgood ipla...@yahoo.co.uk --- @Caolan : seems like bug 65743 has resurfaced again, possibly in a different manifestation, but at same place in wizard UI -- 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 93732] Startcenter window does not have a title
https://bugs.documentfoundation.org/show_bug.cgi?id=93732 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from Alex Thurgood ipla...@yahoo.co.uk --- Confirming on OSX 10.10.5 and Version: 5.0.0.5 Build ID: 1b1a90865e348b492231e1c451437d7a15bb262b Locale : fr-FR (fr.UTF-8) -- 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 93711] Translation error (German: Leerezeichen) in chapter numbering
https://bugs.documentfoundation.org/show_bug.cgi?id=93711 Kü ku...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED Whiteboard||target:5.1.0 target:5.0.2 ||target:4.4.6 --- Comment #4 from Kü ku...@libreoffice.org --- Fixed it for all versions in Pootle. -- 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-commits] core.git: Branch 'libreoffice-5-0' - vcl/qa vcl/source
vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-3.wmf |binary
vcl/source/filter/wmf/enhwmf.cxx | 19 +-
2 files changed, 14 insertions(+), 5 deletions(-)
New commits:
commit e28af9d5cc430244631aeceed290ffe7484f6a1d
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 20:20:01 2015 +0100
don't loop on overly-short nEndPos
Change-Id: I60d3388ece28a69c31a85b9e3b495cbe8a03e7dc
(cherry picked from commit 42732d255423700461f4abadfed77d89efa9cdd0)
Reviewed-on: https://gerrit.libreoffice.org/18097
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-3.wmf
b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-3.wmf
new file mode 100644
index 000..80ad795
Binary files /dev/null and
b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-3.wmf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 7f7bf81..87d492d6 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -617,7 +617,7 @@ void EnhWMFReader::ReadAndDrawPolyPolygon()
bool EnhWMFReader::ReadEnhWMF()
{
sal_uInt32 nStretchBltMode = 0;
-sal_uInt32 nRecType(0), nRecSize(0), nNextPos(0),
+sal_uInt32 nNextPos(0),
nW(0), nH(0), nColor(0), nIndex(0),
nDat32(0), nNom1(0), nDen1(0), nNom2(0), nDen2(0);
sal_Int32 nX32(0), nY32(0), nx32(0), ny32(0);
@@ -629,7 +629,8 @@ bool EnhWMFReader::ReadEnhWMF()
while( bStatus nRecordCount-- pWMF-good())
{
-pWMF-ReadUInt32( nRecType ).ReadUInt32( nRecSize );
+sal_uInt32 nRecType(0), nRecSize(0);
+pWMF-ReadUInt32(nRecType).ReadUInt32(nRecSize);
if ( !pWMF-good() || ( nRecSize 8 ) || ( nRecSize 3 ) ) //
Parameters are always divisible by 4
{
@@ -637,14 +638,22 @@ bool EnhWMFReader::ReadEnhWMF()
break;
}
-const sal_uInt32 nMaxPossibleRecSize = nEndPos - pWMF-Tell() + 8;
+auto nCurPos = pWMF-Tell();
+
+if (nEndPos nCurPos - 8)
+{
+bStatus = false;
+break;
+}
+
+const sal_uInt32 nMaxPossibleRecSize = nEndPos - (nCurPos - 8);
if (nRecSize nMaxPossibleRecSize)
{
bStatus = false;
break;
}
-nNextPos = pWMF-Tell() + ( nRecSize - 8 );
+nNextPos = nCurPos + (nRecSize - 8);
if( !aBmpSaveList.empty()
( nRecType != EMR_STRETCHBLT )
@@ -1423,7 +1432,7 @@ bool EnhWMFReader::ReadEnhWMF()
case EMR_EXTTEXTOUTW :
{
sal_Int32 nLeft, nTop, nRight, nBottom, ptlReferenceX,
ptlReferenceY, nGfxMode, nXScale, nYScale;
-sal_uInt32 nCurPos, nOffString, nOptions, offDx;
+sal_uInt32 nOffString, nOptions, offDx;
sal_Int32 nLen;
std::vectorlong aDX;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/source sd/qa
filter/source/msfilter/msdffimp.cxx |6 --
sd/qa/unit/data/ppt/pass/hang-13.ppt |binary
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 6e0029ee903ebcf97b331908d537f40fde512478
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 20:16:58 2015 +0100
check seek
Change-Id: I358758999bb918e73cdee2224e575e72c2131453
(cherry picked from commit 0c713e45f9831073e34777f50abf9b5801f08ed9)
Reviewed-on: https://gerrit.libreoffice.org/18098
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 09458f8..5e9a34c 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -399,7 +399,8 @@ SvStream ReadSvxMSDffSolverContainer( SvStream rIn,
SvxMSDffSolverContainer r
if ( aHd.nRecType == DFF_msofbtSolverContainer )
{
DffRecordHeader aCRule;
-while ( ( rIn.GetError() == 0 ) ( rIn.Tell()
aHd.GetRecEndFilePos() ) )
+auto nEndPos = DffPropSet::SanitizeEndPos(rIn, aHd.GetRecEndFilePos());
+while ( ( rIn.GetError() == 0 ) ( rIn.Tell() nEndPos ) )
{
ReadDffRecordHeader( rIn, aCRule );
if ( aCRule.nRecType == DFF_msofbtConnectorRule )
@@ -408,7 +409,8 @@ SvStream ReadSvxMSDffSolverContainer( SvStream rIn,
SvxMSDffSolverContainer r
rIn *pRule;
rContainer.aCList.push_back( pRule );
}
-aCRule.SeekToEndOfRecord( rIn );
+if (!aCRule.SeekToEndOfRecord(rIn))
+break;
}
}
return rIn;
diff --git a/sd/qa/unit/data/ppt/pass/hang-13.ppt
b/sd/qa/unit/data/ppt/pass/hang-13.ppt
new file mode 100644
index 000..04fbdc5
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-13.ppt differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/source sd/qa
filter/source/msfilter/svdfppt.cxx | 15 ++-
sd/qa/unit/data/ppt/pass/hang-14.ppt |binary
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 2ddf5ff569ef528d25df7b4613430ab93c207b7a
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 20:32:28 2015 +0100
check seeks and offsets
Change-Id: I2b6ded138b9101415fc49e93e1ec3ebcd3a9d2ae
(cherry picked from commit 5ed690a3e8a575784ca25048e0229ebc52e6fccd)
Reviewed-on: https://gerrit.libreoffice.org/18099
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 428708a..1e8f49d 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6508,10 +6508,12 @@ PPTTextObj::PPTTextObj( SvStream rIn,
SdrPowerPointImport rSdrPowerPointImport
bStatus = false;
else
{
-rIn.Seek( pE-nSlidePersistStartOffset );
+auto nOffset(pE-nSlidePersistStartOffset);
+bStatus = (nOffset == rIn.Seek(nOffset));
// now we got the right page and are searching for
the right
// TextHeaderAtom
-while ( rIn.Tell() pE-nSlidePersistEndOffset )
+auto nEndRecPos = DffPropSet::SanitizeEndPos(rIn,
pE-nSlidePersistEndOffset);
+while (bStatus rIn.Tell() nEndRecPos)
{
ReadDffRecordHeader( rIn, aClientTextBoxHd );
if ( aClientTextBoxHd.nRecType ==
PPT_PST_TextHeaderAtom )
@@ -6522,7 +6524,8 @@ PPTTextObj::PPTTextObj( SvStream rIn,
SdrPowerPointImport rSdrPowerPointImport
break;
}
}
-aClientTextBoxHd.SeekToEndOfRecord( rIn );
+if (!aClientTextBoxHd.SeekToEndOfRecord(rIn))
+break;
}
if ( rIn.Tell() pE-nSlidePersistEndOffset )
bStatus = false;
@@ -6535,12 +6538,14 @@ PPTTextObj::PPTTextObj( SvStream rIn,
SdrPowerPointImport rSdrPowerPointImport
// we have to calculate the correct record len
DffRecordHeader aTmpHd;
-while ( rIn.Tell()
pE-nSlidePersistEndOffset )
+nEndRecPos = DffPropSet::SanitizeEndPos(rIn,
pE-nSlidePersistEndOffset);
+while (rIn.Tell() nEndRecPos)
{
ReadDffRecordHeader( rIn, aTmpHd );
if ( ( aTmpHd.nRecType ==
PPT_PST_SlidePersistAtom ) || ( aTmpHd.nRecType == PPT_PST_TextHeaderAtom ) )
break;
-aTmpHd.SeekToEndOfRecord( rIn );
+if (!aTmpHd.SeekToEndOfRecord(rIn))
+break;
aClientTextBoxHd.nRecLen += aTmpHd.nRecLen
+ DFF_COMMON_RECORD_HEADER_SIZE;
}
aClientTextBoxHd.SeekToContent( rIn );
diff --git a/sd/qa/unit/data/ppt/pass/hang-14.ppt
b/sd/qa/unit/data/ppt/pass/hang-14.ppt
new file mode 100644
index 000..8dd397b
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-14.ppt differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Error while pushing commits for bug 93240
Hi Shreyansh, On Friday, 2015-08-28 10:07:00 +, Shreyansh Gandhi wrote: ! [remote rejected] HEAD - refs/for/master (change 9724 closed) You are attempting to push a change to gerrit that has the same Change-Id as change number 9724 on gerrit, which happens to be a long closed change, coincidentally authored by you, see https://gerrit.libreoffice.org/9724/ Apparently you recycled the Change-Id in the commit message of your new change, or you are accidentally trying to push the same change again. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack pgpHIDFkOy_9O.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 93724] BASE: Insert Row in Filtered Form with Date/Time Fields results in Phantom zero date displayed instead of null, not saved
https://bugs.documentfoundation.org/show_bug.cgi?id=93724 --- Comment #7 from Doug dougt901-2...@yahoo.com --- The functionality also was impervious to changing ODBC settings on a MySQL back-end to report zero-dates as null. Proper functionality would have been responsive to that option. -- 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
Re: Error while pushing commits for bug 93240
Hi, On Friday, 2015-08-28 11:21:45 +0200, Samuel Mehrbrodt wrote: Try ./logerrit submit master Be careful though, ./logerrit pushes every change from your local branch that is on top of the origin, which may explain why you had the problem with the closed 9724 change if that commit still lingered on your branch. The git review plugin command checks and warns if more than one change is to be pushed, see git review --help for usage. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack pgpYlD79nc7XP.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 93529] OpenGL tracker bug ...
https://bugs.documentfoundation.org/show_bug.cgi?id=93529 --- Comment #4 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michael Meeks committed a patch related to this issue. It has been pushed to libreoffice-5-0: http://cgit.freedesktop.org/libreoffice/core/commit/?id=c04099922c2fb177dd310b7aefe5c0b7d3a40fbfh=libreoffice-5-0 tdf#93529 - add glDebugMessageInsert wrappers to help with API tracing. It will be available in 5.0.2. 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 the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/opengl
vcl/opengl/framebuffer.cxx |8 +++
vcl/opengl/gdiimpl.cxx | 46 ++---
2 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit b7614b918f441442cac7e76d1707e05a1fb72951
Author: Michael Meeks michael.me...@collabora.com
Date: Fri Aug 28 11:34:11 2015 +0100
tdf#93529 - use debug messages while rendering to break up the trace.
Change-Id: I56629a721202d7a04bd493d4604278dea85b4212
Reviewed-on: https://gerrit.libreoffice.org/18104
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com
diff --git a/vcl/opengl/framebuffer.cxx b/vcl/opengl/framebuffer.cxx
index c4dfb05..87af985 100644
--- a/vcl/opengl/framebuffer.cxx
+++ b/vcl/opengl/framebuffer.cxx
@@ -22,7 +22,7 @@ OpenGLFramebuffer::OpenGLFramebuffer() :
mpNextFramebuffer( NULL )
{
glGenFramebuffers( 1, mnId );
-SAL_INFO( vcl.opengl, Created framebuffer (int)mnId );
+VCL_GL_INFO( vcl.opengl, Created framebuffer (int)mnId );
}
OpenGLFramebuffer::~OpenGLFramebuffer()
@@ -33,14 +33,14 @@ OpenGLFramebuffer::~OpenGLFramebuffer()
void OpenGLFramebuffer::Bind()
{
glBindFramebuffer( GL_FRAMEBUFFER, mnId );
-SAL_INFO( vcl.opengl, Binding framebuffer (int)mnId );
+VCL_GL_INFO( vcl.opengl, Binding framebuffer (int)mnId );
CHECK_GL_ERROR();
}
void OpenGLFramebuffer::Unbind()
{
glBindFramebuffer( GL_FRAMEBUFFER, 0 );
-SAL_INFO( vcl.opengl, Binding default framebuffer );
+VCL_GL_INFO( vcl.opengl, Binding default framebuffer );
CHECK_GL_ERROR();
}
@@ -59,7 +59,7 @@ void OpenGLFramebuffer::AttachTexture( const OpenGLTexture
rTexture )
if( rTexture.Id() == mnAttachedTexture )
return;
-SAL_INFO( vcl.opengl, Attaching texture rTexture.Id() to
framebuffer (int)mnId );
+VCL_GL_INFO( vcl.opengl, Attaching texture rTexture.Id() to
framebuffer (int)mnId );
mnAttachedTexture = rTexture.Id();
mnWidth = rTexture.GetWidth();
mnHeight = rTexture.GetHeight();
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 3e9b642..f5b746e 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -270,7 +270,7 @@ const vcl::Region OpenGLSalGraphicsImpl::getClipRegion()
const
bool OpenGLSalGraphicsImpl::setClipRegion( const vcl::Region rClip )
{
-SAL_INFO( vcl.opengl, ::setClipRegion rClip );
+VCL_GL_INFO( vcl.opengl, ::setClipRegion rClip );
maClipRegion = rClip;
mbUseStencil = false;
@@ -286,7 +286,7 @@ bool OpenGLSalGraphicsImpl::setClipRegion( const
vcl::Region rClip )
// set the clip region to empty
void OpenGLSalGraphicsImpl::ResetClipRegion()
{
-SAL_INFO( vcl.opengl, ::ResetClipRegion );
+VCL_GL_INFO( vcl.opengl, ::ResetClipRegion );
maClipRegion.SetEmpty();
mbUseScissor = false;
mbUseStencil = false;
@@ -1219,7 +1219,7 @@ void OpenGLSalGraphicsImpl::DrawRadialGradient( const
Gradient rGradient, const
// draw -- LineColor and FillColor and RasterOp and ClipRegion
void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY )
{
-SAL_INFO( vcl.opengl, ::drawPixel );
+VCL_GL_INFO( vcl.opengl, ::drawPixel );
if( mnLineColor != SALCOLOR_NONE )
{
PreDraw();
@@ -1231,7 +1231,7 @@ void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY )
void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY, SalColor nSalColor )
{
-SAL_INFO( vcl.opengl, ::drawPixel );
+VCL_GL_INFO( vcl.opengl, ::drawPixel );
if( nSalColor != SALCOLOR_NONE )
{
PreDraw();
@@ -1243,7 +1243,7 @@ void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY,
SalColor nSalColor )
void OpenGLSalGraphicsImpl::drawLine( long nX1, long nY1, long nX2, long nY2 )
{
-SAL_INFO( vcl.opengl, ::drawLine );
+VCL_GL_INFO( vcl.opengl, ::drawLine );
if( mnLineColor != SALCOLOR_NONE )
{
PreDraw();
@@ -1255,7 +1255,7 @@ void OpenGLSalGraphicsImpl::drawLine( long nX1, long nY1,
long nX2, long nY2 )
void OpenGLSalGraphicsImpl::drawRect( long nX, long nY, long nWidth, long
nHeight )
{
-SAL_INFO( vcl.opengl, ::drawRect );
+VCL_GL_INFO( vcl.opengl, ::drawRect );
PreDraw();
if( UseSolid( mnFillColor ) )
@@ -1289,7 +1289,7 @@ void OpenGLSalGraphicsImpl::drawRect( long nX, long nY,
long nWidth, long nHeigh
void OpenGLSalGraphicsImpl::drawPolyLine( sal_uInt32 nPoints, const SalPoint*
pPtAry )
{
-SAL_INFO( vcl.opengl, ::drawPolyLine );
+VCL_GL_INFO( vcl.opengl, ::drawPolyLine );
if( mnLineColor != SALCOLOR_NONE nPoints 1 )
{
@@ -1302,7 +1302,7 @@ void OpenGLSalGraphicsImpl::drawPolyLine( sal_uInt32
nPoints, const SalPoint* pP
void OpenGLSalGraphicsImpl::drawPolygon( sal_uInt32 nPoints, const SalPoint*
pPtAry )
{
-SAL_INFO( vcl.opengl, ::drawPolygon );
+VCL_GL_INFO( vcl.opengl, ::drawPolygon );
if( nPoints == 0 )
return;
if( nPoints == 1 )
@@ -1330,7 +1330,7 @@
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - filter/source sd/qa sd/source
filter/source/msfilter/msdffimp.cxx | 26 ++
sd/qa/unit/data/ppt/pass/hang-10.ppt |binary
sd/qa/unit/data/ppt/pass/hang-11.ppt |binary
sd/qa/unit/data/ppt/pass/hang-12.ppt |binary
sd/source/filter/ppt/pptin.cxx |6 --
5 files changed, 26 insertions(+), 6 deletions(-)
New commits:
commit 352b5eae4ea9c07d4fab595e75f73b44def7ab77
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 14:28:35 2015 +0100
check status of SeekTo
(cherry picked from commit 932f6de91904f86f38d2914b9ce07b94dfadac0c)
Change-Id: Ia2bb397c3fdd783cab77a6b0dbc31c9e3d19326b
Reviewed-on: https://gerrit.libreoffice.org/18081
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/sd/qa/unit/data/ppt/pass/hang-10.ppt
b/sd/qa/unit/data/ppt/pass/hang-10.ppt
new file mode 100644
index 000..99a81c4
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-10.ppt differ
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index b22372a..db2a05c 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -773,7 +773,8 @@ bool ImplSdPPTImport::Import()
if ( nObjCount++ ) //
skipping the first object
{
Rectangle aEmpty;
-
aHd2.SeekToBegOfRecord( rStCtrl );
+if
(!aHd2.SeekToBegOfRecord( rStCtrl ))
+break;
SdrObject* pImpObj =
ImportObj( rStCtrl, (void*)aProcessData, aEmpty, aEmpty );
if ( pImpObj )
{
@@ -782,7 +783,8 @@ bool ImplSdPPTImport::Import()
}
}
}
-aHd2.SeekToEndOfRecord(
rStCtrl );
+if
(!aHd2.SeekToEndOfRecord(rStCtrl))
+break;
}
}
}
commit c7d1a23c0a6a400beb14be2d72e084fe304ae250
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 15:59:46 2015 +0100
check returns of SeekToEndOfRecord
Change-Id: Ia593dd0e2239a97f17bb03f005d22028da482445
(cherry picked from commit d400f155fdc3867ad4a067c2bf85588fc0fbb2a2)
Reviewed-on: https://gerrit.libreoffice.org/18083
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index be3c003..4748cb9 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3241,12 +3241,19 @@ bool SvxMSDffManager::SeekToRec( SvStream rSt,
sal_uInt16 nRecId, sal_uLong nMa
if ( pRecHd != NULL )
*pRecHd = aHd;
else
-aHd.SeekToBegOfRecord( rSt );
+{
+bool bSeekSuccess = aHd.SeekToBegOfRecord(rSt);
+if (!bSeekSuccess)
+{
+bRet = false;
+break;
+}
+}
}
}
if ( !bRet )
{
-bool bSeekSuccess = aHd.SeekToEndOfRecord( rSt );
+bool bSeekSuccess = aHd.SeekToEndOfRecord(rSt);
if (!bSeekSuccess)
break;
}
@@ -3275,11 +3282,22 @@ bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1,
sal_uInt16 nRecId2, sal_uL
if ( pRecHd )
*pRecHd = aHd;
else
-aHd.SeekToBegOfRecord( rStCtrl );
+{
+bool bSeekSuccess = aHd.SeekToBegOfRecord(rStCtrl);
+if (!bSeekSuccess)
+{
+bRet = false;
+break;
+}
+}
}
}
if ( !bRet )
-aHd.SeekToEndOfRecord( rStCtrl );
+{
+bool bSeekSuccess = aHd.SeekToEndOfRecord(rStCtrl);
+if (!bSeekSuccess)
+break;
+}
}
while ( rStCtrl.good() rStCtrl.Tell() nMaxFilePos !bRet );
if ( !bRet )
diff --git a/sd/qa/unit/data/ppt/pass/hang-11.ppt
b/sd/qa/unit/data/ppt/pass/hang-11.ppt
new file mode 100644
index
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - filter/source sd/qa sd/source
filter/source/msfilter/svdfppt.cxx | 22 +-
sd/qa/unit/data/ppt/pass/hang-9.ppt |binary
sd/source/filter/ppt/pptin.cxx |8 +++-
3 files changed, 24 insertions(+), 6 deletions(-)
New commits:
commit f6e85ec2eb9263e804098aeade75bd9fe8f39b27
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 14:22:23 2015 +0100
avoid loops in atom chains
(cherry picked from commit de71eae5807ff94c8eace0eccaabf1ffa08e77b6)
Change-Id: Icc40c0ee6c7d8d305cf7cc60cbf3e511c763aedd
Reviewed-on: https://gerrit.libreoffice.org/18080
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 9a5ca61..b6693086 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2541,11 +2541,17 @@ bool SdrPowerPointImport::GetColorFromPalette(
sal_uInt16 nNum, Color rColor )
while( ( pMasterPersist
pMasterPersist-aSlideAtom.nFlags 2 ) // it is possible that a masterpage
pMasterPersist-aSlideAtom.nMasterId )
// itself is following a master colorscheme
{
-sal_uInt16 nNextMaster = pMasterPages-FindPage(
pMasterPersist-aSlideAtom.nMasterId );
+auto nOrigMasterId =
pMasterPersist-aSlideAtom.nMasterId;
+sal_uInt16 nNextMaster =
pMasterPages-FindPage(nOrigMasterId);
if ( nNextMaster == PPTSLIDEPERSIST_ENTRY_NOTFOUND )
break;
else
pMasterPersist = (*pPageList2)[ nNextMaster ];
+if (pMasterPersist-aSlideAtom.nMasterId ==
nOrigMasterId)
+{
+SAL_WARN(filter.ms, loop in atom chain);
+break;
+}
}
}
if ( pMasterPersist )
@@ -2554,9 +2560,9 @@ bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16
nNum, Color rColor )
}
}
}
-// resgister current color scheme
-((SdrPowerPointImport*)this)-nPageColorsNum = nAktPageNum;
-((SdrPowerPointImport*)this)-ePageColorsKind = eAktPageKind;
+// register current color scheme
+const_castSdrPowerPointImport*(this)-nPageColorsNum = nAktPageNum;
+const_castSdrPowerPointImport*(this)-ePageColorsKind = eAktPageKind;
}
rColor = aPageColors.GetColor( nNum );
return true;
@@ -2778,11 +2784,17 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet,
const PptSlidePersistEntry*
PptSlidePersistEntry* pE =
(*pPageList)[ nMasterNum ];
while( ( pE-aSlideAtom.nFlags 4
) pE-aSlideAtom.nMasterId )
{
-sal_uInt16 nNextMaster =
pMasterPages-FindPage( pE-aSlideAtom.nMasterId );
+auto nOrigMasterId =
pE-aSlideAtom.nMasterId;
+sal_uInt16 nNextMaster =
pMasterPages-FindPage(nOrigMasterId);
if ( nNextMaster ==
PPTSLIDEPERSIST_ENTRY_NOTFOUND )
break;
else
pE = (*pPageList)[
nNextMaster ];
+if (pE-aSlideAtom.nMasterId
== nOrigMasterId)
+{
+SAL_WARN(filter.ms,
loop in atom chain);
+break;
+}
}
if ( pE-nBackgroundOffset )
{
diff --git a/sd/qa/unit/data/ppt/pass/hang-9.ppt
b/sd/qa/unit/data/ppt/pass/hang-9.ppt
new file mode 100644
index 000..97e0158
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-9.ppt differ
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index db2a05c..5fe2bdc 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -725,11 +725,17 @@ bool ImplSdPPTImport::Import()
PptSlidePersistEntry* pE = pPersist;
while( ( pE-aSlideAtom.nFlags 4 )
pE-aSlideAtom.nMasterId )
{
-sal_uInt16 nNextMaster = pMasterPages-FindPage(
pE-aSlideAtom.nMasterId );
+auto nOrigMasterId = pE-aSlideAtom.nMasterId;
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sd/qa sd/source
sd/qa/unit/data/ppt/pass/hang-18.ppt |binary
sd/source/filter/ppt/propread.cxx| 27 ---
2 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 0591e1bae3963277240848851158bf82d3be3911
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 28 09:15:04 2015 +0100
clip strings to max available size
(cherry picked from commit 580d3837b26f09ed02fe3583de40fa045a3fde0f)
Change-Id: Icc1378c9c27b9b6d229bcffc6a63017f82be70d4
Reviewed-on: https://gerrit.libreoffice.org/18101
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/sd/qa/unit/data/ppt/pass/hang-18.ppt
b/sd/qa/unit/data/ppt/pass/hang-18.ppt
new file mode 100644
index 000..3b3e9f7
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-18.ppt differ
diff --git a/sd/source/filter/ppt/propread.cxx
b/sd/source/filter/ppt/propread.cxx
index 20e59df..1e71044 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -73,7 +73,7 @@ static sal_Int32 lcl_getMaxSafeStrLen(sal_uInt32 nSize)
bool PropItem::Read( OUString rString, sal_uInt32 nStringType, bool bAlign )
{
-sal_uInt32 i, nItemSize, nType, nItemPos;
+sal_uInt32 nType, nItemPos;
boolbRetValue = false;
nItemPos = Tell();
@@ -86,8 +86,8 @@ bool PropItem::Read( OUString rString, sal_uInt32
nStringType, bool bAlign )
else
nType = nStringType VT_TYPEMASK;
-nItemSize = 0; // Initialize in case stream fails.
-ReadUInt32( nItemSize );
+sal_uInt32 nItemSize(0); // Initialize in case stream fails.
+ReadUInt32(nItemSize);
switch( nType )
{
@@ -95,6 +95,12 @@ bool PropItem::Read( OUString rString, sal_uInt32
nStringType, bool bAlign )
{
if ( nItemSize )
{
+auto nMaxSizePossible = remainingSize();
+if (nItemSize nMaxSizePossible)
+{
+SAL_WARN(sd.filter, String of Len nItemSize
claimed, only nMaxSizePossible possible);
+nItemSize = nMaxSizePossible;
+}
try
{
sal_Char* pString = new sal_Char[ nItemSize ];
@@ -103,8 +109,8 @@ bool PropItem::Read( OUString rString, sal_uInt32
nStringType, bool bAlign )
nItemSize = 1;
if ( nItemSize 1 )
{
-sal_Unicode* pWString = (sal_Unicode*)pString;
-for ( i = 0; i nItemSize; i++ )
+sal_Unicode* pWString =
reinterpret_castsal_Unicode*(pString);
+for (sal_uInt32 i = 0; i nItemSize; ++i)
ReadUInt16( pWString[ i ] );
rString = OUString(pWString,
lcl_getMaxSafeStrLen(nItemSize));
}
@@ -140,12 +146,19 @@ bool PropItem::Read( OUString rString, sal_uInt32
nStringType, bool bAlign )
{
if ( nItemSize )
{
+auto nMaxSizePossible = remainingSize() / sizeof(sal_Unicode);
+if (nItemSize nMaxSizePossible)
+{
+SAL_WARN(sd.filter, String of Len nItemSize
claimed, only nMaxSizePossible possible);
+nItemSize = nMaxSizePossible;
+}
+
try
{
sal_Unicode* pString = new sal_Unicode[ nItemSize ];
-for ( i = 0; i nItemSize; i++ )
+for (sal_uInt32 i = 0; i nItemSize; ++i)
ReadUInt16( pString[ i ] );
-if ( pString[ i - 1 ] == 0 )
+if ( pString[ nItemSize - 1 ] == 0 )
{
if ( (sal_uInt16)nItemSize 1 )
rString = OUString(pString,
lcl_getMaxSafeStrLen(nItemSize));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/DocumentContentOperationsManager.cxx | 17 +---
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 99eaa798eb167688648da16a61f0214938caf7c5
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Aug 28 13:25:08 2015 +0200
tdf#93353: fix copy fluy in fly
- prevents flys in inlcuded docs in a master doc from disappearing
- fixes a regression from 3fcb0c3aa8d58a819aa21eb9743eaa6da7394819
Change-Id: If211d8dbf423e2a33a258b43ab7092e1a010206f
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index df092d9..32ece3e 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3201,7 +3201,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
const SwNodeRange rRg,
const sal_Int32 nEndContentIndex,
const SwNodeIndex rStartIdx,
-bool bCopyFlyAtFly,
+const bool bCopyFlyAtFly,
const bool bMergedFirstNode ) const
{
// First collect all Flys, sort them according to their ordering number,
@@ -3223,22 +3223,25 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
bool bAtContent = (pAnchor-GetAnchorId() == FLY_AT_PARA);
if ( !pAPos )
continue;
+sal_uLong nSkipAfter = pAPos-nNode.GetIndex();
+sal_uLong nStart = rRg.aStart.GetIndex();
switch ( pAnchor-GetAnchorId() )
{
case FLY_AT_FLY:
-if( bCopyFlyAtFly rRg.aStart pAPos-nNode.GetIndex() + 1 )
-continue;
+if(bCopyFlyAtFly)
+++nSkipAfter;
+else if(m_rDoc.getIDocumentRedlineAccess().IsRedlineMove())
+++nStart;
break;
case FLY_AT_CHAR:
case FLY_AT_PARA:
-bCopyFlyAtFly = false;
+if(m_rDoc.getIDocumentRedlineAccess().IsRedlineMove())
+++nStart;
break;
default:
continue;
}
-if ( !bCopyFlyAtFly (
m_rDoc.getIDocumentRedlineAccess().IsRedlineMove()
-? rRg.aStart = pAPos-nNode
-: rRg.aStart pAPos-nNode ))
+if ( nStart nSkipAfter )
continue;
if ( pAPos-nNode rRg.aEnd )
continue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92204] WRITER: Japanese Character is not shown on Property Description Comment text box.
https://bugs.documentfoundation.org/show_bug.cgi?id=92204 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Blocks||91488 --- Comment #5 from Björn Michaelsen bjoern.michael...@canonical.com --- Blocking on 91488, as per comment 4 seems to be RenderContext related. -- 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
Re: Error while pushing commits for bug 93240
Same result:- git push origin HEAD:refs/for/master Counting objects: 63, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - refs/for/master (you are not allowed to upload merges) error: failed to push some refs to 'ssh://logerrit/core' On Fri, Aug 28, 2015 at 5:41 PM Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hey, On Fri, Aug 28, 2015 at 2:10 PM, Shreyansh Gandhi gandhish...@gmail.com wrote: Hi, So, the problem was that an original initial commit (with no actual changes) was being inherited from master. Now when I try to push my changes, git push origin HEAD:master Counting objects: 56, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Branch refs/heads/master: remote: You are not allowed to perform this operation. remote: To push into this reference you need 'Push' rights. remote: User: phenom remote: Please read the documentation and contact an administrator remote: if you feel the configuration is incorrect remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - master (prohibited by Gerrit) How should I fix this? -Shreyansh http://lists.freedesktop.org/mailman/listinfo/libreoffice You are not allowed to push to master. Instead you need to use something like git push origin HEAD:refs/for/master which will push it to the review queue. Regards, Markus -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 93743] New: Opening a document with Writer 4.5.2 originally created with Writer 4.3.7.2 loss of format and partial content in tables
https://bugs.documentfoundation.org/show_bug.cgi?id=93743 Bug ID: 93743 Summary: Opening a document with Writer 4.5.2 originally created with Writer 4.3.7.2 loss of format and partial content in tables Product: LibreOffice Version: 4.4.5.2 release Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: klaus.bels...@profluid.de Created attachment 118244 -- https://bugs.documentfoundation.org/attachment.cgi?id=118244action=edit Document created with Writer 4.3.7.2 Formatting problem with 4.5.2 FORMATTING: A odt document, which is routinely used for report generation, including tables and checkboxes, with graphics and photos placed in the table worked fine up to Writer 4.3.7.2. After upgrading to 4.5.2 some content is no longer visible on the 4.5.2 Desktop, however is still present on the desktop of 4.3.7.2, which means the content is still in the disk file. In addition the position layout of pictures in the table is lost and the pictures moved from their original position. I have attached the original odt document. Exporting to pdf with Writer 4.5.2 also shows the blank fields and lost position layout of the pictures. Any idea, how to circumvent this, except creating a completely new document template? -- 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 93745] UI - Writer letter wizard, Step 2, using headed paper, shows no sizing arrows
https://bugs.documentfoundation.org/show_bug.cgi?id=93745 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Keywords||regression -- 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
Re: Deletion of vcl::Window's inside ToolBar
Hi Dennis, On Fri, Aug 28, 2015 at 6:58 AM, Dennis Francis dennisfrancis...@gmail.com wrote: I tried calling disposeAndClear() on mpWindow JFYI there is already a call to disposeAndClear() in SfxToolBoxControl::dispose(). it was clear that ref counts gets added for each font added to the font list box widget while calling the constructor of ImplFontListFontInfo. Good finding. Please suggest any better methods that I may have missed. Well, for me adding a manual m_aOwnFontList.reset() to SvxFontNameBox_Impl::dispose() seems to do the job. Maxim ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 86042] Right side menu buttons disappeared in xfce for Impress 4.2.7.2.
https://bugs.documentfoundation.org/show_bug.cgi?id=86042 Thomas Wielatt wiela...@mindpractise.com changed: What|Removed |Added Status|NEEDINFO|UNCONFIRMED Ever confirmed|1 |0 --- Comment #2 from Thomas Wielatt wiela...@mindpractise.com --- Hi, the bug is still existing in the following configuration: Ubuntu 14.04 64bit Version: 5.0.0.5 Build-ID: 00m0(Build:5) Additionally the layouts are not visible, too. Greets Thomas -- 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 92145] Not possible to adjust row and column sizes when rulers are hidden
https://bugs.documentfoundation.org/show_bug.cgi?id=92145 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Blocks||91488 --- Comment #10 from Björn Michaelsen bjoern.michael...@canonical.com --- Blocking on 91488, as per comment 1 seems to be RenderContext related. -- 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 91488] [META] RenderContext related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=91488 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Depends on||92204 -- 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 91488] [META] RenderContext related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=91488 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Depends on||92843 -- 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
Re: Error while pushing commits for bug 93240
Hi, So, the problem was that an original initial commit (with no actual changes) was being inherited from master. Now when I try to push my changes, git push origin HEAD:master Counting objects: 56, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Branch refs/heads/master: remote: You are not allowed to perform this operation. remote: To push into this reference you need 'Push' rights. remote: User: phenom remote: Please read the documentation and contact an administrator remote: if you feel the configuration is incorrect remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - master (prohibited by Gerrit) How should I fix this? -Shreyansh On Fri, Aug 28, 2015 at 4:43 PM Eike Rathke er...@redhat.com wrote: Hi, On Friday, 2015-08-28 11:21:45 +0200, Samuel Mehrbrodt wrote: Try ./logerrit submit master Be careful though, ./logerrit pushes every change from your local branch that is on top of the origin, which may explain why you had the problem with the closed 9724 change if that commit still lingered on your branch. The git review plugin command checks and warns if more than one change is to be pushed, see git review --help for usage. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdedtv2.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 8f72afaf55a2fdf5a4d25984d2b39b410359d0d1 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 13:08:44 2015 +0100 implement undo for equalize-marked-objects Change-Id: I245e08674b52c2a5648e9d7762101b8057fd30e9 diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 75c884c..719355d 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -1200,6 +1200,8 @@ void SdrEditView::EqualizeMarkedObjects(bool bWidth) else aLogicRectSize.Height() = aLastRectSize.Height(); aLogicRect.SetSize(aLogicRectSize); +if (bUndo) + AddUndo(GetModel()-GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); pObj-SetLogicRect(aLogicRect); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 83546] SIDEBAR: content panels in tray don't open with accelerators when sidebar is enabled but fully hidden
https://bugs.documentfoundation.org/show_bug.cgi?id=83546 --- Comment #15 from V Stuart Foote vstuart.fo...@utsa.edu --- (In reply to Samuel Mehrbrodt from comment #13) It seems to be not that easy to fix this one, I also tried it but couldn't get it working. I wonder whether we really need this arrows to hide the docking areas. The same functionality is available if you use the View-Sidebar menu. Could we just remove this feature to hide the docking areas with the arrow button? That would be an easy fix for this bug. I hope not. Having the ability to hide the full Deck Tab bar, or when just the Tab bar is showing, with the Hide/Show widget grips is a really nice function of the Sidebar GUI. Function is not the same manipulating from the View menu. Currently, when collapsed or hidden the Sidebar remains loaded with the content panel selected, and is simply unhidden by the grip action. Also while hidden it responds to changes in content panel, meaning you can reopen it showing a content panel not active when it was hidden. And when manipulated from the View - Sidebar it currently is being closed. And is reloaded and set back to its default, i.e. opens the Properties panel. So yes some of the function can be duplicated, but it is not as clean as with the Hide/Show grip widgets. -- 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-commits] core.git: sw/qa
sw/qa/core/data/ww8/pass/CVE-2015-2431-1.doc |binary 1 file changed New commits: commit ba433025b38f21173ccab0e9d2f20d0f24cd7b3b Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 14:51:32 2015 +0100 add test case for CVE-2015-2431 Change-Id: I88e3b21d9b7f772eb16a454d0c3a369a92fa3739 diff --git a/sw/qa/core/data/ww8/pass/CVE-2015-2431-1.doc b/sw/qa/core/data/ww8/pass/CVE-2015-2431-1.doc new file mode 100644 index 000..05582e2 Binary files /dev/null and b/sw/qa/core/data/ww8/pass/CVE-2015-2431-1.doc differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/fixes8'
New branch 'feature/fixes8' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93738] Menu Entry for File Templates not translated
https://bugs.documentfoundation.org/show_bug.cgi?id=93738 sophie gautier.sop...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||gautier.sop...@gmail.com Ever confirmed|0 |1 --- Comment #1 from sophie gautier.sop...@gmail.com --- Hi, what is the language it's not translated in? Thanks - Set as need info - Sophie -- 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-commits] core.git: Branch 'libreoffice-5-0-1' - configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d31ce1157a2edf8c966abcd5000b0adf44178aae
Author: Rene Engelhard r...@debian.org
Date: Fri Aug 28 13:55:53 2015 +0200
bump gtk check to gtk+-3.0 = 3.8
Needed since 2ce903c7b2d67a46c2fe2755cfaa66d98f2eddf2
Conflicts:
configure.ac
Change-Id: I589e782baae0bd4d5906b97c371cad587aaf5c94
diff --git a/configure.ac b/configure.ac
index e77c598..02e8c7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9895,7 +9895,7 @@ if test x$enable_gtk3 = xyes; then
AC_MSG_ERROR([System cairo required for gtk3 support, do not combine
--enable-gtk3 with --without-system-cairo])
fi
: ${with_system_cairo:=yes}
-PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.2 gtk+-unix-print-3.0
gmodule-no-export-2.0 cairo, ENABLE_GTK3=TRUE, ENABLE_GTK3=)
+PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.8 gtk+-unix-print-3.0
gmodule-no-export-2.0 cairo, ENABLE_GTK3=TRUE, ENABLE_GTK3=)
if test x$ENABLE_GTK3 = xTRUE; then
R=gtk3
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8d5fda8e7bb043c762b3f9c7169b90c3ee8b6832
Author: Rene Engelhard r...@debian.org
Date: Fri Aug 28 13:55:53 2015 +0200
bump gtk check to gtk+-3.0 = 3.8
Needed since 2ce903c7b2d67a46c2fe2755cfaa66d98f2eddf2
Conflicts:
configure.ac
Change-Id: I589e782baae0bd4d5906b97c371cad587aaf5c94
diff --git a/configure.ac b/configure.ac
index 0d9a8c3..13cfa08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9904,7 +9904,7 @@ if test x$enable_gtk3 = xyes; then
AC_MSG_ERROR([System cairo required for gtk3 support, do not combine
--enable-gtk3 with --without-system-cairo])
fi
: ${with_system_cairo:=yes}
-PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.2 gtk+-unix-print-3.0
gmodule-no-export-2.0 cairo, ENABLE_GTK3=TRUE, ENABLE_GTK3=)
+PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.8 gtk+-unix-print-3.0
gmodule-no-export-2.0 cairo, ENABLE_GTK3=TRUE, ENABLE_GTK3=)
if test x$ENABLE_GTK3 = xTRUE; then
R=gtk3
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93713] Unable to Unprotect Protected cells in Writer Tables from 'Table' menu
https://bugs.documentfoundation.org/show_bug.cgi?id=93713 Maxim Monastirsky momonas...@gmail.com changed: What|Removed |Added Status|REOPENED|NEW --- Comment #10 from Maxim Monastirsky momonas...@gmail.com --- (In reply to Charles from comment #9) 2. Click inside a cell 3. Protect the cell Note that the cursor jumps to an adjacent cell. Confirmed. -- 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 93744] New: Printing problem using RTF text
https://bugs.documentfoundation.org/show_bug.cgi?id=93744 Bug ID: 93744 Summary: Printing problem using RTF text Product: LibreOffice Version: 5.1.0.0.alpha0+ Master Hardware: Other OS: All Status: UNCONFIRMED Severity: blocker Priority: medium Component: LibreOffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: j...@rojego.com 1. Version 3 printed RTF text with pictures but version 5 omits pictures while printing text. 2. It will not print odd number pages. 3. it will not print select pages, ie 86,88. 4. When loading a large rtf file it will add blank space lines in some portions of the file. 5. When scrolling down down a page searching for a specific page, it does not show page numbers as does Microsoft Word. 6. I can not find an icon to center text on a page. 7. It does not have an automatic spell checker while typing. Do you have a version with these problems already corrected? Please advise ASAP. I tried to make a contribution once but could not get the contribution system to work. -- 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-commits] core.git: Branch 'libreoffice-5-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7f0c71d06236d822e3496cabbcfcde97e0d2e7d0 Author: Andras Timar andras.ti...@collabora.com Date: Fri Aug 28 15:00:16 2015 +0200 Updated core Project: translations dc9a76191fa5ada84099b6724025e306b6a6102c Updated Slovenian translation Change-Id: Ibf74d8f7e5417dc1f843e6248b6b04247ca564f7 diff --git a/translations b/translations index ee62796..dc9a761 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit ee62796699c03b6d31184697010db569f6dae8de +Subproject commit dc9a76191fa5ada84099b6724025e306b6a6102c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93713] Unprotect Cells missing from Table Menu and Table Toolbar
https://bugs.documentfoundation.org/show_bug.cgi?id=93713 Charles tansta...@libertytrek.org changed: What|Removed |Added Summary|Unable to Unprotect |Unprotect Cells missing |Protected cells in Writer |from Table Menu and Table |Tables from 'Table' menu|Toolbar --- Comment #11 from Charles tansta...@libertytrek.org --- Changing Summary to reflect that this is just a problem of missing menu entries. Once the 'Unprotect Cells' option is added to the Table Menu and/or Toolbar, it works as expected. -- 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 92843] UI: The case of the disappearing zoom slider
https://bugs.documentfoundation.org/show_bug.cgi?id=92843 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Blocks||91488 --- Comment #3 from Björn Michaelsen bjoern.michael...@canonical.com --- Blocking on 91488, as per comment 2 seems to be RenderContext related. -- 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
Re: Error while pushing commits for bug 93240
Hey, On Fri, Aug 28, 2015 at 2:10 PM, Shreyansh Gandhi gandhish...@gmail.com wrote: Hi, So, the problem was that an original initial commit (with no actual changes) was being inherited from master. Now when I try to push my changes, git push origin HEAD:master Counting objects: 56, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Branch refs/heads/master: remote: You are not allowed to perform this operation. remote: To push into this reference you need 'Push' rights. remote: User: phenom remote: Please read the documentation and contact an administrator remote: if you feel the configuration is incorrect remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - master (prohibited by Gerrit) How should I fix this? -Shreyansh http://lists.freedesktop.org/mailman/listinfo/libreoffice You are not allowed to push to master. Instead you need to use something like git push origin HEAD:refs/for/master which will push it to the review queue. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 93610] cannot flip .PNG properly in Writer and Draw
https://bugs.documentfoundation.org/show_bug.cgi?id=93610 V Stuart Foote vstuart.fo...@utsa.edu changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 Whiteboard|noRepro:Windows:5.0.1.2 |needs:LXDE |noRepro:Windows:5.0.2.0+| |noRepro:Windows:5.1.0.0+| --- Comment #15 from V Stuart Foote vstuart.fo...@utsa.edu --- Confirmed, On Fedora21 with DESKTOP_SESSION=LXDE with Version: 5.0.1.1 Build ID: 13f702ca819ea5b9f8605782c852d5bb513b3891 Locale: en-US (en_US.UTF-8) The PNG in the ODG attachment 118161 does not flip in Draw. And when attachment 118160 is opened in Writer, the same PNG will not flip from the image Image dialog. What is interesting is that in Writers Image dialog--the preview of the transform applied to the PNG shows it as flipped and the checkbox remain selected as the dialog is closed and reopened. But the image on the canvas is not rendered flipped. Setting NEW and adding a needs:LXDE -- 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 93610] cannot flip .PNG properly in Writer and Draw with LXDE
https://bugs.documentfoundation.org/show_bug.cgi?id=93610 V Stuart Foote vstuart.fo...@utsa.edu changed: What|Removed |Added Summary|cannot flip .PNG properly |cannot flip .PNG properly |in Writer and Draw |in Writer and Draw with ||LXDE -- 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-commits] core.git: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0f4ce1e2a19eac4cfac37360114e5e49e4d10d09
Author: Rene Engelhard r...@debian.org
Date: Fri Aug 28 13:55:53 2015 +0200
bump gtk check to gtk+-3.0 = 3.8
Needed since 2ce903c7b2d67a46c2fe2755cfaa66d98f2eddf2
Change-Id: I589e782baae0bd4d5906b97c371cad587aaf5c94
diff --git a/configure.ac b/configure.ac
index 145c3d6..d009794 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9984,7 +9984,7 @@ if test x$enable_gtk3 = xyes; then
AC_MSG_ERROR([System cairo required for gtk3 support, do not combine
--enable-gtk3 with --without-system-cairo])
fi
: ${with_system_cairo:=yes}
-PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.2 gtk+-unix-print-3.0
gmodule-no-export-2.0 glib-2.0 = 2.38 cairo, ENABLE_GTK3=TRUE,
ENABLE_GTK3=)
+PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.8 gtk+-unix-print-3.0
gmodule-no-export-2.0 glib-2.0 = 2.38 cairo, ENABLE_GTK3=TRUE,
ENABLE_GTK3=)
if test x$ENABLE_GTK3 = xTRUE; then
R=gtk3
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93742] New: New password protected library lose module and code
https://bugs.documentfoundation.org/show_bug.cgi?id=93742 Bug ID: 93742 Summary: New password protected library lose module and code Product: LibreOffice Version: 5.0.1.2 release Hardware: Other OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: BASIC Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: lgodard.li...@laposte.net step to reproduce 1. File New Text document 2. Tools Macros Organize LibO Basic, click Organizer, tab Libraries, location:Untitled 1, click New, name Library1, Ok 3. Click Password: foo (confirm), Ok 4. Click Edit: in Module1 of Library1, create the following macro: sub Main msgbox Hello End Sub 5. Save the document and *close it*. 6. Reopen the document 7. Tools Macros Organize LibO Basic and try edit code The Module and code are not there (dataloss) maybe related to issue 68983 Doing the other way, create module and code before setting the library password protected and save -- it is ok -- 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-ux-advise] [Bug 83546] SIDEBAR: content panels in tray don't open with accelerators when sidebar is enabled but fully hidden
https://bugs.documentfoundation.org/show_bug.cgi?id=83546 --- Comment #15 from V Stuart Foote vstuart.fo...@utsa.edu --- (In reply to Samuel Mehrbrodt from comment #13) It seems to be not that easy to fix this one, I also tried it but couldn't get it working. I wonder whether we really need this arrows to hide the docking areas. The same functionality is available if you use the View-Sidebar menu. Could we just remove this feature to hide the docking areas with the arrow button? That would be an easy fix for this bug. I hope not. Having the ability to hide the full Deck Tab bar, or when just the Tab bar is showing, with the Hide/Show widget grips is a really nice function of the Sidebar GUI. Function is not the same manipulating from the View menu. Currently, when collapsed or hidden the Sidebar remains loaded with the content panel selected, and is simply unhidden by the grip action. Also while hidden it responds to changes in content panel, meaning you can reopen it showing a content panel not active when it was hidden. And when manipulated from the View - Sidebar it currently is being closed. And is reloaded and set back to its default, i.e. opens the Properties panel. So yes some of the function can be duplicated, but it is not as clean as with the Hide/Show grip widgets. -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 93713] Unprotect Cells missing from Table Menu and Table Toolbar
https://bugs.documentfoundation.org/show_bug.cgi?id=93713 --- Comment #12 from Charles tansta...@libertytrek.org --- Thanks for confirming @Maxim... Bug 93746 opened... -- 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 93745] UI - Writer letter wizard, Step 2, using headed paper, shows no sizing arrows
https://bugs.documentfoundation.org/show_bug.cgi?id=93745 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Priority|medium |high -- 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 93745] UI - Writer letter wizard, Step 2, using headed paper, shows no sizing arrows
https://bugs.documentfoundation.org/show_bug.cgi?id=93745 --- Comment #1 from Alex Thurgood ipla...@yahoo.co.uk --- Arrows are present in LibreOffice 4432 -- 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-commits] core.git: Branch 'libreoffice-5-0-1' - configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f390174847c955d34db0f7753887cc1ce1b4df9d
Author: Rene Engelhard r...@debian.org
Date: Fri Aug 28 14:02:28 2015 +0200
Revert bump gtk check to gtk+-3.0 = 3.8
This reverts commit d31ce1157a2edf8c966abcd5000b0adf44178aae.
Wrong branch..
diff --git a/configure.ac b/configure.ac
index 02e8c7f..e77c598 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9895,7 +9895,7 @@ if test x$enable_gtk3 = xyes; then
AC_MSG_ERROR([System cairo required for gtk3 support, do not combine
--enable-gtk3 with --without-system-cairo])
fi
: ${with_system_cairo:=yes}
-PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.8 gtk+-unix-print-3.0
gmodule-no-export-2.0 cairo, ENABLE_GTK3=TRUE, ENABLE_GTK3=)
+PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.2 gtk+-unix-print-3.0
gmodule-no-export-2.0 cairo, ENABLE_GTK3=TRUE, ENABLE_GTK3=)
if test x$ENABLE_GTK3 = xTRUE; then
R=gtk3
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes8' - vcl/win
vcl/win/source/gdi/winlayout.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8102bcb06fb3ca03c97796dc0963aa3ad8c893b0
Author: Tor Lillqvist t...@collabora.com
Date: Tue Aug 25 11:52:20 2015 +0300
Turn on glyph caching by default when using OpenGL
Can now be turned off with a SAL_DISABLE_GLYPH_CACHING environment variable.
Change-Id: I7ac14d72dc0f85c0682d92492eb96bec1d207609
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index f26d3eb..d341806 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1658,7 +1658,7 @@ void UniscribeLayout::DrawTextImpl(HDC hDC) const
bool UniscribeLayout::CacheGlyphs(SalGraphics rGraphics) const
{
-static bool bDoGlyphCaching = (std::getenv(SAL_ENABLE_GLYPH_CACHING) !=
NULL);
+static bool bDoGlyphCaching = (std::getenv(SAL_DISABLE_GLYPH_CACHING) ==
NULL);
if (!bDoGlyphCaching)
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93656] Unable to organize forms in subfolders
https://bugs.documentfoundation.org/show_bug.cgi?id=93656 --- Comment #7 from rob...@familiegrosskopf.de --- (In reply to Adolfo Jayme from comment #6) The FIXED status is reserved to issues closed with a commit. This bug seems to be a duplicate of bug93018. Bug 93018 has been fixed with a commit - the same commit, which fixed this bug ... -- 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-commits] core.git: Branch 'private/mcecchetti/bitmapcrc64' - 3 commits - include/vcl sw/qa vcl/inc vcl/opengl
include/vcl/checksum.hxx |5 ++---
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 +-
vcl/inc/salbmp.hxx | 10 +-
vcl/opengl/salbmp.cxx|2 +-
4 files changed, 9 insertions(+), 10 deletions(-)
New commits:
commit e8c983e47fa993d3202bd62e735c53cf6c80
Author: Marco Cecchetti marco.cecche...@collabora.com
Date: Fri Aug 28 15:35:43 2015 +0200
switch to 64-bit checksum: now BitmapChecksum is a sal_uInt64
Changed hardcoded checksum value in ooxmlimport unit test (testN777345).
Change-Id: Ied43bf626be82c0e7f6c62e965d0704fc645ac19
diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx
index 83facef..6efb4ac 100644
--- a/include/vcl/checksum.hxx
+++ b/include/vcl/checksum.hxx
@@ -125,11 +125,10 @@ static const sal_uInt64 vcl_crc64Table[256] = {
0x29b7d047efec8728ULL
};
-#define BITMAP_CHECKSUM_SIZE 4
+#define BITMAP_CHECKSUM_SIZE 8
#define BITMAP_CHECKSUM_BITS BOOST_PP_MUL(BITMAP_CHECKSUM_SIZE, 8)
-typedef sal_uLong BitmapChecksum;
-
+typedef sal_uInt64 BitmapChecksum;
typedef sal_uInt8 BitmapChecksumOctetArray[BITMAP_CHECKSUM_SIZE];
#define BITMAP_CHECKSUM_SET_OCTET(z, i, unused) \
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6bd8269..0c2900f 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -750,7 +750,7 @@ DECLARE_OOXMLIMPORT_TEST(testN777345, n777345.docx)
Graphic aGraphic(xGraphic);
// If this changes later, feel free to update it, but make sure it's not
// the checksum of a white/transparent placeholder rectangle.
-CPPUNIT_ASSERT_EQUAL(sal_uLong(1256330431U), aGraphic.GetChecksum());
+CPPUNIT_ASSERT_EQUAL(BitmapChecksum(3652741777587093783),
aGraphic.GetChecksum());
#endif
}
commit 38499e232728d108a849949a62422b000d2ce2a0
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Aug 27 21:28:48 2015 +0100
CRC is an integer type - mnChecksum.
Change-Id: I9e4d36105a59c5f81677d8e062106dae6f709464
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 26a0b6f..89846b1 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -73,7 +73,7 @@ public:
{
updateChecksum();
assert(mbChecksumValid);
-rChecksum = maChecksum;
+rChecksum = mnChecksum;
return mbChecksumValid;
}
@@ -83,8 +83,8 @@ public:
}
protected:
-ChecksumType maChecksum;
-bool mbChecksumValid;
+ChecksumType mnChecksum;
+bool mbChecksumValid;
protected:
virtual void updateChecksum() const
@@ -99,7 +99,7 @@ protected:
{
nCrc = vcl_get_checksum(0, pBuf-mpBits, pBuf-mnScanlineSize *
pBuf-mnHeight);
pThis-ReleaseBuffer(pBuf, BITMAP_READ_ACCESS);
-pThis-maChecksum = nCrc;
+pThis-mnChecksum = nCrc;
pThis-mbChecksumValid = true;
}
else
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 4c42a7a..fae994f 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -594,7 +594,7 @@ void OpenGLSalBitmap::updateChecksum() const
pThis-CreateTexture();
}
-pThis-mbChecksumValid = calcChecksumGL(pThis-maTexture,
pThis-maChecksum);
+pThis-mbChecksumValid = calcChecksumGL(pThis-maTexture,
pThis-mnChecksum);
}
OpenGLContext* OpenGLSalBitmap::GetBitmapContext()
commit f4994b11da0bb3938194efb38d341caea3cb55c9
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Aug 27 21:27:16 2015 +0100
squash into Marco's commit.
g
Conflicts:
vcl/inc/salbmp.hxx
Change-Id: I57d1e4b8e4909ce0b82c9e61ca271768cc73cd8b
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 40ec937..26a0b6f 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -97,8 +97,8 @@ protected:
BitmapBuffer* pBuf = pThis-AcquireBuffer(BITMAP_READ_ACCESS);
if (pBuf)
{
-pThis-ReleaseBuffer(pBuf, BITMAP_READ_ACCESS);
nCrc = vcl_get_checksum(0, pBuf-mpBits, pBuf-mnScanlineSize *
pBuf-mnHeight);
+pThis-ReleaseBuffer(pBuf, BITMAP_READ_ACCESS);
pThis-maChecksum = nCrc;
pThis-mbChecksumValid = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/win
vcl/win/source/gdi/winlayout.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3706003a81a47ea14011fe58dcef300a5b570f79
Author: Michael Stahl mst...@redhat.com
Date: Fri Aug 28 13:13:39 2015 +0200
vcl: convert to assert in UniscribeLayout::DropGlyph()
Change-Id: I918a47da16a539f981baa9a8c1e5a7a5cf642cf4
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index f4dc9c0..7158e29 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1482,7 +1482,7 @@ void UniscribeLayout::DropGlyph( int nStartx8 )
{
DBG_ASSERT( !(nStartx8 0xff), USP::DropGlyph(): glyph injection not
disabled! );
int nStart = nStartx8 8;
-DBG_ASSERT( nStart=mnGlyphCount, USPLayout::MoveG nStart overflow );
+assert(nStart = mnGlyphCount);
if( nStart 0 )// nStart0 means absolute glyph pos + 1
--nStart;
@@ -1492,7 +1492,7 @@ void UniscribeLayout::DropGlyph( int nStartx8 )
for( int i = mnItemCount, nDummy; --i = 0; ++pVI )
if( GetItemSubrange( *pVI, nStart, nDummy ) )
break;
-DBG_ASSERT( nStart = mnGlyphCount, USPLayout::DropG overflow );
+assert(nStart = mnGlyphCount);
int j = pVI-mnMinGlyphPos;
while (j mnGlyphCount mpOutGlyphs[j] == DROPPED_OUTGLYPH) j++;
commit eba9a6c4b32220dcc729c71e440234f90af5bdcc
Author: Michael Stahl mst...@redhat.com
Date: Fri Aug 28 13:12:25 2015 +0200
vcl: fix drmemory warning in UniscribeLayout::DropGlyph()
It says there's access to uninitialized variable on that line,
so propbably the loop is running over.
Change-Id: I0226f82b20a6fbbc79af5bbb46af09830c3bc25a
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index d341806..f4dc9c0 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1495,7 +1495,7 @@ void UniscribeLayout::DropGlyph( int nStartx8 )
DBG_ASSERT( nStart = mnGlyphCount, USPLayout::DropG overflow );
int j = pVI-mnMinGlyphPos;
-while (mpOutGlyphs[j] == DROPPED_OUTGLYPH) j++;
+while (j mnGlyphCount mpOutGlyphs[j] == DROPPED_OUTGLYPH) j++;
if (j == nStart)
{
pVI-mnXOffset += ((mpJustifications)? mpJustifications[nStart] :
mpGlyphAdvances[nStart]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - distro-configs/CPLinux.conf
distro-configs/CPLinux.conf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c287f397e9779ab02460c2a81e0cc4a6812aae62 Author: Andras Timar andras.ti...@collabora.com Date: Fri Aug 28 14:14:03 2015 +0200 CPLinux.conf: --disable-kde (rendering artifacts, OpenGL related) Change-Id: I3c5a26de6ccb552328457adf342d17ae835b4e82 diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf index 2d0f3af..1936815 100644 --- a/distro-configs/CPLinux.conf +++ b/distro-configs/CPLinux.conf @@ -23,7 +23,7 @@ --enable-extension-integration --disable-odk --enable-lockdown ---enable-kde +--disable-kde --enable-gstreamer-0-10 --disable-gstreamer-1-0 --enable-evolution2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-5-0' - source/sl
source/sl/helpcontent2/source/text/sbasic/shared.po | 12 +++ source/sl/helpcontent2/source/text/swriter/librelogo.po |8 ++-- source/sl/officecfg/registry/data/org/openoffice/Office/UI.po | 12 +++ source/sl/sc/source/ui/src.po | 17 +++--- source/sl/sd/source/ui/view.po| 14 5 files changed, 36 insertions(+), 27 deletions(-) New commits: commit dc9a76191fa5ada84099b6724025e306b6a6102c Author: Andras Timar andras.ti...@collabora.com Date: Fri Aug 28 15:00:16 2015 +0200 Updated Slovenian translation Change-Id: Ibf74d8f7e5417dc1f843e6248b6b04247ca564f7 diff --git a/source/sl/helpcontent2/source/text/sbasic/shared.po b/source/sl/helpcontent2/source/text/sbasic/shared.po index 18ebce0..7e8b899 100644 --- a/source/sl/helpcontent2/source/text/sbasic/shared.po +++ b/source/sl/helpcontent2/source/text/sbasic/shared.po @@ -1,16 +1,16 @@ #. extracted from helpcontent2/source/text/sbasic/shared msgid msgstr -Project-Id-Version: LibreOffice 4.4\n +Project-Id-Version: LibreOffice 5.0\n Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n; -POT-Creation-Date: 2015-05-28 13:36+0200\n -PO-Revision-Date: 2015-05-20 11:53+0200\n +POT-Creation-Date: 2015-08-26 19:12+0200\n +PO-Revision-Date: 2015-08-28 13:28+0200\n Last-Translator: Martin Srebotnjak mi...@filmsi.net\n Language-Team: sl.libreoffice.org\n +Language: sl\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: sl\n Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n X-Generator: Virtaal 0.7.1\n X-Accelerator-Marker: ~\n @@ -9133,7 +9133,7 @@ msgctxt 03020103.xhp\n tit\n help.text -msgid Open Statement[Runtime] +msgid Open Statement [Runtime] msgstr Ukaz Open [med izvajanjem] #: 03020103.xhp @@ -9150,7 +9150,7 @@ msgctxt hd_id3150791\n 1\n help.text -msgid link href=\text/sbasic/shared/03020103.xhp\ name=\Open Statement[Runtime]\Open Statement[Runtime]/link +msgid link href=\text/sbasic/shared/03020103.xhp\ name=\Open Statement [Runtime]\Open Statement [Runtime]/link msgstr link href=\text/sbasic/shared/03020103.xhp\ name=\Ukaz Open [med izvajanjem]\Ukaz Open [med izvajanjem]/link #: 03020103.xhp diff --git a/source/sl/helpcontent2/source/text/swriter/librelogo.po b/source/sl/helpcontent2/source/text/swriter/librelogo.po index 4ef59c6..fc1c181 100644 --- a/source/sl/helpcontent2/source/text/swriter/librelogo.po +++ b/source/sl/helpcontent2/source/text/swriter/librelogo.po @@ -3,14 +3,14 @@ msgid msgstr Project-Id-Version: LibreOffice 5.0\n Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n; -POT-Creation-Date: 2015-05-31 21:36+0200\n -PO-Revision-Date: 2015-05-28 19:32+0200\n +POT-Creation-Date: 2015-08-26 19:12+0200\n +PO-Revision-Date: 2015-08-28 13:27+0200\n Last-Translator: Martin Srebotnjak mi...@filmsi.net\n Language-Team: sl.libreoffice.org\n +Language: sl\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: sl\n Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n X-Generator: Virtaal 0.7.1\n X-Accelerator-Marker: ~\n @@ -1022,7 +1022,7 @@ msgctxt LibreLogo.xhp\n par_1330\n help.text -msgid RECTANGLE [50, 100] ; draw a rectange shape (50Ã100pt)br/ RECTANGLE [50, 100, 10] ; draw a rectangle with rounded cornersbr/ +msgid RECTANGLE [50, 100] ; draw a rectangle shape (50Ã100pt)br/ RECTANGLE [50, 100, 10] ; draw a rectangle with rounded cornersbr/ msgstr PRAVOKOTNIK [50, 100] ; nariÅ¡i pravokotni lik (50Ã100 toÄk)br/ PRAVOKOTNIK [50, 100, 10] ; nariÅ¡i zaobljeni pravokotnikbr/ #: LibreLogo.xhp diff --git a/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po b/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po index efadcc0..e5d1c19 100644 --- a/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po +++ b/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po @@ -3,14 +3,14 @@ msgid msgstr Project-Id-Version: LibreOffice 5.0\n Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n; -POT-Creation-Date: 2015-07-04 14:55+0200\n -PO-Revision-Date: 2015-06-21 16:03+0200\n +POT-Creation-Date: 2015-08-26 19:12+0200\n +PO-Revision-Date: 2015-08-28 13:26+0200\n Last-Translator: Martin Srebotnjak mi...@filmsi.net\n Language-Team: sl.libreoffice.org\n +Language: sl\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: sl\n Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n X-Generator: Virtaal 0.7.1\n X-Accelerator-Marker: ~\n @@
[Libreoffice-bugs] [Bug 93745] New: UI - Writer letter wizard, Step 2, using headed paper, shows no sizing arrows
https://bugs.documentfoundation.org/show_bug.cgi?id=93745 Bug ID: 93745 Summary: UI - Writer letter wizard, Step 2, using headed paper, shows no sizing arrows Product: LibreOffice Version: 5.1.0.0.alpha0+ Master Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: UI Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: ipla...@yahoo.co.uk On master : 1) Start Letter wizard. 2) In step 1, choose Professional letter, Office, then tick the Use headed paper option, click on Next. 3) In step 2, note how the resize dialogs for defining logo space and addressee space have no selection arrows. regression -- 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
