[Libreoffice-commits] core.git: sc/source
sc/source/filter/orcus/interface.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 3554d0a48a05206b894c3dec2f8c65e3b3c5119c
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 28 08:45:42 2015 +0200
Work around loplugin:staticmethods
(...in what appears to be work in progress code)
Change-Id: Ibc30383e7a25b642db63cf022b3fae953c8fee50
diff --git a/sc/source/filter/orcus/interface.cxx
b/sc/source/filter/orcus/interface.cxx
index c65324a..c1551f9 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -751,6 +751,7 @@ ScOrcusStyles::protection::protection():
void ScOrcusStyles::protection::applyToItemSet(SfxItemSet /*rSet*/) const
{
+(void)this; // loplugin:staticmethods
}
ScOrcusStyles::border::border()
@@ -759,10 +760,12 @@ ScOrcusStyles::border::border()
void ScOrcusStyles::border::applyToItemSet(SfxItemSet /*rSet*/) const
{
+(void)this; // loplugin:staticmethods
}
void ScOrcusStyles::number_format::applyToItemSet(SfxItemSet /*rSet*/) const
{
+(void)this; // loplugin:staticmethods
}
ScOrcusStyles::xf::xf():
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: What autogen.sh for an alternative ContentProvider for dav:// scheme?
On 08/27/2015 07:34 PM, Giuseppe Castagno wrote:
I wonder if in INetURLObject I can put a single method like this:
bool INetURLObject::IsWebDAV()
{
return ( hasScheme( http ) ||
hasScheme( https ) ||
hasScheme( vnd.sun.start.webdav ) ||
hasScheme( vnd.sun.start.webdavs ) );
}
to have this test in a single place? Currently I repeat it four times.
Sure, or maybe something more descriptive like isAnyWebDavScheme (so
casual readers don't erroneously assume it only checks for
vnd.sun.star.webdav). Also, for schemes known in INetProtocol, feel
free to use the hasScheme(INetProtocol) overload, which should be
slightly faster (which is likely negligible) and less prone to typos.
Finally, looking at the code in INetURLObject I noticed this comment:
http://opengrok.libreoffice.org/xref/core/tools/source/fsys/urlobj.cxx#114
and this chunk of code:
http://opengrok.libreoffice.org/xref/core/tools/source/fsys/urlobj.cxx#335
should vnd.sun.star.webdavs be added as well?
No, all that is only about those schemes that INetURLObject has intimate
knowledge of. Traditionally, for any URL scheme to be usable in LO it
needed to be added to INetURLObject, with scheme-specific parsing
support and all (and that is how the rather random collection of schemes
in INetProtocol came about over time). But that is largely unnecessary
today.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/unotools unotools/source
include/unotools/atom.hxx |4 ++--
unotools/source/misc/atom.cxx | 10 ++
2 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 1b9c3a17e8496aedfb80528c5275e6658154789d
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 28 09:46:57 2015 +0200
Revert Simplify MultiAtomProvider::getString
This reverts commit 625c93a8daa2d23bfd42908e6fbba428d5967e84,
causes problems in (Linux-only) callers.
diff --git a/include/unotools/atom.hxx b/include/unotools/atom.hxx
index d59f67a..fdc656e 100644
--- a/include/unotools/atom.hxx
+++ b/include/unotools/atom.hxx
@@ -47,7 +47,7 @@ namespace utl {
~AtomProvider();
int getAtom( const OUString, bool bCreate = false );
-OUString getString( int ) const;
+const OUString getString( int ) const;
};
class UNOTOOLS_DLLPUBLIC MultiAtomProvider
@@ -59,7 +59,7 @@ namespace utl {
int getAtom( int atomClass, const OUString rString, bool bCreate =
false );
-OUString getString( int atomClass, int atom ) const;
+const OUString getString( int atomClass, int atom ) const;
};
}
diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx
index 44ad756..85ddad4 100644
--- a/unotools/source/misc/atom.cxx
+++ b/unotools/source/misc/atom.cxx
@@ -45,11 +45,12 @@ int AtomProvider::getAtom( const OUString rString, bool
bCreate )
return m_nAtoms-1;
}
-OUString AtomProvider::getString( int nAtom ) const
+const OUString AtomProvider::getString( int nAtom ) const
{
+static OUString aEmpty;
std::unordered_mapint, OUString::const_iterator it = m_aStringMap.find(
nAtom );
-return it == m_aStringMap.end() ? OUString() : it-second;
+return it == m_aStringMap.end() ? aEmpty : it-second;
}
MultiAtomProvider::MultiAtomProvider()
@@ -78,14 +79,15 @@ int MultiAtomProvider::getAtom( int atomClass, const
OUString rString, bool bCr
return INVALID_ATOM;
}
-OUString MultiAtomProvider::getString( int atomClass, int atom ) const
+const OUString MultiAtomProvider::getString( int atomClass, int atom ) const
{
std::unordered_mapint, AtomProvider*::const_iterator it =
m_aAtomLists.find( atomClass );
if( it != m_aAtomLists.end() )
return it-second-getString( atom );
-return OUString();
+static OUString aEmpty;
+return aEmpty;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 43cb629de1ecc41f702f14209ba8199dfe57c3a2
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 28 09:26:41 2015 +0200
Make sure nEnd-nIndex-1 is valid arg to OUString::copy
Change-Id: Ie646ae781bcd54be81173db42fe10f61b31ac628
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b47d870..2a8621a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2974,7 +2974,7 @@ void DomainMapper_Impl::handleRubyEQField(
FieldContextPtr pContext)
nIndex = 0;
OUString sPart1 = sRubyParts.getToken(0, ',', nIndex);
OUString sPart2 = sRubyParts.getToken(0, ',', nIndex);
-if ((nIndex = sPart1.indexOf('(')) != -1 (nEnd =
sPart1.lastIndexOf(')'))!=-1 )
+if ((nIndex = sPart1.indexOf('(')) != -1 (nEnd =
sPart1.lastIndexOf(')'))!=-1 nEnd nIndex)
{
aInfo.sRubyText = sPart1.copy(nIndex+1,nEnd-nIndex-1);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/dialog.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a206b04ceb4108fdd1414dd70addcfcd42a8c29a
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 28 09:40:36 2015 +0200
Simplify SmFontStyles::GetStyleName
Change-Id: I2df721af0eb60e28cd9882195f68a034a5fa802e
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 57ab5ba..7fe760c 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include sal/config.h
+
+#include cassert
+
#include tools/rcid.h
#include comphelper/string.hxx
#include svl/eitem.hxx
@@ -77,7 +81,6 @@ class SmFontStyles
OUString aBold;
OUString aItalic;
OUString aBoldItalic;
-OUString aEmpty;
public:
SmFontStyles();
@@ -118,17 +121,14 @@ const OUString SmFontStyles::GetStyleName( sal_uInt16
nIdx ) const
// 0 = normal, 1 = italic,
// 2 = bold,3 = bold italic
-#if OSL_DEBUG_LEVEL 1
-OSL_ENSURE( nIdx GetCount(), index out of range );
-#endif
+assert( nIdx GetCount() );
switch (nIdx)
{
case 0 : return aNormal;
case 1 : return aItalic;
case 2 : return aBold;
-case 3 : return aBoldItalic;
+default: /*case 3:*/ return aBoldItalic;
}
-return aEmpty;
}
const SmFontStyles GetFontStyles()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 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 a7f07e4dfe0acdec7386d28b23e65a5c0efa9d80
Author: Michael Meeks michael.me...@collabora.com
Date: Fri Aug 28 08:03:59 2015 +0100
Revert tdf#93530 - the VCL GDI flushing abstraction should glFlush too.
This reverts commit e16e64dd862c8f386f80de43ad68e831e169d49d.
I somehow forgot that glFlush is context specific, (gl always gets
me that way).
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 8f5fbfd..3882c40 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -28,7 +28,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
@@ -39,7 +38,6 @@
#include osx/a11yfactory.h
#include quartz/utils.h
-
#include salwtype.hxx
#include premac.h
@@ -883,7 +881,6 @@ void AquaSalFrame::Flush()
{
[mpNSView display];
}
-OpenGLHelper::flush();
}
void AquaSalFrame::Flush( const Rectangle rRect )
@@ -905,7 +902,6 @@ void AquaSalFrame::Flush( const Rectangle rRect )
{
[mpNSView display];
}
-OpenGLHelper::flush();
}
void AquaSalFrame::Sync()
@@ -918,7 +914,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 f669fba..2e0dcfd 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -707,13 +707,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 43189003..8dacdd8 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
@@ -2455,13 +2454,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 b911378..6bc25f3 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
@@ -2935,13 +2934,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 8dc8076..4268173 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -46,7 +46,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
@@ -2202,13 +2201,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-commits] core.git: vcl/qa
vcl/qa/cppunit/timer.cxx | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 87c33ab18f747fdfeb56079e723982e11fd97c5f
Author: Michael Meeks michael.me...@collabora.com
Date: Fri Aug 28 08:00:20 2015 +0100
Disable the higher frequency timer tests more effectively.
Change-Id: Ibd832d85ce4b7e6747f95297d3c96d071aff41e2
diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index 1c08ff9..c6daa16 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -22,7 +22,8 @@
#include salinst.hxx
// #define TEST_WATCHDOG
-// Comment if UT fails randomly.
+
+// Enables timer tests that appear to provoke windows under load unduly.
//#define TEST_TIMERPRECISION
/// Avoid our timer tests just wedging the build if they fail.
@@ -61,8 +62,10 @@ public:
void testWatchdog();
#endif
void testDurations();
+#ifdef TEST_TIMERPRECISION
void testAutoTimer();
void testMultiAutoTimers();
+#endif
void testRecursiveTimer();
void testSlowTimerCallback();
@@ -73,8 +76,10 @@ public:
CPPUNIT_TEST(testWatchdog);
#endif
CPPUNIT_TEST(testDurations);
+#ifdef TEST_TIMERPRECISION
CPPUNIT_TEST(testAutoTimer);
CPPUNIT_TEST(testMultiAutoTimers);
+#endif
CPPUNIT_TEST(testRecursiveTimer);
CPPUNIT_TEST(testSlowTimerCallback);
@@ -195,6 +200,8 @@ public:
}
};
+#ifdef TEST_TIMERPRECISION
+
void TimerTest::testAutoTimer()
{
const sal_Int32 nDurationMs = 30;
@@ -231,9 +238,7 @@ void TimerTest::testAutoTimer()
}
}
-#ifdef TEST_TIMERPRECISION
CPPUNIT_FAIL(msg.str().c_str());
-#endif
}
void TimerTest::testMultiAutoTimers()
@@ -295,10 +300,9 @@ void TimerTest::testMultiAutoTimers()
}
}
-#ifdef TEST_TIMERPRECISION
CPPUNIT_FAIL(msg.str().c_str());
-#endif
}
+#endif // TEST_TIMERPRECISION
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/unotools unotools/source
include/unotools/atom.hxx |4 ++--
unotools/source/misc/atom.cxx | 10 --
2 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit 625c93a8daa2d23bfd42908e6fbba428d5967e84
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 28 09:29:18 2015 +0200
Simplify MultiAtomProvider::getString
Change-Id: I3ba6f9c829200349a6404c2a155182b5c5c12cd7
diff --git a/include/unotools/atom.hxx b/include/unotools/atom.hxx
index fdc656e..d59f67a 100644
--- a/include/unotools/atom.hxx
+++ b/include/unotools/atom.hxx
@@ -47,7 +47,7 @@ namespace utl {
~AtomProvider();
int getAtom( const OUString, bool bCreate = false );
-const OUString getString( int ) const;
+OUString getString( int ) const;
};
class UNOTOOLS_DLLPUBLIC MultiAtomProvider
@@ -59,7 +59,7 @@ namespace utl {
int getAtom( int atomClass, const OUString rString, bool bCreate =
false );
-const OUString getString( int atomClass, int atom ) const;
+OUString getString( int atomClass, int atom ) const;
};
}
diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx
index 85ddad4..44ad756 100644
--- a/unotools/source/misc/atom.cxx
+++ b/unotools/source/misc/atom.cxx
@@ -45,12 +45,11 @@ int AtomProvider::getAtom( const OUString rString, bool
bCreate )
return m_nAtoms-1;
}
-const OUString AtomProvider::getString( int nAtom ) const
+OUString AtomProvider::getString( int nAtom ) const
{
-static OUString aEmpty;
std::unordered_mapint, OUString::const_iterator it = m_aStringMap.find(
nAtom );
-return it == m_aStringMap.end() ? aEmpty : it-second;
+return it == m_aStringMap.end() ? OUString() : it-second;
}
MultiAtomProvider::MultiAtomProvider()
@@ -79,15 +78,14 @@ int MultiAtomProvider::getAtom( int atomClass, const
OUString rString, bool bCr
return INVALID_ATOM;
}
-const OUString MultiAtomProvider::getString( int atomClass, int atom ) const
+OUString MultiAtomProvider::getString( int atomClass, int atom ) const
{
std::unordered_mapint, AtomProvider*::const_iterator it =
m_aAtomLists.find( atomClass );
if( it != m_aAtomLists.end() )
return it-second-getString( atom );
-static OUString aEmpty;
-return aEmpty;
+return OUString();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/Module_vcl.mk vcl/qa
vcl/Module_vcl.mk|6 -- vcl/qa/cppunit/timer.cxx |3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) New commits: commit f45183fcdef53237af6aff62211751c6b4f542c0 Author: Tor Lillqvist t...@collabora.com Date: Fri Aug 28 09:40:02 2015 +0300 Add a newline and fflush so that it actually shows up in the output Change-Id: Iea123118614ecf038883a0d51337042574ebc6b2 diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx index 64a1ab9..1c08ff9 100644 --- a/vcl/qa/cppunit/timer.cxx +++ b/vcl/qa/cppunit/timer.cxx @@ -42,7 +42,8 @@ public: aWait.Seconds = mnSeconds; aWait.Nanosec = 100; // +1ms osl::Thread::wait( aWait ); -fprintf(stderr, ERROR: WatchDog timer thread expired, failing the test!); +fprintf(stderr, ERROR: WatchDog timer thread expired, failing the test!\n); +fflush(stderr); CPPUNIT_ASSERT_MESSAGE(watchdog triggered, false); } }; commit 6e8ec907dce656b81486889bf27489ad866cebd2 Author: Tor Lillqvist t...@collabora.com Date: Fri Aug 28 09:29:31 2015 +0300 CppunitTest_vcl_timer always fails on Windows for me Change-Id: I73f0771a09d3e74242b25922007c00ff77b37f8a diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index c949f42..4706bdb 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -124,10 +124,4 @@ $(eval $(call gb_Module_add_check_targets,vcl,\ )) endif -# Is any configuration missing? -ifeq ($(OS),WNT) -$(eval $(call gb_Module_add_check_targets,vcl,\ - CppunitTest_vcl_timer \ -)) -endif # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/Module_vcl.mk
vcl/Module_vcl.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit 02d87840558523370d552ef452f1660300d161b5 Author: Tor Lillqvist t...@collabora.com Date: Fri Aug 28 10:43:46 2015 +0300 Revert CppunitTest_vcl_timer always fails on Windows for me Now it works for me on Windows. This reverts commit 6e8ec907dce656b81486889bf27489ad866cebd2. diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 4706bdb..c949f42 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -124,4 +124,10 @@ $(eval $(call gb_Module_add_check_targets,vcl,\ )) endif +# Is any configuration missing? +ifeq ($(OS),WNT) +$(eval $(call gb_Module_add_check_targets,vcl,\ + CppunitTest_vcl_timer \ +)) +endif # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Error while pushing commits for bug 93240
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
Re: About liststore in areatabpage.ui (cui module)
On Wed, 2015-08-26 at 22:52 -0700, julien2412 wrote: Hello, By giving a try to tdf#31488 (pptx import: blue background, save/reopen as .odp changes to gray), I noticed that each value of liststore LB_AREA_TYPE was at 0, see http://opengrok.libreoffice.org/xref/core/cui/uiconfig/ui/areatabpage .ui#23 Comparing with other liststore, I wonder if it's correct or not. Checking the original conversion of ad0c6359dc044c659160a6a51c1647607c58979a the original src also had the same Default id for all None to Bitmap entries, so the value there of 0 is correct from that context. Sometimes the code uses the ids and sometimes the code uses the positions. Checking that commit show that GetSelectEntryPos/SelectEntryPos are the things used here and nothing that uses the ids. So all is well in the .ui file apparently. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/source sd/qa
filter/source/msfilter/msdffimp.cxx | 26 ++
sd/qa/unit/data/ppt/pass/hang-11.ppt |binary
sd/qa/unit/data/ppt/pass/hang-12.ppt |binary
3 files changed, 22 insertions(+), 4 deletions(-)
New commits:
commit a50be4ba133d2a92af37dd7b78b70377a05d716d
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/18096
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 ba0aae0..09458f8 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3253,12 +3253,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;
}
@@ -3287,11 +3294,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 000..2d9ef18
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-11.ppt differ
diff --git a/sd/qa/unit/data/ppt/pass/hang-12.ppt
b/sd/qa/unit/data/ppt/pass/hang-12.ppt
new file mode 100644
index 000..921481c
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-12.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' - sd/qa sd/source
sd/qa/unit/data/ppt/pass/hang-10.ppt |binary
sd/source/filter/ppt/pptin.cxx |6 --
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 15c185132f8c425722c6cdb380857e70a0ce04fd
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/18094
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 7565fd4..0b2c0c8 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -780,7 +780,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 )
{
@@ -789,7 +790,8 @@ bool ImplSdPPTImport::Import()
}
}
}
-aHd2.SeekToEndOfRecord(
rStCtrl );
+if
(!aHd2.SeekToEndOfRecord(rStCtrl))
+break;
}
}
}
___
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' - 2 commits - sd/qa sd/source
sd/qa/unit/data/ppt/pass/hang-4.ppt |binary
sd/qa/unit/data/ppt/pass/hang-7.ppt |binary
sd/source/filter/ppt/propread.cxx | 31 ---
3 files changed, 20 insertions(+), 11 deletions(-)
New commits:
commit 61542931de7abe69a459f3e59513e330ecf47211
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 13:00:36 2015 +0100
check for stream status after a read, not after a seek
Change-Id: I984e99c1a1484547aa4d60bf301167f3cbc9f716
(cherry picked from commit eea399ddd52a0de368321963bb828bc15632dd0b)
Reviewed-on: https://gerrit.libreoffice.org/18088
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-4.ppt
b/sd/qa/unit/data/ppt/pass/hang-4.ppt
new file mode 100644
index 000..f5aa247
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-4.ppt differ
diff --git a/sd/source/filter/ppt/propread.cxx
b/sd/source/filter/ppt/propread.cxx
index 036f1f9..d738eb8 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -319,7 +319,7 @@ bool Section::GetDictionary( Dictionary rDict )
void Section::Read( SotStorageStream *pStrm )
{
-sal_uInt32 i, nSecOfs, nPropType, nPropSize, nCurrent, nVectorCount,
nTemp, nStrmSize;
+sal_uInt32 i, nSecOfs, nPropSize, nStrmSize;
nSecOfs = pStrm-Tell();
pStrm-Seek( STREAM_SEEK_TO_END );
@@ -329,16 +329,20 @@ void Section::Read( SotStorageStream *pStrm )
mnTextEnc = RTL_TEXTENCODING_MS_1252;
sal_uInt32 nSecSize(0), nPropCount(0);
pStrm-ReadUInt32( nSecSize ).ReadUInt32( nPropCount );
-while (nPropCount-- pStrm-good())
+while (nPropCount--)
{
sal_uInt32 nPropId(0), nPropOfs(0);
-pStrm-ReadUInt32( nPropId ).ReadUInt32( nPropOfs );
-nCurrent = pStrm-Tell();
-pStrm-Seek( nPropOfs + nSecOfs );
+pStrm-ReadUInt32(nPropId).ReadUInt32(nPropOfs);
+if (!pStrm-good())
+break;
+auto nCurrent = pStrm-Tell();
+sal_uInt64 nOffset = nPropOfs + nSecOfs;
+if (nOffset != pStrm-Seek(nOffset))
+break;
if ( nPropId ) // do not read dictionary
{
-
-pStrm-ReadUInt32( nPropType );
+sal_uInt32 nPropType(0), nVectorCount(0);
+pStrm-ReadUInt32(nPropType);
nPropSize = 4;
@@ -360,6 +364,7 @@ void Section::Read( SotStorageStream *pStrm )
pStrm-ReadUInt32( nPropType );
nPropSize += 4;
}
+sal_uInt32 nTemp(0);
switch( nPropType )
{
case VT_UI1 :
@@ -457,11 +462,11 @@ void Section::Read( SotStorageStream *pStrm )
PropItem aPropItem;
if ( GetProperty( 1, aPropItem ) )
{
-sal_uInt16 nCodePage;
aPropItem.ReadUInt32( nPropType );
if ( nPropType == VT_I2 )
{
-aPropItem.ReadUInt16( nCodePage );
+sal_uInt16 nCodePage(0);
+aPropItem.ReadUInt16(nCodePage);
if ( nCodePage == 1200 )
{
@@ -503,7 +508,7 @@ void Section::Read( SotStorageStream *pStrm )
AddProperty( 0x, pBuf, nSize );
delete[] pBuf;
}
-pStrm-Seek( nCurrent );
+pStrm-Seek(nCurrent);
}
pStrm-Seek( nSecOfs + nSecSize );
}
commit a7fd3a06834900c449448f21624f03edc7b27dda
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/18091
Tested-by: Jenkins c...@libreoffice.org
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 75a4bcc..036f1f9 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -427,7 +427,11 @@ void Section::Read( SotStorageStream *pStrm )
if ( nPropSize )
{
if ( ( nVectorCount - i ) 1 )
-pStrm-Seek( nPropOfs + nSecOfs + nPropSize );
+{
+nOffset = nPropOfs + nSecOfs + nPropSize;
+if (nOffset != pStrm-Seek(nOffset))
+break;
+}
}
[Libreoffice-commits] core.git: basic/source
basic/source/sbx/sbxscan.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9e318c09778f0416143f211c5817536d5f1db3b7
Author: Damjan Jovanovic dam...@apache.org
Date: Wed Aug 26 18:10:02 2015 +
Resolves: #i112383# CLng(H) fails on 64-bits...
rather than returning -1
Found-by: andrew
Patch-by: Damjan Jovanovic
(cherry picked from commit 175afdcb151d9ce1238dc9fec59f2dfc2eb07345)
Change-Id: I996bbfa82b10716318944f390ea53e0a5ae7c89c
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 329d4c2..2d8daf7 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -236,7 +236,7 @@ SbxError ImpScan( const OUString rWSrc, double nVal,
SbxDataType rType,
p++;
}
OUString aBufStr( aBuf.makeStringAndClear());
-long l = 0;
+sal_Int32 l = 0;
for( const sal_Unicode* q = aBufStr.getStr(); bRes *q; q++ )
{
int i = *q - '0';
___
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
This is the output of ./logerrit submit master ./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' -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'private/mcecchetti/bitmapcrc64'
New branch 'private/mcecchetti/bitmapcrc64' available with the following commits: commit 066d5579fd521d442dac152a43cf49b9880d2546 Author: Marco Cecchetti marco.cecche...@collabora.com Date: Thu Aug 27 22:57:15 2015 +0200 switch to 64-bit checksum: conversion from BitmapChecksum to an octet array Defined BitmapChecksumOctetArray which is an array of bytes whose size is the same of BitmapChecksum. Defined a routine for converting a BitmapChecksum into a BitmapChecksumOctetArray. Change-Id: I70d17ab8b841795ae27c60b418d6b090bff604bb commit 200180aba280d5299bcd2dd36ea520b8e712c686 Author: Marco Cecchetti marco.cecche...@collabora.com Date: Thu Aug 27 17:09:36 2015 +0200 vcl_get_checksum wraps the call to the real checksum function Change-Id: I72916f18966756ecc99e77f1b164e99377eb456e commit 4d4674929b386d773998351f58744eb9ae0c3925 Author: Marco Cecchetti marco.cecche...@collabora.com Date: Thu Aug 27 15:25:11 2015 +0200 Switching to 64-bit checksum: substituted sal_uLong with BitmapChecksum A typedef sal_uLong BitmapChecksum; has been added to include/vcl/checksum.hxx Wherever needed sal_uLong and sal_Int32 has been substituted with BitmapChecksum. A BITMAP_CHECKSUM_BITS constant equal to the amount of bits used by the BitmapChecksum type has been defined and used in `GraphicID::GetIDString` (vstools/source/graphic/grfcache.cxx). Change-Id: I74bd285089e58a8b18c06233d75b87023c7bf31b commit 52405b362675e52f80d07ccbf9b7e09cb6a9d3f9 Author: Marco Cecchetti marco.cecche...@collabora.com Date: Thu Aug 27 12:12:52 2015 +0200 moved chechsum.hxx in include/vcl Change-Id: I70f82f16d5907ce0bbe2d838c4acee226886aab2 commit acf5479a920e75999fb0c58c7a2206ea83575195 Author: Marco Cecchetti marco.cecche...@collabora.com Date: Wed Aug 26 13:50:57 2015 +0200 Added support for computing 64-bit checksum of bitmap in OpenGL Added a C++ and a GLSL implementation of a 64-bit CRC algorithm. Changed hardcoded checksum value in ooxmlimport unit test (testN777345). Change-Id: I16bb985a14866775efda49e21fe033ff64645896 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Idea] Add files from SVG Test Suite Overview to get-bugzilla-attachments-by-mimetype (crashtest)
On Wed, 2015-08-26 at 16:59 +0200, Xisco Faulí wrote: Hello, Reviewing some issues in bugzilla, I found that some of them make mention of files in the SVG Test Suite Overview(1), so I thought it could be a good a idea to include the files from the different test suite editions into get-bugzilla-attachments-by-mimetype. What I've done is to take the suite archive and just add it manually to the crashtesting archive rather than hack the downloader, which is more for scraping documents out of bugzillas. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/source sd/qa
filter/source/msfilter/svdfppt.cxx |4 +++- sd/qa/unit/data/ppt/pass/hang-6.ppt |binary 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit 8ccabcc0c0c70bdcc6632c6758723f591677371d 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/18090 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 d3bb6b7..29f0b36 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2880,7 +2880,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-commits] core.git: Branch 'libreoffice-4-4' - sd/qa sd/source
sd/qa/unit/data/ppt/pass/hang-4.ppt |binary
sd/source/filter/ppt/propread.cxx | 25 +++--
2 files changed, 15 insertions(+), 10 deletions(-)
New commits:
commit ca9cbc1aa3458de7ce4893668476aa4433e6b0e0
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 13:00:36 2015 +0100
check for stream status after a read, not after a seek
Change-Id: I984e99c1a1484547aa4d60bf301167f3cbc9f716
(cherry picked from commit eea399ddd52a0de368321963bb828bc15632dd0b)
Reviewed-on: https://gerrit.libreoffice.org/18075
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-4.ppt
b/sd/qa/unit/data/ppt/pass/hang-4.ppt
new file mode 100644
index 000..f5aa247
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-4.ppt differ
diff --git a/sd/source/filter/ppt/propread.cxx
b/sd/source/filter/ppt/propread.cxx
index 1e71044..8f376fd 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -319,7 +319,7 @@ bool Section::GetDictionary( Dictionary rDict )
void Section::Read( SvStorageStream *pStrm )
{
-sal_uInt32 i, nSecOfs, nPropType, nPropSize, nCurrent, nVectorCount,
nTemp, nStrmSize;
+sal_uInt32 i, nSecOfs, nPropSize, nStrmSize;
nSecOfs = pStrm-Tell();
pStrm-Seek( STREAM_SEEK_TO_END );
@@ -329,16 +329,20 @@ void Section::Read( SvStorageStream *pStrm )
mnTextEnc = RTL_TEXTENCODING_MS_1252;
sal_uInt32 nSecSize(0), nPropCount(0);
pStrm-ReadUInt32( nSecSize ).ReadUInt32( nPropCount );
-while (nPropCount-- pStrm-good())
+while (nPropCount--)
{
sal_uInt32 nPropId(0), nPropOfs(0);
-pStrm-ReadUInt32( nPropId ).ReadUInt32( nPropOfs );
-nCurrent = pStrm-Tell();
-pStrm-Seek( nPropOfs + nSecOfs );
+pStrm-ReadUInt32(nPropId).ReadUInt32(nPropOfs);
+if (!pStrm-good())
+break;
+auto nCurrent = pStrm-Tell();
+sal_uInt64 nOffset = nPropOfs + nSecOfs;
+if (nOffset != pStrm-Seek(nOffset))
+break;
if ( nPropId ) // do not read dictionary
{
-
-pStrm-ReadUInt32( nPropType );
+sal_uInt32 nPropType(0), nVectorCount(0);
+pStrm-ReadUInt32(nPropType);
nPropSize = 4;
@@ -360,6 +364,7 @@ void Section::Read( SvStorageStream *pStrm )
pStrm-ReadUInt32( nPropType );
nPropSize += 4;
}
+sal_uInt32 nTemp(0);
switch( nPropType )
{
case VT_UI1 :
@@ -457,11 +462,11 @@ void Section::Read( SvStorageStream *pStrm )
PropItem aPropItem;
if ( GetProperty( 1, aPropItem ) )
{
-sal_uInt16 nCodePage;
aPropItem.ReadUInt32( nPropType );
if ( nPropType == VT_I2 )
{
-aPropItem.ReadUInt16( nCodePage );
+sal_uInt16 nCodePage(0);
+aPropItem.ReadUInt16(nCodePage);
if ( nCodePage == 1200 )
{
@@ -503,7 +508,7 @@ void Section::Read( SvStorageStream *pStrm )
AddProperty( 0x, pBuf, nSize );
delete[] pBuf;
}
-pStrm-Seek( nCurrent );
+pStrm-Seek(nCurrent);
}
pStrm-Seek( nSecOfs + nSecSize );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vba-export' - oox/source
oox/source/ole/vbaexport.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit cc6eacd2bca5ab3c3e49fbac80ae80e0a00f3c82 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Aug 28 13:34:43 2015 +0200 also dump the module source code diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx index d9d4871..06dc8aa 100644 --- a/oox/source/ole/vbaexport.cxx +++ b/oox/source/ole/vbaexport.cxx @@ -641,6 +641,11 @@ void VbaExport::exportVBA(SotStorage* pRootStorage) SAL_DEBUG(aElementNames[i]); css::script::ModuleInfo aModuleInfo = xModuleInfo-getModuleInfo(aElementNames[i]); SAL_DEBUG(aModuleInfo.ModuleType); + +css::uno::Any aCode = xNameContainer-getByName(aElementNames[i]); +OUString aSourceCode; +aCode = aSourceCode; +SAL_DEBUG(aSourceCode); } pVBAProjectStream-Commit(); pDirStream-Commit(); ___ 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' - 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 5015596b795931eeb328666ec2c99dd372bf6c34
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/18076
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 57f1c23..b22372a 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2541,7 +2541,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-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - include/vcl sd/qa sd/source vcl/source
include/vcl/opengl/OpenGLHelper.hxx | 23 -
sd/qa/unit/data/ppt/pass/hang-18.ppt |binary
sd/source/filter/ppt/propread.cxx| 25 +--
vcl/source/opengl/OpenGLContext.cxx |2 +
vcl/source/opengl/OpenGLHelper.cxx | 38 +++
5 files changed, 81 insertions(+), 7 deletions(-)
New commits:
commit 7d50c8250c7fb916137c9e687ee0ceed7d96758d
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
(cherry picked from commit 580d3837b26f09ed02fe3583de40fa045a3fde0f)
Reviewed-on: https://gerrit.libreoffice.org/18100
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 374ecbb..75a4bcc 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 c04099922c2fb177dd310b7aefe5c0b7d3a40fbf
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
Reviewed-on: https://gerrit.libreoffice.org/18103
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com
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
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - filter/source
filter/source/graphicfilter/itiff/lzwdecom.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 5e3b4e302afd36b382a1d177c434fcada21ed2d4
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 14:40:37 2015 +0100
crashtesting: tiff loop detection too slow
moz323894-1.tiff and moz456356-1.tiff take too long to load
Change-Id: Iaafa064fd05e4a4152004e7ceb6256af68aeef01
(cherry picked from commit 7e373e92fc02393732422d05264dd5115076183f)
Reviewed-on: https://gerrit.libreoffice.org/18082
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/filter/source/graphicfilter/itiff/lzwdecom.cxx
b/filter/source/graphicfilter/itiff/lzwdecom.cxx
index 5fb7514..dc437e2 100644
--- a/filter/source/graphicfilter/itiff/lzwdecom.cxx
+++ b/filter/source/graphicfilter/itiff/lzwdecom.cxx
@@ -20,7 +20,7 @@
#include lzwdecom.hxx
#include algorithm
-#include vector
+#include set
#define MAX_TABLE_SIZE 4096
@@ -163,16 +163,16 @@ void LZWDecompressor::AddToTable(sal_uInt16 nPrevCode,
sal_uInt16 nCodeFirstData
return;
}
-std::vectorsal_uInt16 aSeenIndexes;
+unsigned char aSeenIndexes[MAX_TABLE_SIZE] = {0};
while (pTable[nCodeFirstData].nDataCount1)
{
-if (std::find(aSeenIndexes.begin(), aSeenIndexes.end(),
nCodeFirstData) != aSeenIndexes.end())
+if (aSeenIndexes[nCodeFirstData])
{
SAL_WARN(filter.tiff, Loop in chain);
bEOIFound = true;
return;
}
-aSeenIndexes.push_back(nCodeFirstData);
+aSeenIndexes[nCodeFirstData] = 1;
nCodeFirstData=pTable[nCodeFirstData].nPrevCode;
}
___
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
filter/source/graphicfilter/itiff/lzwdecom.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit a6ea269296089b43dd5810f418e8e1239f30a565
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 27 14:40:37 2015 +0100
crashtesting: tiff loop detection too slow
moz323894-1.tiff and moz456356-1.tiff take too long to load
Change-Id: Iaafa064fd05e4a4152004e7ceb6256af68aeef01
(cherry picked from commit 7e373e92fc02393732422d05264dd5115076183f)
Reviewed-on: https://gerrit.libreoffice.org/18095
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/filter/source/graphicfilter/itiff/lzwdecom.cxx
b/filter/source/graphicfilter/itiff/lzwdecom.cxx
index 5fb7514..dc437e2 100644
--- a/filter/source/graphicfilter/itiff/lzwdecom.cxx
+++ b/filter/source/graphicfilter/itiff/lzwdecom.cxx
@@ -20,7 +20,7 @@
#include lzwdecom.hxx
#include algorithm
-#include vector
+#include set
#define MAX_TABLE_SIZE 4096
@@ -163,16 +163,16 @@ void LZWDecompressor::AddToTable(sal_uInt16 nPrevCode,
sal_uInt16 nCodeFirstData
return;
}
-std::vectorsal_uInt16 aSeenIndexes;
+unsigned char aSeenIndexes[MAX_TABLE_SIZE] = {0};
while (pTable[nCodeFirstData].nDataCount1)
{
-if (std::find(aSeenIndexes.begin(), aSeenIndexes.end(),
nCodeFirstData) != aSeenIndexes.end())
+if (aSeenIndexes[nCodeFirstData])
{
SAL_WARN(filter.tiff, Loop in chain);
bEOIFound = true;
return;
}
-aSeenIndexes.push_back(nCodeFirstData);
+aSeenIndexes[nCodeFirstData] = 1;
nCodeFirstData=pTable[nCodeFirstData].nPrevCode;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/htmlexport/data/tdf90905.odt |binary
sw/qa/extras/htmlexport/htmlexport.cxx|3 ++-
sw/source/filter/html/wrthtml.cxx |3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit fd3468024e1ac199f4a2f4108321ef8100d58414
Author: Vasily Melenchuk vasily.melenc...@cib.de
Date: Tue Aug 25 17:45:11 2015 +0300
tdf#93449 Internal hyperlinks are not exported corectly in HTML
InetURLObject class does not work correctly with internal document
links, containing not full url, but just a fragment. This case added
as an exception for HTML link export.
Change-Id: I44496a1cf186836d4194fc65ce7bf9aeb2f79b65
Reviewed-on: https://gerrit.libreoffice.org/17993
Reviewed-by: Thorsten Behrens thorsten.behr...@cib.de
Tested-by: Thorsten Behrens thorsten.behr...@cib.de
diff --git a/sw/qa/extras/htmlexport/data/tdf90905.odt
b/sw/qa/extras/htmlexport/data/tdf90905.odt
index cab8a04..19a51bd 100644
Binary files a/sw/qa/extras/htmlexport/data/tdf90905.odt and
b/sw/qa/extras/htmlexport/data/tdf90905.odt differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 77db88b..2ce1040 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -250,7 +250,8 @@ DECLARE_HTMLEXPORT_TEST(testExportInternalUrl,
tdf90905.odt)
CPPUNIT_ASSERT(pDoc);
// Internal url should be valid
-assertXPath(pDoc, /html/body/p/a, href, #0.0.1.Text|outline);
+assertXPath(pDoc, /html/body/p[1]/a, href, #0.0.1.Text|outline);
+assertXPath(pDoc, /html/body/p[2]/a, href, #bookmark);
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/html/wrthtml.cxx
b/sw/source/filter/html/wrthtml.cxx
index 1502441..4e5d57b 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1198,8 +1198,9 @@ OUString SwHTMLWriter::convertHyperlinkHRefValue(const
OUString rURL)
}
}
}
-else
+else if (!sURL.isEmpty() sURL[0] != '#')
{
+// Link is not started from #, so looks like external link. Encode
this URL.
INetURLObject aURL(sURL);
sURL = aURL.GetMainURL(INetURLObject::NO_DECODE);
}
___
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/msdffimp.cxx |6 --
filter/source/msfilter/svdfppt.cxx | 15 ++-
sd/qa/unit/data/ppt/pass/hang-13.ppt |binary
sd/qa/unit/data/ppt/pass/hang-14.ppt |binary
4 files changed, 14 insertions(+), 7 deletions(-)
New commits:
commit 1bfbdeb07c0d4059f08bf1c295a465482e9ef3a5
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/18085
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 4748cb9..47a89e0 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
commit a9a09a49a86776575f78289a9023ed024dffdcf5
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/18086
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 b6693086..8c41446 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6507,10 +6507,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 )
@@ -6521,7 +6523,8 @@ PPTTextObj::PPTTextObj( SvStream rIn,
SdrPowerPointImport rSdrPowerPointImport
break;
}
}
-aClientTextBoxHd.SeekToEndOfRecord( rIn );
+if (!aClientTextBoxHd.SeekToEndOfRecord(rIn))
+break;
}
if ( rIn.Tell() pE-nSlidePersistEndOffset )
bStatus = false;
@@ -6534,12 +6537,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 ) || (
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - editeng/source include/editeng include/tools tools/source vcl/qa vcl/source
editeng/source/editeng/editattr.cxx |6 --
editeng/source/items/textitem.cxx | 38 +-
include/editeng/colritem.hxx | 10 ++--
include/tools/color.hxx |4 -
tools/source/generic/color.cxx|2
vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-3.wmf |binary
vcl/source/filter/wmf/enhwmf.cxx | 19 ++---
7 files changed, 34 insertions(+), 45 deletions(-)
New commits:
commit 27f6ddefd4b845f3d51221681c864490fa9b580b
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
(cherry picked from commit 3bc69b1d0d8620afd89a993b5f6bc46a2ff5267f)
Change-Id: I18b5105dd8e060b9e49dda6026e26d3a0f00d8f5
Reviewed-on: https://gerrit.libreoffice.org/18074
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 85676ab..66e664f 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 b55d9ad..587e253 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1809,9 +1809,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 ) :
@@ -1821,9 +1824,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
{
@@ -1877,23 +1885,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 )
{
@@ -1902,21 +1905,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 ||
@@ -1926,8 +1924,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 );
@@ -1935,16 +1931,12 @@ bool SvxColorItem::operator==(
Re: ahelp/ahelp - Extended tips in Helpcontent VCL + Glade
Hi all, Thanks a lot for your work and explanations, I jump to the end: Le 26/08/2015 18:35, Markus Mohrhard a écrit : Hey Olivier, [...] At least my patches to move the tooltips extracts them to simple java like property files. You can easily process them from there. That format at least easily allows us to keep all the existing translations and handle all the corner cases that are currently not covered by ui files. Additionally the agreement with the translators asks us to make sure that the extended tooltips can be extracted into an own pootle project to keep them independent of the normal UI translations. I hope my points explain why all this is less of an technical problem and more a social one where before you can do any work you need to convince the people affected by your change to come to a common understanding. At least your current proposal goes against the current agreement betwee Kendy, Sophi, me and the translators. (It already took a long time to get that far). I think we could go further now if we plan the changes largely in advance and if it would be possible to make the changes in 3 or 4 steps instead of a big one. Knowing it in advance will allow translators to organize their work between the different open source projects they contribute to. Olivier, we will discuss the help topic during the l10n workshop at LibOCon, would it be possible that you explain the process to the group during Tuesday afternoon? Then I'll discuss with the team to push the project further. Cheers Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org GSM: +33683901545 IRC: sophi Co-founder - Release coordinator The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[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
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-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-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
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-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-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-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-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-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-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-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-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
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-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
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
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
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-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-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-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
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-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-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-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-commits] core.git: vcl/unx
vcl/unx/gtk3/app/gtk3gtkinst.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit e5539b0b53ebaf9b792652e4866eeacf8c10b101
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 28 15:09:31 2015 +0100
deb#795131 plausible fix
Change-Id: I95c191ed865d6920845b146c3ef4baf30280a734
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index 823d741..9d7284f 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -382,6 +382,8 @@ Reference css::datatransfer::XTransferable
VclGtkClipboard::getContents() thr
void VclGtkClipboard::ClipboardGet(GtkClipboard* /*clipboard*/,
GtkSelectionData *selection_data,
guint info)
{
+if (!m_aContents.is())
+return;
GdkAtom
type(gdk_atom_intern(OUStringToOString(m_aInfoToFlavor[info].MimeType,
RTL_TEXTENCODING_UTF8).getStr(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/qa
writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2015-1760-1.wpd |binary writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2015-1760-2.wpd |binary 2 files changed New commits: commit 5be676d052fe7fc2774df2148eb6f2824ad6aa1f Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 16:09:05 2015 +0100 add CVE-2015-1760 test cases Change-Id: I85b4376b213ce8ab2880d41b5df2e6e003e3ca4d diff --git a/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2015-1760-1.wpd b/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2015-1760-1.wpd new file mode 100644 index 000..23c8aa3 Binary files /dev/null and b/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2015-1760-1.wpd differ diff --git a/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2015-1760-2.wpd b/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2015-1760-2.wpd new file mode 100644 index 000..cca30a0 Binary files /dev/null and b/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2015-1760-2.wpd differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/xls/pass/CVE-2014-6360-1.xls |binary 1 file changed New commits: commit 8fb984e2a2eca1e27432a1186b7071e3e7b3b0b8 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 16:47:46 2015 +0100 add CVE-2014-6360 test case Change-Id: Ifa1b162e4d222c9446563846a81c559518533515 diff --git a/sc/qa/unit/data/xls/pass/CVE-2014-6360-1.xls b/sc/qa/unit/data/xls/pass/CVE-2014-6360-1.xls new file mode 100644 index 000..319ed6e Binary files /dev/null and b/sc/qa/unit/data/xls/pass/CVE-2014-6360-1.xls differ ___ 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/CVE-2015-2380-1.doc |binary 1 file changed New commits: commit 1b65581ad6a0fa1a748b414a2b6032e05d62c80b Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 15:59:45 2015 +0100 add CVE-2015-2380-1.doc test case Change-Id: I94afaee6aeedd80feb1fa2078bc12e04de0db4ab diff --git a/sw/qa/core/data/ww8/pass/CVE-2015-2380-1.doc b/sw/qa/core/data/ww8/pass/CVE-2015-2380-1.doc new file mode 100644 index 000..cf15678 Binary files /dev/null and b/sw/qa/core/data/ww8/pass/CVE-2015-2380-1.doc differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/qa
writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2015-1759-1.wpd |binary 1 file changed New commits: commit be35344b6bf0b9bfc945b7e8b023b09d7db6f046 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 16:12:26 2015 +0100 add CVE-2015-1759 test case Change-Id: Ifc3a347f66ab5bdb15a5fcd7ca91fae2df2dfa66 diff --git a/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2015-1759-1.wpd b/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2015-1759-1.wpd new file mode 100644 index 000..9ff9a08 Binary files /dev/null and b/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2015-1759-1.wpd differ ___ 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/rtf/pass/CVE-2015-0086.rtf |1 + 1 file changed, 1 insertion(+) New commits: commit c43577552370baa7494d43d93a2005452ed68c40 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 16:23:06 2015 +0100 add CVE-2015-0086 test case Change-Id: Id82b199f4d182132e9dce5aca81298ecd37116df diff --git a/sw/qa/core/data/rtf/pass/CVE-2015-0086.rtf b/sw/qa/core/data/rtf/pass/CVE-2015-0086.rtf new file mode 100644 index 000..c8fa720 --- /dev/null +++ b/sw/qa/core/data/rtf/pass/CVE-2015-0086.rtf @@ -0,0 +1 @@ +2 ØHvõyúªòR+9Bñu7K}^/^ TøêF½ÿî^rwBHzjSÒ_¶(/Ó¥1Éýªü»ºÉà¬n %;¶ \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/xls/pass/CVE-2014-6361.xls |binary 1 file changed New commits: commit 8e8680ee758e622336366f2352e6d776268166b8 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 16:44:37 2015 +0100 add CVE-2014-6361 test case Change-Id: I101a5265540eeeaaa82428d93a2a32e8fc1bdb4d diff --git a/sc/qa/unit/data/xls/pass/CVE-2014-6361.xls b/sc/qa/unit/data/xls/pass/CVE-2014-6361.xls new file mode 100644 index 000..f56dd33 Binary files /dev/null and b/sc/qa/unit/data/xls/pass/CVE-2014-6361.xls 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
On Fri, Aug 28, 2015 at 8:15 AM, Shreyansh Gandhi gandhish...@gmail.com wrote: Same result:- git push origin HEAD:refs/for/master Try replacing HEAD with the branch name. 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 mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/core/data/ww8/pass/CVE-2015-2467-1.doc |binary 1 file changed New commits: commit 00692940908b5ed02d5f256613e0e2fc8577f000 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 15:37:14 2015 +0100 add CVE-2015-2467 test case Change-Id: Ia1196732bc1920be54e2e6dec51ddf6deb855e29 diff --git a/sw/qa/core/data/ww8/pass/CVE-2015-2467-1.doc b/sw/qa/core/data/ww8/pass/CVE-2015-2467-1.doc new file mode 100644 index 000..a8f0f26 Binary files /dev/null and b/sw/qa/core/data/ww8/pass/CVE-2015-2467-1.doc differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Build errors
I am trying to build LibreOffice for the first time, and am running into difficulties. This is my clone command: git clone git://anongit.freedesktop.org/libreoffice/core libreoffice This is my gcc: (Debian 4.9.3-3) 4.9.3 The autogen script works fine with no modifications. When I actually attempt to make it though, I keep on running into the same error, which I could find no information on. The error is the same each time, besides where in the source it is obviously : * */In file included from /home/quailman/code/libreoffice/lotuswordpro/source/filter/lwpheader.hxx:75:0,// // from /home/quailman/code/libreoffice/lotuswordpro/source/filter/lwpbulletstylemgr.hxx:67,// // from /home/quailman/code/libreoffice/lotuswordpro/source/filter/lwpbulletstylemgr.cxx:61:// ///home/quailman/code/libreoffice/include/rtl/ustring.hxx:168:5: note: declared here// // OUString(int) = delete;// // ^// ///home/quailman/code/libreoffice/lotuswordpro/source/filter/lwpbulletstylemgr.cxx:119:16: error: invalid conversion from ‘const char*’ to ‘int’ [-fpermissive]// // return ;/ Each time it is in a function which returns a OUString, but the actual return statement is the *return ;* If I change the return statement to *return OUString();* it seems to work, but after running into the error in three separate files(and having no familiarity with the code), I figure I must be missing something bigger. Is this a familiar problem to anyone? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
Hey, On Fri, Aug 28, 2015 at 4:52 PM, Ashod Nakashian ashnak...@gmail.com wrote: On Fri, Aug 28, 2015 at 8:15 AM, Shreyansh Gandhi gandhish...@gmail.com wrote: Same result:- git push origin HEAD:refs/for/master Try replacing HEAD with the branch name. No. Please read the error message. ( [remote rejected] HEAD - refs/for/master (you are not allowed to upload merges)) You have somewhere a merge commit. Can you pastebin the first lines of git log? Regards, Markus 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 mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build errors
On 08/27/2015 10:45 PM, quailman wrote: I am trying to build LibreOffice for the first time, and am running into difficulties. This is my clone command: git clone git://anongit.freedesktop.org/libreoffice/core libreoffice This is my gcc: (Debian 4.9.3-3) 4.9.3 The autogen script works fine with no modifications. When I actually attempt to make it though, I keep on running into the same error, which I could find no information on. The error is the same each time, besides where in the source it is obviously : * */In file included from /home/quailman/code/libreoffice/lotuswordpro/source/filter/lwpheader.hxx:75:0,// // from /home/quailman/code/libreoffice/lotuswordpro/source/filter/lwpbulletstylemgr.hxx:67,// // from /home/quailman/code/libreoffice/lotuswordpro/source/filter/lwpbulletstylemgr.cxx:61:// ///home/quailman/code/libreoffice/include/rtl/ustring.hxx:168:5: note: declared here// // OUString(int) = delete;// // ^// ///home/quailman/code/libreoffice/lotuswordpro/source/filter/lwpbulletstylemgr.cxx:119:16: error: invalid conversion from ‘const char*’ to ‘int’ [-fpermissive]// // return ;/ Each time it is in a function which returns a OUString, but the actual return statement is the *return ;* If I change the return statement to *return OUString();* it seems to work, but after running into the error in three separate files(and having no familiarity with the code), I figure I must be missing something bigger. Is this a familiar problem to anyone? Just git pull again. Some GCC versions have trouble with such statements, and those that unfortunately made it into master recently are fixed again with 8be00a3f757618b98d2407978eec2b8526e33232 Help GCC. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/core/data/rtf/pass/CVE-2014-6357.rtf |binary 1 file changed New commits: commit c99323bbf1ddbb5893c19b2116fd1662ce274c8e Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 16:33:12 2015 +0100 add CVE-2014-6357 test case Change-Id: Ie52195ef8bef45fae66f58d00dd1566ce5605a9f diff --git a/sw/qa/core/data/rtf/pass/CVE-2014-6357.rtf b/sw/qa/core/data/rtf/pass/CVE-2014-6357.rtf new file mode 100644 index 000..93fbc40 Binary files /dev/null and b/sw/qa/core/data/rtf/pass/CVE-2014-6357.rtf differ ___ 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/CVE-2014-6356-1.doc |binary 1 file changed New commits: commit f98bd4d9244d8fef5b89b6fbdb4d32a83b3ee871 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 16:37:45 2015 +0100 add CVE-2014-6356 test case Change-Id: I59ba2c81066182f7cecd24f26b63633fd6309f92 diff --git a/sw/qa/core/data/ww8/pass/CVE-2014-6356-1.doc b/sw/qa/core/data/ww8/pass/CVE-2014-6356-1.doc new file mode 100644 index 000..a287294 Binary files /dev/null and b/sw/qa/core/data/ww8/pass/CVE-2014-6356-1.doc differ ___ 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/CVE-2014-6364.doc |binary 1 file changed New commits: commit 7d9160c98bc76cac4c1ff9279984d182af6c7a68 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 16:51:58 2015 +0100 add CVE-2014-6364 test case Change-Id: I2c47d5b622a54cbfd91b0037f03113c87104da67 diff --git a/sw/qa/core/data/ww8/pass/CVE-2014-6364.doc b/sw/qa/core/data/ww8/pass/CVE-2014-6364.doc new file mode 100644 index 000..14ac417 Binary files /dev/null and b/sw/qa/core/data/ww8/pass/CVE-2014-6364.doc 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' - vcl/opengl
vcl/opengl/gdiimpl.cxx | 32 ++--
1 file changed, 18 insertions(+), 14 deletions(-)
New commits:
commit 394387490ad4f8e52deeb2f32d7f83042b3eded1
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
(cherry picked from commit c9d39c37b2c186e2b9d9841b18ecc6aed4684f62)
Reviewed-on: https://gerrit.libreoffice.org/18105
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index f5b746e..266f61e 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1418,27 +1418,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-commits] core.git: sw/qa
sw/qa/core/data/rtf/pass/CVE-2015-1651.rtf |binary 1 file changed New commits: commit e6474308be81578c99aeb48c94575739d72fe455 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 28 16:18:37 2015 +0100 add CVE-2015-1651 test case Change-Id: I166dcb1fd9653dc9bfe9d737ea570c328186f11d diff --git a/sw/qa/core/data/rtf/pass/CVE-2015-1651.rtf b/sw/qa/core/data/rtf/pass/CVE-2015-1651.rtf new file mode 100644 index 000..2a4f15e Binary files /dev/null and b/sw/qa/core/data/rtf/pass/CVE-2015-1651.rtf 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' - vcl/win
vcl/win/source/gdi/winlayout.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 47fb13510fe249bdc0c0b3bb8d9d5d8009a8974b Author: Tor Lillqvist t...@collabora.com Date: Fri Aug 28 18:35:59 2015 +0300 Avoid accidental leftover unconditional debug printout Change-Id: I67d2430aec782efa7916856584028f469d39355c diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index f26d3eb..9c1ed98 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -276,9 +276,10 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, const WinLayout rLayou return false; } +std::ostringstream sLine; for (int i = 0; i nCount; i++) -std::cerr aABC[i].abcA : aABC[i].abcB : aABC[i].abcC ; -std::cerr std::endl; +sLine aABC[i].abcA : aABC[i].abcB : aABC[i].abcC ; +SAL_INFO(vcl.gdi.opengl, ABC widths: sLine.str()); // Try hard to avoid overlap as we want to be able to use // individual rectangles for each glyph. The ABC widths don't ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/opengl/OpenGLHelper.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit be662ff54c24b245baf7526ff13a06350679d0f5
Author: Tor Lillqvist t...@collabora.com
Date: Sat Aug 29 07:55:29 2015 +0300
This is C++, we have booleans
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index fd9c2de..646a2d3 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -32,7 +32,7 @@
detail_stream stream;\
OpenGLHelper::debugMsgStream((area),detail_stream); \
} \
-} while (0)
+} while (false)
class VCL_DLLPUBLIC OpenGLHelper
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: distro-configs/Jenkins
distro-configs/Jenkins/PerfSuite_Linux.conf |8 1 file changed, 8 insertions(+) New commits: commit cec9e1176cf667bf8fafe1752c93e45176c92d42 Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Aug 28 20:32:53 2015 -0500 Add PerfSuite.conf Jenkins pseudo distro-config Change-Id: I0fecd634930629c7de65f11ce5190a9a95f98e52 diff --git a/distro-configs/Jenkins/PerfSuite_Linux.conf b/distro-configs/Jenkins/PerfSuite_Linux.conf new file mode 100644 index 000..fcb6009 --- /dev/null +++ b/distro-configs/Jenkins/PerfSuite_Linux.conf @@ -0,0 +1,8 @@ +--with-distro=LibreOfficeLinux +--without-help +--disable-epm +--disable-online-update +--without-junit +--disable-ccache +--enable-symbols +--enable-mergelibs ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
