Repository.mk | 2 +-
chart2/Library_chartopengl.mk | 4 ++++
chart2/Module_chart2.mk | 2 +-
chart2/source/view/inc/DummyXShape.hxx | 14 ++++++--------
chart2/source/view/main/DummyXShape.cxx | 16 +++++++++++++---
chart2/source/view/main/OpenGLRender.cxx | 8 ++++++++
chart2/source/view/main/OpenGLRender.hxx | 13 ++++++++-----
desktop/source/app/app.cxx | 7 -------
editeng/source/editeng/editdbg.cxx | 8 ++++----
framework/source/fwe/helper/titlehelper.cxx | 5 ++++-
include/vcl/apptypes.hxx | 1 -
postprocess/Rdb_services.mk | 4 +++-
vcl/source/app/svapp.cxx | 3 ---
vcl/source/gdi/virdev.cxx | 1 -
vcl/source/window/window.cxx | 1 -
15 files changed, 52 insertions(+), 37 deletions(-)
New commits:
commit 26cb65db74d67fc2561a495018d0f580c31202bc
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Feb 3 17:06:55 2014 +0100
Make the OpenGL stuff in chart2 compile for OS X (but definitely won't work)
Change-Id: I487fcd12bf90e8ce2c05743244858f7b5145c355
diff --git a/Repository.mk b/Repository.mk
index e91efd6..2e820e7 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -222,7 +222,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
canvastools \
chartcore \
chartcontroller \
- $(if $(filter LINUX FREEBSD WNT,$(OS)),chartopengl) \
+ $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),chartopengl) \
$(if $(filter $(OS),WNT),,cmdmail) \
cppcanvas \
configmgr \
diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
index 8cf8385..0aa6340 100644
--- a/chart2/Library_chartopengl.mk
+++ b/chart2/Library_chartopengl.mk
@@ -62,6 +62,10 @@ $(eval $(call gb_Library_use_system_win32_libs,chartopengl,\
gdi32 \
glu32 \
))
+else ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_use_system_darwin_frameworks,chartopengl,\
+ OpenGL \
+))
else ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,chartopengl,\
-ldl \
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 9d6e019..611e699 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,chart2))
$(eval $(call gb_Module_add_targets,chart2,\
Library_chartcontroller \
Library_chartcore \
- $(if $(filter LINUX FREEBSD WNT,$(OS)), \
+ $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)), \
Library_chartopengl \
Package_opengl \
) \
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index df9a892..eae679b 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -61,8 +61,14 @@
#include <map>
#include <boost/scoped_ptr.hpp>
+#if defined( MACOSX )
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
#include <GL/gl.h>
#include <GL/glu.h>
+#endif
+
#include <vcl/window.hxx>
#include <vcl/syschild.hxx>
#include <vcl/sysdata.hxx>
@@ -72,9 +78,6 @@
#include <GL/glext.h>
#include <GL/wglext.h>
#elif defined( MACOSX )
- #include "premac.h"
- #include <Cocoa/Cocoa.h>
- #include "postmac.h"
#elif defined( UNX )
#include <GL/glu.h>
#include <GL/glext.h>
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 636679e..003afd2 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -947,6 +947,13 @@ bool DummyChart::initWindow()
return true;
}
+#elif defined( MACOSX )
+
+bool DummyChart::initWindow()
+{
+ return false;
+}
+
#elif defined( UNX )
namespace {
@@ -1085,6 +1092,8 @@ bool DummyChart::initOpengl()
#if defined( WNT )
GLWin.hDC = GetDC(GLWin.hWnd);
+#elif defined( MACOSX )
+
#elif defined( UNX )
GLWin.ctx = glXCreateContext(GLWin.dpy,
GLWin.vi,
@@ -1135,6 +1144,8 @@ bool DummyChart::initOpengl()
GLWin.hRC = wglCreateContext(GLWin.hDC);
wglMakeCurrent(GLWin.hDC,GLWin.hRC);
+#elif defined( MACOSX )
+
#elif defined( UNX )
if( !glXMakeCurrent( GLWin.dpy, GLWin.win, GLWin.ctx ) )
{
@@ -1195,6 +1206,8 @@ bool DummyChart::initOpengl()
#if defined( WNT )
SwapBuffers(GLWin.hDC);
glFlush();
+#elif defined( MACOSX )
+
#elif defined( UNX )
glXSwapBuffers(GLWin.dpy, GLWin.win);
#endif
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 9cc75cb..1c3795a 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -424,6 +424,8 @@ int OpenGLRender::InitOpenGL(GLWindow aWindow)
#if defined( WNT )
SwapBuffers(glWin.hDC);
+#elif defined( MACOSX )
+
#elif defined( UNX )
glXSwapBuffers(glWin.dpy, glWin.win);
#endif
@@ -663,6 +665,8 @@ void OpenGLRender::renderToBitmap()
glBindFramebuffer(GL_FRAMEBUFFER, 0);
#if defined( WNT )
SwapBuffers(glWin.hDC);
+#elif defined( MACOSX )
+
#elif defined( UNX )
glXSwapBuffers(glWin.dpy, glWin.win);
#endif
@@ -745,6 +749,8 @@ int OpenGLRender::RenderTexture(GLuint TexID)
glUseProgram(0);
#if defined( WNT )
SwapBuffers(glWin.hDC);
+#elif defined( MACOSX )
+
#elif defined( UNX )
glXSwapBuffers(glWin.dpy, glWin.win);
#endif
@@ -826,6 +832,8 @@ void OpenGLRender::Release()
glDeleteRenderbuffers(1, &m_RboID);
#if defined( WNT )
wglMakeCurrent(NULL, NULL);
+#elif defined( MACOSX )
+
#elif defined( UNX )
glXMakeCurrent(glWin.dpy, None, NULL);
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index 23e842d..4b717d8 100755
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -10,7 +10,8 @@
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <vcl/font.hxx>
-#if defined( UNX )
+#if defined( MACOSX )
+#elif defined( UNX )
#include <prex.h>
#include "GL/glxew.h"
#include <postx.h>
@@ -22,9 +23,14 @@
#include "postwin.h"
#endif
-
+#if defined( MACOSX )
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
#include <GL/gl.h>
#include <GL/glu.h>
+#endif
+
#include <vcl/window.hxx>
#include <vcl/syschild.hxx>
#include <vcl/sysdata.hxx>
@@ -36,9 +42,6 @@
#include <GL/glext.h>
#include <GL/wglext.h>
#elif defined( MACOSX )
-#include "premac.h"
-#include <Cocoa/Cocoa.h>
-#include "postmac.h"
#elif defined( UNX )
#include <GL/glu.h>
commit b6ba651fa9ed4b79605b74f4b3073db654071013
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Feb 3 15:35:12 2014 +0100
Bin silly inline versioning comments
Change-Id: Ie1c9a52702268bf1d1d9c8836d6dc538176f70d4
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index 7d2c25e..df9a892 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -79,11 +79,6 @@
#include <GL/glu.h>
#include <GL/glext.h>
#endif
-//[mod] by gaowei
-
-
-//[mod] by gaowei end
-
class SystemWindow;
class SystemChildWindow;
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 44da917..636679e 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -1244,7 +1244,6 @@ void DummyChart::setSize( const awt::Size& aSize )
pWindow->SetSizePixel(Size(aSize.Width, aSize.Height));
#else
-//[Mod] GaoWei
SAL_WARN("chart2.opengl", "DummyChart::setSize()---aSize.Width = " <<
aSize.Width << ", aSize.Height = " << aSize.Height);
// DummyXShape::setSize(aSize);
// mpWindow->SetSizePixel(Size(aSize.Width, aSize.Height));
@@ -1260,8 +1259,6 @@ void DummyChart::setSize( const awt::Size& aSize )
m_GLRender.SetHeight(height);
SAL_WARN("chart2.opengl", "DummyChart::GLRender.Width = " << width << ",
GLRender.Height = " << height);
#endif
- //[mod] by gaowei end
-
}
void DummyChart::render()
commit eeb840d6ba930015b969c3d0a98031f0ae508d61
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Feb 3 14:30:32 2014 +0100
fdo#70376: Put only document (file) name in window title on OS X
Change-Id: I0b975a1a0e73c546beec96599fd4e5f87caa51db
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index 8829372..0e3a97b 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -486,10 +486,13 @@ void TitleHelper::impl_updateTitleForFrame (const
css::uno::Reference< css::fram
OUStringBuffer sTitle (256);
impl_appendComponentTitle (sTitle, xComponent);
+#ifndef MACOSX
+ // fdo#70376: We want the window title to contain just the
+ // document name (from the above "component title").
impl_appendProductName (sTitle);
impl_appendModuleName (sTitle);
impl_appendDebugVersion (sTitle);
-
+#endif
// SYNCHRONIZED ->
aLock.reset ();
commit c320f835c91dcea8d64a858bae41bb7f3f847420
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Feb 3 14:06:00 2014 +0100
WaE: sal_Int32 format mismatches
(Do we really need this ancient debug code writing to a /tmp/debug.log
/ d:\debug.log ?)
Change-Id: I005b938e95d963bc3b6a2d0d1d11352623b7c2e1
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index a857cb8..8c68431 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -326,7 +326,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
for ( sal_Int32 nPortion = 0; nPortion <
pEE->pImpEditEngine->GetParaPortions().Count(); nPortion++)
{
ParaPortion* pPPortion =
pEE->pImpEditEngine->GetParaPortions()[nPortion];
- fprintf( fp, "\nParagraph %" SAL_PRIdINT32 ": Length = %i, Invalid =
%i\nText = '%s'",
+ fprintf( fp, "\nParagraph %" SAL_PRIdINT32 ": Length = %"
SAL_PRIdINT32 ", Invalid = %i\nText = '%s'",
nPortion, pPPortion->GetNode()->Len(), pPPortion->IsInvalid(),
OUStringToOString(pPPortion->GetNode()->GetString(),
RTL_TEXTENCODING_UTF8).getStr() );
fprintf( fp, "\nVorlage:" );
@@ -408,8 +408,8 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
for ( nLine = 0; nLine < pPPortion->GetLines().Count(); nLine++ )
{
EditLine* pLine = pPPortion->GetLines()[nLine];
- fprintf( fp, "\nZeile %i:\tStart: %i,\tEnd: %i", nLine,
pLine->GetStart(), pLine->GetEnd() );
- fprintf( fp, "\t\tPortions: %i - %i.\tHight: %i, Ascent=%i",
pLine->GetStartPortion(), pLine->GetEndPortion(), pLine->GetHeight(),
pLine->GetMaxAscent() );
+ fprintf( fp, "\nZeile %i:\tStart: %" SAL_PRIdINT32 ",\tEnd: %"
SAL_PRIdINT32, nLine, pLine->GetStart(), pLine->GetEnd() );
+ fprintf( fp, "\t\tPortions: %" SAL_PRIdINT32 " - %" SAL_PRIdINT32
".\tHight: %i, Ascent=%i", pLine->GetStartPortion(), pLine->GetEndPortion(),
pLine->GetHeight(), pLine->GetMaxAscent() );
}
fprintf( fp,
"\n-----------------------------------------------------------------------------"
);
@@ -461,7 +461,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
aR = pV->GetVisArea();
fprintf( fp, "\n VisArea: nX=%li, nY=%li, dX=%li, dY=%li",
aR.TopLeft().X(), aR.TopLeft().Y(), aR.GetSize().Width(), aR.GetSize().Height()
);
ESelection aSel = pV->GetSelection();
- fprintf( fp, "\n Selection: Start=%" SAL_PRIdINT32 ",%u, End=%"
SAL_PRIdINT32 ",%u", aSel.nStartPara, aSel.nStartPos, aSel.nEndPara,
aSel.nEndPos );
+ fprintf( fp, "\n Selection: Start=%" SAL_PRIdINT32 ",%" SAL_PRIdINT32
", End=%" SAL_PRIdINT32 ",%" SAL_PRIdINT32, aSel.nStartPara, aSel.nStartPos,
aSel.nEndPara, aSel.nEndPos );
}
if ( pEE->GetActiveView() )
{
commit 8077c3ed6f1cb7fa8f7466339979f939da58bfb5
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Feb 3 13:37:16 2014 +0100
Follow-up to 5fc9a33b9a684eff92bdf1bad705dbc5986098ce
Change-Id: I07c7d831fc75a6020e03993c6b087562e5422b32
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index b0c8a10..1f9ca5b 100755
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -119,7 +119,9 @@ $(eval $(call gb_Rdb_add_components,services,\
writerperfect/source/impress/wpftimpress \
$(if $(filter MACOSX,$(OS)), \
$(if $(filter-out X86_64,$(CPUNAME)), \
- avmedia/source/quicktime/avmediaQuickTime \
+ $(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
+ avmedia/source/quicktime/avmediaQuickTime \
+ ) \
) \
lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \
fpicker/source/aqua/fps_aqua \
commit c8d0a3517083c4f366dd1883e30ee01581dd6f94
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Feb 3 12:26:19 2014 +0100
EXC_SYSOBJNOTCREATED was not really used
Change-Id: Id5ece6db33aa92b619571252df91b965a8805c96
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 7c754cf..e391c86 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1303,13 +1303,6 @@ sal_uInt16 Desktop::Exception(sal_uInt16 nError)
break;
}
- case EXC_SYSOBJNOTCREATED:
- {
- OUString aSysResExceptionString;
- Application::Abort( aSysResExceptionString );
- break;
- }
-
default:
{
m_xLockfile.reset();
diff --git a/include/vcl/apptypes.hxx b/include/vcl/apptypes.hxx
index 5a22c1c..60ead54 100644
--- a/include/vcl/apptypes.hxx
+++ b/include/vcl/apptypes.hxx
@@ -24,7 +24,6 @@
#include <tools/rtti.hxx>
#define EXC_RSCNOTLOADED ((sal_uInt16)0x0100)
-#define EXC_SYSOBJNOTCREATED ((sal_uInt16)0x0200)
#define EXC_SYSTEM ((sal_uInt16)0x0300)
#define EXC_DISPLAY ((sal_uInt16)0x0400)
#define EXC_REMOTE ((sal_uInt16)0x0500)
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 67374f3..877f29e 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -290,9 +290,6 @@ sal_uInt16 Application::Exception( sal_uInt16 nError )
case EXC_RSCNOTLOADED:
Abort(OUString("Resource not loaded"));
break;
- case EXC_SYSOBJNOTCREATED:
- Abort(OUString("System Object not created"));
- break;
default:
Abort(OUString("Unknown Error"));
break;
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index cc0cc16..dae1e8c 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -68,7 +68,6 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice*
pOutDev,
throw ::com::sun::star::uno::RuntimeException(
OUString( "Could not create system bitmap!" ),
::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >() );
- //GetpApp()->Exception( EXC_SYSOBJNOTCREATED );
}
mnBitCount = ( nBitCount ? nBitCount : pOutDev->GetBitCount() );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a79fecf..e0226b4 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -854,7 +854,6 @@ void Window::ImplInit( Window* pParent, WinBits nStyle,
SystemParentData* pSyste
throw ::com::sun::star::uno::RuntimeException(
OUString( "Could not create system window!" ),
::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >() );
- //GetpApp()->Exception( EXC_SYSOBJNOTCREATED );
}
pFrame->SetCallback( this, ImplWindowFrameProc );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
