[Libreoffice-commits] .: sfx2/source
Joseph Powers
jpowers at kemper.freedesktop.org
Mon Jul 25 06:05:41 PDT 2011
sfx2/source/view/viewsh.cxx | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 0893c1c71901a3d8a99faa006ec3c93c315ff4b6
Author: Joseph Powers <jpowers27 at cox.net>
Date: Mon Jul 25 06:05:28 2011 -0700
Remove unneeded #include <unotools/javaoptions.hxx>
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index dcd484b..87907c3 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -57,7 +57,6 @@
#include <svtools/soerr.hxx>
#include <unotools/internaloptions.hxx>
-#include <unotools/javaoptions.hxx>
#include <basic/basmgr.hxx>
#include <basic/sbuno.hxx>
#include <framework/actiontriggerhelper.hxx>
@@ -135,17 +134,17 @@ public:
struct AsyncExecuteInfo
{
- AsyncExecuteInfo( AsyncExecuteCmd eCmd, uno::Reference< datatransfer::clipboard::XClipboardListener > xThis, SfxClipboardChangeListener* pListener ) :
+ AsyncExecuteInfo( AsyncExecuteCmd eCmd, uno::Reference< datatransfer::clipboard::XClipboardListener > xThis, SfxClipboardChangeListener* pListener ) :
m_eCmd( eCmd ), m_xThis( xThis ), m_pListener( pListener ) {}
AsyncExecuteCmd m_eCmd;
uno::Reference< datatransfer::clipboard::XClipboardListener > m_xThis;
SfxClipboardChangeListener* m_pListener;
};
-
+
private:
SfxViewShell* m_pViewShell;
- uno::Reference< datatransfer::clipboard::XClipboardNotifier > m_xClpbrdNtfr;
+ uno::Reference< datatransfer::clipboard::XClipboardNotifier > m_xClpbrdNtfr;
uno::Reference< lang::XComponent > m_xCtrl;
DECL_STATIC_LINK( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, AsyncExecuteInfo* );
@@ -197,7 +196,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, A
}
}
delete pAsyncExecuteInfo;
-
+
return 0;
}
@@ -207,7 +206,7 @@ throw ( uno::RuntimeException )
// Either clipboard or ViewShell is going to be destroyed -> no interest in listening anymore
uno::Reference< lang::XComponent > xCtrl( m_xCtrl );
uno::Reference< datatransfer::clipboard::XClipboardNotifier > xNotify( m_xClpbrdNtfr );
-
+
uno::Reference< datatransfer::clipboard::XClipboardListener > xThis( static_cast< datatransfer::clipboard::XClipboardListener* >( this ));
if ( xCtrl.is() )
xCtrl->removeEventListener( uno::Reference < lang::XEventListener > ( static_cast < lang::XEventListener* >( this )));
@@ -1469,7 +1468,7 @@ String SfxViewShell::GetSelectionText
//--------------------------------------------------------------------
sal_Bool SfxViewShell::HasSelection( sal_Bool ) const
-
+
/* [Description]
With this virtual Method can a for example a Dialog be queried, to
More information about the Libreoffice-commits
mailing list