diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-01-29 14:06:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-29 14:06:11 +0000 |
| commit | 0f534be41e7c2c9ec1706eb1fde56c50a595fe82 (patch) | |
| tree | 1b43503c4d3055c4e512e4c5259c0efe9fa66d53 | |
| parent | ea665e6fe7af34fcdcefd73bc05c68eb88e42073 (diff) | |
INTEGRATION: CWS fwk80_SRC680 (1.23.14); FILE MERGED
2008/01/24 07:50:54 pb 1.23.14.3: RESYNC: (1.23-1.23.20.1); FILE MERGED
2008/01/11 15:06:00 pb 1.23.14.2: fix: #i83756# UnoControlFixedHyperlinkModel
2007/12/10 14:44:03 cd 1.23.14.1: #i79974# Use a sorted sequence inside UnoDialogControl::windowResized
| -rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 74306614a2ee..d8cf0a37eb3a 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dialogcontrol.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: ihi $ $Date: 2008-01-15 14:21:34 $ + * last change: $Author: rt $ $Date: 2008-01-29 15:06:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -466,7 +466,9 @@ Reference< XInterface > UnoControlDialogModel::createInstance( const ::rtl::OUSt pNewModel = new OGeometryControlModel< UnoControlRadioButtonModel >; else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlCheckBoxModel ) == 0 ) pNewModel = new OGeometryControlModel< UnoControlCheckBoxModel >; - else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlFixedTextModel ) == 0 ) + else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoControlFixedHyperlinkModel ) == 0 ) + pNewModel = new OGeometryControlModel< UnoControlFixedHyperlinkModel >; + else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoControlFixedTextModel ) == 0 ) pNewModel = new OGeometryControlModel< UnoControlFixedTextModel >; else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlGroupBoxModel ) == 0 ) pNewModel = new OGeometryControlModel< UnoControlGroupBoxModel >; @@ -1809,10 +1811,11 @@ throw (::com::sun::star::uno::RuntimeException) mbSizeModified = true; Sequence< rtl::OUString > aProps( 2 ); Sequence< Any > aValues( 2 ); - aProps[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" )); - aProps[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" )); - aValues[0] <<= aTmp.Width(); - aValues[1] <<= aTmp.Height(); + // Properties in a sequence must be sorted! + aProps[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" )); + aProps[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" )); + aValues[0] <<= aTmp.Height(); + aValues[1] <<= aTmp.Width(); ImplSetPropertyValues( aProps, aValues, true ); mbSizeModified = false; |