diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 06:58:18 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 06:58:18 +0000 |
| commit | fc2a537a2a0b15cb90d5cb3a8049109a2abd298d (patch) | |
| tree | 789c0fe6396e680bacf959314a673bd2c0de964f | |
| parent | 1f9fbc29833885ae8cac439e4e1cec688bdd9dfd (diff) | |
INTEGRATION: CWS swdrawobjapi (1.74.20); FILE MERGED
2004/08/12 06:06:10 od 1.74.20.3: RESYNC: (1.74-1.75); FILE MERGED
2004/08/11 14:15:30 od 1.74.20.2: #i28749# - move member <mbShapePositionInHoriL2R> from class <SvXMLImport>
to <SvXMLImport_Impl>
2004/08/10 09:07:46 od 1.74.20.1: #i28749# - initialize and retrieve value for new member <mbShapePositionInHoriL2R>
| -rw-r--r-- | xmloff/source/core/xmlimp.cxx | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index e6652d6f96da..e85fc2ff9459 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlimp.cxx,v $ * - * $Revision: 1.75 $ + * $Revision: 1.76 $ * - * last change: $Author: hr $ $Date: 2004-08-02 14:12:49 $ + * last change: $Author: rt $ $Date: 2004-08-23 07:58:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -261,12 +261,22 @@ public: bool mbOwnGraphicResolver; bool mbOwnEmbeddedResolver; INetURLObject aBaseURL; + // --> OD 2004-08-10 #i28749# - boolean, indicating that position attributes + // of shapes are given in horizontal left-to-right layout. This is the case + // for the OpenOffice.org file format. + sal_Bool mbShapePositionInHoriL2R; + // <-- SvXMLImport_Impl() : #ifdef CONV_STAR_FONTS hBatsFontConv( 0 ), hMathFontConv( 0 ), #endif - mbOwnGraphicResolver( false ), mbOwnEmbeddedResolver( false ) {} + mbOwnGraphicResolver( false ), + mbOwnEmbeddedResolver( false ), + // --> OD 2004-08-11 #i28749# + mbShapePositionInHoriL2R( sal_False ) + // <-- + {} ~SvXMLImport_Impl() { #ifdef CONV_STAR_FONTS @@ -935,7 +945,14 @@ void SAL_CALL SvXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen pImpl->aBaseURL.insertName( sRelPath ); pImpl->aBaseURL.insertName( sName ); } - + // --> OD 2004-08-10 #i28749# - retrieve property <ShapePositionInHoriL2R> + sPropName = OUString( RTL_CONSTASCII_USTRINGPARAM("ShapePositionInHoriL2R" ) ); + if( xPropertySetInfo->hasPropertyByName(sPropName) ) + { + uno::Any aAny = xImportInfo->getPropertyValue(sPropName); + aAny >>= (pImpl->mbShapePositionInHoriL2R); + } + // <-- } } } @@ -1651,4 +1668,10 @@ void SvXMLImport::DisposingModel() return mxServiceFactory; } +// --> OD 2004-08-10 #i28749# +sal_Bool SvXMLImport::IsShapePositionInHoriL2R() const +{ + return pImpl->mbShapePositionInHoriL2R; +} +// <-- // eof |