summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-09-02 01:05:33 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-09-02 01:05:33 +0200
commit7eb4239e3e5fbcdd8002a2d57275ac4916464daf (patch)
tree86161d132f5dd35a2515ff588185125077362f26
parente010352a3d3f36ba2318c86fc9e389a32749e26f (diff)
remove SAL_DEBUGs introduced earlierfeature/mac-opengl-fixes
Change-Id: I901188b5b0a3e64e2407d039dd80f89cce8cf6de
-rw-r--r--canvas/source/factory/cf_service.cxx20
-rw-r--r--canvas/source/opengl/ogl_spritedevicehelper.cxx1
-rw-r--r--chart2/source/view/main/GL3DRenderer.cxx11
3 files changed, 0 insertions, 32 deletions
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index 07ee8b72d0e9..014b82d944e1 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -168,12 +168,6 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
Reference<container::XHierarchicalNameAccess> xHierarchicalNameAccess(
xNameAccess, UNO_QUERY_THROW);
- Sequence<OUString> serviceNames = xNameAccess->getElementNames();
- for (sal_Int32 i = 0; i < serviceNames.getLength(); ++i)
- {
- SAL_DEBUG(serviceNames[i]);
- }
-
const OUString* pCurr = serviceNames.getConstArray();
const OUString* const pEnd = pCurr + serviceNames.getLength();
while( pCurr != pEnd )
@@ -188,25 +182,13 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
if( (xEntryNameAccess->getByName("PreferredImplementations") >>= implementationList) )
{
m_aAvailableImplementations.push_back( std::make_pair(*pCurr,implementationList) );
- for (sal_Int32 i = 0; i < implementationList.getLength(); ++i)
- {
- SAL_DEBUG("available :" << implementationList[i]);
- }
}
if( (xEntryNameAccess->getByName("AcceleratedImplementations") >>= implementationList) )
{
- for (sal_Int32 i = 0; i < implementationList.getLength(); ++i)
- {
- SAL_DEBUG("accelerated: " <<implementationList[i]);
- }
m_aAcceleratedImplementations.push_back( std::make_pair(*pCurr,implementationList) );
}
if( (xEntryNameAccess->getByName("AntialiasingImplementations") >>= implementationList) )
{
- for (sal_Int32 i = 0; i < implementationList.getLength(); ++i)
- {
- SAL_DEBUG("aa implemented: " << implementationList[i]);
- }
m_aAAImplementations.push_back( std::make_pair(*pCurr,implementationList) );
}
@@ -294,7 +276,6 @@ Reference<XInterface> CanvasFactory::use(
Reference<XComponentContext> const & xContext ) const
{
try {
- SAL_DEBUG("use: " << serviceName);
return m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
serviceName, args, xContext);
}
@@ -337,7 +318,6 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
Reference<XComponentContext> const & xContext ) const
{
::osl::MutexGuard guard(m_mutex);
- SAL_DEBUG(serviceName);
// forcing last entry from impl list, if config flag set
bool bForceLastEntry(false);
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 2e4b592c1f80..58a59ea1fe1c 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -389,7 +389,6 @@ namespace oglcanvas
uno::Reference<rendering::XColorSpace> SpriteDeviceHelper::getColorSpace() const
{
- SAL_DEBUG("called SpriteDeviceHelper::getColorSpace()");
// always the same
return uno::Reference<rendering::XColorSpace>(
::canvas::tools::getStdColorSpace(),
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 999b9df12b80..cde4356c46d7 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -218,9 +218,7 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders()
m_3DModelID = glGetUniformLocation(m_3DProID, "M");
m_3DNormalMatrixID = glGetUniformLocation(m_3DProID, "normalMatrix");
m_3DVertexID = glGetAttribLocation(m_3DProID, "vertexPositionModelspace");
- SAL_DEBUG("first " << m_3DVertexID);
m_3DNormalID = glGetAttribLocation(m_3DProID, "vertexNormalModelspace");
- SAL_DEBUG("second " << m_3DNormalID);
CHECK_GL_ERROR();
if (m_bScrollFlag)
{
@@ -289,30 +287,22 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders()
m_TextProID = OpenGLHelper::LoadShaders("textVertexShader", "textFragmentShader");
m_TextMatrixID = glGetUniformLocation(m_TextProID, "MVP");
m_TextVertexID = glGetAttribLocation(m_TextProID, "vPosition");
- SAL_DEBUG(m_TextVertexID);
m_TextTexCoordID = glGetAttribLocation(m_TextProID, "texCoord");
- SAL_DEBUG(m_TextTexCoordID);
m_TextTexID = glGetUniformLocation(m_TextProID, "TextTex");
}
CHECK_GL_ERROR();
m_ScreenTextProID = OpenGLHelper::LoadShaders("screenTextVertexShader", "screenTextFragmentShader");
m_ScreenTextVertexID = glGetAttribLocation(m_ScreenTextProID, "vPosition");
- SAL_DEBUG(m_ScreenTextVertexID);
m_ScreenTextTexCoordID = glGetAttribLocation(m_ScreenTextProID, "texCoord");
- SAL_DEBUG(m_ScreenTextTexCoordID);
m_ScreenTextTexID = glGetUniformLocation(m_ScreenTextProID, "TextTex");
m_ScreenTextColorID = glGetUniformLocation(m_ScreenTextProID, "textColor");
CHECK_GL_ERROR();
m_CommonProID = OpenGLHelper::LoadShaders("commonVertexShader", "commonFragmentShader");
- SAL_DEBUG(m_CommonProID);
m_MatrixID = glGetUniformLocation(m_CommonProID, "MVP");
- SAL_DEBUG(m_MatrixID);
m_2DColorID = glGetUniformLocation(m_CommonProID, "vColor");
- SAL_DEBUG(m_2DColorID);
m_2DVertexID = glGetAttribLocation(m_CommonProID, "vPosition");
- SAL_DEBUG(m_2DVertexID);
CHECK_GL_ERROR();
}
@@ -878,7 +868,6 @@ void OpenGL3DRenderer::RenderLine3D(const Polygon3DInfo& polygon)
// 1rst attribute buffer : vertices
glEnableVertexAttribArray(maResources.m_2DVertexID);
- SAL_DEBUG(maResources.m_2DVertexID);
CHECK_GL_ERROR();
glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer);
CHECK_GL_ERROR();