diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 14:14:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-17 11:33:57 +0000 |
| commit | 2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch) | |
| tree | 1f335918a854319df9269329d165a91d711d2108 /embeddedobj/source/inc/oleembobj.hxx | |
| parent | d6bf086012343b4a1e27cd4242dced9ee0d73a06 (diff) | |
use consistent #define checks for the Windows platform
stage 2 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
In this stage we focus on replacing usage of the WIN macro
Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84
Reviewed-on: https://gerrit.libreoffice.org/22393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'embeddedobj/source/inc/oleembobj.hxx')
| -rw-r--r-- | embeddedobj/source/inc/oleembobj.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx index 687ccf32dac3..f83a4a143aac 100644 --- a/embeddedobj/source/inc/oleembobj.hxx +++ b/embeddedobj/source/inc/oleembobj.hxx @@ -51,7 +51,7 @@ class VerbExecutionController sal_Int32 m_nNotificationLock; -#ifdef WNT +#ifdef _WIN32 bool m_bWasEverActive; bool m_bVerbExecutionInProgress; oslThreadIdentifier m_nVerbExecutionThreadIdentifier; @@ -62,7 +62,7 @@ public: VerbExecutionController() : m_nNotificationLock( 0 ) -#ifdef WNT +#ifdef _WIN32 , m_bWasEverActive( false ) , m_bVerbExecutionInProgress( false ) , m_nVerbExecutionThreadIdentifier( 0 ) @@ -70,7 +70,7 @@ public: #endif {} -#ifdef WNT +#ifdef _WIN32 void StartControlExecution(); sal_Bool EndControlExecution_WasModified(); void ModificationNotificationIsDone(); @@ -205,11 +205,11 @@ protected: css::uno::Reference< css::io::XStream > GetNewFilledTempStream_Impl( const css::uno::Reference< css::io::XInputStream >& xInStream ) throw( css::io::IOException, css::uno::RuntimeException ); -#ifdef WNT +#ifdef _WIN32 void SwitchComponentToRunningState_Impl(); #endif void MakeEventListenerNotification_Impl( const OUString& aEventName ); -#ifdef WNT +#ifdef _WIN32 void StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState ); css::uno::Reference< css::io::XOutputStream > GetStreamForSaving(); @@ -239,7 +239,7 @@ protected: const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs, bool bSaveAs ) throw ( css::uno::Exception ); -#ifdef WNT +#ifdef _WIN32 void StoreObjectToStream( css::uno::Reference< css::io::XOutputStream > xOutStream ) throw ( css::uno::Exception ); #endif @@ -262,7 +262,7 @@ protected: const css::uno::Reference< css::io::XStream >& xStream, bool bAllowRepair50 = false ) throw (); -#ifdef WNT +#ifdef _WIN32 sal_Bool SaveObject_Impl(); sal_Bool OnShowWindow_Impl( sal_Bool bShow ); void CreateOleComponent_Impl( OleComponent* pOleComponent = NULL ); @@ -289,14 +289,14 @@ public: // factory can do it for OOo objects, but for OLE objects OS dependent code is required OleEmbeddedObject( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory, bool bLink ); -#ifdef WNT +#ifdef _WIN32 // this constructor let object be initialized from clipboard OleEmbeddedObject( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); #endif virtual ~OleEmbeddedObject(); -#ifdef WNT +#ifdef _WIN32 void OnIconChanged_Impl(); void OnViewChanged_Impl(); void OnClosed_Impl(); |