summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/inc/oleembobj.hxx18
-rw-r--r--embeddedobj/source/msole/oleembed.cxx18
-rw-r--r--embeddedobj/source/msole/olemisc.cxx10
-rw-r--r--embeddedobj/source/msole/olepersist.cxx22
-rw-r--r--embeddedobj/source/msole/oleregister.cxx4
-rw-r--r--embeddedobj/source/msole/olevisual.cxx8
-rw-r--r--embeddedobj/source/msole/xdialogcreator.cxx6
-rw-r--r--embeddedobj/test/Container1/nativelib/nativeview.c6
8 files changed, 46 insertions, 46 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();
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index bf5d08cc5b4b..473df8956c2b 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -52,13 +52,13 @@
#include "ownview.hxx"
-#if defined WNT
+#if defined(_WIN32)
#include <olecomponent.hxx>
#endif
using namespace ::com::sun::star;
-#ifdef WNT
+#ifdef _WIN32
void OleEmbeddedObject::SwitchComponentToRunningState_Impl()
{
@@ -465,7 +465,7 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
if ( m_nObjectState == nNewState )
return;
-#ifdef WNT
+#ifdef _WIN32
if ( m_pOleComponent )
{
if ( m_nTargetState != -1 )
@@ -615,7 +615,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OleEmbeddedObject::getReachableStates()
throw embed::WrongStateException( "The object has no persistence!",
static_cast< ::cppu::OWeakObject* >(this) );
-#ifdef WNT
+#ifdef _WIN32
if ( m_pOleComponent )
{
if ( m_nObjectState == embed::EmbedStates::LOADED )
@@ -663,7 +663,7 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getCurrentState()
namespace
{
-#ifndef WNT
+#ifndef _WIN32
bool lcl_CopyStream(uno::Reference<io::XInputStream> xIn, uno::Reference<io::XOutputStream> xOut)
{
const sal_Int32 nChunkSize = 4096;
@@ -689,7 +689,7 @@ namespace
OUString sUrl;
// the solution is only active for Unix systems
-#ifndef WNT
+#ifndef _WIN32
uno::Reference <beans::XPropertySet> xNativeTempFile(
io::TempFile::create(comphelper::getComponentContext(xFactory)),
uno::UNO_QUERY_THROW);
@@ -775,7 +775,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
throw embed::WrongStateException( "The object has no persistence!",
static_cast< ::cppu::OWeakObject* >(this) );
-#ifdef WNT
+#ifdef _WIN32
if ( m_pOleComponent )
{
sal_Int32 nOldState = m_nObjectState;
@@ -907,7 +907,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OleEmbeddedObject::getSupportedV
if ( m_nObjectState == -1 )
throw embed::WrongStateException( "The object has no persistence!",
static_cast< ::cppu::OWeakObject* >(this) );
-#ifdef WNT
+#ifdef _WIN32
if ( m_pOleComponent )
{
// registry could be used in this case
@@ -1072,7 +1072,7 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64
sal_Int64 nResult = 0;
-#ifdef WNT
+#ifdef _WIN32
if ( m_bGotStatus && m_nStatusAspect == nAspect )
nResult = m_nStatus;
else if ( m_pOleComponent )
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index 25f5528590e3..31d6f9ca399c 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -33,7 +33,7 @@
#include "ownview.hxx"
-#if defined WNT
+#if defined(_WIN32)
#include <olecomponent.hxx>
#endif
@@ -104,7 +104,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
, m_bTriedConversion( false )
{
}
-#ifdef WNT
+#ifdef _WIN32
// this constructor let object be initialized from clipboard
OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory )
@@ -183,7 +183,7 @@ void OleEmbeddedObject::MakeEventListenerNotification_Impl( const OUString& aEve
}
}
}
-#ifdef WNT
+#ifdef _WIN32
void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState )
{
@@ -228,7 +228,7 @@ void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sa
void OleEmbeddedObject::GetRidOfComponent()
{
-#ifdef WNT
+#ifdef _WIN32
if ( m_pOleComponent )
{
if ( m_nObjectState != -1 && m_nObjectState != embed::EmbedStates::LOADED )
@@ -385,7 +385,7 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent()
static_cast< ::cppu::OWeakObject* >(this) );
}
-#if defined WNT
+#if defined(_WIN32)
if (m_pOleComponent != 0)
{
return uno::Reference< util::XCloseable >( static_cast< ::cppu::OWeakObject* >( m_pOleComponent ), uno::UNO_QUERY );
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 3fbf05a21c13..fd705ae028fa 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -47,7 +47,7 @@
#include <closepreventer.hxx>
-#if defined WNT
+#if defined(_WIN32)
#include <olecomponent.hxx>
#endif
@@ -154,7 +154,7 @@ OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xI
return aResult;
}
-#ifdef WNT
+#ifdef _WIN32
OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStorage >& xParentStorage, const OUString& aEntryName, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
throw( io::IOException, uno::RuntimeException )
{
@@ -207,7 +207,7 @@ void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream >& xStre
xPropSet->setPropertyValue("UseCommonStoragePasswordEncryption",
uno::makeAny( true ) );
}
-#ifdef WNT
+#ifdef _WIN32
void VerbExecutionController::StartControlExecution()
{
@@ -730,7 +730,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
m_aTempURL.clear();
}
-#ifdef WNT
+#ifdef _WIN32
// retry to create the component after recovering
GetRidOfComponent();
@@ -801,7 +801,7 @@ void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStor
SwitchOwnPersistence( xNewParentStorage, xNewOwnStream, aNewName );
}
-#ifdef WNT
+#ifdef _WIN32
sal_Bool OleEmbeddedObject::SaveObject_Impl()
{
@@ -1119,7 +1119,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
bool bStoreLoaded = false;
if ( m_nObjectState == embed::EmbedStates::LOADED
-#ifdef WNT
+#ifdef _WIN32
// if the object was NOT modified after storing it can be just copied
// as if it was in loaded state
|| ( m_pOleComponent && !m_pOleComponent->IsDirty() )
@@ -1159,7 +1159,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
bVisReplIsStored = HasVisReplInStream();
bStoreLoaded = true;
}
-#ifdef WNT
+#ifdef _WIN32
else if ( m_pOleComponent )
{
xTargetStream =
@@ -1358,7 +1358,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
if ( lArguments[nInd].Name == "ReadOnly" )
lArguments[nInd].Value >>= m_bReadOnly;
-#ifdef WNT
+#ifdef _WIN32
sal_Int32 nStorageMode = m_bReadOnly ? embed::ElementModes::READ : embed::ElementModes::READWRITE;
#endif
@@ -1368,7 +1368,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
if ( lObjArgs[nInd].Name == "StoreVisualReplacement" )
lObjArgs[nInd].Value >>= m_bStoreVisRepl;
-#ifdef WNT
+#ifdef _WIN32
if ( nEntryConnectionMode == embed::EntryInitModes::DEFAULT_INIT )
{
if ( m_bFromClipboard )
@@ -1756,7 +1756,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
bool bStoreLoaded = true;
-#ifdef WNT
+#ifdef _WIN32
if ( m_nObjectState != embed::EmbedStates::LOADED && m_pOleComponent && m_pOleComponent->IsDirty() )
{
bStoreLoaded = sal_False;
@@ -1956,7 +1956,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
static_cast< ::cppu::OWeakObject* >(this) );
-#ifdef WNT
+#ifdef _WIN32
if ( m_pOleComponent )
{
// TODO: create an object based on the link
diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx
index aa87776d0af4..2261015fb224 100644
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
@@ -23,7 +23,7 @@
#include "xolefactory.hxx"
-#if defined WNT
+#if defined(_WIN32)
#include "xdialogcreator.hxx"
#endif
@@ -50,7 +50,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL emboleobj_component_getFactory(
OleEmbeddedObjectFactory::impl_staticCreateSelfInstance,
OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() );
}
-#ifdef WNT
+#ifdef _WIN32
// the following service makes sense only on windows
else if ( aImplName.equals( MSOLEDialogObjectCreator::impl_staticGetImplementationName() ) )
{
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 5be4ed5b077a..d53ef5fea033 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -30,7 +30,7 @@
#include <comphelper/seqstream.hxx>
#include <filter/msfilter/classids.hxx>
-#if defined WNT
+#if defined(_WIN32)
#include <olecomponent.hxx>
#endif
@@ -107,7 +107,7 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt
throw embed::WrongStateException( "The object is not loaded!",
static_cast< ::cppu::OWeakObject* >(this) );
-#ifdef WNT
+#ifdef _WIN32
// RECOMPOSE_ON_RESIZE misc flag means that the object has to be switched to running state on resize.
// SetExtent() is called only for objects that require it,
// it should not be called for MSWord documents to workaround problem i49369
@@ -186,7 +186,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
awt::Size aResult;
-#ifdef WNT
+#ifdef _WIN32
// TODO/LATER: Support different aspects
if ( m_pOleComponent && !m_bHasSizeToSet && nAspect == embed::Aspects::MSOLE_CONTENT )
{
@@ -347,7 +347,7 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
{
return GetVisualRepresentationInNativeFormat_Impl( m_xCachedVisualRepresentation );
}
-#ifdef WNT
+#ifdef _WIN32
else if ( m_pOleComponent )
{
try
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index 833bc6f6fbfa..d92b8e72ca9b 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -39,7 +39,7 @@
#include <oleembobj.hxx>
-#ifdef WNT
+#ifdef _WIN32
#include <oledlg.h>
@@ -138,7 +138,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
embed::InsertedObjectInfo aObjectInfo;
uno::Sequence< beans::PropertyValue > aObjArgs( aInObjArgs );
-#ifdef WNT
+#ifdef _WIN32
if ( !xStorage.is() )
throw lang::IllegalArgumentException( "No parent storage is provided!",
@@ -289,7 +289,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF
{
embed::InsertedObjectInfo aObjectInfo;
-#ifdef WNT
+#ifdef _WIN32
if ( !xStorage.is() )
throw lang::IllegalArgumentException( "No parent storage is provided!",
static_cast< ::cppu::OWeakObject* >(this),
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c
index adee0e86a583..dfd1adbac972 100644
--- a/embeddedobj/test/Container1/nativelib/nativeview.c
+++ b/embeddedobj/test/Container1/nativelib/nativeview.c
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
// property name to register own window procedure on hwnd
@@ -67,7 +67,7 @@ JNIEXPORT jlong JNICALL Java_embeddedobj_test_NativeView_getNativeWindow
JAWT awt ;
JAWT_DrawingSurface* ds ;
JAWT_DrawingSurfaceInfo* dsi ;
-#ifdef WNT
+#ifdef _WIN32
JAWT_Win32DrawingSurfaceInfo* dsi_win ;
#else
// FIXME: Where is dsi_x11 defined?
@@ -94,7 +94,7 @@ JNIEXPORT jlong JNICALL Java_embeddedobj_test_NativeView_getNativeWindow
dsi = ds->GetDrawingSurfaceInfo(ds);
/* Get the platform-specific drawing info */
-#ifdef WNT
+#ifdef _WIN32
dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo;
drawable = (jlong)dsi_win->hwnd;
#else