[Libreoffice-commits] core.git: vcl/osx vcl/quartz
Thorsten Behrens
Thorsten.Behrens at CIB.de
Tue Jun 21 01:43:17 UTC 2016
vcl/osx/salframeview.mm | 3 ---
vcl/quartz/salbmp.cxx | 6 +-----
2 files changed, 1 insertion(+), 8 deletions(-)
New commits:
commit 5d336fb1d515b0967bc730e47ac3e4b850cf9872
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date: Tue Jun 21 03:41:48 2016 +0200
vcl: remove some commented-out code
Change-Id: Iac827fd102404ae615dfd1685886010e949ff653
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 219c681..3dded25 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1680,9 +1680,6 @@ private:
{
if( AquaSalFrame::isAlive( mpFrame ) )
{
- #if OSL_DEBUG_LEVEL > 1
- // fprintf( stderr, "SalFrameView: doCommandBySelector %s\n", (char*)aSelector );
- #endif
if( (mpFrame->mnICOptions & InputContextFlags::Text) &&
aSelector != nullptr && [self respondsToSelector: aSelector] )
{
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 7c44fb2..86c4dab 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -751,13 +751,9 @@ const BitmapPalette& GetDefaultPalette( int mnBits, bool bMonochrome )
BitmapBuffer* QuartzSalBitmap::AcquireBuffer( BitmapAccessMode /*nMode*/ )
{
+ // TODO: AllocateUserData();
if (!m_pUserBuffer.get())
-// || m_pContextBuffer.get() && (m_pUserBuffer.get() != m_pContextBuffer.get()) )
- {
- // fprintf(stderr,"ASB::Acq(%dx%d,d=%d)\n",mnWidth,mnHeight,mnBits);
- // TODO: AllocateUserData();
return nullptr;
- }
BitmapBuffer* pBuffer = new BitmapBuffer;
pBuffer->mnWidth = mnWidth;
More information about the Libreoffice-commits
mailing list