[Libreoffice-commits] core.git: embeddedobj/source embeddedobj/test
Alexander Wilms
f.alexander.wilms at gmail.com
Wed Feb 26 13:03:11 PST 2014
embeddedobj/source/general/docholder.cxx | 6 +--
embeddedobj/source/msole/graphconvert.cxx | 4 +-
embeddedobj/source/msole/olecomponent.hxx | 2 -
embeddedobj/source/msole/oleembed.cxx | 6 +--
embeddedobj/source/msole/olepersist.cxx | 2 -
embeddedobj/source/msole/ownview.cxx | 8 ++--
embeddedobj/test/Container1/BitmapPainter.java | 34 ++++++++++----------
embeddedobj/test/Container1/JavaWindowPeerFake.java | 2 -
embeddedobj/test/Container1/NativeView.java | 14 ++++----
embeddedobj/test/Container1/nativelib/nativeview.c | 2 -
10 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit e4f6ba5e3ced6ff2ef28d71d406b5b6a6cdd90c5
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 18:24:45 2014 +0100
Remove visual noise from embeddedobj
Change-Id: I63ce6896e2f82160ffedb9f6123ca765f49698c5
Reviewed-on: https://gerrit.libreoffice.org/8256
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 6520423..a970979 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -78,7 +78,7 @@
using namespace ::com::sun::star;
-//===========================================================================
+
class IntCounterGuard {
sal_Int32& m_nFlag;
@@ -96,7 +96,7 @@ public:
}
};
-//===========================================================================
+
static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >& xTargetMenu,
sal_Int32 nTargetIndex,
@@ -148,7 +148,7 @@ static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >&
xTargetMenu->insertByIndex( nTargetIndex, uno::makeAny( aTargetProps ) );
}
-//===========================================================================
+
DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >& xContext,
OCommonEmbeddedObject* pEmbObj )
: m_pEmbedObj( pEmbObj ),
diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index 9883c49..ad8e910 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -79,9 +79,9 @@ sal_Bool ConvertBufferToFormat( void* pBuf,
return sal_False;
}
-// =====================================================================
+
// MainThreadNotificationRequest
-// =====================================================================
+
MainThreadNotificationRequest::MainThreadNotificationRequest( const ::rtl::Reference< OleEmbeddedObject >& xObj, sal_uInt16 nNotificationType, sal_uInt32 nAspect )
: m_pObject( xObj.get() )
, m_xObject( static_cast< embed::XEmbeddedObject* >( xObj.get() ) )
diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index 2ec7f89..1238988 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -114,7 +114,7 @@ public:
void CreateLinkFromFile( const OUString& aFileName );
void InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent );
- // ======================================================================
+
void RunObject(); // switch OLE object to running state
void CloseObject(); // switch OLE object to loaded state
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 7d3c463..244c543 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -799,7 +799,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
// ==== the STAMPIT related solution =============================
m_aVerbExecutionController.StartControlExecution();
- // ===============================================================
+
m_pOleComponent->ExecuteVerb( nVerbID );
@@ -810,13 +810,13 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
// if object was modified during verb execution it is saved here
if ( bModifiedOnExecution && m_pOleComponent->IsDirty() )
SaveObject_Impl();
- // ===============================================================
+
}
catch( uno::Exception& )
{
// ==== the STAMPIT related solution =============================
m_aVerbExecutionController.EndControlExecution_WasModified();
- // ===============================================================
+
aGuard.clear();
StateChangeNotification_Impl( sal_False, nOldState, m_nObjectState );
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 3b5bad5..e3c17be 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -897,7 +897,7 @@ void OleEmbeddedObject::OnViewChanged_Impl()
SaveObject_Impl();
MakeEventListenerNotification_Impl( OUString( "OnVisAreaChanged" ) );
}
- // ===============================================================
+
}
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 3ca096b..ebe91a9 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -53,9 +53,9 @@ OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xI
sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory );
uno::Reference< io::XStream > TryToGetAcceptableFormat_Impl( const uno::Reference< io::XStream >& xStream, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw ( uno::Exception );
-//========================================================
+
// Dummy interaction handler
-//========================================================
+
class DummyHandler_Impl : public ::cppu::WeakImplHelper1< task::XInteractionHandler >
{
@@ -79,9 +79,9 @@ void SAL_CALL DummyHandler_Impl::handle( const uno::Reference< task::XInteractio
return;
}
-//========================================================
+
// Object viewer
-//========================================================
+
OwnView_Impl::OwnView_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory,
const uno::Reference< io::XInputStream >& xInputStream )
diff --git a/embeddedobj/test/Container1/BitmapPainter.java b/embeddedobj/test/Container1/BitmapPainter.java
index 6f688c8f..75e9c8a 100644
--- a/embeddedobj/test/Container1/BitmapPainter.java
+++ b/embeddedobj/test/Container1/BitmapPainter.java
@@ -69,7 +69,7 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe
private boolean m_bProceedWithPainting = true;
// Methods
- //------------------------------------------------------
+
public BitmapPainter( XJob xJob, XWindow xWindow, XBitmap xBitmap, com.sun.star.awt.Rectangle aDrawRect )
{
if ( xJob == null )
@@ -103,7 +103,7 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe
m_xWindow.addMouseMotionListener( this );
}
- //------------------------------------------------------
+
public void disconnectListener()
{
m_aPaintThread.disposeThread();
@@ -112,7 +112,7 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe
m_xWindow.removeMouseMotionListener( this );
}
- //------------------------------------------------------
+
public void setBitmap( XBitmap xBitmap )
{
synchronized( m_oImageLock )
@@ -121,7 +121,7 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe
}
}
- //------------------------------------------------------
+
public void setPos( com.sun.star.awt.Point aPoint )
{
synchronized( m_oImageLock )
@@ -131,7 +131,7 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe
}
}
- //------------------------------------------------------
+
public void setRect( com.sun.star.awt.Rectangle aRect )
{
synchronized( m_oImageLock )
@@ -140,7 +140,7 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe
}
}
- //------------------------------------------------------
+
public void setSize( com.sun.star.awt.Size aSize )
{
synchronized( m_oImageLock )
@@ -150,20 +150,20 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe
}
}
- //------------------------------------------------------
+
public void stopPainting()
{
m_bProceedWithPainting = false;
}
- //------------------------------------------------------
+
public void startPainting()
{
m_bProceedWithPainting = true;
}
// XPaintListener
- //------------------------------------------------------
+
public void windowPaint( PaintEvent e )
{
if ( !m_bProceedWithPainting )
@@ -199,49 +199,49 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe
}
// XMouseListener
- //------------------------------------------------------
+
public void mousePressed( MouseEvent e )
{
}
- //------------------------------------------------------
+
public void mouseReleased( MouseEvent e )
{
}
- //------------------------------------------------------
+
public void mouseEntered( MouseEvent e )
{
}
- //------------------------------------------------------
+
public void mouseExited( MouseEvent e )
{
}
// XMouseMotionListener
- //------------------------------------------------------
+
public void mouseDragged( MouseEvent e )
{
// TODO: react to resizing of object bitmap
// if the object is inplace active the object must control resizing
}
- //------------------------------------------------------
+
public void mouseMoved( MouseEvent e )
{
}
// XEventListener
- //------------------------------------------------------
+
public void disposing( com.sun.star.lang.EventObject e )
{
// do nothing, the window can die only when the application is closed
}
// XJob
- //------------------------------------------------------
+
public Object execute( NamedValue[] pValues )
{
/*
diff --git a/embeddedobj/test/Container1/JavaWindowPeerFake.java b/embeddedobj/test/Container1/JavaWindowPeerFake.java
index 0b3c705..54d1f39 100644
--- a/embeddedobj/test/Container1/JavaWindowPeerFake.java
+++ b/embeddedobj/test/Container1/JavaWindowPeerFake.java
@@ -39,7 +39,7 @@ class JavaWindowPeerFake implements XSystemDependentWindowPeer,
maView = aNative;
}
- // ____________________
+
/**
* Implementation of XSystemDependentWindowPeer ( that's all we really need ).
* This method is called back from the Office toolkit to retrieve the system data.
diff --git a/embeddedobj/test/Container1/NativeView.java b/embeddedobj/test/Container1/NativeView.java
index 70d7457..7063072 100644
--- a/embeddedobj/test/Container1/NativeView.java
+++ b/embeddedobj/test/Container1/NativeView.java
@@ -37,7 +37,7 @@ import java.awt.event.*;
public class NativeView extends java.awt.Canvas
{
- // ____________________
+
/**
* ctor
@@ -54,7 +54,7 @@ public class NativeView extends java.awt.Canvas
this.setBackground( Color.white );
}
- // ____________________
+
/**
* Overload this method to make necessary initializations here.
@@ -71,7 +71,7 @@ public class NativeView extends java.awt.Canvas
getHWND();
}
- // ____________________
+
/**
* to guarantee right resize handling inside a swing container
@@ -93,7 +93,7 @@ public class NativeView extends java.awt.Canvas
return new Dimension( 300, 300 );
}
- // ____________________
+
/**
* overload paint routine to show provide against
@@ -112,7 +112,7 @@ public class NativeView extends java.awt.Canvas
}
}
- // ____________________
+
/**
* JNI interface of this class
@@ -143,7 +143,7 @@ public class NativeView extends java.awt.Canvas
return maHandle;
}
- // ____________________
+
/**
* for using of the JNI methods it's necessary to load
@@ -154,7 +154,7 @@ public class NativeView extends java.awt.Canvas
System.loadLibrary( "nativeview" );
}
- // ____________________
+
/**
* @member maHandle system window handle
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c
index 8f5e4c7..2f3ea77 100644
--- a/embeddedobj/test/Container1/nativelib/nativeview.c
+++ b/embeddedobj/test/Container1/nativelib/nativeview.c
@@ -72,7 +72,7 @@ JNIEXPORT jlong JNICALL Java_embeddedobj_test_NativeView_getNativeWindow
#else
// FIXME: Where is dsi_x11 defined?
// Added below because I'm guessing this test breaks
- //
+
// JAWT_X11DrawingSurfaceInfo*dsi_x11 ;
#endif
jlong drawable;
More information about the Libreoffice-commits
mailing list