diff options
author | Release Engineers <releng@openoffice.org> | 2008-12-01 12:31:27 +0000 |
---|---|---|
committer | Release Engineers <releng@openoffice.org> | 2008-12-01 12:31:27 +0000 |
commit | 7a5d79f2297a43d0a854e304b0792164272edfe0 (patch) | |
tree | f25e19c1ca477035aa7d38e62a409b00f218be5d /xmloff | |
parent | CWS-TOOLING: integrate CWS cairosource01 (diff) | |
download | core-7a5d79f2297a43d0a854e304b0792164272edfe0.tar.gz core-7a5d79f2297a43d0a854e304b0792164272edfe0.zip |
CWS-TOOLING: integrate CWS dba31e
2008-11-19 12:36:23 +0100 msc r263980 : i96104
2008-11-19 12:31:19 +0100 msc r263979 : i96104
2008-11-19 12:21:55 +0100 msc r263977 : i96104
2008-11-19 12:18:53 +0100 msc r263976 : i96104
2008-11-18 09:09:45 +0100 oj r263746 : disable color entry when area is set
2008-11-18 08:37:52 +0100 oj r263741 : #remove sub report entry
2008-11-17 11:20:25 +0100 fs r263708 : #i10000#
2008-11-17 11:06:52 +0100 fs r263706 : minimal version now is 3.1
2008-11-12 22:25:59 +0100 fs r263621 : #i96150#
2008-11-12 22:20:02 +0100 fs r263620 : rebased to m34
2008-11-12 21:39:41 +0100 fs r263618 : MANUAL REBASE: rebase CWS dba31d to DEV300_m34
2008-11-12 13:54:58 +0100 fs r263597 : #i96134# MediaDescriptor.URL is to be preferred over MediaDescriptor.FileName. Nonetheless, ensure both are handled
2008-11-12 13:53:40 +0100 fs r263596 : #i96134# re-enabled the code for #i41897#, a better fix is to come
2008-11-12 12:48:21 +0100 fs r263585 : #i96134# disable saving URLs of file-base databases relatively
2008-11-11 16:11:11 +0100 msc r263566 : #i96104#
2008-11-05 09:09:47 +0100 oj r263342 : #i88727# color noe added
2008-11-05 08:41:43 +0100 oj r263341 : #i77916# zoom added
2008-11-04 21:24:15 +0100 fs r263339 : disposing: call disposeAndClear without own mutex locked - some of our listeners insist on locking the SolarMutex, which sometimes led to deadlocks on the complex test cases
2008-11-04 21:23:15 +0100 fs r263338 : remove SolarMutex locking - this happned in CWS dba31c (in the CVS version), which this CWS was created from, but seems to got lost during resync
2008-11-04 20:49:50 +0100 fs r263335 : docu formatting
2008-11-04 20:06:39 +0100 fs r263334 : #i95826# use m_aMutex, not a DocumentGuard (wrongly resolved merge conflicts)
2008-11-04 17:36:29 +0100 fs r263332 : #i92688# properly revoke as XEventListener from m_xActiveController when disposing
2008-11-04 14:49:34 +0100 fs r263324 : #i92322# enable Input Required if EmptyIsNULL does not exist at the control
2008-10-31 11:10:04 +0100 oj r262857 : merge from cvs to svn
2008-10-31 09:46:45 +0100 oj r262853 : merge from cvs to svn
2008-10-31 08:46:37 +0100 oj r262849 : merge from cvs to svn
2008-10-31 08:44:24 +0100 oj r262848 : merge from cvs to svn
2008-10-31 08:43:33 +0100 oj r262847 : merge from cvs to svn
2008-10-31 08:42:28 +0100 oj r262846 : merge from cvs to svn
2008-10-31 08:41:58 +0100 oj r262845 : merge from cvs to svn
2008-10-31 08:41:32 +0100 oj r262844 : merge from cvs to svn
2008-10-28 12:19:50 +0100 oj r262733 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:42 +0100 oj r262732 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:36 +0100 oj r262731 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:31 +0100 oj r262730 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:22 +0100 oj r262729 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:18 +0100 oj r262728 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:10 +0100 oj r262727 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:06 +0100 oj r262726 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:05 +0100 oj r262725 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:01 +0100 oj r262724 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:50 +0100 oj r262723 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:41 +0100 oj r262722 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:40 +0100 oj r262721 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:27 +0100 oj r262720 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:10 +0100 oj r262719 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:01 +0100 oj r262718 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:17:39 +0100 oj r262717 : #iXXXXX#: migrate CWS dba31e to SVN
Diffstat (limited to 'xmloff')
21 files changed, 210 insertions, 262 deletions
diff --git a/xmloff/inc/xmloff/ControlBorderHandler.hxx b/xmloff/inc/xmloff/ControlBorderHandler.hxx deleted file mode 100644 index f4d474297f86..000000000000 --- a/xmloff/inc/xmloff/ControlBorderHandler.hxx +++ /dev/null @@ -1,73 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: ControlBorderHandler.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _XMLOFF_CONTROLBORDERHDL_HXX_ -#define _XMLOFF_CONTROLBORDERHDL_HXX_ - -#include <xmloff/prhdlfac.hxx> -#include <vos/ref.hxx> -#include <rtl/ustring.hxx> -#include <xmloff/xmlexppr.hxx> - -//......................................................................... -namespace xmloff -{ -//......................................................................... - - //===================================================================== - //= OControlBorderHandlerFactory - //===================================================================== - class OControlBorderHandlerFactory - { - private: - OControlBorderHandlerFactory(); // never implemented - - public: - static const XMLPropertyHandler* createBorderHandler(); - static const XMLPropertyHandler* createBorderColorHandler(); - }; - - //===================================================================== - //= OControlTextEmphasisHandler - //===================================================================== - class OControlTextEmphasisHandler : public XMLPropertyHandler - { - public: - OControlTextEmphasisHandler(); - - virtual sal_Bool importXML( const ::rtl::OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - }; - -//......................................................................... -} // namespace xmloff -//......................................................................... - -#endif // _XMLOFF_CONTROLBORDERHDL_HXX_ diff --git a/xmloff/inc/xmloff/controlpropertyhdl.hxx b/xmloff/inc/xmloff/controlpropertyhdl.hxx index e04a7c902697..53fff06e7f3b 100644 --- a/xmloff/inc/xmloff/controlpropertyhdl.hxx +++ b/xmloff/inc/xmloff/controlpropertyhdl.hxx @@ -37,10 +37,9 @@ #include <vos/ref.hxx> #include <rtl/ustring.hxx> #include <xmloff/xmlexppr.hxx> -#include <xmloff/ControlBorderHandler.hxx> +#include <xmloff/XMLConstantsPropertyHandler.hxx> struct SvXMLEnumMapEntry; -class XMLConstantsPropertyHandler; class Color; //......................................................................... namespace xmloff @@ -77,58 +76,54 @@ namespace xmloff //===================================================================== //= OControlBorderHandlerBase //===================================================================== - class OControlBorderHandlerBase : public XMLPropertyHandler + class OControlBorderHandler : public XMLPropertyHandler { public: - OControlBorderHandlerBase(); + enum BorderFacet + { + STYLE, + COLOR + }; + + OControlBorderHandler( const BorderFacet _eFacet ); virtual sal_Bool importXML( const ::rtl::OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const = 0; + virtual sal_Bool exportXML( ::rtl::OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - protected: - /** called during importXML, after the string value has been split - */ - virtual void pickOne( const Color& _rColor, sal_Int16 _nStyle, ::com::sun::star::uno::Any& _rValue ) const = 0; + private: + BorderFacet m_eFacet; }; //===================================================================== - //= OControlBorderStyleHandler + //= OControlTextEmphasisHandler //===================================================================== - class OControlBorderStyleHandler : public OControlBorderHandlerBase + class OControlTextEmphasisHandler : public XMLPropertyHandler { public: - OControlBorderStyleHandler(); + OControlTextEmphasisHandler(); + virtual sal_Bool importXML( const ::rtl::OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; virtual sal_Bool exportXML( ::rtl::OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - - protected: - virtual void pickOne( const Color& _rColor, sal_Int16 _nStyle, ::com::sun::star::uno::Any& _rValue ) const; }; //===================================================================== - //= OControlBorderStyleHandler + //= ImageScaleModeHandler //===================================================================== - class OControlBorderColorHandler : public OControlBorderHandlerBase + class ImageScaleModeHandler : public XMLConstantsPropertyHandler { public: - OControlBorderColorHandler(); - - virtual sal_Bool exportXML( ::rtl::OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - - protected: - virtual void pickOne( const Color& _rColor, sal_Int16 _nStyle, ::com::sun::star::uno::Any& _rValue ) const; + ImageScaleModeHandler(); }; //===================================================================== //= OControlPropertyHandlerFactory //===================================================================== - class XMLOFF_DLLPUBLIC OControlPropertyHandlerFactory: - public XMLPropertyHandlerFactory + class XMLOFF_DLLPUBLIC OControlPropertyHandlerFactory : public XMLPropertyHandlerFactory { protected: mutable XMLConstantsPropertyHandler* m_pTextAlignHandler; - mutable OControlBorderStyleHandler* m_pControlBorderStyleHandler; - mutable OControlBorderColorHandler* m_pControlBorderColorHandler; + mutable OControlBorderHandler* m_pControlBorderStyleHandler; + mutable OControlBorderHandler* m_pControlBorderColorHandler; mutable ORotationAngleHandler* m_pRotationAngleHandler; mutable OFontWidthHandler* m_pFontWidthHandler; mutable XMLConstantsPropertyHandler* m_pFontEmphasisHandler; diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index 075515ff8446..be883e9de461 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -3050,6 +3050,10 @@ namespace xmloff { namespace token { XML_N_FIELD, XML_NP_FIELD, + XML_IMAGE_SCALE, + XML_ISOTROPIC, + XML_ANISOTROPIC, + XML_TOKEN_END }; diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 13c08bac6e37..fd096851ea05 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3052,6 +3052,10 @@ namespace xmloff { namespace token { TOKEN( "urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0", XML_N_FIELD ), TOKEN( "field", XML_NP_FIELD ), + TOKEN( "image-scale", XML_IMAGE_SCALE ), + TOKEN( "isotropic", XML_ISOTROPIC ), + TOKEN( "anisotropic", XML_ANISOTROPIC ), + #if OSL_DEBUG_LEVEL > 0 { 0, NULL, NULL, XML_TOKEN_END } #else diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 4be1baed7ce8..9b44a67582f2 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -59,7 +59,7 @@ #include <com/sun/star/drawing/TextFitToSizeType.hpp> #include <com/sun/star/drawing/MeasureTextHorzPos.hpp> #include <com/sun/star/drawing/MeasureTextVertPos.hpp> -#include <xmloff/ControlBorderHandler.hxx> +#include <xmloff/controlpropertyhdl.hxx> #include <xmloff/xmltoken.hxx> #include "sdpropls.hxx" #include "propimp0.hxx" @@ -134,7 +134,7 @@ const XMLPropertyMapEntry aXMLSDProperties[] = GMAP( "FillBitmapLogicalSize", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_WIDTH, XML_SD_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0 ), GMAP( "FillBitmapSizeY", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_HEIGHT, XML_SD_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY, 0 ), GMAP( "FillBitmapLogicalSize", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_HEIGHT, XML_SD_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0 ), - GMAP( "FillBitmapMode", XML_NAMESPACE_STYLE,XML_REPEAT, XML_SD_TYPE_BITMAP_MODE, 0 ), + GMAP( "FillBitmapMode", XML_NAMESPACE_STYLE,XML_REPEAT, XML_SD_TYPE_BITMAP_MODE|MID_FLAG_MULTI_PROPERTY, 0 ), GMAP( "FillBitmapPositionOffsetX", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_REF_POINT_X, XML_TYPE_PERCENT, 0 ), GMAP( "FillBitmapPositionOffsetY", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_REF_POINT_Y, XML_TYPE_PERCENT, 0 ), GMAP( "FillBitmapRectanglePoint", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_REF_POINT, XML_SD_TYPE_BITMAP_REFPOINT, 0 ), @@ -266,6 +266,7 @@ const XMLPropertyMapEntry aXMLSDProperties[] = GMAP( "ControlBorderColor", XML_NAMESPACE_FO, XML_BORDER, XML_SD_TYPE_CONTROL_BORDER_COLOR|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE, 0 ), GMAP( "ControlDataStyle", XML_NAMESPACE_STYLE,XML_DATA_STYLE_NAME, XML_TYPE_STRING|MID_FLAG_NO_PROPERTY_EXPORT|MID_FLAG_SPECIAL_ITEM, CTF_SD_CONTROL_SHAPE_DATA_STYLE ), GMAP( "ControlTextEmphasis", XML_NAMESPACE_STYLE,XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ), + GMAP( "ImageScaleMode", XML_NAMESPACE_STYLE,XML_REPEAT, XML_SD_TYPE_IMAGE_SCALE_MODE|MID_FLAG_MULTI_PROPERTY, 0 ), // special entries for floating frames GMAP( "FrameIsAutoScroll", XML_NAMESPACE_DRAW, XML_FRAME_DISPLAY_SCROLLBAR, XML_TYPE_BOOL|MID_FLAG_MULTI_PROPERTY, CTF_FRAME_DISPLAY_SCROLLBAR ), @@ -1086,10 +1087,13 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy break; case XML_SD_TYPE_CONTROL_BORDER: - pHdl = xmloff::OControlBorderHandlerFactory::createBorderHandler(); + pHdl = new ::xmloff::OControlBorderHandler( ::xmloff::OControlBorderHandler::STYLE ); break; case XML_SD_TYPE_CONTROL_BORDER_COLOR: - pHdl = xmloff::OControlBorderHandlerFactory::createBorderColorHandler(); + pHdl = new ::xmloff::OControlBorderHandler( ::xmloff::OControlBorderHandler::COLOR ); + break; + case XML_SD_TYPE_IMAGE_SCALE_MODE: + pHdl = new ::xmloff::ImageScaleModeHandler; break; case XML_TYPE_CONTROL_TEXT_EMPHASIZE: pHdl = new ::xmloff::OControlTextEmphasisHandler; diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index f3d9dcd51f9a..bf27e669f1ca 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -89,6 +89,7 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[]; #define XML_SD_TYPE_MEASURE_PLACING (XML_SD_TYPES_START + 31 ) #define XML_SD_TYPE_CONTROL_BORDER (XML_SD_TYPES_START + 32 ) #define XML_SD_TYPE_CONTROL_BORDER_COLOR (XML_SD_TYPES_START + 33 ) +#define XML_SD_TYPE_IMAGE_SCALE_MODE (XML_SD_TYPES_START + 34 ) // 3D property types #define XML_SD_TYPE_BACKFACE_CULLING (XML_SD_TYPES_START + 40 ) diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx index 8bab6ec72cd7..2b1f70883b19 100644 --- a/xmloff/source/forms/controlpropertyhdl.cxx +++ b/xmloff/source/forms/controlpropertyhdl.cxx @@ -96,13 +96,13 @@ namespace xmloff case XML_TYPE_CONTROL_BORDER: if (!m_pControlBorderStyleHandler) - m_pControlBorderStyleHandler = new OControlBorderStyleHandler; + m_pControlBorderStyleHandler = new OControlBorderHandler( OControlBorderHandler::STYLE ); pHandler = m_pControlBorderStyleHandler; break; case XML_TYPE_CONTROL_BORDER_COLOR: if ( !m_pControlBorderColorHandler ) - m_pControlBorderColorHandler = new OControlBorderColorHandler; + m_pControlBorderColorHandler = new OControlBorderHandler( OControlBorderHandler::COLOR ); pHandler = m_pControlBorderColorHandler; break; @@ -225,30 +225,16 @@ namespace xmloff } //===================================================================== - //= OControlBorderHandlerFactory - //===================================================================== - //--------------------------------------------------------------------- - const XMLPropertyHandler* OControlBorderHandlerFactory::createBorderHandler() - { - return new OControlBorderStyleHandler; - } - - //--------------------------------------------------------------------- - const XMLPropertyHandler* OControlBorderHandlerFactory::createBorderColorHandler() - { - return new OControlBorderColorHandler; - } - - //===================================================================== //= OControlBorderHandlerBase //===================================================================== //--------------------------------------------------------------------- - OControlBorderHandlerBase::OControlBorderHandlerBase() + OControlBorderHandler::OControlBorderHandler( const OControlBorderHandler::BorderFacet _eFacet ) + :m_eFacet( _eFacet ) { } //--------------------------------------------------------------------- - sal_Bool OControlBorderHandlerBase::importXML( const ::rtl::OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OControlBorderHandler::importXML( const ::rtl::OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { ::rtl::OUString sToken; SvXMLTokenEnumerator aTokens(_rStrImpValue); @@ -256,92 +242,70 @@ namespace xmloff sal_uInt16 nStyle = 1; Color aColor; - sal_Bool bFoundStyle = sal_False; - sal_Bool bFoundColor = sal_False; - - while ( !( bFoundStyle && bFoundColor ) // did not yet find both aspects - && aTokens.getNextToken(sToken) // have a new token + while ( aTokens.getNextToken(sToken) // have a new token && (0 != sToken.getLength()) // really have a new token ) { - // is it a valid enum value? - if ( !bFoundStyle ) - bFoundStyle = SvXMLUnitConverter::convertEnum(nStyle, sToken, OEnumMapper::getEnumMap(OEnumMapper::epBorderWidth)); - // is it a color value? - if ( !bFoundColor ) - bFoundColor = SvXMLUnitConverter::convertColor( aColor, sToken ); - } - - if ( !bFoundStyle && !bFoundColor ) - return sal_False; - - // if we're here, the string could have had more or less than the requested 3 tokens, but we ignore this. - // At least we have a valid style or a valid, which is everything we're interested in. - pickOne( aColor, (sal_Int16)nStyle, _rValue ); - return sal_True; - } - - //===================================================================== - //= OControlBorderStyleHandler - //===================================================================== - //--------------------------------------------------------------------- - OControlBorderStyleHandler::OControlBorderStyleHandler() - { - } - - //--------------------------------------------------------------------- - sal_Bool OControlBorderStyleHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const - { - sal_Bool bSuccess = sal_False; - sal_Int16 nBorder = 0; - - ::rtl::OUStringBuffer aOut; - bSuccess = (_rValue >>= nBorder) - && SvXMLUnitConverter::convertEnum(aOut, nBorder, OEnumMapper::getEnumMap(OEnumMapper::epBorderWidth)); - - if ( _rStrExpValue.getLength() ) - _rStrExpValue += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) ); - _rStrExpValue += aOut.makeStringAndClear(); - return bSuccess; - } + // try interpreting the token as border style + if ( m_eFacet == STYLE ) + { + // is it a valid enum value? + if ( SvXMLUnitConverter::convertEnum( nStyle, sToken, OEnumMapper::getEnumMap( OEnumMapper::epBorderWidth ) ) ) + { + _rValue <<= nStyle; + return sal_True; + } + } - //--------------------------------------------------------------------- - void OControlBorderStyleHandler::pickOne( const Color&, sal_Int16 _nStyle, Any& _rValue ) const - { - _rValue <<= _nStyle; - } + // try interpreting it as color value + if ( m_eFacet == COLOR ) + { + if ( SvXMLUnitConverter::convertColor( aColor, sToken ) ) + { + _rValue <<= (sal_Int32)aColor.GetColor(); + return sal_True; + } + } + } - //===================================================================== - //= OControlBorderColorHandler - //===================================================================== - //--------------------------------------------------------------------- - OControlBorderColorHandler::OControlBorderColorHandler() - { + return sal_False; } //--------------------------------------------------------------------- - sal_Bool OControlBorderColorHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OControlBorderHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { sal_Bool bSuccess = sal_False; - sal_Int32 nBorderColor = 0; ::rtl::OUStringBuffer aOut; - if ( _rValue >>= nBorderColor ) + switch ( m_eFacet ) + { + case STYLE: { - SvXMLUnitConverter::convertColor( aOut, Color( nBorderColor ) ); - bSuccess = sal_True; + sal_Int16 nBorder = 0; + bSuccess = (_rValue >>= nBorder) + && SvXMLUnitConverter::convertEnum( aOut, nBorder, OEnumMapper::getEnumMap( OEnumMapper::epBorderWidth ) ); } + break; + case COLOR: + { + sal_Int32 nBorderColor = 0; + if ( _rValue >>= nBorderColor ) + { + SvXMLUnitConverter::convertColor( aOut, Color( nBorderColor ) ); + bSuccess = sal_True; + } + } + break; + } // switch ( m_eFacet ) + + if ( !bSuccess ) + return sal_False; if ( _rStrExpValue.getLength() ) _rStrExpValue += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) ); _rStrExpValue += aOut.makeStringAndClear(); - return bSuccess; - } - //--------------------------------------------------------------------- - void OControlBorderColorHandler::pickOne( const Color& _rColor, sal_Int16 /*_nStyle*/, Any& _rValue ) const - { - _rValue <<= (sal_Int32)_rColor.GetColor(); + return sal_True; } //===================================================================== @@ -414,6 +378,15 @@ namespace xmloff return bSuccess; } + //===================================================================== + //= ImageScaleModeHandler + //===================================================================== + //--------------------------------------------------------------------- + ImageScaleModeHandler::ImageScaleModeHandler() + :XMLConstantsPropertyHandler( OEnumMapper::getEnumMap( OEnumMapper::epImageScaleMode ), XML_STRETCH ) + { + } + //......................................................................... } // namespace xmloff //......................................................................... diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx index b09745baeb53..79ad5588cf0c 100644 --- a/xmloff/source/forms/controlpropertymap.cxx +++ b/xmloff/source/forms/controlpropertymap.cxx @@ -134,16 +134,16 @@ namespace xmloff } //===================================================================== - //= OFormExportPropertyMapper + //= OFormComponentStyleExportMapper //===================================================================== //--------------------------------------------------------------------- - OFormExportPropertyMapper::OFormExportPropertyMapper( const UniReference< XMLPropertySetMapper >& _rMapper ) + OFormComponentStyleExportMapper::OFormComponentStyleExportMapper( const UniReference< XMLPropertySetMapper >& _rMapper ) :SvXMLExportPropertyMapper( _rMapper ) { } //--------------------------------------------------------------------- - void OFormExportPropertyMapper::handleSpecialItem( SvXMLAttributeList& _rAttrList, const XMLPropertyState& _rProperty, const SvXMLUnitConverter& _rUnitConverter, + void OFormComponentStyleExportMapper::handleSpecialItem( SvXMLAttributeList& _rAttrList, const XMLPropertyState& _rProperty, const SvXMLUnitConverter& _rUnitConverter, const SvXMLNamespaceMap& _rNamespaceMap, const ::std::vector< XMLPropertyState >* _pProperties, sal_uInt32 _nIdx ) const { diff --git a/xmloff/source/forms/controlpropertymap.hxx b/xmloff/source/forms/controlpropertymap.hxx index 19e7dc882ece..9ac8f39d5e7c 100644 --- a/xmloff/source/forms/controlpropertymap.hxx +++ b/xmloff/source/forms/controlpropertymap.hxx @@ -45,12 +45,12 @@ namespace xmloff void initializePropertyMaps(); //===================================================================== - //= OFormExportPropertyMapper + //= OFormComponentStyleExportMapper //===================================================================== - class OFormExportPropertyMapper : public SvXMLExportPropertyMapper + class OFormComponentStyleExportMapper : public SvXMLExportPropertyMapper { public: - OFormExportPropertyMapper( const UniReference< XMLPropertySetMapper >& _rMapper ); + OFormComponentStyleExportMapper( const UniReference< XMLPropertySetMapper >& _rMapper ); void handleSpecialItem( SvXMLAttributeList& _rAttrList, diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index f2dcf934b138..769eff8de77d 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -31,24 +31,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include <stdio.h> #include "elementexport.hxx" #include "strings.hxx" -#include <xmloff/xmlexp.hxx> -#include <xmloff/nmspmap.hxx> #include "xmlnmspe.hxx" -#include <xmloff/xmluconv.hxx> -#include <xmloff/xmltoken.hxx> -#include <tools/time.hxx> -#include <tools/diagnose_ex.h> -#include <comphelper/extract.hxx> #include "eventexport.hxx" #include "formenums.hxx" -#include <vcl/wintypes.hxx> // for check states -#include <xmloff/XMLEventExport.hxx> #include "formcellbinding.hxx" - -#include <algorithm> +#include "formcellbinding.hxx" +#include "xformsexport.hxx" /** === begin UNO includes === **/ #include <com/sun/star/text/XText.hpp> @@ -67,21 +57,37 @@ #include <com/sun/star/form/ListSourceType.hpp> #include <com/sun/star/awt/ImagePosition.hpp> /** === end UNO includes === **/ + #include <vcl/wintypes.hxx> // for check states #include <xmloff/txtprmap.hxx> -#include "formcellbinding.hxx" -#include "xformsexport.hxx" #include <com/sun/star/form/binding/XBindableValue.hpp> #include <com/sun/star/form/binding/XListEntrySink.hpp> #include <tools/urlobj.hxx> -#include <algorithm> +#include <xmloff/xmlexp.hxx> +#include <xmloff/nmspmap.hxx> +#include <vcl/wintypes.hxx> // for check states +#include <xmloff/XMLEventExport.hxx> +#include <xmloff/xmluconv.hxx> +#include <xmloff/xmltoken.hxx> +#include <tools/time.hxx> +#include <tools/diagnose_ex.h> +#include <comphelper/extract.hxx> +#include <stdio.h> +#include <algorithm> //......................................................................... namespace xmloff { //......................................................................... + #if OSL_DEBUG_LEVEL > 0 + #define RESET_BIT( bitfield, bit ) \ + bitfield = bitfield & ~bit + #else + #define RESET_BIT( bitfield, bit ) + #endif + using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; @@ -310,7 +316,7 @@ namespace xmloff // the control id if (CCA_CONTROL_ID & m_nIncludeCommon) { - OSL_ENSURE(m_sControlId.getLength(), "OControlExport::exportOuterAttributes: have no control id for the control!"); + OSL_ENSURE(m_sControlId.getLength(), "OControlExport::exportInnerAttributes: have no control id for the control!"); AddAttribute( OAttributeMetaData::getCommonControlAttributeNamespace(CCA_CONTROL_ID), OAttributeMetaData::getCommonControlAttributeName(CCA_CONTROL_ID), @@ -789,10 +795,19 @@ namespace xmloff OAttributeMetaData::getDatabaseAttributeNamespace(DA_DATA_FIELD), OAttributeMetaData::getDatabaseAttributeName(DA_DATA_FIELD), PROPERTY_DATAFIELD); - #if OSL_DEBUG_LEVEL > 0 - // reset the bit for later checking - nIncludeDatabase = nIncludeDatabase & ~DA_DATA_FIELD; - #endif + RESET_BIT( nIncludeDatabase, DA_DATA_FIELD ); + } + + // InputRequired + if ( DA_INPUT_REQUIRED & m_nIncludeDatabase ) + { + exportBooleanPropertyAttribute( + OAttributeMetaData::getDatabaseAttributeNamespace( DA_INPUT_REQUIRED ), + OAttributeMetaData::getDatabaseAttributeName( DA_INPUT_REQUIRED ), + PROPERTY_INPUT_REQUIRED, + BOOLATTR_DEFAULT_TRUE + ); + RESET_BIT( nIncludeDatabase, DA_INPUT_REQUIRED ); } // the only int16 property: BoundColumn @@ -803,13 +818,10 @@ namespace xmloff OAttributeMetaData::getDatabaseAttributeName(DA_BOUND_COLUMN), PROPERTY_BOUNDCOLUMN, 0); - #if OSL_DEBUG_LEVEL > 0 - // reset the bit for later checking - nIncludeDatabase = nIncludeDatabase & ~DA_BOUND_COLUMN; - #endif + RESET_BIT( nIncludeDatabase, DA_BOUND_COLUMN ); } - // the only boolean property: ConvertEmptyToNull + // ConvertEmptyToNull if (DA_CONVERT_EMPTY & m_nIncludeDatabase) { exportBooleanPropertyAttribute( @@ -818,10 +830,7 @@ namespace xmloff PROPERTY_EMPTY_IS_NULL, BOOLATTR_DEFAULT_FALSE ); - #if OSL_DEBUG_LEVEL > 0 - // reset the bit for later checking - nIncludeDatabase = nIncludeDatabase & ~DA_CONVERT_EMPTY; - #endif + RESET_BIT( nIncludeDatabase, DA_CONVERT_EMPTY ); } // the only enum property: ListSourceType @@ -834,19 +843,13 @@ namespace xmloff OEnumMapper::getEnumMap(OEnumMapper::epListSourceType), ListSourceType_VALUELIST ); - #if OSL_DEBUG_LEVEL > 0 - // reset the bit for later checking - nIncludeDatabase = nIncludeDatabase & ~DA_LIST_SOURCE_TYPE; - #endif + RESET_BIT( nIncludeDatabase, DA_LIST_SOURCE_TYPE ); } if (m_nIncludeDatabase & DA_LIST_SOURCE) { exportListSourceAsAttribute(); - #if OSL_DEBUG_LEVEL > 0 - // reset the bit for later checking - nIncludeDatabase = nIncludeDatabase & ~DA_LIST_SOURCE; - #endif + RESET_BIT( nIncludeDatabase, DA_LIST_SOURCE ); } #if OSL_DEBUG_LEVEL > 0 @@ -1151,11 +1154,7 @@ namespace xmloff if ( SCA_IMAGE_POSITION & m_nIncludeSpecial ) { exportImagePositionAttributes(); - - #if OSL_DEBUG_LEVEL > 0 - // reset the bit for later checking - m_nIncludeSpecial = m_nIncludeSpecial & ~SCA_IMAGE_POSITION; - #endif + RESET_BIT( m_nIncludeSpecial, SCA_IMAGE_POSITION ); } OSL_ENSURE(0 == m_nIncludeSpecial, @@ -1446,7 +1445,7 @@ namespace xmloff CCA_PRINTABLE | CCA_TAB_INDEX | CCA_TAB_STOP | CCA_TITLE; // database attributes - m_nIncludeDatabase = DA_DATA_FIELD; + m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED; // event attributes m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE | EA_ON_SELECT; @@ -1508,7 +1507,7 @@ namespace xmloff CCA_DISABLED | CCA_DROPDOWN | CCA_MAX_LENGTH | CCA_PRINTABLE | CCA_READONLY | CCA_SIZE | CCA_TAB_INDEX | CCA_TAB_STOP | CCA_TITLE | CCA_VALUE; m_nIncludeSpecial = SCA_AUTOMATIC_COMPLETION; - m_nIncludeDatabase = DA_CONVERT_EMPTY | DA_DATA_FIELD | DA_LIST_SOURCE | DA_LIST_SOURCE_TYPE; + m_nIncludeDatabase = DA_CONVERT_EMPTY | DA_DATA_FIELD | DA_INPUT_REQUIRED | DA_LIST_SOURCE | DA_LIST_SOURCE_TYPE; m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE | EA_ON_SELECT; break; @@ -1518,7 +1517,7 @@ namespace xmloff CCA_NAME | CCA_SERVICE_NAME | CCA_DISABLED | CCA_DROPDOWN | CCA_PRINTABLE | CCA_SIZE | CCA_TAB_INDEX | CCA_TAB_STOP | CCA_TITLE; m_nIncludeSpecial = SCA_MULTIPLE; - m_nIncludeDatabase = DA_BOUND_COLUMN | DA_DATA_FIELD | DA_LIST_SOURCE_TYPE; + m_nIncludeDatabase = DA_BOUND_COLUMN | DA_DATA_FIELD | DA_INPUT_REQUIRED | DA_LIST_SOURCE_TYPE; m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE | EA_ON_CLICK | EA_ON_DBLCLICK; // check if we need to export the ListSource as attribute { @@ -1545,8 +1544,10 @@ namespace xmloff // NO BREAK ! case FormComponentType::IMAGEBUTTON: if (BUTTON != m_eType) + { // not coming from the previous case m_eType = IMAGE; + } m_nIncludeCommon |= CCA_NAME | CCA_SERVICE_NAME | CCA_BUTTON_TYPE | CCA_DISABLED | CCA_IMAGE_DATA | CCA_PRINTABLE | CCA_TAB_INDEX | CCA_TARGET_FRAME | @@ -1569,7 +1570,7 @@ namespace xmloff } if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_IMAGE_POSITION ) ) m_nIncludeSpecial |= SCA_IMAGE_POSITION; - m_nIncludeDatabase = DA_DATA_FIELD; + m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED; m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE; break; @@ -1586,7 +1587,7 @@ namespace xmloff m_nIncludeCommon = CCA_NAME | CCA_SERVICE_NAME | CCA_DISABLED | CCA_IMAGE_DATA | CCA_PRINTABLE | CCA_READONLY | CCA_TITLE; - m_nIncludeDatabase = DA_DATA_FIELD; + m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED; m_nIncludeEvents = EA_CONTROL_EVENTS; break; @@ -1955,7 +1956,7 @@ namespace xmloff // grid columns miss some properties of the controls they're representing m_nIncludeCommon &= ~(CCA_FOR | CCA_PRINTABLE | CCA_TAB_INDEX | CCA_TAB_STOP | CCA_LABEL); - m_nIncludeSpecial &= ~(SCA_ECHO_CHAR | SCA_AUTOMATIC_COMPLETION | SCA_MULTIPLE | SCA_MULTI_LINE | SCA_IS_TRISTATE); + m_nIncludeSpecial &= ~(SCA_ECHO_CHAR | SCA_AUTOMATIC_COMPLETION | SCA_MULTIPLE | SCA_MULTI_LINE); if (FormComponentType::DATEFIELD != m_nClassId) // except date fields, no column has the DropDown property diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 7c5e4c5c6788..d28218615bac 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -331,7 +331,12 @@ namespace xmloff { if ( !xDynamicProperties.is() ) { - OSL_ENSURE( false, "OElementImport::implImportGenericProperties: encountered an unknown property, but component is no PropertyBag!" ); + #if OSL_DEBUG_LEVEL > 0 + ::rtl::OString aMessage( "OElementImport::implImportGenericProperties: encountered an unknown property (" ); + aMessage += ::rtl::OUStringToOString( aPropValues->Name, RTL_TEXTENCODING_ASCII_US ); + aMessage += "), but component is no PropertyBag!"; + OSL_ENSURE( false, aMessage.getStr() ); + #endif continue; } @@ -1133,10 +1138,10 @@ namespace xmloff ) ); - if ( bMakeAbsolute ) + if ( bMakeAbsolute && ( _rValue.getLength() > 0 ) ) { // make a global URL out of the local one - ::rtl::OUString sAdjustedValue = m_rContext.getGlobalContext().GetAbsoluteReference( _rValue ); + ::rtl::OUString sAdjustedValue = m_rContext.getGlobalContext().ResolveGraphicObjectURL( _rValue, FALSE ); OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, sAdjustedValue ); } else @@ -1989,10 +1994,8 @@ namespace xmloff case OControlElement::BUTTON: case OControlElement::IMAGE: - return new OButtonImport(m_rFormImport, *this, _nPrefix, _rLocalName, m_xMeAsContainer, _eType); - case OControlElement::IMAGE_FRAME: - return new OURLReferenceImport( m_rFormImport, *this, _nPrefix, _rLocalName, m_xMeAsContainer, _eType ); + return new OButtonImport( m_rFormImport, *this, _nPrefix, _rLocalName, m_xMeAsContainer, _eType ); case OControlElement::COMBOBOX: case OControlElement::LISTBOX: diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index 8045c524dda5..7d0aa05e9231 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -150,6 +150,7 @@ namespace xmloff case DA_DATA_FIELD: return "data-field"; case DA_LIST_SOURCE: return "list-source"; case DA_LIST_SOURCE_TYPE: return "list-source-type"; + case DA_INPUT_REQUIRED: return "input-required"; default: OSL_ENSURE(sal_False, "OAttributeMetaData::getDatabaseAttributeName: invalid id (maybe you or-ed two flags?)!"); } diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx index 7a0226810a99..5d55948be328 100644 --- a/xmloff/source/forms/formattributes.hxx +++ b/xmloff/source/forms/formattributes.hxx @@ -76,6 +76,7 @@ namespace xmloff #define DA_DATA_FIELD 0x00000004 #define DA_LIST_SOURCE 0x00000008 #define DA_LIST_SOURCE_TYPE 0x00000010 + #define DA_INPUT_REQUIRED 0x00000020 // flags for binding related control attributes #define BA_LINKED_CELL 0x00000001 diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx index cb5d2d643a1b..d34fe30485a5 100644 --- a/xmloff/source/forms/formenums.cxx +++ b/xmloff/source/forms/formenums.cxx @@ -45,6 +45,7 @@ #include <com/sun/star/awt/FontRelief.hpp> #include <com/sun/star/awt/ScrollBarOrientation.hpp> #include <com/sun/star/awt/VisualEffect.hpp> +#include <com/sun/star/awt/ImageScaleMode.hpp> #include <vcl/wintypes.hxx> // for check states #include <xmloff/xmltoken.hxx> @@ -321,6 +322,21 @@ namespace xmloff rReturn = aImageAlignMap; } break; + + case epImageScaleMode: + { + static const SvXMLEnumMapEntry aScaleModeMap[] = + { + { XML_BACKGROUND_NO_REPEAT, ImageScaleMode::None }, + { XML_REPEAT, ImageScaleMode::None }, // repeating the image is not supported + { XML_STRETCH, ImageScaleMode::Anisotropic }, + { XML_SCALE, ImageScaleMode::Isotropic }, + { XML_TOKEN_INVALID, ImageScaleMode::None } + }; + rReturn = aScaleModeMap; + } + break; + case KNOWN_ENUM_PROPERTIES: break; } diff --git a/xmloff/source/forms/formenums.hxx b/xmloff/source/forms/formenums.hxx index 7aa16fb4dcc1..4c58561582ee 100644 --- a/xmloff/source/forms/formenums.hxx +++ b/xmloff/source/forms/formenums.hxx @@ -63,6 +63,7 @@ namespace xmloff epVisualEffect, epImagePosition, epImageAlign, + epImageScaleMode, KNOWN_ENUM_PROPERTIES }; diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index 2ddbd04ccf47..1dad8cbb2c7f 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -103,12 +103,12 @@ namespace xmloff // add our style family to the export context's style pool m_xPropertyHandlerFactory = new OControlPropertyHandlerFactory(); ::vos::ORef< XMLPropertySetMapper > xStylePropertiesMapper = new XMLPropertySetMapper( getControlStylePropertyMap(), m_xPropertyHandlerFactory.getBodyPtr() ); - m_xExportMapper = new OFormExportPropertyMapper( xStylePropertiesMapper.getBodyPtr() ); + m_xStyleExportMapper = new OFormComponentStyleExportMapper( xStylePropertiesMapper.getBodyPtr() ); // our style family m_rContext.GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_CONTROL_ID, token::GetXMLToken(token::XML_PARAGRAPH), - m_xExportMapper.getBodyPtr(), + m_xStyleExportMapper.getBodyPtr(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_CONTROL_PREFIX) ) ); @@ -188,7 +188,7 @@ namespace xmloff //--------------------------------------------------------------------- ::vos::ORef< SvXMLExportPropertyMapper > OFormLayerXMLExport_Impl::getStylePropertyMapper() { - return m_xExportMapper; + return m_xStyleExportMapper; } //--------------------------------------------------------------------- @@ -641,7 +641,7 @@ namespace xmloff // determine a number style, if needed xColumnPropertiesMeta = xColumnProperties->getPropertySetInfo(); // get the styles of the column - ::std::vector< XMLPropertyState > aPropertyStates = m_xExportMapper->Filter( xColumnProperties ); + ::std::vector< XMLPropertyState > aPropertyStates = m_xStyleExportMapper->Filter( xColumnProperties ); // care for the number format, additionally ::rtl::OUString sColumnNumberStyle; @@ -650,7 +650,7 @@ namespace xmloff if ( sColumnNumberStyle.getLength() ) { // the column indeed has a formatting - sal_Int32 nStyleMapIndex = m_xExportMapper->getPropertySetMapper()->FindEntryIndex( CTF_FORMS_DATA_STYLE ); + sal_Int32 nStyleMapIndex = m_xStyleExportMapper->getPropertySetMapper()->FindEntryIndex( CTF_FORMS_DATA_STYLE ); // TODO: move this to the ctor OSL_ENSURE ( -1 != nStyleMapIndex, "XMLShapeExport::collectShapeAutoStyles: could not obtain the index for our context id!"); diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx index 1a53ab5c79a1..e2e06fd7a215 100644 --- a/xmloff/source/forms/layerexport.hxx +++ b/xmloff/source/forms/layerexport.hxx @@ -84,7 +84,7 @@ namespace xmloff // style handling ::vos::ORef< XMLPropertyHandlerFactory > m_xPropertyHandlerFactory; - ::vos::ORef< SvXMLExportPropertyMapper > m_xExportMapper; + ::vos::ORef< SvXMLExportPropertyMapper > m_xStyleExportMapper; // we need our own number formats supplier: // Controls which have a number formats do not work with the formats supplier of the document they reside @@ -100,7 +100,7 @@ namespace xmloff // add this format to the global (document) formats supplier. // In case of an export we could do some cleanup afterwards, but in case of an import, there is no such // chance, as (if other user-defined formats exist in the document as well) we can't distinguish - // between user-defined formats really beeded for the doc (i.e. in a calc cell) and formats only added + // between user-defined formats really needed for the doc (i.e. in a calc cell) and formats only added // to the supplier because the controls needed it. ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > m_xControlNumberFormats; diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index b8c3cc2f0da8..11b1b3807370 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -177,6 +177,8 @@ namespace xmloff OAttributeMetaData::getSpecialAttributeName( SCA_TOGGLE ), PROPERTY_TOGGLE, sal_False ); m_aAttributeMetaData.addBooleanProperty( OAttributeMetaData::getSpecialAttributeName( SCA_FOCUS_ON_CLICK ), PROPERTY_FOCUS_ON_CLICK, sal_True ); + m_aAttributeMetaData.addBooleanProperty( + OAttributeMetaData::getDatabaseAttributeName( DA_INPUT_REQUIRED ), PROPERTY_INPUT_REQUIRED, sal_False ); // the int16 attributes m_aAttributeMetaData.addInt16Property( diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 39d839e252dd..4c61da8fdf50 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -429,7 +429,9 @@ namespace xmloff ::rtl::OUString sTargetLocation = comphelper::getString(m_xProps->getPropertyValue(_sPropertyName)); if ( sTargetLocation.getLength() ) - sTargetLocation = m_rContext.getGlobalContext().GetRelativeReference(sTargetLocation); + // If this isn't a GraphicObject then GetRelativeReference + // will be called anyway ( in AddEmbeddedGraphic ) + sTargetLocation = m_rContext.getGlobalContext().AddEmbeddedGraphicObject(sTargetLocation); AddAttribute(OAttributeMetaData::getCommonControlAttributeNamespace(_nProperty) ,OAttributeMetaData::getCommonControlAttributeName(_nProperty) , sTargetLocation); diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index 2b46adad4083..78534b4780d9 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -143,10 +143,21 @@ namespace xmloff */ void enableTrackAttributes() { m_bTrackAttributes = sal_True; } - void implPushBackPropertyValue(const ::com::sun::star::beans::PropertyValue& _rProp) - { m_aValues.push_back(_rProp); } - void implPushBackGenericPropertyValue(const ::com::sun::star::beans::PropertyValue& _rProp) - { m_aGenericValues.push_back(_rProp); } + inline void implPushBackPropertyValue(const ::com::sun::star::beans::PropertyValue& _rProp) + { + m_aValues.push_back(_rProp); + } + + inline void implPushBackPropertyValue( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& _rValue ) + { + m_aValues.push_back( ::com::sun::star::beans::PropertyValue( + _rName, -1, _rValue, ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) ); + } + + inline void implPushBackGenericPropertyValue(const ::com::sun::star::beans::PropertyValue& _rProp) + { + m_aGenericValues.push_back(_rProp); + } }; SV_DECL_IMPL_REF( OPropertyImport ) diff --git a/xmloff/source/forms/strings.hxx b/xmloff/source/forms/strings.hxx index acb1b22ea2ef..bfedd30b1d48 100644 --- a/xmloff/source/forms/strings.hxx +++ b/xmloff/source/forms/strings.hxx @@ -136,6 +136,7 @@ namespace xmloff XMLFORM_CONSTASCII_STRING( PROPERTY_DATAFIELD, "DataField" ); XMLFORM_CONSTASCII_STRING( PROPERTY_BOUNDCOLUMN, "BoundColumn"); XMLFORM_CONSTASCII_STRING( PROPERTY_EMPTY_IS_NULL, "ConvertEmptyToNull"); + XMLFORM_CONSTASCII_STRING( PROPERTY_INPUT_REQUIRED, "InputRequired"); XMLFORM_CONSTASCII_STRING( PROPERTY_LISTSOURCE, "ListSource"); XMLFORM_CONSTASCII_STRING( PROPERTY_LISTSOURCETYPE, "ListSourceType"); XMLFORM_CONSTASCII_STRING( PROPERTY_ECHO_CHAR, "EchoChar"); @@ -204,6 +205,7 @@ namespace xmloff XMLFORM_CONSTASCII_STRING( PROPERTY_VISUAL_EFFECT, "VisualEffect"); XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_POSITION, "ImagePosition"); XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_ALIGN, "ImageAlign"); + XMLFORM_CONSTASCII_STRING( PROPERTY_SCALE_IMAGE, "ScaleImage"); XMLFORM_CONSTASCII_STRING( PROPERTY_BOUND_CELL, "BoundCell"); XMLFORM_CONSTASCII_STRING( PROPERTY_LIST_CELL_RANGE, "CellRange"); |