[Libreoffice-commits] core.git: 4 commits - chart2/source sc/source

[Markus Mohrhard]

 chart2/source/view/main/DummyXShape.cxx |   44 ++++++++++++++++++--------------
 sc/source/filter/qpro/README            |    4 ++
 sc/source/filter/qpro/qpro.cxx          |    2 -
 3 files changed, 30 insertions(+), 20 deletions(-)

New commits:
commit f759239d7d4a7c9d9fc641f1873a34c5a4d6c31b
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Thu Feb 13 23:11:11 2014 +0100

    fix QPro import filter, related #i41688#
    
    We desperately need a test document for this format.
    
    Change-Id: Ifd8e35bb3330c2b9d2443a3a0f18209001a4bdff

diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index 9ec5757..3752f7c 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -226,7 +226,7 @@ void ScQProReader::readString( OUString &rString, sal_uInt16 nLength )
     sal_Char* pText = new sal_Char[ nLength + 1 ];
     mpStream->Read( pText, nLength );
     pText[ nLength ] = 0;
-    rString = OUString( pText, nLength, mpStream->GetStreamCharSet() );
+    rString = OUString( pText, std::strlen(pText), mpStream->GetStreamCharSet() );
     delete [] pText;
 }
 
commit a0e3e985cd624b604df00e693e7840d6df98c438
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Thu Feb 13 22:48:10 2014 +0100

    add documentation where to find spec and ile format docs for qpro
    
    Change-Id: I94aa2a5522bdcf3f6c5cdd6fef200c678132b3d6

diff --git a/sc/source/filter/qpro/README b/sc/source/filter/qpro/README
new file mode 100644
index 0000000..9f49f705
--- /dev/null
+++ b/sc/source/filter/qpro/README
@@ -0,0 +1,4 @@
+Quattro Pro filter
+
+Old spec files can be found at:
+http://web.archive.org/web/20021020204833/http://www.corel.com/partners_developers/ds/co32sdk/docs/qp7/qpf1copy.htm
commit 205ad30483fdb0d7ef24f4fedf4a85cfe0edd2ce
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Thu Feb 13 04:39:21 2014 +0100

    add native OpenGL debug output for dbgutil builds
    
    depends on support of ARB_debug_output
    
    Change-Id: I8c96284377e2cb9d2ee06ddd4101c1de4d0fbe9f

diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index d9c1a90..b8f4018 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -1140,6 +1140,21 @@ int oglErrorHandler( Display* /*dpy*/, XErrorEvent* /*evnt*/ )
 
 #endif
 
+#if DBG_UTIL
+
+namespace {
+
+void debug_callback(GLenum source, GLenum type, GLuint id,
+        GLenum severity, GLsizei , const GLchar* message, void* )
+{
+    SAL_WARN("chart2.opengl", "OpenGL debug message: source: " << source << ", type: "
+            << type << ", id: " << id << ", severity: " << severity << " with message: " << message);
+}
+
+}
+
+#endif
+
 bool DummyChart::initOpengl()
 {
     SAL_WARN("chart2.opengl", "DummyChart::initOpengl----start");
@@ -1253,6 +1268,16 @@ bool DummyChart::initOpengl()
 
     m_GLRender.InitOpenGL(GLWin);
 
+#if DBG_UTIL
+    // only enable debug output in dbgutil build
+    if( GLEW_ARB_debug_output )
+    {
+        glEnable(GL_DEBUG_OUTPUT);
+        glDebugMessageCallback(&debug_callback, NULL);
+    }
+
+#endif
+
     glEnable(GL_TEXTURE_2D);
     glEnable(GL_CULL_FACE);
     glCullFace(GL_BACK);
commit efb8378ce1694091fbe46a002b82d2a9e0947d67
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Thu Feb 13 04:10:50 2014 +0100

    remove unused enum
    
    Change-Id: Ib5cc05f20fad673c015700657f02a07659e0c566

diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index f701314..d9c1a90 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -41,25 +41,6 @@ using namespace com::sun::star;
 
 using namespace std;
 
-enum SymbolEnum { Symbol_Square=0
-                 , Symbol_Diamond
-                 , Symbol_DownArrow
-                 , Symbol_UpArrow
-                 , Symbol_RightArrow
-                 , Symbol_LeftArrow
-                 , Symbol_Bowtie
-                 , Symbol_Sandglass
-                 , Symbol_Circle
-                 , Symbol_Star
-                 , Symbol_X
-                 , Symbol_Plus
-                 , Symbol_Asterisk
-                 , Symbol_HorizontalBar
-                 , Symbol_VerticalBar
-                 , Symbol_COUNT
-};
-
-
 namespace chart {
 
 namespace dummy {