diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:31:03 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:31:03 +0000 |
| commit | 00456302c5131ac1dccaae477cbc48d4d6908fb7 (patch) | |
| tree | b3353edfb341067a38b9f00fe06330545c1c10e4 /embeddedobj | |
| parent | 853effe375e90c6ab9dbac0bea54da4548f3ce8d (diff) | |
INTEGRATION: CWS warnings01 (1.10.8); FILE MERGED
2006/05/23 23:26:25 sb 1.10.8.5: RESYNC: (1.13-1.14); FILE MERGED
2006/05/15 12:05:56 sb 1.10.8.4: #i53898# Made code warning-free and/or compile at all after resync to SRC680m162.
2006/04/07 20:00:55 sb 1.10.8.3: RESYNC: (1.11-1.13); FILE MERGED
2006/01/25 20:33:55 sb 1.10.8.2: RESYNC: (1.10-1.11); FILE MERGED
2005/11/16 11:40:59 pl 1.10.8.1: #i55991# removed warnings
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/msole/olevisual.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index 0a4a98cbd8ee..95968718b140 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -4,9 +4,9 @@ * * $RCSfile: olevisual.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2006-04-26 14:23:15 $ + * last change: $Author: hr $ $Date: 2006-06-20 00:31:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -176,7 +176,11 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt m_nCachedAspect = nAspect; } -awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) +awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 +#if defined WNT || OSL_DEBUG_LEVEL > 0 +nAspect +#endif +) throw ( lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, @@ -309,7 +313,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) return aResult; } -embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepresentation( sal_Int64 nAspect ) +embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepresentation( sal_Int64 /*nAspect*/ ) throw ( lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, @@ -391,7 +395,7 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres return GetVisualRepresentationInNativeFormat_Impl( m_xCachedVisualRepresentation ); } -sal_Int32 SAL_CALL OleEmbeddedObject::getMapUnit( sal_Int64 nAspect ) +sal_Int32 SAL_CALL OleEmbeddedObject::getMapUnit( sal_Int64 /*nAspect*/ ) throw ( uno::Exception, uno::RuntimeException) { |