diff options
author | Noel Power <noel.power@novell.com> | 2010-10-15 21:07:41 +0100 |
---|---|---|
committer | Noel Power <noel.power@novell.com> | 2010-10-15 21:13:58 +0100 |
commit | be37e676a22b9c9979aeb3d60cfbf6b29410f4f3 (patch) | |
tree | 99da593714d5b345c314dd040916f2bbee315567 | |
parent | 7ae8bc064dba89ac275c3eba7430cdff9e4dd381 (diff) |
make misc patches apply again
-rw-r--r-- | patches/dev300/apply | 2 | ||||
-rw-r--r-- | patches/dev300/dlopen-global-symbols.diff | 16 | ||||
-rw-r--r-- | patches/dev300/size-sal-textenc.diff | 2 | ||||
-rw-r--r-- | patches/vba/vba-container-controls.diff | 1145 |
4 files changed, 552 insertions, 613 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index 0bb6fe375..f1ceac06c 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -611,7 +611,7 @@ scp2-user-config-ooo3.diff, pmladek # change user config dir name from ~/.openoffice.org3 to ~/.ooo3 # FIXME: do we want another config dir for the Novell buidls? -scp2-user-config-suse.diff, pmladek +#scp2-user-config-suse.diff, pmladek # link against the versioned libmysqlcppconn # we do not want to require the devel package diff --git a/patches/dev300/dlopen-global-symbols.diff b/patches/dev300/dlopen-global-symbols.diff index bf391fcd5..ce5964425 100644 --- a/patches/dev300/dlopen-global-symbols.diff +++ b/patches/dev300/dlopen-global-symbols.diff @@ -69,14 +69,14 @@ index e1b341a..8076abd 100644 --- sw/source/filter/basflt/fltini.cxx +++ sw/source/filter/basflt/fltini.cxx @@ -969,7 +969,7 @@ static oslGenericFunction GetMswordLibSy - static sal_Bool bLoaded = sal_False;
- static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "msword" ) ) );
- if (!bLoaded)
-- bLoaded = SvLibrary::LoadModule( aModule, aLibName, &thisModule );
-+ bLoaded = SvLibrary::LoadModule( aModule, aLibName, &thisModule, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY );
- if (bLoaded)
- return aModule.getFunctionSymbol( ::rtl::OUString::createFromAscii( pSymbol ) );
- return NULL;
+ static sal_Bool bLoaded = sal_False; + static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "msword" ) ) ); + if (!bLoaded) +- bLoaded = SvLibrary::LoadModule( aModule, aLibName, &thisModule ); ++ bLoaded = SvLibrary::LoadModule( aModule, aLibName, &thisModule, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ); + if (bLoaded) + return aModule.getFunctionSymbol( ::rtl::OUString::createFromAscii( pSymbol ) ); + return NULL; diff --git sw/source/ui/dialog/swabstdlg.cxx sw/source/ui/dialog/swabstdlg.cxx index 2214dc5..32a7a2d 100644 --- sw/source/ui/dialog/swabstdlg.cxx diff --git a/patches/dev300/size-sal-textenc.diff b/patches/dev300/size-sal-textenc.diff index 5133de67d..f3791d1b4 100644 --- a/patches/dev300/size-sal-textenc.diff +++ b/patches/dev300/size-sal-textenc.diff @@ -745,8 +745,8 @@ index 0db7e2b..c4c285a 100755 --- scp2/source/ooo/ure.scp +++ scp2/source/ooo/ure.scp @@ -270,6 +270,13 @@ File gid_File_Dl_Sal - // CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6"; End + #endif +File gid_File_Dl_Sal_TextEnc + TXT_FILE_BODY; diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff index 197ea5948..fb11e796c 100644 --- a/patches/vba/vba-container-controls.diff +++ b/patches/vba/vba-container-controls.diff @@ -1,40 +1,13 @@ -diff --git basctl/source/basicide/baside3.cxx basctl/source/basicide/baside3.cxx -index fbd83c8..8d6c3d8 100644 ---- basctl/source/basicide/baside3.cxx -+++ basctl/source/basicide/baside3.cxx -@@ -82,7 +82,6 @@ - #include <com/sun/star/resource/XStringResourceResolver.hpp> - #include <com/sun/star/resource/StringResourceWithLocation.hpp> - #include <com/sun/star/task/XInteractionHandler.hpp> --#include <com/sun/star/script/vba/XVBACompatibility.hpp> - - using namespace comphelper; - using namespace ::com::sun::star; -@@ -115,14 +114,6 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St - - pEditor = new DlgEditor( rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() ); - pEditor->SetWindow( this ); -- // set vba mode on DialogModel ( allows it to work in 100thmm instead of MAP_APPFONT ) -- if ( rDocument.isDocument() && rDocument.getDocument().is() ) -- { -- uno::Reference< script::vba::XVBACompatibility > xDocVBAMode( rDocument.getLibraryContainer( E_SCRIPTS ), uno::UNO_QUERY ); -- uno::Reference< script::vba::XVBACompatibility > xDialogModelVBAMode( xDialogModel, uno::UNO_QUERY ); -- if ( xDocVBAMode.is() && xDialogModelVBAMode.is() ) -- xDialogModelVBAMode->setVBACompatibilityMode( xDocVBAMode->getVBACompatibilityMode() ); -- } - pEditor->SetDialog( xDialogModel ); - - // Undo einrichten diff --git basic/source/classes/sbxmod.cxx basic/source/classes/sbxmod.cxx -index 0b9b351..9e36b67 100644 +index 813db18..aee1e7e 100644 --- basic/source/classes/sbxmod.cxx +++ basic/source/classes/sbxmod.cxx -@@ -2534,8 +2534,15 @@ void SbUserFormModule::InitObject() +@@ -2502,8 +2502,15 @@ void SbUserFormModule::InitObject() aArgs[ 0 ] <<= m_xModel; rtl::OUString sDialogUrl( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:" ) ); rtl::OUString sProjectName( RTL_CONSTASCII_USTRINGPARAM("Standard") ); - if ( this->GetParent()->GetName().Len() ) -- sProjectName = this->GetParent()->GetName(); +- sProjectName = this->GetParent()->GetName(); + + try + { @@ -44,11 +17,11 @@ index 0b9b351..9e36b67 100644 + } + catch( Exception& /*e*/) {} + - sDialogUrl = sDialogUrl.concat( sProjectName ).concat( rtl::OUString( '.') ).concat( GetName() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?location=document") ) ); + sDialogUrl = sDialogUrl.concat( sProjectName ).concat( rtl::OUString( '.') ).concat( GetName() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?location=document") ) ); uno::Reference< awt::XDialogProvider > xProvider( xFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.DialogProvider")), aArgs ), uno::UNO_QUERY_THROW ); diff --git basic/source/inc/namecont.hxx basic/source/inc/namecont.hxx -index 29bc734..5766038 100644 +index 69ea926..208a608 100644 --- basic/source/inc/namecont.hxx +++ basic/source/inc/namecont.hxx @@ -224,6 +224,7 @@ class SfxLibraryContainer :public LibraryContainerHelper @@ -69,10 +42,10 @@ index 29bc734..5766038 100644 class LibraryContainerMethodGuard diff --git basic/source/uno/dlgcont.cxx basic/source/uno/dlgcont.cxx -index e0611ab..3bb090b 100644 +index 9a7b33b..bd71ffd 100644 --- basic/source/uno/dlgcont.cxx +++ basic/source/uno/dlgcont.cxx -@@ -40,6 +40,7 @@ +@@ -41,6 +41,7 @@ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include "com/sun/star/resource/XStringResourceWithStorage.hpp" #include "com/sun/star/resource/XStringResourceWithLocation.hpp" @@ -80,7 +53,7 @@ index e0611ab..3bb090b 100644 #include "dlgcont.hxx" #include "sbmodule.hxx" #include <comphelper/processfactory.hxx> -@@ -73,6 +74,8 @@ using namespace osl; +@@ -74,6 +75,8 @@ using namespace osl; using com::sun::star::uno::Reference; @@ -89,7 +62,7 @@ index e0611ab..3bb090b 100644 //============================================================================ // Implementation class SfxDialogLibraryContainer -@@ -224,6 +227,35 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement +@@ -225,6 +228,35 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement xInput->closeInput(); } @@ -125,7 +98,7 @@ index e0611ab..3bb090b 100644 void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< embed::XStorage >& xStorage ) throw ( RuntimeException ) { LibraryContainerMethodGuard aGuard( *this ); -@@ -252,6 +284,54 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e +@@ -253,6 +285,54 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e SfxLibraryContainer::storeLibrariesToStorage( xStorage ); @@ -181,10 +154,10 @@ index e0611ab..3bb090b 100644 } diff --git basic/source/uno/namecont.cxx basic/source/uno/namecont.cxx -index 2eb7a4e..5b7d103 100644 +index 6a00699..90298ae 100644 --- basic/source/uno/namecont.cxx +++ basic/source/uno/namecont.cxx -@@ -2830,6 +2830,18 @@ void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( ::sal_Bool _vbacompa +@@ -2827,6 +2827,18 @@ void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( ::sal_Bool _vbacompa mbVBACompat = _vbacompatmodeon; } @@ -204,10 +177,10 @@ index 2eb7a4e..5b7d103 100644 ::sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) diff --git extensions/source/propctrlr/formcomponenthandler.cxx extensions/source/propctrlr/formcomponenthandler.cxx -index 97d72da..f813bc6 100644 +index 8f4353f..8f4ba8a 100644 --- extensions/source/propctrlr/formcomponenthandler.cxx +++ extensions/source/propctrlr/formcomponenthandler.cxx -@@ -2783,8 +2783,9 @@ namespace pcr +@@ -2784,8 +2784,9 @@ namespace pcr aFileDlg.SetTitle(aStrTrans); // non-linked images ( e.g. those located in the document @@ -220,10 +193,10 @@ index 97d72da..f813bc6 100644 Reference< XFilePickerControlAccess > xController(aFileDlg.GetFilePicker(), UNO_QUERY); DBG_ASSERT(xController.is(), "FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the controller interface on the file picker!"); diff --git filter/source/msfilter/msvbahelper.cxx filter/source/msfilter/msvbahelper.cxx -index d71999e..372fc9f 100644 +index b1bdfe7..8bf36dd 100644 --- filter/source/msfilter/msvbahelper.cxx +++ filter/source/msfilter/msvbahelper.cxx -@@ -36,6 +36,7 @@ +@@ -37,6 +37,7 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentInfoSupplier.hpp> @@ -231,7 +204,7 @@ index d71999e..372fc9f 100644 #include <tools/urlobj.hxx> #include <osl/file.hxx> #include <unotools/pathoptions.hxx> -@@ -286,15 +287,15 @@ VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUStrin +@@ -287,15 +288,15 @@ VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUStrin { // Ok, if we have no Container specified then we need to search them in order, this document, template this document created from, global templates, // get the name of Project/Library for 'this' document @@ -428,7 +401,7 @@ index 730d46d..ddfabbf 100755 /** Functor for comparing controls by their tab index. */ static bool compareByTabIndex( const VbaFormControlRef& rxLeft, const VbaFormControlRef& rxRight ); diff --git oox/inc/oox/ole/vbahelper.hxx oox/inc/oox/ole/vbahelper.hxx -index b0277f8..7777554 100755 +index b0277f8..7777554 100644 --- oox/inc/oox/ole/vbahelper.hxx +++ oox/inc/oox/ole/vbahelper.hxx @@ -52,6 +52,7 @@ const sal_uInt16 VBA_ID_MODULESTREAMNAMEUNICODE = 0x0032; @@ -440,7 +413,7 @@ index b0277f8..7777554 100755 const sal_uInt16 VBA_ID_PROJECTMODULES = 0x000F; const sal_uInt16 VBA_ID_PROJECTVERSION = 0x0009; diff --git oox/inc/oox/ole/vbaproject.hxx oox/inc/oox/ole/vbaproject.hxx -index 1d2fca2..09f4c74 100755 +index 1d2fca2..09f4c74 100644 --- oox/inc/oox/ole/vbaproject.hxx +++ oox/inc/oox/ole/vbaproject.hxx @@ -127,7 +127,7 @@ private: @@ -453,7 +426,7 @@ index 1d2fca2..09f4c74 100755 // ============================================================================ diff --git oox/inc/oox/xls/excelfilter.hxx oox/inc/oox/xls/excelfilter.hxx -index 1409740..72ed636 100644 +index 49a0c85..55b0ca5 100644 --- oox/inc/oox/xls/excelfilter.hxx +++ oox/inc/oox/xls/excelfilter.hxx @@ -30,6 +30,8 @@ @@ -465,7 +438,7 @@ index 1409740..72ed636 100644 namespace oox { namespace xls { -@@ -92,6 +94,18 @@ private: +@@ -94,6 +96,18 @@ private: virtual ::rtl::OUString implGetImplementationName() const; }; @@ -485,10 +458,10 @@ index 1409740..72ed636 100644 } // namespace xls diff --git oox/prj/d.lst oox/prj/d.lst -index 482a270..82dc662 100644 +index 70c7c1e..c92cf4d 100644 --- oox/prj/d.lst +++ oox/prj/d.lst -@@ -25,6 +25,7 @@ mkdir: %_DEST%\inc%_EXT%\oox\xls +@@ -26,6 +26,7 @@ mkdir: %_DEST%\inc%_EXT%\oox\xls ..\inc\oox\helper\binarystreambase.hxx %_DEST%\inc%_EXT%\oox\helper\binarystreambase.hxx ..\inc\oox\helper\helper.hxx %_DEST%\inc%_EXT%\oox\helper\helper.hxx ..\inc\oox\helper\containerhelper.hxx %_DEST%\inc%_EXT%\oox\helper\containerhelper.hxx @@ -497,10 +470,10 @@ index 482a270..82dc662 100644 ..\inc\oox\helper\zipstorage.hxx %_DEST%\inc%_EXT%\oox\helper\zipstorage.hxx ..\inc\oox\core\filterbase.hxx %_DEST%\inc%_EXT%\oox\core\filterbase.hxx diff --git oox/source/core/facreg.cxx oox/source/core/facreg.cxx -index 50a2a54..7be7c3c 100644 +index 7233692..b6a9803 100644 --- oox/source/core/facreg.cxx +++ oox/source/core/facreg.cxx -@@ -60,6 +60,8 @@ namespace oox { +@@ -61,6 +61,8 @@ namespace oox { namespace xls { SERVICE( BiffDetector ); } namespace xls { SERVICE( ExcelFilter ); } namespace xls { SERVICE( ExcelBiffFilter ); } @@ -509,7 +482,7 @@ index 50a2a54..7be7c3c 100644 namespace shape { SERVICE( ShapeContextHandler ); } namespace shape { SERVICE( FastTokenHandlerService ); } namespace docprop { SERVICE2( OOXMLDocPropImportImpl ); } -@@ -103,6 +105,8 @@ OOX_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( void * , void * pRegistryKe +@@ -104,6 +106,8 @@ OOX_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( void * , void * pRegistryKe WRITEINFO( ::oox::xls::BiffDetector ); WRITEINFO( ::oox::xls::ExcelFilter ); WRITEINFO( ::oox::xls::ExcelBiffFilter ); @@ -518,7 +491,7 @@ index 50a2a54..7be7c3c 100644 WRITEINFO( ::oox::shape::ShapeContextHandler ); WRITEINFO( ::oox::shape::FastTokenHandlerService ); WRITEINFO( ::oox::docprop::OOXMLDocPropImportImpl ); -@@ -151,6 +155,8 @@ OOX_DLLPUBLIC void * SAL_CALL component_getFactory( const sal_Char * pImplName, +@@ -152,6 +156,8 @@ OOX_DLLPUBLIC void * SAL_CALL component_getFactory( const sal_Char * pImplName, else SINGLEFACTORY( ::oox::xls::BiffDetector ) else SINGLEFACTORY( ::oox::xls::ExcelFilter ) else SINGLEFACTORY( ::oox::xls::ExcelBiffFilter ) @@ -528,10 +501,10 @@ index 50a2a54..7be7c3c 100644 else SINGLEFACTORY( ::oox::shape::FastTokenHandlerService) else SINGLEFACTORY2( ::oox::docprop::OOXMLDocPropImportImpl ) diff --git oox/source/helper/propertyset.cxx oox/source/helper/propertyset.cxx -index b43ea12..1f1403e 100644 +index a3c9ee0..d29bfcb 100644 --- oox/source/helper/propertyset.cxx +++ oox/source/helper/propertyset.cxx -@@ -30,6 +30,21 @@ +@@ -31,6 +31,21 @@ #include <osl/diagnose.h> #include "oox/helper/propertymap.hxx" @@ -553,7 +526,7 @@ index b43ea12..1f1403e 100644 using ::rtl::OUString; using ::rtl::OStringBuffer; using ::rtl::OUStringToOString; -@@ -37,8 +52,22 @@ using ::com::sun::star::uno::Any; +@@ -38,8 +53,22 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Exception; @@ -576,7 +549,7 @@ index b43ea12..1f1403e 100644 namespace oox { -@@ -178,6 +207,109 @@ void PropertySet::dump() +@@ -179,6 +208,109 @@ void PropertySet::dump() PropertyMap::dump( Reference< XPropertySet >( getXPropertySet(), UNO_QUERY ) ); } #endif @@ -687,10 +660,10 @@ index b43ea12..1f1403e 100644 // ============================================================================ diff --git oox/source/ole/axcontrol.cxx oox/source/ole/axcontrol.cxx -index d8c3913..6f4d58b 100644 +index e67724f..983acaa 100644 --- oox/source/ole/axcontrol.cxx +++ oox/source/ole/axcontrol.cxx -@@ -431,14 +431,16 @@ OUString ControlModelBase::getServiceName() const +@@ -432,14 +432,16 @@ OUString ControlModelBase::getServiceName() const case API_CONTROL_FIXEDTEXT: return CREATE_OUSTRING( "com.sun.star.awt.UnoControlFixedTextModel" ); case API_CONTROL_IMAGE: return CREATE_OUSTRING( "com.sun.star.awt.UnoControlImageControlModel" ); case API_CONTROL_CHECKBOX: return CREATE_OUSTRING( "com.sun.star.awt.UnoControlCheckBoxModel" ); @@ -713,7 +686,7 @@ index d8c3913..6f4d58b 100644 case API_CONTROL_DIALOG: return CREATE_OUSTRING( "com.sun.star.awt.UnoControlDialogModel" ); default: OSL_ENSURE( false, "ControlModelBase::getServiceName - no AWT model service supported" ); } -@@ -1417,7 +1419,8 @@ ApiControlType AxTabStripModel::getControlType() const +@@ -1418,7 +1420,8 @@ ApiControlType AxTabStripModel::getControlType() const void AxTabStripModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const { rPropMap.setProperty( PROP_Decoration, mnTabStyle != AX_TABSTRIP_NONE ); @@ -723,7 +696,7 @@ index d8c3913..6f4d58b 100644 rConv.convertColor( rPropMap, PROP_BackgroundColor, mnBackColor ); AxFontDataModel::convertProperties( rPropMap, rConv ); } -@@ -1541,7 +1544,7 @@ AxFrameModel::AxFrameModel() : +@@ -1542,7 +1545,7 @@ AxFrameModel::AxFrameModel() : ApiControlType AxFrameModel::getControlType() const { @@ -828,10 +801,10 @@ index 0000000..85c1e70 + +} /*namespace ole*/ } /*namespace oox*/ diff --git oox/source/ole/vbacontrol.cxx oox/source/ole/vbacontrol.cxx -index 8a3a5c6..1a792f8 100755 +index 5b2057a..8a138f5 100755 --- oox/source/ole/vbacontrol.cxx +++ oox/source/ole/vbacontrol.cxx -@@ -49,6 +49,7 @@ using ::rtl::OUString; +@@ -50,6 +50,7 @@ using ::rtl::OUString; using ::rtl::OUStringBuffer; using ::com::sun::star::awt::XControlModel; using ::com::sun::star::container::XNameContainer; @@ -839,7 +812,7 @@ index 8a3a5c6..1a792f8 100755 using ::com::sun::star::io::XInputStreamProvider; using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::uno::Any; -@@ -221,17 +222,11 @@ bool VbaSiteModel::importBinaryModel( BinaryInputStream& rInStrm ) +@@ -222,17 +223,11 @@ bool VbaSiteModel::importBinaryModel( BinaryInputStream& rInStrm ) aReader.skipUndefinedProperty(); aReader.readStringProperty( maToolTip ); aReader.skipStringProperty(); // license key @@ -859,7 +832,7 @@ index 8a3a5c6..1a792f8 100755 bool VbaSiteModel::isVisible() const { return getFlag( mnFlags, VBA_SITE_VISIBLE ); -@@ -279,12 +274,12 @@ ControlModelRef VbaSiteModel::createControlModel( const AxClassTable& rClassTabl +@@ -280,12 +275,12 @@ ControlModelRef VbaSiteModel::createControlModel( const AxClassTable& rClassTabl case VBA_SITE_TEXTBOX: xCtrlModel.reset( new AxTextBoxModel ); break; case VBA_SITE_LISTBOX: xCtrlModel.reset( new AxListBoxModel ); break; case VBA_SITE_COMBOBOX: xCtrlModel.reset( new AxComboBoxModel ); break; @@ -876,7 +849,7 @@ index 8a3a5c6..1a792f8 100755 default: OSL_ENSURE( false, "VbaSiteModel::createControlModel - unknown type index" ); } } -@@ -318,6 +313,12 @@ ControlModelRef VbaSiteModel::createControlModel( const AxClassTable& rClassTabl +@@ -319,6 +314,12 @@ ControlModelRef VbaSiteModel::createControlModel( const AxClassTable& rClassTabl return xCtrlModel; } @@ -889,7 +862,7 @@ index 8a3a5c6..1a792f8 100755 void VbaSiteModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv, ApiControlType eCtrlType, sal_Int32 nCtrlIndex ) const { -@@ -379,6 +380,7 @@ sal_Int32 VbaFormControl::getControlId() const +@@ -380,6 +381,7 @@ sal_Int32 VbaFormControl::getControlId() const } void VbaFormControl::createAndConvert( sal_Int32 nCtrlIndex, @@ -897,7 +870,7 @@ index 8a3a5c6..1a792f8 100755 const Reference< XNameContainer >& rxParentNC, const ControlConverter& rConv ) const { if( rxParentNC.is() && mxSiteModel.get() && mxCtrlModel.get() ) try -@@ -389,7 +391,7 @@ void VbaFormControl::createAndConvert( sal_Int32 nCtrlIndex, +@@ -390,7 +392,7 @@ void VbaFormControl::createAndConvert( sal_Int32 nCtrlIndex, Reference< XControlModel > xCtrlModel( xModelFactory->createInstance( aServiceName ), UNO_QUERY_THROW ); // convert all properties and embedded controls @@ -906,7 +879,7 @@ index 8a3a5c6..1a792f8 100755 { // insert into parent container const OUString& rCtrlName = mxSiteModel->getName(); -@@ -444,16 +446,14 @@ void VbaFormControl::importStorage( StorageBase& rStrg, const AxClassTable& rCla +@@ -445,16 +447,14 @@ void VbaFormControl::importStorage( StorageBase& rStrg, const AxClassTable& rCla maControls.forEachMem( &VbaFormControl::importModelOrStorage, ::boost::ref( aOStrm ), ::boost::ref( rStrg ), ::boost::cref( maClassTable ) ); @@ -927,7 +900,7 @@ index 8a3a5c6..1a792f8 100755 const ControlConverter& rConv, sal_Int32 nCtrlIndex ) const { if( rxCtrlModel.is() && mxSiteModel.get() && mxCtrlModel.get() ) -@@ -465,10 +465,13 @@ bool VbaFormControl::convertProperties( const Reference< XControlModel >& rxCtrl +@@ -466,10 +466,13 @@ bool VbaFormControl::convertProperties( const Reference< XControlModel >& rxCtrl // convert all properties PropertyMap aPropMap; mxSiteModel->convertProperties( aPropMap, rConv, mxCtrlModel->getControlType(), nCtrlIndex ); @@ -942,7 +915,7 @@ index 8a3a5c6..1a792f8 100755 // create and convert all embedded controls if( !maControls.empty() ) try -@@ -477,7 +480,7 @@ bool VbaFormControl::convertProperties( const Reference< XControlModel >& rxCtrl +@@ -478,7 +481,7 @@ bool VbaFormControl::convertProperties( const Reference< XControlModel >& rxCtrl /* Call conversion for all controls. Pass vector index as new tab order to make option button groups work correctly. */ maControls.forEachMemWithIndex( &VbaFormControl::createAndConvert, @@ -951,7 +924,7 @@ index 8a3a5c6..1a792f8 100755 } catch( Exception& ) { -@@ -552,30 +555,110 @@ bool VbaFormControl::importEmbeddedSiteModels( BinaryInputStream& rInStrm ) +@@ -553,30 +556,110 @@ bool VbaFormControl::importEmbeddedSiteModels( BinaryInputStream& rInStrm ) return bValid; } @@ -1078,7 +1051,7 @@ index 8a3a5c6..1a792f8 100755 /* Reprocess the sorted list and collect all option button controls that are part of the same option group (determined by group name). All -@@ -592,11 +675,12 @@ void VbaFormControl::finalizeEmbeddedControls() +@@ -593,11 +676,12 @@ void VbaFormControl::finalizeEmbeddedControls() typedef VbaFormControlVectorMap::mapped_type VbaFormControlVectorRef; bool bLastWasOptionButton = false; @@ -1093,7 +1066,7 @@ index 8a3a5c6..1a792f8 100755 if( const AxOptionButtonModel* pOptButtonModel = dynamic_cast< const AxOptionButtonModel* >( pCtrlModel ) ) { // check if a new option group needs to be created -@@ -626,6 +710,10 @@ void VbaFormControl::finalizeEmbeddedControls() +@@ -627,6 +711,10 @@ void VbaFormControl::finalizeEmbeddedControls() } else { @@ -1104,7 +1077,7 @@ index 8a3a5c6..1a792f8 100755 // open a new control group, if the last group is an option group if( bLastWasOptionButton || aControlGroups.empty() ) { -@@ -636,55 +724,14 @@ void VbaFormControl::finalizeEmbeddedControls() +@@ -637,55 +725,14 @@ void VbaFormControl::finalizeEmbeddedControls() VbaFormControlVector& rLastGroup = *aControlGroups.back(); rLastGroup.push_back( xControl ); bLastWasOptionButton = false; @@ -1160,7 +1133,7 @@ index 8a3a5c6..1a792f8 100755 } /*static*/ bool VbaFormControl::compareByTabIndex( const VbaFormControlRef& rxLeft, const VbaFormControlRef& rxRight ) -@@ -825,7 +872,7 @@ void VbaUserForm::importForm( const Reference< XModel >& rxDocModel, const Refer +@@ -826,7 +873,7 @@ void VbaUserForm::importForm( const Reference< XModel >& rxDocModel, const Refer Reference< XNameContainer > xDialogNC( xDialogModel, UNO_QUERY_THROW ); // convert properties and embedded controls @@ -1170,10 +1143,10 @@ index 8a3a5c6..1a792f8 100755 // export the dialog to XML and insert it into the dialog library PropertySet aFactoryProps( mxGlobalFactory ); diff --git oox/source/ole/vbaproject.cxx oox/source/ole/vbaproject.cxx -index 877f16e..11ae11d 100755 +index 5e6e0ff..add8f8e 100755 --- oox/source/ole/vbaproject.cxx +++ oox/source/ole/vbaproject.cxx -@@ -129,11 +129,9 @@ VbaProject::VbaProject( const Reference< XMultiServiceFactory >& rxGlobalFactory +@@ -130,11 +130,9 @@ VbaProject::VbaProject( const Reference< XMultiServiceFactory >& rxGlobalFactory VbaFilterConfig( rxGlobalFactory, rConfigCompName ), mxGlobalFactory( rxGlobalFactory ), mxDocModel( rxDocModel ), @@ -1186,7 +1159,7 @@ index 877f16e..11ae11d 100755 } VbaProject::~VbaProject() -@@ -188,9 +186,9 @@ Reference< XNameContainer > VbaProject::openLibrary( sal_Int32 nPropId, bool bCr +@@ -189,9 +187,9 @@ Reference< XNameContainer > VbaProject::openLibrary( sal_Int32 nPropId, bool bCr try { Reference< XLibraryContainer > xLibContainer( getLibraryContainer( nPropId ), UNO_SET_THROW ); @@ -1199,7 +1172,7 @@ index 877f16e..11ae11d 100755 } catch( Exception& ) { -@@ -277,6 +275,12 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap +@@ -278,6 +276,12 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap aModulesByStrm[ rxModule->getStreamName() ] = rxModule; } break; @@ -1212,7 +1185,7 @@ index 877f16e..11ae11d 100755 #undef OOX_ENSURE_RECORDSIZE } } -@@ -346,7 +350,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap +@@ -347,7 +351,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap } /* Now it is time to load the source code. All modules will be inserted @@ -1222,10 +1195,10 @@ index 877f16e..11ae11d 100755 specified. */ if( !aModules.empty() ) try diff --git oox/source/token/properties.txt oox/source/token/properties.txt -index da1aeb2..9b6319f 100644 +index 2a7960a..cb18e82 100644 --- oox/source/token/properties.txt +++ oox/source/token/properties.txt -@@ -84,6 +84,7 @@ CompileEnglish +@@ -85,6 +85,7 @@ CompileEnglish ConditionalFormat ConnectBars ContainsHeader @@ -1233,7 +1206,7 @@ index da1aeb2..9b6319f 100644 Coordinates CopyBack CopyFormulas -@@ -349,6 +350,7 @@ RotationHorizontal +@@ -352,6 +353,7 @@ RotationHorizontal RotationVertical RowGrand RowLabelRanges @@ -1242,7 +1215,7 @@ index da1aeb2..9b6319f 100644 ScaleToPages ScaleToPagesX diff --git oox/source/token/tokenmap.cxx oox/source/token/tokenmap.cxx -index a3dac5c..a27d741 100644 +index a3b80ee..8b368b1 100644 --- oox/source/token/tokenmap.cxx +++ oox/source/token/tokenmap.cxx @@ -33,8 +33,6 @@ @@ -1255,10 +1228,10 @@ index a3dac5c..a27d741 100644 using ::rtl::OUString; using ::com::sun::star::uno::Sequence; diff --git oox/source/xls/excelfilter.cxx oox/source/xls/excelfilter.cxx -index 52d6b69..6f3263f 100644 +index b5b3dc6..c1a9b8d 100644 --- oox/source/xls/excelfilter.cxx +++ oox/source/xls/excelfilter.cxx -@@ -240,6 +240,63 @@ OUString ExcelBiffFilter::implGetImplementationName() const +@@ -200,6 +200,63 @@ OUString SAL_CALL ExcelBiffFilter_getImplementationName() throw() return CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelBiffFilter" ); } @@ -1323,10 +1296,10 @@ index 52d6b69..6f3263f 100644 { OUString aServiceName = CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelBiffFilter" ); diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx -index 6083116..d50848b 100644 +index 18b36c4..049447a 100644 --- sc/source/filter/excel/excimp8.cxx +++ sc/source/filter/excel/excimp8.cxx -@@ -106,9 +106,14 @@ +@@ -107,9 +107,14 @@ #include <com/sun/star/script/ModuleInfo.hpp> #include <cppuhelper/component_context.hxx> #include <sfx2/app.hxx> @@ -1341,7 +1314,7 @@ index 6083116..d50848b 100644 using ::rtl::OUString; // defined in docfunc.cxx ( really this needs a new name ) -@@ -243,14 +248,41 @@ void ImportExcel8::ReadBasic( void ) +@@ -244,14 +249,41 @@ void ImportExcel8::ReadBasic( void ) bool bLoadCode = pFilterOpt->IsLoadExcelBasicCode(); bool bLoadExecutable = pFilterOpt->IsLoadExcelBasicExecutable(); bool bLoadStrg = pFilterOpt->IsLoadExcelBasicStorage(); @@ -1385,7 +1358,7 @@ index 6083116..d50848b 100644 #if 1 // see if we have the XCB stream SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "XCB" ) ), STREAM_STD_READ | STREAM_NOCREATE ); -@@ -268,9 +300,11 @@ void ImportExcel8::ReadBasic( void ) +@@ -269,9 +301,11 @@ void ImportExcel8::ReadBasic( void ) #endif } @@ -1398,7 +1371,7 @@ index 6083116..d50848b 100644 } } } -@@ -306,6 +340,7 @@ void ImportExcel8::PostDocLoad( void ) +@@ -308,6 +342,7 @@ void ImportExcel8::PostDocLoad( void ) aScenList.Apply( GetRoot() ); } @@ -1407,10 +1380,10 @@ index 6083116..d50848b 100644 LoadDocumentProperties(); diff --git sc/source/ui/docshell/docsh5.cxx sc/source/ui/docshell/docsh5.cxx -index 82e797e..54c116e 100644 +index 676c201..59c7e4b 100644 --- sc/source/ui/docshell/docsh5.cxx +++ sc/source/ui/docshell/docsh5.cxx -@@ -42,6 +42,7 @@ +@@ -43,6 +43,7 @@ #include <svl/smplhint.hxx> #include <com/sun/star/sdbc/XResultSet.hpp> @@ -1431,7 +1404,7 @@ index 82e797e..54c116e 100644 // --------------------------------------------------------------------------- // -@@ -943,18 +950,21 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec +@@ -940,18 +947,21 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec { StarBASIC* pStarBASIC = GetBasic(); String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) ); @@ -1446,7 +1419,7 @@ index 82e797e..54c116e 100644 pStarBASIC = GetBasicManager()->GetLib( aLibName ); } + - SCTAB nTabToUse = nDestTab; + SCTAB nTabToUse = nDestTab; if ( nDestTab == SC_TAB_APPEND ) nTabToUse = aDocument.GetMaxTableNumber() - 1; String sCodeName; @@ -1457,7 +1430,7 @@ index 82e797e..54c116e 100644 if( xLibContainer.is() ) { com::sun::star::uno::Any aLibAny = xLibContainer->getByName( aLibName ); -@@ -1021,7 +1031,7 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer ) +@@ -1018,7 +1028,7 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer ) { ScRange aRange; pDBData->GetArea( aRange ); @@ -1477,10 +1450,10 @@ index 7d51621..28fcdbc 100755 tc scripting\inc nmake - all tc1_inc NULL tc scripting\source\provider nmake - all tc1_scriptingprovider tc1_inc NULL diff --git scripting/source/dlgprov/dlgevtatt.cxx scripting/source/dlgprov/dlgevtatt.cxx -index 2d8c853..bcc19f8 100644 +index 5be31fb..f454bed 100644 --- scripting/source/dlgprov/dlgevtatt.cxx +++ scripting/source/dlgprov/dlgevtatt.cxx -@@ -37,6 +37,7 @@ +@@ -38,6 +38,7 @@ #include <tools/diagnose_ex.h> #include <com/sun/star/awt/XControl.hpp> @@ -1488,7 +1461,7 @@ index 2d8c853..bcc19f8 100644 #include <com/sun/star/awt/XDialogEventHandler.hpp> #include <com/sun/star/awt/XContainerWindowEventHandler.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -@@ -231,6 +232,9 @@ namespace dlgprov +@@ -232,6 +233,9 @@ namespace dlgprov Reference< container::XNameContainer > xEventCont = xEventsSupplier->getEvents(); Reference< XControlModel > xControlModel = xControl->getModel(); @@ -1498,7 +1471,7 @@ index 2d8c853..bcc19f8 100644 if ( xEventCont.is() ) { Sequence< ::rtl::OUString > aNames = xEventCont->getElementNames(); -@@ -287,6 +291,51 @@ namespace dlgprov +@@ -288,6 +292,51 @@ namespace dlgprov } } @@ -1550,7 +1523,7 @@ index 2d8c853..bcc19f8 100644 // ----------------------------------------------------------------------------- // XScriptEventsAttacher // ----------------------------------------------------------------------------- -@@ -319,12 +368,9 @@ namespace dlgprov +@@ -320,12 +369,9 @@ namespace dlgprov } } @@ -1559,16 +1532,16 @@ index 2d8c853..bcc19f8 100644 - const Reference< XInterface >* pObjects = Objects.getConstArray(); + rtl::OUString sDialogCodeName; sal_Int32 nObjCount = Objects.getLength(); - Reference< awt::XControl > xDlgControl( Objects[ nObjCount - 1 ], uno::UNO_QUERY ); // last object is the dialog + Reference< awt::XControl > xDlgControl( Objects[ nObjCount - 1 ], uno::UNO_QUERY ); // last object is the dialog - rtl::OUString sDialogCodeName; if ( xDlgControl.is() ) { Reference< XPropertySet > xProps( xDlgControl->getModel(), UNO_QUERY ); -@@ -334,26 +380,8 @@ namespace dlgprov +@@ -335,26 +381,8 @@ namespace dlgprov } catch( Exception& ){} } -- +- - for ( sal_Int32 i = 0; i < nObjCount; ++i ) - { - // We know that we have to do with instances of XControl. @@ -1594,10 +1567,10 @@ index 2d8c853..bcc19f8 100644 diff --git scripting/source/dlgprov/dlgevtatt.hxx scripting/source/dlgprov/dlgevtatt.hxx -index 0df79b2..f64190a 100644 +index 0868465..78d3b3a 100644 --- scripting/source/dlgprov/dlgevtatt.hxx +++ scripting/source/dlgprov/dlgevtatt.hxx -@@ -70,6 +70,7 @@ namespace dlgprov +@@ -68,6 +68,7 @@ namespace dlgprov ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacher > m_xEventAttacher; ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > getScriptListenerForKey( const rtl::OUString& sScriptName ) throw ( ::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, rtl::OUString& sCodeName ); @@ -1606,10 +1579,10 @@ index 0df79b2..f64190a 100644 public: DialogEventsAttacherImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, diff --git scripting/source/vbaevents/eventhelper.cxx scripting/source/vbaevents/eventhelper.cxx -index 703357d..8411b09 100644 +index 80c6edd..f39acd8 100644 --- scripting/source/vbaevents/eventhelper.cxx +++ scripting/source/vbaevents/eventhelper.cxx -@@ -54,6 +54,7 @@ +@@ -56,6 +56,7 @@ #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> @@ -1617,16 +1590,16 @@ index 703357d..8411b09 100644 #include <com/sun/star/container/XNamed.hpp> -@@ -763,7 +764,7 @@ private: +@@ -765,7 +766,7 @@ private: Reference< frame::XModel > m_xModel; SfxObjectShell* mpShell; sal_Bool m_bDocClosed; -- -+ rtl::OUString msProject; +- ++ rtl::OUString msProject; }; EventListener::EventListener( const Reference< XComponentContext >& rxContext ) : -@@ -771,7 +772,7 @@ OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), m_bDocClosed( +@@ -773,7 +774,7 @@ OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), m_bDocClosed( { registerProperty( EVENTLSTNR_PROPERTY_MODEL, EVENTLSTNR_PROPERTY_ID_MODEL, beans::PropertyAttribute::TRANSIENT, &m_xModel, ::getCppuType( &m_xModel ) ); @@ -1635,10 +1608,10 @@ index 703357d..8411b09 100644 } void -@@ -789,6 +790,14 @@ EventListener::setShellFromModel() +@@ -791,6 +792,14 @@ EventListener::setShellFromModel() } pShell = SfxObjectShell::GetNext( *pShell ); - } + } + // set ProjectName from model + try + { @@ -1650,33 +1623,33 @@ index 703357d..8411b09 100644 } //XEventListener -@@ -1059,19 +1068,10 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce - +@@ -1061,19 +1070,10 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce + StarBASIC* pBasic = mpShell->GetBasic(); BasicManager* pBasicManager = mpShell->GetBasicManager(); - rtl::OUString sProject; + rtl::OUString sProject( msProject ); rtl::OUString sScriptCode( evt.ScriptCode ); - // dialogs pass their own library, presence of Dot determines that -- if ( sScriptCode.indexOf( '.' ) == -1 ) -- { -- //'Project' is a better default but I want to force failures -- //rtl::OUString sMacroLoc = rtl::OUString::createFromAscii("Project"); -- sProject = rtl::OUString::createFromAscii("Standard"); -- -- if ( pBasicManager->GetName().Len() > 0 ) -- sProject = pBasicManager->GetName(); -- } -- else -+ if ( sScriptCode.indexOf( '.' ) != -1 ) - { - sal_Int32 nIndex = sScriptCode.indexOf( '.' ); - sProject = sScriptCode.copy( 0, nIndex ); + // dialogs pass their own library, presence of Dot determines that +- if ( sScriptCode.indexOf( '.' ) == -1 ) +- { +- //'Project' is a better default but I want to force failures +- //rtl::OUString sMacroLoc = rtl::OUString::createFromAscii("Project"); +- sProject = rtl::OUString::createFromAscii("Standard"); +- +- if ( pBasicManager->GetName().Len() > 0 ) +- sProject = pBasicManager->GetName(); +- } +- else ++ if ( sScriptCode.indexOf( '.' ) != -1 ) + { + sal_Int32 nIndex = sScriptCode.indexOf( '.' ); + sProject = sScriptCode.copy( 0, nIndex ); diff --git toolkit/inc/toolkit/awt/vclxwindows.hxx toolkit/inc/toolkit/awt/vclxwindows.hxx -index b32f7ec..dffd240 100644 +index 5533155..c7edaa3 100644 --- toolkit/inc/toolkit/awt/vclxwindows.hxx +++ toolkit/inc/toolkit/awt/vclxwindows.hxx -@@ -82,6 +82,7 @@ +@@ -81,6 +81,7 @@ #include <com/sun/star/awt/XDateField.hpp> #include <com/sun/star/awt/XComboBox.hpp> #include <com/sun/star/awt/XCheckBox.hpp> @@ -1684,7 +1657,7 @@ index b32f7ec..dffd240 100644 #include <com/sun/star/awt/XItemListListener.hpp> #include <cppuhelper/weak.hxx> #include <cppuhelper/implbase3.hxx> -@@ -93,6 +94,7 @@ +@@ -92,6 +93,7 @@ #include <vcl/pointr.hxx> #include <vcl/image.hxx> @@ -1692,7 +1665,7 @@ index b32f7ec..dffd240 100644 #include <com/sun/star/document/XVbaMethodParameter.hpp> //liuchen 2009-6-22, add the support of input/output parameters to VBA Dialog_QueryClose event class Button; -@@ -373,6 +375,40 @@ public: +@@ -372,6 +374,40 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; @@ -1733,7 +1706,7 @@ index b32f7ec..dffd240 100644 // ---------------------------------------------------- -@@ -450,6 +486,59 @@ public: +@@ -449,6 +485,59 @@ public: // ::com::sun::star::awt::XVclWindowPeer void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); @@ -1794,10 +1767,10 @@ index b32f7ec..dffd240 100644 // ---------------------------------------------------- diff --git toolkit/inc/toolkit/controls/dialogcontrol.hxx toolkit/inc/toolkit/controls/dialogcontrol.hxx -index a1725f2..f13a018 100644 +index 32e7db6..2b83f01 100644 --- toolkit/inc/toolkit/controls/dialogcontrol.hxx +++ toolkit/inc/toolkit/controls/dialogcontrol.hxx -@@ -34,12 +34,16 @@ +@@ -35,12 +35,16 @@ #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/util/XChangesNotifier.hpp> #include <com/sun/star/util/XChangesListener.hpp> @@ -1814,7 +1787,7 @@ index a1725f2..f13a018 100644 #include <toolkit/helper/listenermultiplexer.hxx> #include <toolkit/controls/unocontrolmodel.hxx> #include "toolkit/helper/servicenames.hxx" -@@ -67,11 +71,12 @@ class UnoControlDialogModel : public UnoControlDialogModel_IBase +@@ -68,11 +72,12 @@ class UnoControlDialogModel : public UnoControlDialogModel_IBase , public UnoControlDialogModel_Base { public: @@ -1828,7 +1801,7 @@ index a1725f2..f13a018 100644 typedef ::std::list< UnoControlModelHolder > UnoControlModelHolderList; // for grouping control models (XTabControllerModel::getGroupXXX) -@@ -83,7 +88,7 @@ private: +@@ -84,7 +89,7 @@ private: friend struct FindControlModel; friend struct CompareControlModel; @@ -1837,10 +1810,10 @@ index a1725f2..f13a018 100644 ContainerListenerMultiplexer maContainerListeners; ::cppu::OInterfaceContainerHelper maChangeListeners; UnoControlModelHolderList maModels; -@@ -94,13 +99,14 @@ private: - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj; - bool mbAdjustingGraphic; - protected: +@@ -95,13 +100,14 @@ private: + ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj; + bool mbAdjustingGraphic; + protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); @@ -1853,27 +1826,27 @@ index a1725f2..f13a018 100644 + UnoControlDialogModel( bool bRegProps = true ); UnoControlDialogModel( const UnoControlDialogModel& rModel ); ~UnoControlDialogModel(); - -@@ -123,13 +129,6 @@ public: + +@@ -124,13 +130,6 @@ public: ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); - + - // ::com::sun::star::container::XIndexContainer, XIndexReplace, XIndexAcces - // void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0; - // sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException) = 0; - // ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0; - // void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0; - // void SAL_CALL removeByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0; -- +- // ::com::sun::star::container::XNameContainer, XNameReplace, XNameAccess void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); -@@ -179,12 +178,12 @@ public: +@@ -180,12 +179,12 @@ public: protected: void startControlListening( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxChildModel ); void stopControlListening( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxChildModel ); - // ::cppu::OPropertySetHelper -- void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception); +- void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception); void implNotifyTabModelChange( const ::rtl::OUString& _rAccessor ); @@ -1883,7 +1856,7 @@ index a1725f2..f13a018 100644 private: void AddRadioButtonToGroup ( const ::com::sun::star::uno::Reference< XControlModel >& rControlModel, -@@ -195,17 +194,6 @@ private: +@@ -196,17 +195,6 @@ private: ::std::map< ::rtl::OUString, ModelGroup >& pNamedGroups ); }; @@ -1901,7 +1874,7 @@ index a1725f2..f13a018 100644 class ResourceListener :public ::com::sun::star::util::XModifyListener, public ::cppu::OWeakObject, public ::cppu::BaseMutex -@@ -234,29 +222,78 @@ class ResourceListener :public ::com::sun::star::util::XModifyListener, +@@ -235,29 +223,78 @@ class ResourceListener :public ::com::sun::star::util::XModifyListener, bool m_bListening; }; @@ -1965,7 +1938,7 @@ index a1725f2..f13a018 100644 private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar > mxMenuBar; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > mxTabController; -- ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxListener; +- ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxListener; TopWindowListenerMultiplexer maTopWindowListeners; bool mbWindowListener; - bool mbSizeModified; @@ -1974,7 +1947,7 @@ index a1725f2..f13a018 100644 + ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxListener; protected: - + void ImplInsertControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel, const ::rtl::OUString& rName ); - void ImplRemoveControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel ); - void ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl ); @@ -1984,23 +1957,23 @@ index a1725f2..f13a018 100644 public: UnoDialogControl(); -+ ~UnoDialogControl(); ++ ~UnoDialogControl(); ::rtl::OUString GetComponentServiceName(); ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlContainer::queryInterface(rType); } -@@ -281,11 +318,6 @@ public: +@@ -282,11 +319,6 @@ public: virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); - + - // ::com::sun::star::container::XContainerListener - void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); -- +- // ::com::sun::star::awt::XDialog2 virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setHelpId( ::sal_Int32 Id ) throw (::com::sun::star::uno::RuntimeException); -@@ -302,10 +334,6 @@ public: +@@ -303,10 +335,6 @@ public: // ::com::sun::star::awt::XControl sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model ) throw(::com::sun::star::uno::RuntimeException); @@ -2011,7 +1984,7 @@ index a1725f2..f13a018 100644 // XModifyListener virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); -@@ -316,13 +344,153 @@ public: +@@ -317,13 +345,153 @@ public: protected: virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents ) throw(::com::sun::star::uno::RuntimeException); virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ); @@ -2028,12 +2001,12 @@ index a1725f2..f13a018 100644 + UnoControlModel* Clone() const; + + DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, UnoControlDialogModel, szServiceName_UnoMultiPageModel ) -+ + + virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException); + // XNamedContainer + void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ++ + // Override the method of parent Class + virtual sal_Bool SAL_CALL getGroupControl( ) throw (::com::sun::star::uno::RuntimeException); protected: @@ -2168,10 +2141,10 @@ index a1725f2..f13a018 100644 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git toolkit/inc/toolkit/controls/unocontrolcontainer.hxx toolkit/inc/toolkit/controls/unocontrolcontainer.hxx -index d85d3f0..d59825e 100644 +index 3550bc1..1ae139b 100644 --- toolkit/inc/toolkit/controls/unocontrolcontainer.hxx +++ toolkit/inc/toolkit/controls/unocontrolcontainer.hxx -@@ -119,6 +119,15 @@ protected: +@@ -120,6 +120,15 @@ protected: virtual void removingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ); virtual void addingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ); @@ -2187,7 +2160,7 @@ index d85d3f0..d59825e 100644 private: /** adds the control to the container, does necessary notifications, and the like @param _rxControl -@@ -149,15 +158,6 @@ private: +@@ -150,15 +159,6 @@ private: const ::rtl::OUString* _pNameAccessor ); @@ -2204,10 +2177,10 @@ index d85d3f0..d59825e 100644 diff --git toolkit/inc/toolkit/controls/unocontrols.hxx toolkit/inc/toolkit/controls/unocontrols.hxx -index c3d1de0..4567d96 100644 +index 993c798..2f6e185 100644 --- toolkit/inc/toolkit/controls/unocontrols.hxx +++ toolkit/inc/toolkit/controls/unocontrols.hxx -@@ -71,6 +71,16 @@ +@@ -72,6 +72,16 @@ #define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:" #define UNO_NAME_GRAPHOBJ_URLPKGPREFIX "vnd.sun.star.Package:" @@ -2224,7 +2197,7 @@ index c3d1de0..4567d96 100644 // ---------------------------------------------------- // class UnoControlEditModel -@@ -223,6 +233,7 @@ private: +@@ -224,6 +234,7 @@ private: bool mbAdjustingGraphic; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj; @@ -2232,30 +2205,30 @@ index c3d1de0..4567d96 100644 protected: GraphicControlModel() : mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { } -@@ -636,44 +647,6 @@ public: +@@ -637,44 +648,6 @@ public: }; -class UnoMultiPageModel : public UnoControlModel -{ -protected: -- ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; -- ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); +- ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; +- ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - -public: -- UnoMultiPageModel(); -- UnoMultiPageModel( const UnoMultiPageModel& rModel ) : UnoControlModel( rModel ) {;} +- UnoMultiPageModel(); +- UnoMultiPageModel( const UnoMultiPageModel& rModel ) : UnoControlModel( rModel ) {;} - -- UnoControlModel* Clone() const { return new UnoMultiPageModel( *this ); } +- UnoControlModel* Clone() const { return new UnoMultiPageModel( *this ); } - -- // ::com::sun::star::io::XPersistObject +- // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); - -- // ::com::sun::star::beans::XMultiPropertySet +- // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - -- // ::com::sun::star::lang::XServiceInfo -- DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, UnoControlModel, szServiceName_UnoMultiPageModel ) +- // ::com::sun::star::lang::XServiceInfo +- DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, UnoControlModel, szServiceName_UnoMultiPageModel ) - -}; -// ---------------------------------------------------- @@ -2264,13 +2237,13 @@ index c3d1de0..4567d96 100644 -class UnoMultiPageControl : public UnoControlBase -{ -public: -- UnoMultiPageControl(); -- ::rtl::OUString GetComponentServiceName(); +- UnoMultiPageControl(); +- ::rtl::OUString GetComponentServiceName(); - - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException); - -- // ::com::sun::star::lang::XServiceInfo -- DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageControl, UnoControlBase, szServiceName_UnoMultiPageControl ) +- // ::com::sun::star::lang::XServiceInfo +- DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageControl, UnoControlBase, szServiceName_UnoMultiPageControl ) - -}; - @@ -2278,10 +2251,10 @@ index c3d1de0..4567d96 100644 // class UnoFixedTextControl // ---------------------------------------------------- diff --git toolkit/inc/toolkit/helper/listenermultiplexer.hxx toolkit/inc/toolkit/helper/listenermultiplexer.hxx -index 3328752..740fd27 100644 +index f8d49ee..189571f 100644 --- toolkit/inc/toolkit/helper/listenermultiplexer.hxx +++ toolkit/inc/toolkit/helper/listenermultiplexer.hxx -@@ -41,6 +41,7 @@ +@@ -42,6 +42,7 @@ #include <com/sun/star/awt/XTextListener.hpp> #include <com/sun/star/awt/XActionListener.hpp> #include <com/sun/star/awt/XItemListener.hpp> @@ -2289,7 +2262,7 @@ index 3328752..740fd27 100644 #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/awt/XSpinListener.hpp> #include <com/sun/star/awt/XAdjustmentListener.hpp> -@@ -183,6 +184,17 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( ItemListenerMultiplexer, ::com::sun::star +@@ -184,6 +185,17 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( ItemListenerMultiplexer, ::com::sun::star DECL_LISTENERMULTIPLEXER_END // ---------------------------------------------------- @@ -2308,10 +2281,10 @@ index 3328752..740fd27 100644 // ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener ) diff --git toolkit/inc/toolkit/helper/macros.hxx toolkit/inc/toolkit/helper/macros.hxx -index 6ad74d0..f2a1503 100644 +index 65c0cbf..4e5fa6b 100644 --- toolkit/inc/toolkit/helper/macros.hxx +++ toolkit/inc/toolkit/helper/macros.hxx -@@ -189,6 +189,57 @@ void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(:: +@@ -190,6 +190,57 @@ void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(:: #define DISPLAY_EXCEPTION( ClassName, MethodName, e ) #endif @@ -2370,25 +2343,23 @@ index 6ad74d0..f2a1503 100644 { \ EventType aMulti( evt ); \ diff --git toolkit/inc/toolkit/helper/property.hxx toolkit/inc/toolkit/helper/property.hxx -index 3c8e4a1..e92870c 100644 +index 3ca2fdd..4b13758 100644 --- toolkit/inc/toolkit/helper/property.hxx +++ toolkit/inc/toolkit/helper/property.hxx -@@ -204,8 +204,8 @@ namespace rtl { +@@ -205,6 +205,8 @@ namespace rtl { #define BASEPROPERTY_MULTISELECTION_SIMPLEMODE 152 #define BASEPROPERTY_ITEM_SEPARATOR_POS 153 #define BASEPROPERTY_GROUPNAME 154 // ::rtl::OUString --#define BASEPROPERTY_VBAFORM 155 // sal_Bool -- +#define BASEPROPERTY_MULTIPAGEVALUE 155 // sal_Int32 +#define BASEPROPERTY_USERFORMCONTAINEES 156 // css::container::XNameContainer + // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen. - #define BASEPROPERTY_FONTDESCRIPTORPART_START 1000 diff --git toolkit/inc/toolkit/helper/servicenames.hxx toolkit/inc/toolkit/helper/servicenames.hxx -index 374373b..1f02d41 100644 +index 4067cd0..fd41577 100644 --- toolkit/inc/toolkit/helper/servicenames.hxx +++ toolkit/inc/toolkit/helper/servicenames.hxx -@@ -40,6 +40,12 @@ extern const sal_Char __FAR_DATA szServiceName_UnoControlContainer[], szServiceN +@@ -41,6 +41,12 @@ extern const sal_Char __FAR_DATA szServiceName_UnoControlContainer[], szServiceN extern const sal_Char __FAR_DATA szServiceName_UnoMultiPageControl[], szServiceName2_UnoMultiPageControl[]; extern const sal_Char __FAR_DATA szServiceName_UnoMultiPageModel[], szServiceName2_UnoMultiPageModel[]; extern const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[], szServiceName2_UnoControlContainerModel[]; @@ -2402,10 +2373,10 @@ index 374373b..1f02d41 100644 extern const sal_Char __FAR_DATA szServiceName_TabControllerModel[], szServiceName2_TabControllerModel[]; extern const sal_Char __FAR_DATA szServiceName_UnoControlDialog[], szServiceName2_UnoControlDialog[]; diff --git toolkit/source/awt/vclxtabcontrol.cxx toolkit/source/awt/vclxtabcontrol.cxx -index 1aceb60..d163b4f 100644 +index 4d9f63a..3f81839 100644 --- toolkit/source/awt/vclxtabcontrol.cxx +++ toolkit/source/awt/vclxtabcontrol.cxx -@@ -25,7 +25,7 @@ +@@ -26,7 +26,7 @@ * ************************************************************************/ @@ -2415,10 +2386,10 @@ index 1aceb60..d163b4f 100644 #include <com/sun/star/awt/PosSize.hpp> #include <sal/macros.h> diff --git toolkit/source/awt/vclxtabcontrol.hxx toolkit/source/awt/vclxtabcontrol.hxx -index 36e0d9f..34fc10c 100644 +index c4b9002..84c7859 100644 --- toolkit/source/awt/vclxtabcontrol.hxx +++ toolkit/source/awt/vclxtabcontrol.hxx -@@ -122,6 +122,8 @@ public: +@@ -123,6 +123,8 @@ public: ChildProps( VCLXTabControl::ChildData *pData ); }; @@ -2427,7 +2398,7 @@ index 36e0d9f..34fc10c 100644 protected: ChildData *createChild( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild ); ChildProps *createChildProps( Box_Base::ChildData* pData ); -@@ -132,7 +134,6 @@ protected: +@@ -133,7 +135,6 @@ protected: std::list< ::com::sun::star::uno::Reference < ::com::sun::star::awt::XTabListener > > mxTabListeners; @@ -2436,10 +2407,10 @@ index 36e0d9f..34fc10c 100644 private: VCLXTabControl( const VCLXTabControl& ); // never implemented diff --git toolkit/source/awt/vclxtabpage.cxx toolkit/source/awt/vclxtabpage.cxx -index fae1c35..ec95176 100644 +index 231eced..71499bb 100644 --- toolkit/source/awt/vclxtabpage.cxx +++ toolkit/source/awt/vclxtabpage.cxx -@@ -25,7 +25,8 @@ +@@ -26,7 +26,8 @@ * ************************************************************************/ @@ -2450,10 +2421,10 @@ index fae1c35..ec95176 100644 #include <com/sun/star/awt/PosSize.hpp> diff --git toolkit/source/awt/vclxtoolkit.cxx toolkit/source/awt/vclxtoolkit.cxx -index c8ee016..73471b4 100644 +index 7282020..b437574 100644 --- toolkit/source/awt/vclxtoolkit.cxx +++ toolkit/source/awt/vclxtoolkit.cxx -@@ -119,6 +119,7 @@ +@@ -116,6 +116,7 @@ #include <tools/debug.hxx> #include <comphelper/processfactory.hxx> @@ -2461,7 +2432,7 @@ index c8ee016..73471b4 100644 namespace css = ::com::sun::star; -@@ -286,6 +287,7 @@ static ComponentInfo __FAR_DATA aComponentInfos [] = +@@ -283,6 +284,7 @@ static ComponentInfo __FAR_DATA aComponentInfos [] = { "floatingwindow", WINDOW_FLOATINGWINDOW }, { "framewindow", VCLWINDOW_FRAMEWINDOW }, { "groupbox", WINDOW_GROUPBOX }, @@ -2469,7 +2440,7 @@ index c8ee016..73471b4 100644 { "helpbutton", WINDOW_HELPBUTTON }, { "imagebutton", WINDOW_IMAGEBUTTON }, { "imageradiobutton", WINDOW_IMAGERADIOBUTTON }, -@@ -626,7 +628,14 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, +@@ -623,7 +625,14 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, Window* pNewWindow = NULL; sal_uInt16 nType = ImplGetComponentType( aServiceName ); @@ -2485,7 +2456,7 @@ index c8ee016..73471b4 100644 if ( !pParent ) { // Wenn die Component einen Parent braucht, dann NULL zurueckgeben, -@@ -723,7 +732,17 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, +@@ -720,7 +729,17 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, pNewWindow = new FloatingWindow( pParent, nWinBits ); break; case WINDOW_GROUPBOX: @@ -2503,7 +2474,7 @@ index c8ee016..73471b4 100644 break; case WINDOW_HELPBUTTON: pNewWindow = new HelpButton( pParent, nWinBits ); -@@ -863,6 +882,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, +@@ -860,6 +879,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, break; case WINDOW_TABCONTROL: pNewWindow = new TabControl( pParent, nWinBits ); @@ -2512,10 +2483,10 @@ index c8ee016..73471b4 100644 case WINDOW_TABDIALOG: pNewWindow = new TabDialog( pParent, nWinBits ); diff --git toolkit/source/awt/vclxwindows.cxx toolkit/source/awt/vclxwindows.cxx -index 1e1aa1d..9597a20 100644 +index 9332a0b..f367f7d 100644 --- toolkit/source/awt/vclxwindows.cxx +++ toolkit/source/awt/vclxwindows.cxx -@@ -2291,6 +2291,7 @@ void VCLXDialog::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +@@ -2290,6 +2290,7 @@ void VCLXDialog::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) VCLXDialog::VCLXDialog() { @@ -2523,7 +2494,7 @@ index 1e1aa1d..9597a20 100644 } VCLXDialog::~VCLXDialog() -@@ -2496,6 +2497,292 @@ throw(::com::sun::star::uno::RuntimeException) +@@ -2503,6 +2504,292 @@ throw(::com::sun::star::uno::RuntimeException) } } @@ -2816,7 +2787,7 @@ index 1e1aa1d..9597a20 100644 // ---------------------------------------------------- // class VCLXTabPage // ---------------------------------------------------- -@@ -2503,6 +2790,27 @@ VCLXTabPage::VCLXTabPage() +@@ -2510,6 +2797,27 @@ VCLXTabPage::VCLXTabPage() { } @@ -2844,7 +2815,7 @@ index 1e1aa1d..9597a20 100644 VCLXTabPage::~VCLXTabPage() { } -@@ -2592,6 +2900,14 @@ throw(::com::sun::star::uno::RuntimeException) +@@ -2599,6 +2907,14 @@ throw(::com::sun::star::uno::RuntimeException) } } @@ -2859,7 +2830,7 @@ index 1e1aa1d..9597a20 100644 // ---------------------------------------------------- // class VCLXFixedHyperlink // ---------------------------------------------------- -@@ -6183,5 +6499,99 @@ VCLXToolBox::~VCLXToolBox() +@@ -6272,5 +6588,99 @@ VCLXToolBox::~VCLXToolBox() { return getAccessibleFactory().createAccessibleContext( this ); } @@ -2960,10 +2931,10 @@ index 1e1aa1d..9597a20 100644 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git toolkit/source/controls/dialogcontrol.cxx toolkit/source/controls/dialogcontrol.cxx -index 1fe21d2..b5d4679 100644 +index fa6d50a..7d72e8b 100644 --- toolkit/source/controls/dialogcontrol.cxx +++ toolkit/source/controls/dialogcontrol.cxx -@@ -69,10 +69,16 @@ +@@ -68,10 +68,16 @@ #include "grid/gridcontrol.hxx" #include <map> @@ -2980,7 +2951,7 @@ index 1fe21d2..b5d4679 100644 using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -@@ -92,8 +98,6 @@ using namespace toolkit; +@@ -91,8 +97,6 @@ using namespace toolkit; //HELPER ::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ); @@ -2989,10 +2960,10 @@ index 1fe21d2..b5d4679 100644 struct LanguageDependentProp { const char* pPropName; -@@ -120,32 +124,6 @@ namespace +@@ -119,32 +123,6 @@ namespace return s_aLanguageDependentProperties; } - + - static uno::Reference< graphic::XGraphic > lcl_getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL ) - { - uno::Reference< graphic::XGraphic > xGraphic; @@ -3022,7 +2993,7 @@ index 1fe21d2..b5d4679 100644 static ::rtl::OUString lcl_GetStringProperty( const ::rtl::OUString& sProperty, const Reference< XPropertySet >& xSet ) { ::rtl::OUString sValue; -@@ -263,14 +241,91 @@ static const ::rtl::OUString& getStepPropertyName( ) +@@ -262,14 +240,91 @@ static const ::rtl::OUString& getStepPropertyName( ) return s_sStepProperty; } @@ -3108,35 +3079,33 @@ index 1fe21d2..b5d4679 100644 +UnoControlDialogModel::UnoControlDialogModel( bool regProps ) :maContainerListeners( *this ) ,maChangeListeners ( GetMutex() ) - ,mbGroupsUpToDate( sal_False ), mbAdjustingGraphic( false ) + ,mbGroupsUpToDate( sal_False ), mbAdjustingGraphic( false ) { + if ( regProps ) + { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); // ImplRegisterProperty( BASEPROPERTY_BORDER ); ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL ); -@@ -291,8 +346,9 @@ UnoControlDialogModel::UnoControlDialogModel() +@@ -290,6 +345,9 @@ UnoControlDialogModel::UnoControlDialogModel() aBool <<= (sal_Bool) sal_True; ImplRegisterProperty( BASEPROPERTY_MOVEABLE, aBool ); ImplRegisterProperty( BASEPROPERTY_CLOSEABLE, aBool ); -- aBool <<= (sal_Bool) sal_False; -- ImplRegisterProperty( BASEPROPERTY_VBAFORM, aBool ); + uno::Reference< XNameContainer > xNameCont = new SimpleNamedThingContainer< XControlModel >(); + ImplRegisterProperty( BASEPROPERTY_USERFORMCONTAINEES, uno::makeAny( xNameCont ) ); + } } UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rModel ) -@@ -300,7 +356,7 @@ UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rMode +@@ -297,7 +355,7 @@ UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rMode , UnoControlDialogModel_Base( rModel ) , maContainerListeners( *this ) , maChangeListeners ( GetMutex() ) -- , mbGroupsUpToDate( sal_False ), mbAdjustingGraphic( false ) +- , mbGroupsUpToDate( sal_False ), mbAdjustingGraphic( false ) + , mbGroupsUpToDate( sal_False ), mxGrfObj( rModel.mxGrfObj ), mbAdjustingGraphic( false ) { } -@@ -333,7 +389,8 @@ Sequence< Type > UnoControlDialogModel::getTypes() throw(RuntimeException) +@@ -330,7 +388,8 @@ Sequence< Type > UnoControlDialogModel::getTypes() throw(RuntimeException) void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception) { @@ -3146,7 +3115,7 @@ index 1fe21d2..b5d4679 100644 try { switch ( nHandle ) -@@ -344,7 +401,7 @@ void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 +@@ -341,7 +400,7 @@ void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 mbAdjustingGraphic = true; ::rtl::OUString sImageURL; OSL_VERIFY( rValue >>= sImageURL ); @@ -3155,7 +3124,7 @@ index 1fe21d2..b5d4679 100644 mbAdjustingGraphic = false; } break; -@@ -507,6 +564,10 @@ Reference< XInterface > UnoControlDialogModel::createInstance( const ::rtl::OUSt +@@ -504,6 +563,10 @@ Reference< XInterface > UnoControlDialogModel::createInstance( const ::rtl::OUSt pNewModel = new OGeometryControlModel< UnoTreeModel >; else if ( aServiceSpecifier.compareToAscii( szServiceName_GridControlModel ) == 0 ) pNewModel = new OGeometryControlModel< UnoGridModel >; @@ -3166,7 +3135,7 @@ index 1fe21d2..b5d4679 100644 else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoSimpleAnimationControlModel ) == 0 ) pNewModel = new OGeometryControlModel< UnoSimpleAnimationControlModel >; else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoThrobberControlModel ) == 0 ) -@@ -550,7 +611,7 @@ Sequence< ::rtl::OUString > UnoControlDialogModel::getAvailableServiceNames() th +@@ -547,7 +610,7 @@ Sequence< ::rtl::OUString > UnoControlDialogModel::getAvailableServiceNames() th static Sequence< ::rtl::OUString >* pNamesSeq = NULL; if ( !pNamesSeq ) { @@ -3175,7 +3144,7 @@ index 1fe21d2..b5d4679 100644 ::rtl::OUString* pNames = pNamesSeq->getArray(); pNames[0] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlEditModel ); pNames[1] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlFormattedFieldModel ); -@@ -573,9 +634,11 @@ Sequence< ::rtl::OUString > UnoControlDialogModel::getAvailableServiceNames() th +@@ -570,9 +633,11 @@ Sequence< ::rtl::OUString > UnoControlDialogModel::getAvailableServiceNames() th pNames[18] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlFixedLineModel ); pNames[19] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlRoadmapModel ); pNames[20] = ::rtl::OUString::createFromAscii( szServiceName_TreeControlModel ); @@ -3187,7 +3156,7 @@ index 1fe21d2..b5d4679 100644 } return *pNamesSeq; } -@@ -598,6 +661,55 @@ Type UnoControlDialogModel::getElementType() throw(RuntimeException) +@@ -595,6 +660,55 @@ Type UnoControlDialogModel::getElementType() throw(RuntimeException) return aType; } @@ -3243,7 +3212,7 @@ index 1fe21d2..b5d4679 100644 sal_Bool UnoControlDialogModel::hasElements() throw(RuntimeException) { return !maModels.empty(); -@@ -617,6 +729,20 @@ void UnoControlDialogModel::replaceByName( const ::rtl::OUString& aName, const A +@@ -614,6 +728,20 @@ void UnoControlDialogModel::replaceByName( const ::rtl::OUString& aName, const A if ( maModels.end() == aElementPos ) lcl_throwNoSuchElementException(); @@ -3264,7 +3233,7 @@ index 1fe21d2..b5d4679 100644 // stop listening at the old model stopControlListening( aElementPos->first ); Reference< XControlModel > xReplaced( aElementPos->first ); -@@ -624,6 +750,7 @@ void UnoControlDialogModel::replaceByName( const ::rtl::OUString& aName, const A +@@ -621,6 +749,7 @@ void UnoControlDialogModel::replaceByName( const ::rtl::OUString& aName, const A aElementPos->first = xNewModel; startControlListening( xNewModel ); @@ -3272,7 +3241,7 @@ index 1fe21d2..b5d4679 100644 ContainerEvent aEvent; aEvent.Source = *this; aEvent.Element = aElement; -@@ -684,7 +811,13 @@ void UnoControlDialogModel::insertByName( const ::rtl::OUString& aName, const An +@@ -681,7 +810,13 @@ void UnoControlDialogModel::insertByName( const ::rtl::OUString& aName, const An { Any aUrl = xProps.get()->getPropertyValue( sImageSourceProperty ); @@ -3287,7 +3256,7 @@ index 1fe21d2..b5d4679 100644 getPhysicalLocation( getPropertyValue( GetPropertyName( BASEPROPERTY_DIALOGSOURCEURL ) ), aUrl ); aUrl <<= absoluteUrl; -@@ -700,10 +833,25 @@ void UnoControlDialogModel::insertByName( const ::rtl::OUString& aName, const An +@@ -697,10 +832,25 @@ void UnoControlDialogModel::insertByName( const ::rtl::OUString& aName, const An lcl_throwIllegalArgumentException(); UnoControlModelHolderList::iterator aElementPos = ImplFindElement( aName ); @@ -3313,7 +3282,7 @@ index 1fe21d2..b5d4679 100644 mbGroupsUpToDate = sal_False; startControlListening( xM ); -@@ -725,6 +873,15 @@ void UnoControlDialogModel::removeByName( const ::rtl::OUString& aName ) throw(N +@@ -722,6 +872,15 @@ void UnoControlDialogModel::removeByName( const ::rtl::OUString& aName ) throw(N if ( maModels.end() == aElementPos ) lcl_throwNoSuchElementException(); @@ -3329,7 +3298,7 @@ index 1fe21d2..b5d4679 100644 ContainerEvent aEvent; aEvent.Source = *this; aEvent.Element <<= aElementPos->first; -@@ -734,6 +891,7 @@ void UnoControlDialogModel::removeByName( const ::rtl::OUString& aName ) throw(N +@@ -731,6 +890,7 @@ void UnoControlDialogModel::removeByName( const ::rtl::OUString& aName ) throw(N stopControlListening( aElementPos->first ); Reference< XPropertySet > xPS( aElementPos->first, UNO_QUERY ); maModels.erase( aElementPos ); @@ -3337,7 +3306,7 @@ index 1fe21d2..b5d4679 100644 mbGroupsUpToDate = sal_False; if ( xPS.is() ) -@@ -1392,67 +1550,624 @@ throw ( RuntimeException ) +@@ -1389,67 +1549,624 @@ throw ( RuntimeException ) } } @@ -3384,9 +3353,9 @@ index 1fe21d2..b5d4679 100644 +{ +} +void SAL_CALL UnoMultiPageControl::activated( ::sal_Int32 ID ) throw (RuntimeException) -+{ + { + ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( ID ), sal_False ); -+ + +} +void SAL_CALL UnoMultiPageControl::deactivated( ::sal_Int32 /*ID*/ ) throw (RuntimeException) +{ @@ -3463,7 +3432,7 @@ index 1fe21d2..b5d4679 100644 +} + +void SAL_CALL UnoMultiPageControl::removeTabListener( const Reference< XTabListener >& Listener ) throw (RuntimeException) - { ++{ + Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); + if ( xMultiPage.is() && maTabListeners.getLength() == 1 ) + xMultiPage->removeTabListener( &maTabListeners ); @@ -3485,7 +3454,7 @@ index 1fe21d2..b5d4679 100644 + SAL_STATIC_CAST( awt::XTabListener*, this ), SAL_STATIC_CAST( awt::XSimpleTabController*, this ) ); + return (aRet.hasValue() ? aRet : UnoDialogContainerControl::queryAggregation( rType )); +} - ++ +::rtl::OUString UnoMultiPageControl::GetComponentServiceName() +{ sal_Bool bDecoration( sal_True ); @@ -3994,7 +3963,7 @@ index 1fe21d2..b5d4679 100644 Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); Reference < XControl > xCtrl( xMSF->createInstance( aDefCtrl ), UNO_QUERY ); -@@ -1469,7 +2184,7 @@ void UnoDialogControl::ImplInsertControl( Reference< XControlModel >& rxModel, c +@@ -1466,7 +2183,7 @@ void UnoDialogControl::ImplInsertControl( Reference< XControlModel >& rxModel, c } } @@ -4003,7 +3972,7 @@ index 1fe21d2..b5d4679 100644 { Sequence< Reference< XControl > > aControls = getControls(); Reference< XControl > xCtrl = StdTabController::FindControl( aControls, rxModel ); -@@ -1477,7 +2192,7 @@ void UnoDialogControl::ImplRemoveControl( Reference< XControlModel >& rxModel ) +@@ -1474,7 +2191,7 @@ void UnoDialogControl::ImplRemoveControl( Reference< XControlModel >& rxModel ) removeControl( xCtrl ); } @@ -4012,32 +3981,7 @@ index 1fe21d2..b5d4679 100644 { Reference< XPropertySet > xP( rxCtrl->getModel(), UNO_QUERY ); -@@ -1486,24 +2201,7 @@ void UnoDialogControl::ImplSetPosSize( Reference< XControl >& rxCtrl ) - xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PositionY" ) ) ) >>= nY; - xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ) >>= nWidth; - xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) >>= nHeight; -- -- // Currentley we are simply using MAP_APPFONT ( for normal Dialogs ) -- // and MAP_100TH_MM for imported Userforms - MapMode aMode( MAP_APPFONT ); -- sal_Bool bVBAForm = sal_False; -- Reference< XPropertySet > xDlgModelProps( getModel(), UNO_QUERY ); -- if ( xDlgModelProps.is() ) -- { -- try -- { -- xDlgModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAForm" ) ) ) >>= bVBAForm; -- } -- catch( Exception& ) -- { -- } -- } -- if ( bVBAForm ) -- aMode = MapMode( MAP_100TH_MM ); - OutputDevice*pOutDev = Application::GetDefaultDevice(); - if ( pOutDev ) - { -@@ -1552,53 +2250,19 @@ void UnoDialogControl::ImplSetPosSize( Reference< XControl >& rxCtrl ) +@@ -1534,53 +2251,19 @@ void UnoDialogControl::ImplSetPosSize( Reference< XControl >& rxCtrl ) xW->setPosSize( nX, nY, nWidth, nHeight, PosSize::POSSIZE ); } @@ -4094,7 +4038,7 @@ index 1fe21d2..b5d4679 100644 { vos::OGuard aSolarGuard( Application::GetSolarMutex() ); -@@ -1667,12 +2331,11 @@ sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) +@@ -1649,12 +2332,11 @@ sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) mxTabController->setModel( xTabbing ); addTabController( mxTabController ); } @@ -4109,7 +4053,7 @@ index 1fe21d2..b5d4679 100644 { vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); -@@ -1692,6 +2355,251 @@ void UnoDialogControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException) +@@ -1674,6 +2356,251 @@ void UnoDialogControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException) mxTabController->activateTabOrder(); } @@ -4361,7 +4305,7 @@ index 1fe21d2..b5d4679 100644 void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException) { vos::OGuard aSolarGuard( Application::GetSolarMutex() ); -@@ -1731,53 +2639,21 @@ void UnoDialogControl::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDes +@@ -1713,53 +2640,21 @@ void UnoDialogControl::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDes // can lead to overwrites we have to set the graphic property // before the propertiesChangeEvents are sent! ::rtl::OUString aImageURL; @@ -4369,7 +4313,7 @@ index 1fe21d2..b5d4679 100644 if (( ImplGetPropertyValue( PROPERTY_IMAGEURL ) >>= aImageURL ) && ( aImageURL.getLength() > 0 )) { -- aImageURL = +- aImageURL = - getPhysicalLocation( ImplGetPropertyValue( PROPERTY_DIALOGSOURCEURL ), - ImplGetPropertyValue( PROPERTY_IMAGEURL )); - @@ -4422,7 +4366,7 @@ index 1fe21d2..b5d4679 100644 } void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener >& rxListener ) throw (RuntimeException) -@@ -1834,12 +2710,6 @@ void UnoDialogControl::setMenuBar( const Reference< XMenuBar >& rxMenuBar ) thro +@@ -1816,12 +2711,6 @@ void UnoDialogControl::setMenuBar( const Reference< XMenuBar >& rxMenuBar ) thro } } @@ -4435,7 +4379,7 @@ index 1fe21d2..b5d4679 100644 // ::com::sun::star::awt::XWindowListener void SAL_CALL UnoDialogControl::windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException) -@@ -1921,76 +2791,40 @@ throw (::com::sun::star::uno::RuntimeException) +@@ -1903,76 +2792,40 @@ throw (::com::sun::star::uno::RuntimeException) // XPropertiesChangeListener void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException) { @@ -4524,7 +4468,7 @@ index 1fe21d2..b5d4679 100644 Reference< resource::XStringResourceResolver > xStringResourceResolver; ImplGetPropertyValue( PROPERTY_RESOURCERESOLVER ) >>= xStringResourceResolver; -@@ -2005,21 +2839,16 @@ void UnoDialogControl::ImplStartListingForResourceEvents() +@@ -1987,21 +2840,16 @@ void UnoDialogControl::ImplStartListingForResourceEvents() ImplUpdateResourceResolver(); } @@ -4548,7 +4492,7 @@ index 1fe21d2..b5d4679 100644 for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ ) { Reference< XControl > xControl( aSeq[i] ); -@@ -2050,8 +2879,26 @@ void UnoDialogControl::ImplUpdateResourceResolver() +@@ -2032,8 +2880,26 @@ void UnoDialogControl::ImplUpdateResourceResolver() catch ( const Exception& ) { } @@ -4575,7 +4519,7 @@ index 1fe21d2..b5d4679 100644 // propagate resource resolver changes to language dependent props of the dialog Reference< XPropertySet > xPropertySet( getModel(), UNO_QUERY ); if ( xPropertySet.is() ) -@@ -2121,53 +2968,6 @@ void UnoDialogControl::endExecute() throw(RuntimeException) +@@ -2103,53 +2969,6 @@ void UnoDialogControl::endExecute() throw(RuntimeException) } } @@ -4629,7 +4573,7 @@ index 1fe21d2..b5d4679 100644 // XModifyListener void SAL_CALL UnoDialogControl::modified( const lang::EventObject& /*rEvent*/ ) -@@ -2183,8 +2983,6 @@ throw (RuntimeException) +@@ -2165,8 +2984,6 @@ throw (RuntimeException) ::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ) { @@ -4638,28 +4582,28 @@ index 1fe21d2..b5d4679 100644 ::rtl::OUString baseLocation; ::rtl::OUString url; -@@ -2194,16 +2992,9 @@ throw (RuntimeException) +@@ -2176,16 +2993,9 @@ throw (RuntimeException) ::rtl::OUString absoluteURL( url ); if ( url.getLength() > 0 ) { -- // Don't adjust GraphicObject url(s) -- if ( url.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) != 0 ) -- { - INetURLObject urlObj(baseLocation); - urlObj.removeSegment(); - baseLocation = urlObj.GetMainURL( INetURLObject::NO_DECODE ); -- ::osl::FileBase::getAbsoluteFileURL( baseLocation, url, ret ); -- } -- else -- ret = url; +- // Don't adjust GraphicObject url(s) +- if ( url.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) != 0 ) +- { + INetURLObject urlObj(baseLocation); + urlObj.removeSegment(); + baseLocation = urlObj.GetMainURL( INetURLObject::NO_DECODE ); +- ::osl::FileBase::getAbsoluteFileURL( baseLocation, url, ret ); +- } +- else +- ret = url; const INetURLObject protocolCheck( url ); const INetProtocol protocol = protocolCheck.GetProtocol(); diff --git toolkit/source/controls/unocontrolcontainer.cxx toolkit/source/controls/unocontrolcontainer.cxx -index 0fa370e..501aa09 100644 +index 4918f9e..773fd63 100644 --- toolkit/source/controls/unocontrolcontainer.cxx +++ toolkit/source/controls/unocontrolcontainer.cxx -@@ -808,7 +808,7 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT +@@ -809,7 +809,7 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT aCtrls.getArray()[n]->createPeer( rxToolkit, getPeer() ); uno::Reference< awt::XVclContainerPeer > xC( getPeer(), uno::UNO_QUERY ); @@ -4669,10 +4613,10 @@ index 0fa370e..501aa09 100644 ImplActivateTabControllers(); } diff --git toolkit/source/controls/unocontrols.cxx toolkit/source/controls/unocontrols.cxx -index 1edb424..6cb7f68 100644 +index 90fcba2..e29347b 100644 --- toolkit/source/controls/unocontrols.cxx +++ toolkit/source/controls/unocontrols.cxx -@@ -526,7 +526,7 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const +@@ -537,7 +537,7 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const return UnoControlModel::ImplGetDefaultValue( nPropId ); } @@ -4681,7 +4625,7 @@ index 1edb424..6cb7f68 100644 { uno::Reference< graphic::XGraphic > xGraphic; -@@ -536,10 +536,10 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const +@@ -547,10 +547,10 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ); // get the DefaultContext ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() ); @@ -4694,7 +4638,7 @@ index 1edb424..6cb7f68 100644 if ( !_rURL.getLength() ) return xGraphic; -@@ -564,6 +564,11 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const +@@ -575,6 +575,11 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const return xGraphic; } @@ -4706,7 +4650,7 @@ index 1edb424..6cb7f68 100644 void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception) { UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue ); -@@ -580,7 +585,7 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n +@@ -591,7 +596,7 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n mbAdjustingGraphic = true; ::rtl::OUString sImageURL; OSL_VERIFY( rValue >>= sImageURL ); @@ -4715,7 +4659,7 @@ index 1edb424..6cb7f68 100644 mbAdjustingGraphic = false; } break; -@@ -1718,75 +1723,6 @@ sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException) +@@ -1729,75 +1734,6 @@ sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException) return sal_True; } @@ -4723,50 +4667,50 @@ index 1edb424..6cb7f68 100644 - -UnoMultiPageModel::UnoMultiPageModel() -{ -- ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL ); -- ImplRegisterProperty( BASEPROPERTY_ENABLED ); -- ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR ); -- ImplRegisterProperty( BASEPROPERTY_HELPTEXT ); -- ImplRegisterProperty( BASEPROPERTY_HELPURL ); -- ImplRegisterProperty( BASEPROPERTY_LABEL ); -- ImplRegisterProperty( BASEPROPERTY_PRINTABLE ); -- ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE ); -- ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE_MAX ); +- ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL ); +- ImplRegisterProperty( BASEPROPERTY_ENABLED ); +- ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR ); +- ImplRegisterProperty( BASEPROPERTY_HELPTEXT ); +- ImplRegisterProperty( BASEPROPERTY_HELPURL ); +- ImplRegisterProperty( BASEPROPERTY_LABEL ); +- ImplRegisterProperty( BASEPROPERTY_PRINTABLE ); +- ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE ); +- ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE_MAX ); -} - -::rtl::OUString UnoMultiPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) -{ -- return ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageModel ); +- return ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageModel ); -} - -uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const -{ -- if ( nPropId == BASEPROPERTY_DEFAULTCONTROL ) -- { -- uno::Any aAny; -- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlGroupBox ); -- //aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageControl ); -- return aAny; -- } -- return UnoControlModel::ImplGetDefaultValue( nPropId ); +- if ( nPropId == BASEPROPERTY_DEFAULTCONTROL ) +- { +- uno::Any aAny; +- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlGroupBox ); +- //aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageControl ); +- return aAny; +- } +- return UnoControlModel::ImplGetDefaultValue( nPropId ); -} - -::cppu::IPropertyArrayHelper& UnoMultiPageModel::getInfoHelper() -{ -- static UnoPropertyArrayHelper* pHelper = NULL; -- if ( !pHelper ) -- { -- uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); -- pHelper = new UnoPropertyArrayHelper( aIDs ); -- } -- return *pHelper; +- static UnoPropertyArrayHelper* pHelper = NULL; +- if ( !pHelper ) +- { +- uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); +- pHelper = new UnoPropertyArrayHelper( aIDs ); +- } +- return *pHelper; -} - -// beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo( ) throw(uno::RuntimeException) -{ -- static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); -- return xInfo; +- static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); +- return xInfo; -} - -// ---------------------------------------------------- @@ -4774,25 +4718,25 @@ index 1edb424..6cb7f68 100644 -// ---------------------------------------------------- -UnoMultiPageControl::UnoMultiPageControl() -{ -- maComponentInfos.nWidth = 100; -- maComponentInfos.nHeight = 100; +- maComponentInfos.nWidth = 100; +- maComponentInfos.nHeight = 100; -} - -::rtl::OUString UnoMultiPageControl::GetComponentServiceName() -{ -- return ::rtl::OUString::createFromAscii( "multipage" ); +- return ::rtl::OUString::createFromAscii( "multipage" ); -} - -sal_Bool UnoMultiPageControl::isTransparent() throw(uno::RuntimeException) -{ -- return sal_True; +- return sal_True; -} - // ===================================================================================================================== // = UnoControlListBoxModel_Data // ===================================================================================================================== diff --git toolkit/source/helper/listenermultiplexer.cxx toolkit/source/helper/listenermultiplexer.cxx -index 541150e..1394535 100644 +index c197d7e..f9d1daa 100644 --- toolkit/source/helper/listenermultiplexer.cxx +++ toolkit/source/helper/listenermultiplexer.cxx @@ -154,6 +154,21 @@ IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ItemListenerMultiplexer, ::com::sun::star: @@ -4818,10 +4762,10 @@ index 541150e..1394535 100644 // ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener ) diff --git toolkit/source/helper/property.cxx toolkit/source/helper/property.cxx -index 3b937d7..4b17c40 100644 +index 93d6850..c26937b 100644 --- toolkit/source/helper/property.cxx +++ toolkit/source/helper/property.cxx -@@ -55,6 +55,7 @@ +@@ -56,6 +56,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/resource/XStringResourceResolver.hpp> @@ -4829,11 +4773,7 @@ index 3b937d7..4b17c40 100644 #include <comphelper/types.hxx> #include <functional> #include <algorithm> -@@ -285,11 +286,14 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) - DECL_PROP_3 ( "SelectionModel", GRID_SELECTIONMODE, ::com::sun::star::view::SelectionType, BOUND, MAYBEDEFAULT, MAYBEVOID ), - DECL_PROP_2 ( "EnableVisible", ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_3 ( "ReferenceDevice", REFERENCE_DEVICE, Reference< XDevice >,BOUND, MAYBEDEFAULT, TRANSIENT ), -- DECL_PROP_2 ( "VBAForm", VBAFORM, sal_Bool, BOUND, MAYBEDEFAULT ), +@@ -289,7 +290,11 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_3 ( "EvenRowBackgroundColor", GRID_EVEN_ROW_BACKGROUND, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_3 ( "HeaderBackgroundColor", GRID_HEADER_BACKGROUND, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_3 ( "GridLineColor", GRID_LINE_COLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), @@ -4847,10 +4787,10 @@ index 3b937d7..4b17c40 100644 pPropertyInfos = aImplPropertyInfos; nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo ); diff --git toolkit/source/helper/registerservices.cxx toolkit/source/helper/registerservices.cxx -index bcaa925..804b335 100644 +index f219795..7b3dc42 100644 --- toolkit/source/helper/registerservices.cxx +++ toolkit/source/helper/registerservices.cxx -@@ -166,6 +166,8 @@ IMPL_CREATEINSTANCE( UnoControlProgressBarModel ) +@@ -167,6 +167,8 @@ IMPL_CREATEINSTANCE( UnoControlProgressBarModel ) IMPL_CREATEINSTANCE( UnoControlScrollBarModel ) IMPL_CREATEINSTANCE( UnoSpinButtonModel ) IMPL_CREATEINSTANCE( UnoMultiPageModel ) @@ -4859,7 +4799,7 @@ index bcaa925..804b335 100644 IMPL_CREATEINSTANCE( UnoControlFixedLineModel ) IMPL_CREATEINSTANCE( UnoCurrencyFieldControl ) IMPL_CREATEINSTANCE( UnoDateFieldControl ) -@@ -186,6 +188,8 @@ IMPL_CREATEINSTANCE( UnoProgressBarControl ) +@@ -187,6 +189,8 @@ IMPL_CREATEINSTANCE( UnoProgressBarControl ) IMPL_CREATEINSTANCE( UnoScrollBarControl ) IMPL_CREATEINSTANCE( UnoSpinButtonControl ) IMPL_CREATEINSTANCE( UnoMultiPageControl ) @@ -4868,7 +4808,7 @@ index bcaa925..804b335 100644 IMPL_CREATEINSTANCE( UnoFixedLineControl ) IMPL_CREATEINSTANCE( VCLXMenuBar ) IMPL_CREATEINSTANCE( VCLXPointer ) -@@ -280,6 +284,10 @@ TOOLKIT_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( void* _pServiceManager, +@@ -281,6 +285,10 @@ TOOLKIT_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( void* _pServiceManager, registerServices( xRegistryKey, "UnoSpinButtonControl", szServiceName_UnoSpinButtonControl ); registerServices( xRegistryKey, "UnoMultiPageModel", szServiceName_UnoMultiPageModel ); registerServices( xRegistryKey, "UnoMultiPageControl", szServiceName_UnoMultiPageControl ); @@ -4879,7 +4819,7 @@ index bcaa925..804b335 100644 registerServices( xRegistryKey, "UnoFixedLineControl", szServiceName_UnoControlFixedLine, szServiceName2_UnoControlFixedLine ); registerServices( xRegistryKey, "UnoControlFixedLineModel", szServiceName_UnoControlFixedLineModel, szServiceName2_UnoControlFixedLineModel ); registerServices( xRegistryKey, "VCLXPrinterServer", szServiceName_PrinterServer, szServiceName2_PrinterServer ); -@@ -316,7 +324,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* sImplemen +@@ -317,7 +325,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* sImplemen { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory = static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( _pServiceManager ); @@ -4887,7 +4827,7 @@ index bcaa925..804b335 100644 CHECKANDCREATEFACTORY( VCLXToolkit, szServiceName_Toolkit, szServiceName2_Toolkit ) CHECKANDCREATEFACTORY( VCLXPopupMenu, szServiceName_PopupMenu, szServiceName2_PopupMenu ) CHECKANDCREATEFACTORY( VCLXMenuBar, szServiceName_MenuBar, szServiceName2_MenuBar ) -@@ -372,6 +379,10 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* sImplemen +@@ -373,6 +380,10 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* sImplemen CHECKANDCREATEFACTORY( UnoControlRoadmapModel, szServiceName_UnoControlRoadmapModel, szServiceName2_UnoControlRoadmapModel ) CHECKANDCREATEFACTORY( UnoMultiPageModel, szServiceName_UnoMultiPageModel, NULL ) CHECKANDCREATEFACTORY( UnoMultiPageControl, szServiceName_UnoMultiPageControl, NULL ) @@ -4899,10 +4839,10 @@ index bcaa925..804b335 100644 CHECKANDCREATEFACTORY( UnoSpinButtonControl, szServiceName_UnoSpinButtonControl, NULL ) CHECKANDCREATEFACTORY( TreeControl, szServiceName_TreeControl, NULL ) diff --git toolkit/source/helper/servicenames.cxx toolkit/source/helper/servicenames.cxx -index 06cb4a3..879d5c9 100644 +index 5bd87f1..1fd8ee4 100644 --- toolkit/source/helper/servicenames.cxx +++ toolkit/source/helper/servicenames.cxx -@@ -92,6 +92,10 @@ const sal_Char __FAR_DATA szServiceName_UnoSpinButtonControl[] = "com.sun.star.a +@@ -93,6 +93,10 @@ const sal_Char __FAR_DATA szServiceName_UnoSpinButtonControl[] = "com.sun.star.a const sal_Char __FAR_DATA szServiceName_UnoSpinButtonModel[] = "com.sun.star.awt.UnoControlSpinButtonModel"; const sal_Char __FAR_DATA szServiceName_UnoMultiPageControl[] = "com.sun.star.awt.UnoControlMultiPage"; const sal_Char __FAR_DATA szServiceName_UnoMultiPageModel[] = "com.sun.star.awt.UnoMultiPageModel"; @@ -4914,10 +4854,10 @@ index 06cb4a3..879d5c9 100644 const sal_Char __FAR_DATA szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel"; const sal_Char __FAR_DATA szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel"; diff --git toolkit/source/helper/unowrapper.cxx toolkit/source/helper/unowrapper.cxx -index 93e3bee..de7f33c 100644 +index 8ef8c48..9b590e2 100644 --- toolkit/source/helper/unowrapper.cxx +++ toolkit/source/helper/unowrapper.cxx -@@ -38,6 +38,7 @@ +@@ -39,6 +39,7 @@ #include <toolkit/awt/vclxcontainer.hxx> #include <toolkit/awt/vclxtopwindow.hxx> #include <toolkit/awt/vclxgraphics.hxx> @@ -4925,7 +4865,7 @@ index 93e3bee..de7f33c 100644 #include "toolkit/dllapi.h" #include <vcl/svapp.hxx> -@@ -107,6 +108,7 @@ using namespace ::com::sun::star; +@@ -108,6 +109,7 @@ using namespace ::com::sun::star; case WINDOW_TABPAGE: return new VCLXContainer; case WINDOW_TOOLBOX: return new VCLXToolBox; @@ -4934,7 +4874,7 @@ index 93e3bee..de7f33c 100644 // case WINDOW_FIXEDLINE: // case WINDOW_FIXEDBITMAP: diff --git vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/inc/vbahelper/vbahelper.hxx -index 8c3aa6a..8dd3468 100644 +index 46396bb..1727d50 100644 --- vbahelper/inc/vbahelper/vbahelper.hxx +++ vbahelper/inc/vbahelper/vbahelper.hxx @@ -49,6 +49,7 @@ @@ -4945,7 +4885,7 @@ index 8c3aa6a..8dd3468 100644 #include <memory> #include "vbaaccesshelper.hxx" -@@ -194,6 +195,7 @@ class VBAHELPER_DLLPUBLIC UserFormGeometryHelper : public AbstractGeometryAttrib +@@ -202,6 +203,7 @@ class VBAHELPER_DLLPUBLIC UserFormGeometryHelper : public AbstractGeometryAttrib { css::uno::Reference< css::awt::XUnitConversion > mxControlUnits; css::uno::Reference< css::beans::XPropertySet > mxModel; @@ -4964,10 +4904,10 @@ index 20001db..ded9ee2 100644 #vba vbahelper\inc nmake - all vba_inc NULL vba vbahelper\source\vbahelper nmake - all vba_vbahelper NULL diff --git vbahelper/source/msforms/vbacontrol.cxx vbahelper/source/msforms/vbacontrol.cxx -index 046bcb0..5643033 100644 +index 8b0b640..d08e328 100644 --- vbahelper/source/msforms/vbacontrol.cxx +++ vbahelper/source/msforms/vbacontrol.cxx -@@ -589,6 +589,11 @@ ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< awt::XCo +@@ -590,6 +590,11 @@ ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< awt::XCo pControl = new ScVbaSpinButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) ); else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.custom.awt.UnoControlSystemAXContainerModel") ) ) ) pControl = new VbaSystemAXControl( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) ); @@ -4980,10 +4920,10 @@ index 046bcb0..5643033 100644 throw uno::RuntimeException( rtl::OUString::createFromAscii("Unsupported control " ), uno::Reference< uno::XInterface >() ); return pControl; diff --git vbahelper/source/msforms/vbacontrols.cxx vbahelper/source/msforms/vbacontrols.cxx -index 78c8b25..10a7687 100644 +index 9afb602..1c05b81 100644 --- vbahelper/source/msforms/vbacontrols.cxx +++ vbahelper/source/msforms/vbacontrols.cxx -@@ -66,22 +66,35 @@ private: +@@ -67,22 +67,35 @@ private: msNames.realloc( nIndex ); msNames[ nIndex ] = getControlName( xCtrl ); @@ -5026,10 +4966,10 @@ index 78c8b25..10a7687 100644 catch( uno::Exception& ) { diff --git vbahelper/source/msforms/vbamultipage.cxx vbahelper/source/msforms/vbamultipage.cxx -index 8b3592c..e42d49d 100644 +index 46593a1..37879ca 100644 --- vbahelper/source/msforms/vbamultipage.cxx +++ vbahelper/source/msforms/vbamultipage.cxx -@@ -28,14 +28,12 @@ +@@ -29,14 +29,12 @@ #include <ooo/vba/XCollection.hpp> #include "vbapages.hxx" #include <vector> @@ -5046,7 +4986,7 @@ index 8b3592c..e42d49d 100644 typedef cppu::WeakImplHelper1< container::XIndexAccess > PagesImpl_Base; class PagesImpl : public PagesImpl_Base -@@ -71,8 +69,6 @@ ScVbaMultiPage::getPages( sal_Int32 nPages ) +@@ -72,8 +70,6 @@ ScVbaMultiPage::getPages( sal_Int32 nPages ) ScVbaMultiPage::ScVbaMultiPage( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, const uno::Reference< uno::XInterface >& xDialog ) : MultiPageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ) { mxDialogProps.set( xDialog, uno::UNO_QUERY_THROW ); @@ -5055,7 +4995,7 @@ index 8b3592c..e42d49d 100644 } // Attributes -@@ -81,17 +77,17 @@ ScVbaMultiPage::getValue() throw (css::uno::RuntimeException) +@@ -82,17 +78,17 @@ ScVbaMultiPage::getValue() throw (css::uno::RuntimeException) { sal_Int32 nValue = 0; m_xProps->getPropertyValue( SVALUE ) >>= nValue; @@ -5078,7 +5018,7 @@ index 8b3592c..e42d49d 100644 if ( nVal != nOldVal ) fireChangeEvent(); } -@@ -107,9 +103,9 @@ ScVbaMultiPage::getServiceImplName() +@@ -108,9 +104,9 @@ ScVbaMultiPage::getServiceImplName() uno::Any SAL_CALL ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException) { @@ -5092,10 +5032,10 @@ index 8b3592c..e42d49d 100644 return uno::makeAny( xColl ); return xColl->Item( uno::makeAny( index ), uno::Any() ); diff --git vbahelper/source/msforms/vbauserform.cxx vbahelper/source/msforms/vbauserform.cxx -index 5218610..e5c678a 100644 +index 1894d3c..a248965 100644 --- vbahelper/source/msforms/vbauserform.cxx +++ vbahelper/source/msforms/vbauserform.cxx -@@ -27,9 +27,9 @@ +@@ -28,9 +28,9 @@ #include <vbahelper/helperdecl.hxx> #include "vbauserform.hxx" #include <com/sun/star/awt/XControl.hpp> @@ -5106,7 +5046,7 @@ index 5218610..e5c678a 100644 #include <basic/sbx.hxx> #include <basic/sbstar.hxx> #include <basic/sbmeth.hxx> -@@ -166,6 +166,30 @@ ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& a +@@ -191,6 +191,30 @@ ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& a } } @@ -5137,7 +5077,7 @@ index 5218610..e5c678a 100644 uno::Any SAL_CALL ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) { -@@ -181,7 +181,9 @@ ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& a +@@ -201,7 +225,9 @@ ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::Un { uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW ); uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW ); @@ -5148,7 +5088,7 @@ index 5218610..e5c678a 100644 ScVbaControlFactory aFac( mxContext, xControl, m_xModel ); uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) ); ScVbaControl* pControl = dynamic_cast< ScVbaControl* >( xVBAControl.get() ); -@@ -202,14 +228,19 @@ ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException) +@@ -235,14 +261,19 @@ ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException) ScVbaUserForm::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException) { uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY ); @@ -5172,7 +5112,7 @@ index 5218610..e5c678a 100644 } diff --git vbahelper/source/msforms/vbauserform.hxx vbahelper/source/msforms/vbauserform.hxx -index fc55bb3..ccc853e 100644 +index 216f558..bd609ad 100644 --- vbahelper/source/msforms/vbauserform.hxx +++ vbahelper/source/msforms/vbauserform.hxx @@ -30,6 +30,7 @@ @@ -5192,7 +5132,7 @@ index fc55bb3..ccc853e 100644 virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException); // XUserForm diff --git vbahelper/util/makefile.mk vbahelper/util/makefile.mk -index 33c4900..4b08391 100644 +index a09ffa5..da3f31a 100644 --- vbahelper/util/makefile.mk +++ vbahelper/util/makefile.mk @@ -61,6 +61,7 @@ SHL1STDLIBS= \ @@ -5204,10 +5144,10 @@ index 33c4900..4b08391 100644 SHL1DEPN= diff --git vcl/inc/vcl/tabctrl.hxx vcl/inc/vcl/tabctrl.hxx -index da4014b..ff50ee6 100644 +index 877772f..f6ac7e6 100644 --- vcl/inc/vcl/tabctrl.hxx +++ vcl/inc/vcl/tabctrl.hxx -@@ -102,6 +102,7 @@ private: +@@ -103,6 +103,7 @@ private: protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); @@ -5216,10 +5156,10 @@ index da4014b..ff50ee6 100644 virtual void FillLayoutData() const; diff --git vcl/source/control/group.cxx vcl/source/control/group.cxx -index 9b42370..f66ced1 100644 +index 9922b45..f209123 100644 --- vcl/source/control/group.cxx +++ vcl/source/control/group.cxx -@@ -136,6 +136,7 @@ GroupBox::GroupBox( Window* pParent, const ResId& rResId ) : +@@ -135,6 +135,7 @@ GroupBox::GroupBox( Window* pParent, const ResId& rResId ) : void GroupBox::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, const Point& rPos, const Size& rSize, bool bLayout ) { @@ -5228,10 +5168,10 @@ index 9b42370..f66ced1 100644 long nTextOff; const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); diff --git vcl/source/control/tabctrl.cxx vcl/source/control/tabctrl.cxx -index beaff51..73767ed 100644 +index 6fccc62..f67dc5d 100644 --- vcl/source/control/tabctrl.cxx +++ vcl/source/control/tabctrl.cxx -@@ -194,6 +194,18 @@ const Color& TabControl::GetCanonicalTextColor( const StyleSettings& _rStyle ) c +@@ -195,6 +195,18 @@ const Color& TabControl::GetCanonicalTextColor( const StyleSettings& _rStyle ) c // ----------------------------------------------------------------------- @@ -5250,7 +5190,7 @@ index beaff51..73767ed 100644 void TabControl::ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ) { -@@ -250,6 +262,7 @@ TabControl::TabControl( Window* pParent, WinBits nStyle ) : +@@ -251,6 +263,7 @@ TabControl::TabControl( Window* pParent, WinBits nStyle ) : Control( WINDOW_TABCONTROL ) { ImplInit( pParent, nStyle ); @@ -5258,7 +5198,7 @@ index beaff51..73767ed 100644 } // ----------------------------------------------------------------------- -@@ -715,6 +728,12 @@ void TabControl::ImplChangeTabPage( USHORT nId, USHORT nOldId ) +@@ -716,6 +729,12 @@ void TabControl::ImplChangeTabPage( USHORT nId, USHORT nOldId ) if ( pPage ) { @@ -5271,7 +5211,7 @@ index beaff51..73767ed 100644 pPage->SetPosSizePixel( aRect.TopLeft(), aRect.GetSize() ); // activate page here so the conbtrols can be switched -@@ -775,6 +794,12 @@ BOOL TabControl::ImplPosCurTabPage() +@@ -776,6 +795,12 @@ BOOL TabControl::ImplPosCurTabPage() ImplTabItem* pItem = ImplGetItem( GetCurPageId() ); if ( pItem && pItem->mpTabPage ) { @@ -5284,7 +5224,7 @@ index beaff51..73767ed 100644 Rectangle aRect = ImplGetTabRect( TAB_PAGERECT ); pItem->mpTabPage->SetPosSizePixel( aRect.TopLeft(), aRect.GetSize() ); return TRUE; -@@ -1183,6 +1208,7 @@ void TabControl::KeyInput( const KeyEvent& rKEvt ) +@@ -1184,6 +1209,7 @@ void TabControl::KeyInput( const KeyEvent& rKEvt ) void TabControl::Paint( const Rectangle& rRect ) { @@ -5292,7 +5232,7 @@ index beaff51..73767ed 100644 ImplPaint( rRect, false ); } -@@ -1620,6 +1646,10 @@ void TabControl::StateChanged( StateChangedType nType ) +@@ -1621,6 +1647,10 @@ void TabControl::StateChanged( StateChangedType nType ) ImplInitSettings( FALSE, FALSE, TRUE ); Invalidate(); } @@ -5304,7 +5244,7 @@ index beaff51..73767ed 100644 // ----------------------------------------------------------------------- diff --git xmlscript/inc/xmlscript/xmldlg_imexp.hxx xmlscript/inc/xmlscript/xmldlg_imexp.hxx -index 987a8c3..9a91e24 100644 +index ed3c131..d390e27 100644 --- xmlscript/inc/xmlscript/xmldlg_imexp.hxx +++ xmlscript/inc/xmlscript/xmldlg_imexp.hxx @@ -27,12 +27,11 @@ @@ -5321,7 +5261,7 @@ index 987a8c3..9a91e24 100644 #include "xmlscript/xmlns.h" -@@ -93,7 +92,6 @@ void SAL_CALL importDialogModel( +@@ -85,7 +84,6 @@ void SAL_CALL importDialogModel( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > const & xDocument ) SAL_THROW( (::com::sun::star::uno::Exception) ); @@ -5432,7 +5372,7 @@ index d06ffee..46088bf 100644 void readFixedHyperLinkModel( StyleBag * all_styles ) SAL_THROW( (css::uno::Exception) ); diff --git xmlscript/source/xmldlg_imexp/imp_share.hxx xmlscript/source/xmldlg_imexp/imp_share.hxx -index 0bc9756..82c3b0d 100644 +index a13a205..7f57f35 100644 --- xmlscript/source/xmldlg_imexp/imp_share.hxx +++ xmlscript/source/xmldlg_imexp/imp_share.hxx @@ -42,9 +42,8 @@ @@ -5456,10 +5396,10 @@ index 0bc9756..82c3b0d 100644 + : DialogImport_Base { friend class ImportContext; - + css::uno::Reference< css::uno::XComponentContext > _xContext; css::uno::Reference< css::util::XNumberFormatsSupplier > _xSupplier; - + - ::std::vector< ::rtl::OUString > _styleNames; - ::std::vector< css::uno::Reference< css::xml::input::XElement > > _styles; + ::boost::shared_ptr< ::std::vector< ::rtl::OUString > > _pStyleNames; @@ -5467,7 +5407,7 @@ index 0bc9756..82c3b0d 100644 + ::std::vector< ::rtl::OUString >& _styleNames; + ::std::vector< css::uno::Reference< css::xml::input::XElement > >& _styles; + - + css::uno::Reference< css::container::XNameContainer > _xDialogModel; css::uno::Reference< css::lang::XMultiServiceFactory > _xDialogModelFactory; css::uno::Reference< css::frame::XModel > _xDoc; @@ -5475,7 +5415,7 @@ index 0bc9756..82c3b0d 100644 + sal_Int32 XMLNS_DIALOGS_UID, XMLNS_SCRIPT_UID; - + @@ -165,19 +168,36 @@ public: css::uno::Reference<css::uno::XComponentContext> const & xContext, css::uno::Reference<css::container::XNameContainer> @@ -5510,15 +5450,15 @@ index 0bc9756..82c3b0d 100644 + , XMLNS_SCRIPT_UID( rOther.XMLNS_SCRIPT_UID ) {} virtual ~DialogImport() SAL_THROW( () ); -- +- inline css::uno::Reference< css::frame::XModel > getDocOwner() { return _xDoc; } - -- css::uno::Reference< css::script::XLibraryContainer > getScriptLibraryContainer(); +- css::uno::Reference< css::script::XLibraryContainer > getScriptLibraryContainer(); // XRoot virtual void SAL_CALL startDocument( css::uno::Reference< css::xml::input::XNamespaceMapping > @@ -364,6 +384,9 @@ protected: - + ::rtl::OUString getControlId( css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ); + ::rtl::OUString getControlModelName( @@ -5534,7 +5474,7 @@ index 0bc9756..82c3b0d 100644 + bool importImageURLProperty( rtl::OUString const & rPropName, rtl::OUString const & rAttrName, + css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ); bool importImageAlignProperty( - ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName, + ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName, css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ); @@ -458,6 +483,9 @@ public: bool importSelectionTypeProperty( @@ -5633,10 +5573,10 @@ index 0bc9756..82c3b0d 100644 class ProgressBarElement diff --git xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx -index abfa771..641efc5 100644 +index 6564ee3..48fb6d5 100644 --- xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx +++ xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx -@@ -71,8 +71,7 @@ Reference< io::XInputStream > InputStreamProvider::createInputStream() +@@ -72,8 +72,7 @@ Reference< io::XInputStream > InputStreamProvider::createInputStream() //================================================================================================== Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel( Reference< container::XNameContainer > const & xDialogModel, @@ -5646,7 +5586,7 @@ index abfa771..641efc5 100644 SAL_THROW( (Exception) ) { Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() ); -@@ -106,8 +105,7 @@ Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel( +@@ -107,8 +106,7 @@ Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel( void SAL_CALL importDialogModel( Reference< io::XInputStream > xInput, Reference< container::XNameContainer > const & xDialogModel, @@ -5657,10 +5597,10 @@ index abfa771..641efc5 100644 { Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() ); diff --git xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx -index 1c67f19..89eb46b 100644 +index fbe68fe..c74ee06 100644 --- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx -@@ -29,16 +29,8 @@ +@@ -30,16 +30,8 @@ #include "precompiled_xmlscript.hxx" #include "exp_share.hxx" @@ -5678,7 +5618,7 @@ index 1c67f19..89eb46b 100644 using namespace ::com::sun::star; -@@ -48,66 +40,6 @@ using ::rtl::OUString; +@@ -49,66 +41,6 @@ using ::rtl::OUString; namespace xmlscript { @@ -5694,20 +5634,20 @@ index 1c67f19..89eb46b 100644 - { - try - { -- Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY ); +- Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY ); - Reference< beans::XPropertySet > xBindable( xBinding->getValueBinding(), UNO_QUERY ); - if ( xBindable.is() ) - { -- table::CellAddress aAddress; -- xBindable->getPropertyValue( OUSTR("BoundCell") ) >>= aAddress; +- table::CellAddress aAddress; +- xBindable->getPropertyValue( OUSTR("BoundCell") ) >>= aAddress; - xConvertor->setPropertyValue( OUSTR("Address"), makeAny( aAddress ) ); - rtl::OUString sAddress; - xConvertor->getPropertyValue( OUSTR("PersistentRepresentation") ) >>= sAddress; - if ( sAddress.getLength() > 0 ) - rModel.addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":linked-cell"), sAddress ); -- -- OSL_TRACE( "*** Bindable value %s", rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() ); -- +- +- OSL_TRACE( "*** Bindable value %s", rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() ); +- - } - } - catch( uno::Exception& ) @@ -5722,16 +5662,16 @@ index 1c67f19..89eb46b 100644 - { - try - { -- Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY ); +- Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY ); - -- table::CellRangeAddress aAddress; +- table::CellRangeAddress aAddress; - xListSource->getPropertyValue( OUSTR( "CellRange" ) ) >>= aAddress; - - rtl::OUString sAddress; - xConvertor->setPropertyValue( OUSTR("Address"), makeAny( aAddress ) ); - xConvertor->getPropertyValue( OUSTR("PersistentRepresentation") ) >>= sAddress; - OSL_TRACE("**** cell range source list %s", -- rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() ); +- rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() ); - if ( sAddress.getLength() > 0 ); - rModel.addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":source-cell-range"), sAddress ); - } @@ -5745,7 +5685,7 @@ index 1c67f19..89eb46b 100644 static inline bool readBorderProps( ElementDescriptor * element, Style & style ) { -@@ -137,7 +69,9 @@ static inline bool readFontProps( ElementDescriptor * element, Style & style ) +@@ -138,7 +70,9 @@ static inline bool readFontProps( ElementDescriptor * element, Style & style ) void ElementDescriptor::readMultiPageModel( StyleBag * all_styles ) { // collect styles @@ -5756,7 +5696,7 @@ index 1c67f19..89eb46b 100644 if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor) aStyle._set |= 0x2; if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor) -@@ -152,24 +86,101 @@ void ElementDescriptor::readMultiPageModel( StyleBag * all_styles ) +@@ -153,24 +87,101 @@ void ElementDescriptor::readMultiPageModel( StyleBag * all_styles ) // collect elements readDefaults(); @@ -5862,7 +5802,7 @@ index 1c67f19..89eb46b 100644 void ElementDescriptor::readButtonModel( StyleBag * all_styles ) SAL_THROW( (Exception) ) { -@@ -203,8 +214,10 @@ void ElementDescriptor::readButtonModel( StyleBag * all_styles ) +@@ -204,8 +215,10 @@ void ElementDescriptor::readButtonModel( StyleBag * all_styles ) OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":valign") ) ); readButtonTypeAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("PushButtonType") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":button-type") ) ); @@ -5874,7 +5814,7 @@ index 1c67f19..89eb46b 100644 readImagePositionAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImagePosition") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) ); readImageAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageAlign") ), -@@ -274,7 +287,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles ) +@@ -275,7 +288,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles ) OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) ); readVerticalAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":valign") ) ); @@ -5883,7 +5823,7 @@ index 1c67f19..89eb46b 100644 OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) ); readImagePositionAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImagePosition") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) ); -@@ -311,7 +324,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles ) +@@ -312,7 +325,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles ) readEvents(); } //__________________________________________________________________________________________________ @@ -5892,7 +5832,7 @@ index 1c67f19..89eb46b 100644 SAL_THROW( (Exception) ) { // collect styles -@@ -352,8 +365,10 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles, Reference< fra +@@ -353,8 +366,10 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles, Reference< fra OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":maxlength") ) ); readShortAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("LineCount") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linecount") ) ); @@ -5905,7 +5845,7 @@ index 1c67f19..89eb46b 100644 // string item list Sequence< OUString > itemValues; if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ) ) >>= itemValues) && -@@ -361,14 +376,14 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles, Reference< fra +@@ -362,14 +377,14 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles, Reference< fra { ElementDescriptor * popup = new ElementDescriptor( _xProps, _xPropState, @@ -5922,7 +5862,7 @@ index 1c67f19..89eb46b 100644 item->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ), pItemValues[ nPos ] ); popup->addSubElement( item ); -@@ -379,7 +394,7 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles, Reference< fra +@@ -380,7 +395,7 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles, Reference< fra readEvents(); } //__________________________________________________________________________________________________ @@ -5931,7 +5871,7 @@ index 1c67f19..89eb46b 100644 SAL_THROW( (Exception) ) { // collect styles -@@ -414,7 +429,8 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< fram +@@ -415,7 +430,8 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< fram OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linecount") ) ); readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) ); @@ -5941,7 +5881,7 @@ index 1c67f19..89eb46b 100644 // string item list Sequence< OUString > itemValues; if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ) ) >>= itemValues) && -@@ -422,7 +438,7 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< fram +@@ -423,7 +439,7 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< fram { ElementDescriptor * popup = new ElementDescriptor( _xProps, _xPropState, @@ -5950,7 +5890,7 @@ index 1c67f19..89eb46b 100644 OUString const * pItemValues = itemValues.getConstArray(); sal_Int32 nPos; -@@ -430,7 +446,7 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< fram +@@ -431,7 +447,7 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< fram { ElementDescriptor * item = new ElementDescriptor( _xProps, _xPropState, @@ -5959,7 +5899,7 @@ index 1c67f19..89eb46b 100644 item->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ), pItemValues[ nPos ] ); popup->addSubElement( item ); -@@ -454,7 +470,7 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< fram +@@ -455,7 +471,7 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< fram readEvents(); } //__________________________________________________________________________________________________ @@ -5968,7 +5908,7 @@ index 1c67f19..89eb46b 100644 SAL_THROW( (Exception) ) { // collect styles -@@ -485,14 +501,12 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles, Reference< +@@ -486,14 +502,12 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles, Reference< OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) ); readVerticalAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":valign") ) ); @@ -5984,7 +5924,7 @@ index 1c67f19..89eb46b 100644 sal_Int16 nState = 0; if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ) ) >>= nState) -@@ -512,7 +526,7 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles, Reference< +@@ -513,7 +527,7 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles, Reference< break; } } @@ -5993,7 +5933,7 @@ index 1c67f19..89eb46b 100644 readEvents(); } //__________________________________________________________________________________________________ -@@ -541,7 +555,7 @@ void ElementDescriptor::readGroupBoxModel( StyleBag * all_styles ) +@@ -542,7 +556,7 @@ void ElementDescriptor::readGroupBoxModel( StyleBag * all_styles ) { ElementDescriptor * title = new ElementDescriptor( _xProps, _xPropState, @@ -6002,7 +5942,7 @@ index 1c67f19..89eb46b 100644 title->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ), aTitle ); addSubElement( title ); -@@ -685,7 +699,7 @@ void ElementDescriptor::readEditModel( StyleBag * all_styles ) +@@ -686,7 +700,7 @@ void ElementDescriptor::readEditModel( StyleBag * all_styles ) readEvents(); } //__________________________________________________________________________________________________ @@ -6011,13 +5951,13 @@ index 1c67f19..89eb46b 100644 SAL_THROW( (Exception) ) { // collect styles -@@ -704,33 +718,11 @@ void ElementDescriptor::readImageControlModel( StyleBag * all_styles, com::sun:: +@@ -705,33 +719,11 @@ void ElementDescriptor::readImageControlModel( StyleBag * all_styles, com::sun:: readDefaults(); readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":scale-image") ) ); - rtl::OUString sURL; - _xProps->getPropertyValue( OUSTR("ImageURL") ) >>= sURL; - + - if ( sURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) ) ) == 0 ) - { - Reference< document::XStorageBasedDocument > xDocStorage( xDocument, UNO_QUERY ); @@ -6034,7 +5974,7 @@ index 1c67f19..89eb46b 100644 - { - sURL = xGraphicResolver->resolveGraphicObjectURL( sURL ); - } -- } +- } - } - if ( sURL.getLength() > 0 ) - { @@ -6047,8 +5987,8 @@ index 1c67f19..89eb46b 100644 readEvents(); } //__________________________________________________________________________________________________ -@@ -1150,6 +1142,45 @@ void ElementDescriptor::readFormattedFieldModel( StyleBag * all_styles ) - +@@ -1151,6 +1143,45 @@ void ElementDescriptor::readFormattedFieldModel( StyleBag * all_styles ) + readEvents(); } + @@ -6093,7 +6033,7 @@ index 1c67f19..89eb46b 100644 //__________________________________________________________________________________________________ void ElementDescriptor::readFixedLineModel( StyleBag * all_styles ) SAL_THROW( (Exception) ) -@@ -1205,7 +1236,7 @@ void ElementDescriptor::readProgressBarModel( StyleBag * all_styles ) +@@ -1206,7 +1237,7 @@ void ElementDescriptor::readProgressBarModel( StyleBag * all_styles ) readEvents(); } //__________________________________________________________________________________________________ @@ -6102,7 +6042,7 @@ index 1c67f19..89eb46b 100644 SAL_THROW( (Exception) ) { // collect styles -@@ -1243,47 +1274,7 @@ void ElementDescriptor::readScrollBarModel( StyleBag * all_styles, Reference< fr +@@ -1244,47 +1275,7 @@ void ElementDescriptor::readScrollBarModel( StyleBag * all_styles, Reference< fr OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":live-scroll") ) ); readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SymbolColor") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":symbol-color") ) ); @@ -6151,7 +6091,7 @@ index 1c67f19..89eb46b 100644 readEvents(); } //__________________________________________________________________________________________________ -@@ -1333,12 +1324,256 @@ void ElementDescriptor::readDialogModel( StyleBag * all_styles ) +@@ -1334,12 +1325,256 @@ void ElementDescriptor::readDialogModel( StyleBag * all_styles ) addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":withtitlebar") ), OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) ); @@ -6410,10 +6350,10 @@ index 1c67f19..89eb46b 100644 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git xmlscript/source/xmldlg_imexp/xmldlg_export.cxx xmlscript/source/xmldlg_imexp/xmldlg_export.cxx -index 47b1d2f..1b12100 100644 +index 36c3a2d..0df9b16 100644 --- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx +++ xmlscript/source/xmldlg_imexp/xmldlg_export.cxx -@@ -46,6 +46,8 @@ +@@ -47,6 +47,8 @@ #include <com/sun/star/awt/PushButtonType.hpp> #include <com/sun/star/awt/VisualEffect.hpp> @@ -6422,7 +6362,7 @@ index 47b1d2f..1b12100 100644 #include <com/sun/star/script/XScriptEventsSupplier.hpp> #include <com/sun/star/script/ScriptEventDescriptor.hpp> -@@ -57,6 +59,17 @@ +@@ -58,6 +60,17 @@ #include <com/sun/star/view/SelectionType.hpp> @@ -6440,7 +6380,7 @@ index 47b1d2f..1b12100 100644 using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -@@ -776,6 +789,33 @@ void ElementDescriptor::readVerticalAlignAttr( OUString const & rPropName, OUStr +@@ -777,6 +790,33 @@ void ElementDescriptor::readVerticalAlignAttr( OUString const & rPropName, OUStr } } //__________________________________________________________________________________________________ @@ -6474,7 +6414,7 @@ index 47b1d2f..1b12100 100644 void ElementDescriptor::readImageAlignAttr( OUString const & rPropName, OUString const & rAttrName ) { if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName )) -@@ -939,6 +979,66 @@ void ElementDescriptor::readLineEndFormatAttr( OUString const & rPropName, OUStr +@@ -940,6 +980,66 @@ void ElementDescriptor::readLineEndFormatAttr( OUString const & rPropName, OUStr } } //__________________________________________________________________________________________________ @@ -6541,7 +6481,7 @@ index 47b1d2f..1b12100 100644 void ElementDescriptor::readSelectionTypeAttr( OUString const & rPropName, OUString const & rAttrName ) { if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName )) -@@ -975,6 +1075,28 @@ void ElementDescriptor::readSelectionTypeAttr( OUString const & rPropName, OUStr +@@ -976,6 +1076,28 @@ void ElementDescriptor::readSelectionTypeAttr( OUString const & rPropName, OUStr void ElementDescriptor::readDefaults( bool supportPrintable, bool supportVisible ) { Any a( _xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ) ); @@ -6570,7 +6510,7 @@ index 47b1d2f..1b12100 100644 addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":id") ), * reinterpret_cast< const OUString * >( a.getValue() ) ); readShortAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("TabIndex") ), -@@ -1325,253 +1447,21 @@ void StyleBag::dump( Reference< xml::sax::XExtendedDocumentHandler > const & xOu +@@ -1326,253 +1448,21 @@ void StyleBag::dump( Reference< xml::sax::XExtendedDocumentHandler > const & xOu //================================================================================================== void SAL_CALL exportDialogModel( Reference< xml::sax::XExtendedDocumentHandler > const & xOut, @@ -6833,7 +6773,7 @@ index 47b1d2f..1b12100 100644 xOut->startDocument(); -@@ -1581,14 +1471,9 @@ void SAL_CALL exportDialogModel( +@@ -1582,14 +1472,9 @@ void SAL_CALL exportDialogModel( xOut->unknown( aDocTypeStr ); xOut->ignorableWhitespace( OUString() ); @@ -6849,7 +6789,7 @@ index 47b1d2f..1b12100 100644 Reference< xml::sax::XAttributeList > xWindow( pWindow ); pWindow->readDialogModel( &all_styles ); xOut->ignorableWhitespace( OUString() ); -@@ -1598,20 +1483,14 @@ void SAL_CALL exportDialogModel( +@@ -1599,20 +1484,14 @@ void SAL_CALL exportDialogModel( // dump out stylebag all_styles.dump( xOut ); @@ -6874,10 +6814,10 @@ index 47b1d2f..1b12100 100644 xOut->ignorableWhitespace( OUString() ); xOut->endElement( aBBoardName ); diff --git xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx -index 37a561f..a5aee90 100644 +index 4575baa..5db980f 100644 --- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx -@@ -28,38 +28,37 @@ +@@ -29,38 +29,37 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmlscript.hxx" #include "imp_share.hxx" @@ -6905,19 +6845,19 @@ index 37a561f..a5aee90 100644 -Reference< xml::input::XElement > MultiPage::startChildElement( + +Reference< xml::input::XElement > Frame::startChildElement( - sal_Int32 nUid, OUString const & rLocalName, - Reference< xml::input::XAttributes > const & xAttributes ) - throw (xml::sax::SAXException, RuntimeException) + sal_Int32 nUid, OUString const & rLocalName, + Reference< xml::input::XAttributes > const & xAttributes ) + throw (xml::sax::SAXException, RuntimeException) { + if ( !m_xContainer.is() ) + m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoFrameModel") ) ), UNO_QUERY ); - // event + // event -rtl::OUString _label = rtl::OUString::createFromAscii("foo"); if (_pImport->isEventElement( nUid, rLocalName )) - { - return new EventElement( + { + return new EventElement( nUid, rLocalName, xAttributes, this, _pImport ); - } + } + else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") )) + { + // Create new DialogImport for this container @@ -6925,29 +6865,29 @@ index 37a561f..a5aee90 100644 + pFrameImport->_xDialogModel = m_xContainer; + return new BulletinBoardElement( rLocalName, xAttributes, this, pFrameImport ); + } - else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("title") )) - { - getStringAttr( &_label, -@@ -73,7 +72,7 @@ rtl::OUString _label = rtl::OUString::createFromAscii("foo"); - } - else - { -- + else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("title") )) + { + getStringAttr( &_label, +@@ -74,7 +73,7 @@ rtl::OUString _label = rtl::OUString::createFromAscii("foo"); + } + else + { +- + OSL_TRACE("****** ARGGGGG!!!! **********"); - throw xml::sax::SAXException( - OUString( RTL_CONSTASCII_USTRINGPARAM("expected event element!") ), - Reference< XInterface >(), Any() ); -@@ -81,13 +80,15 @@ rtl::OUString _label = rtl::OUString::createFromAscii("foo"); + throw xml::sax::SAXException( + OUString( RTL_CONSTASCII_USTRINGPARAM("expected event element!") ), + Reference< XInterface >(), Any() ); +@@ -82,13 +81,15 @@ rtl::OUString _label = rtl::OUString::createFromAscii("foo"); } //__________________________________________________________________________________________________ -void MultiPage::endElement() +void Frame::endElement() - throw (xml::sax::SAXException, RuntimeException) + throw (xml::sax::SAXException, RuntimeException) { -- ControlImportContext ctx( -- _pImport, getControlId( _xAttributes ), -- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ); +- ControlImportContext ctx( +- _pImport, getControlId( _xAttributes ), +- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ); -// OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) ); + if ( !m_xContainer.is() ) + m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoFrameModel") ) ), UNO_QUERY ); @@ -6955,17 +6895,17 @@ index 37a561f..a5aee90 100644 + // _pImport is what we need to add to ( e.g. the dialog in this case ) + ControlImportContext ctx( _pImport, xProps, getControlId( _xAttributes ) ); + - Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() ); - - Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) ); -@@ -100,122 +101,134 @@ void MultiPage::endElement() - } - - ctx.importDefaults( 0, 0, _xAttributes ); // inherited from BulletinBoardElement -- ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") ), + Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() ); + + Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) ); +@@ -101,122 +102,134 @@ void MultiPage::endElement() + } + + ctx.importDefaults( 0, 0, _xAttributes ); // inherited from BulletinBoardElement +- ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("value") ), - _xAttributes ); -- ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") ), +- ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("value-max") ), - _xAttributes ); + if (_label.getLength()) @@ -6973,13 +6913,13 @@ index 37a561f..a5aee90 100644 + xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ), + makeAny( _label ) ); + } - ctx.importEvents( _events ); + ctx.importEvents( _events ); // avoid ring-reference: // vector< event elements > holding event elements holding this (via _pParent) _events.clear(); } --// #FIXME cut'n'pasted from xmloff/source/core/xmlimp.cxx:1251 +-// #FIXME cut'n'pasted from xmloff/source/core/xmlimp.cxx:1251 -// of course we need to find a common home for this helper - -bool IsPackageURL( const ::rtl::OUString& rURL ) @@ -7063,21 +7003,23 @@ index 37a561f..a5aee90 100644 { - table::CellAddress aAddress; - xConvertor->setPropertyValue( OUSTR( "PersistentRepresentation" ), uno::makeAny( sLinkedCell ) ); -- xConvertor->getPropertyValue( OUSTR( "Address" ) ) >>= aAddress; +- xConvertor->getPropertyValue( OUSTR( "Address" ) ) >>= aAddress; - beans::NamedValue aArg1; - aArg1.Name = OUSTR("BoundCell"); - aArg1.Value <<= aAddress; -- +- - uno::Sequence< uno::Any > aArgs(1); - aArgs[ 0 ] <<= aArg1; +- +- uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( OUSTR("com.sun.star.table.CellValueBinding" ), aArgs ), uno::UNO_QUERY ); +- xBindable->setValueBinding( xBinding ); +- + Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW ); + // _pImport is what we need to add to ( e.g. the dialog in this case ) + ControlImportContext ctx( _pImport, xProps, getControlId( _xAttributes )); - -- uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( OUSTR("com.sun.star.table.CellValueBinding" ), aArgs ), uno::UNO_QUERY ); -- xBindable->setValueBinding( xBinding ); ++ + Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() ); - ++ + Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) ); + if (xStyle.is()) + { @@ -7117,17 +7059,17 @@ index 37a561f..a5aee90 100644 { - table::CellRangeAddress aAddress; - xConvertor->setPropertyValue( OUSTR( "PersistentRepresentation" ), uno::makeAny( sCellRange ) ); -- xConvertor->getPropertyValue( OUSTR( "Address" ) ) >>= aAddress; +- xConvertor->getPropertyValue( OUSTR( "Address" ) ) >>= aAddress; - beans::NamedValue aArg1; - aArg1.Name = OUSTR("CellRange"); - aArg1.Value <<= aAddress; -- +- - uno::Sequence< uno::Any > aArgs(1); - aArgs[ 0 ] <<= aArg1; -- +- - uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( OUSTR("com.sun.star.table.CellRangeListSource" ), aArgs ), uno::UNO_QUERY ); - xListEntrySink->setListEntrySource( xSource ); -- +- + return new EventElement( + nUid, rLocalName, xAttributes, this, _pImport ); } @@ -7152,9 +7094,13 @@ index 37a561f..a5aee90 100644 +void Page::endElement() + throw (xml::sax::SAXException, RuntimeException) { -- sal_Bool bVBAMode = sal_False; -- Reference< script::vba::XVBACompatibility > xVBACompat( _pImport->getScriptLibraryContainer(), UNO_QUERY ); -- if( xVBACompat.is() ) +- sal_Bool bVBAMode = sal_False; +- Reference< script::vba::XVBACompatibility > xVBACompat( _pImport->getScriptLibraryContainer(), UNO_QUERY ); +- if( xVBACompat.is() ) +- { +- bVBAMode = xVBACompat->getVBACompatibilityMode(); +- } +- return bVBAMode; + Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW ); + + ControlImportContext ctx( _pImport, xProps, getControlId( _xAttributes )); @@ -7163,15 +7109,13 @@ index 37a561f..a5aee90 100644 + + Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) ); + if (xStyle.is()) - { -- bVBAMode = xVBACompat->getVBACompatibilityMode(); ++ { + StyleElement * pStyle = static_cast< StyleElement * >( xStyle.get () ); + pStyle->importTextColorStyle( xControlModel ); + pStyle->importTextLineColorStyle( xControlModel ); + pStyle->importFontStyle( xControlModel ); + pStyle->importBackgroundColorStyle( xControlModel ); - } -- return bVBAMode; ++ } + + ctx.importDefaults( 0, 0, _xAttributes ); // inherited from BulletinBoardElement + ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ), OUString( RTL_CONSTASCII_USTRINGPARAM("title") ), _xAttributes ); @@ -7182,14 +7126,14 @@ index 37a561f..a5aee90 100644 } // progessmeter -@@ -297,23 +310,9 @@ Reference< xml::input::XElement > ScrollBarElement::startChildElement( +@@ -298,23 +311,9 @@ Reference< xml::input::XElement > ScrollBarElement::startChildElement( void ScrollBarElement::endElement() throw (xml::sax::SAXException, RuntimeException) { -- OUString sService( OUSTR("com.sun.star.awt.UnoControlScrollBarModel") ); -- // we should probably limit this to vba mode also ( leave for now ) -- if ( isVBACompatibilityMode( _pImport ) ) -- sService = OUSTR("com.sun.star.form.component.ScrollBar"); +- OUString sService( OUSTR("com.sun.star.awt.UnoControlScrollBarModel") ); +- // we should probably limit this to vba mode also ( leave for now ) +- if ( isVBACompatibilityMode( _pImport ) ) +- sService = OUSTR("com.sun.star.form.component.ScrollBar"); - - OUString sLinkedCell; - try @@ -7202,26 +7146,26 @@ index 37a561f..a5aee90 100644 - ControlImportContext ctx( _pImport, getControlId( _xAttributes ), -- sService ); +- sService ); + getControlModelName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ), _xAttributes ) ); Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) ); if (xStyle.is()) -@@ -357,10 +356,7 @@ void ScrollBarElement::endElement() +@@ -358,10 +357,7 @@ void ScrollBarElement::endElement() OUString( RTL_CONSTASCII_USTRINGPARAM("symbol-color") ), _xAttributes ); - + - // import cell-link -- OUString sCellRange; -- importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx ); +- OUString sCellRange; +- importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx ); - + ctx.importDataAwareProperty( OUSTR("linked-cell" ), _xAttributes ); - ctx.importEvents( _events ); + ctx.importEvents( _events ); // avoid ring-reference: // vector< event elements > holding event elements holding this (via _pParent) -@@ -392,18 +388,9 @@ Reference< xml::input::XElement > SpinButtonElement::startChildElement( +@@ -393,18 +389,9 @@ Reference< xml::input::XElement > SpinButtonElement::startChildElement( void SpinButtonElement::endElement() - throw (xml::sax::SAXException, RuntimeException) + throw (xml::sax::SAXException, RuntimeException) { - OUString sLinkedCell; - try @@ -7232,26 +7176,26 @@ index 37a561f..a5aee90 100644 - { - } - - ControlImportContext ctx( - _pImport, getControlId( _xAttributes ), -- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.SpinButton") ) ); + ControlImportContext ctx( + _pImport, getControlId( _xAttributes ), +- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.SpinButton") ) ); + getControlModelName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlSpinButtonModel") ), _xAttributes ) ); - - Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) ); - if (xStyle.is()) -@@ -439,10 +426,7 @@ void SpinButtonElement::endElement() + + Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) ); + if (xStyle.is()) +@@ -440,10 +427,7 @@ void SpinButtonElement::endElement() ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SymbolColor") ), OUString( RTL_CONSTASCII_USTRINGPARAM("symbol-color") ), _xAttributes ); - // import cell-link -- OUString sCellRange; -- importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx ); -- +- OUString sCellRange; +- importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx ); +- + ctx.importDataAwareProperty( OUSTR("linked-cell" ), _xAttributes ); ctx.importEvents( _events ); // avoid ring-reference: // vector< event elements > holding event elements holding this (via _pParent) -@@ -450,7 +434,6 @@ void SpinButtonElement::endElement() +@@ -451,7 +435,6 @@ void SpinButtonElement::endElement() } //################################################################################################## @@ -7259,7 +7203,7 @@ index 37a561f..a5aee90 100644 // fixedline //__________________________________________________________________________________________________ Reference< xml::input::XElement > FixedLineElement::startChildElement( -@@ -1281,37 +1264,7 @@ void ImageControlElement::endElement() +@@ -1282,37 +1265,7 @@ void ImageControlElement::endElement() ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ), OUString( RTL_CONSTASCII_USTRINGPARAM("scale-image") ), _xAttributes ); @@ -7286,7 +7230,7 @@ index 37a561f..a5aee90 100644 - xProps->setPropertyValue( OUSTR("ImageURL"), makeAny( sURL ) ); - } - } -- +- - else if ( sURL.getLength() > 0 ) - { - Reference< beans::XPropertySet > xProps( ctx.getControlModel(), UNO_QUERY ); @@ -7298,33 +7242,33 @@ index 37a561f..a5aee90 100644 ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ), OUString( RTL_CONSTASCII_USTRINGPARAM("tabstop") ), _xAttributes ); -@@ -1644,24 +1597,10 @@ void TitledBoxElement::endElement() +@@ -1645,24 +1598,10 @@ void TitledBoxElement::endElement() Reference< xml::input::XElement > xRadio( _radios[ nPos ] ); Reference< xml::input::XAttributes > xAttributes( xRadio->getAttributes() ); -- OUString sLinkedCell; -- OUString sCellRange; -- OUString sService( OUSTR("com.sun.star.awt.UnoControlRadioButtonModel") ); -- try -- { -- sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) ); -- // we should probably limit this to vba mode also ( leave for now ) -- if ( isVBACompatibilityMode( _pImport ) ) -- sService = OUSTR("com.sun.star.form.component.RadioButton"); -- } -- catch( Exception& /*e*/ ) -- { -- } +- OUString sLinkedCell; +- OUString sCellRange; +- OUString sService( OUSTR("com.sun.star.awt.UnoControlRadioButtonModel") ); +- try +- { +- sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) ); +- // we should probably limit this to vba mode also ( leave for now ) +- if ( isVBACompatibilityMode( _pImport ) ) +- sService = OUSTR("com.sun.star.form.component.RadioButton"); +- } +- catch( Exception& /*e*/ ) +- { +- } - - + ControlImportContext ctx( _pImport, getControlId( xAttributes ), -- sService ); +- sService ); + getControlModelName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ), xAttributes ) ); Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() ); - + Reference< xml::input::XElement > xStyle( getStyle( xAttributes ) ); -@@ -1688,19 +1627,13 @@ void TitledBoxElement::endElement() +@@ -1689,19 +1628,13 @@ void TitledBoxElement::endElement() ctx.importVerticalAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ), OUString( RTL_CONSTASCII_USTRINGPARAM("valign") ), xAttributes ); @@ -7341,47 +7285,47 @@ index 37a561f..a5aee90 100644 - ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("GroupName") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("group-name") ), - xAttributes ); -- +- sal_Int16 nVal = 0; sal_Bool bChecked = sal_False; if (getBoolAttr( &bChecked, -@@ -1713,7 +1646,9 @@ void TitledBoxElement::endElement() +@@ -1714,7 +1647,9 @@ void TitledBoxElement::endElement() } xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ), makeAny( nVal ) ); -- importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx ); +- importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx ); + + ctx.importDataAwareProperty( OUSTR("linked-cell" ), xAttributes ); + ::std::vector< Reference< xml::input::XElement > > * radioEvents = static_cast< RadioElement * >( xRadio.get() )->getEvents(); ctx.importEvents( *radioEvents ); -@@ -1789,23 +1724,10 @@ void RadioGroupElement::endElement() +@@ -1790,23 +1725,10 @@ void RadioGroupElement::endElement() Reference< xml::input::XElement > xRadio( _radios[ nPos ] ); Reference< xml::input::XAttributes > xAttributes( xRadio->getAttributes() ); -- OUString sLinkedCell; -- OUString sCellRange; -- OUString sService( OUSTR("com.sun.star.awt.UnoControlRadioButtonModel") ); -- try -- { -- sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) ); -- // we should probably limit this to vba mode also ( leave for now ) -- if ( isVBACompatibilityMode( _pImport ) ) -- sService = OUSTR("com.sun.star.form.component.RadioButton"); -- } -- catch( Exception& /*e*/ ) -- { -- } - +- OUString sLinkedCell; +- OUString sCellRange; +- OUString sService( OUSTR("com.sun.star.awt.UnoControlRadioButtonModel") ); +- try +- { +- sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) ); +- // we should probably limit this to vba mode also ( leave for now ) +- if ( isVBACompatibilityMode( _pImport ) ) +- sService = OUSTR("com.sun.star.form.component.RadioButton"); +- } +- catch( Exception& /*e*/ ) +- { +- } + ControlImportContext ctx( _pImport, getControlId( xAttributes ), -- sService ); +- sService ); + getControlModelName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ), xAttributes ) ); Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() ); - + Reference< xml::input::XElement > xStyle( getStyle( xAttributes ) ); -@@ -1832,18 +1754,13 @@ void RadioGroupElement::endElement() +@@ -1833,18 +1755,13 @@ void RadioGroupElement::endElement() ctx.importVerticalAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ), OUString( RTL_CONSTASCII_USTRINGPARAM("valign") ), xAttributes ); @@ -7401,17 +7345,17 @@ index 37a561f..a5aee90 100644 sal_Int16 nVal = 0; sal_Bool bChecked = sal_False; if (getBoolAttr( &bChecked, -@@ -1857,7 +1774,8 @@ void RadioGroupElement::endElement() +@@ -1858,7 +1775,8 @@ void RadioGroupElement::endElement() xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ), makeAny( nVal ) ); - -- importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx ); + +- importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx ); + ctx.importDataAwareProperty( OUSTR("linked-cell" ), xAttributes ); + ::std::vector< Reference< xml::input::XElement > > * radioEvents = static_cast< RadioElement * >( xRadio.get() )->getEvents(); ctx.importEvents( *radioEvents ); -@@ -1978,26 +1896,10 @@ Reference< xml::input::XElement > MenuListElement::startChildElement( +@@ -1979,26 +1897,10 @@ Reference< xml::input::XElement > MenuListElement::startChildElement( void MenuListElement::endElement() throw (xml::sax::SAXException, RuntimeException) { @@ -7433,19 +7377,19 @@ index 37a561f..a5aee90 100644 - } ControlImportContext ctx( _pImport, getControlId( _xAttributes ), -- //OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) ); -- sListBoxService ); +- //OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) ); +- sListBoxService ); + getControlModelName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ), _xAttributes ) ); + Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() ); - + Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) ); -@@ -2030,15 +1932,17 @@ void MenuListElement::endElement() +@@ -2031,15 +1933,17 @@ void MenuListElement::endElement() ctx.importAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ), OUString( RTL_CONSTASCII_USTRINGPARAM("align") ), _xAttributes ); - // import cell-link and cell source range -- importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx ); +- importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx ); + + bool bHasLinkedCell = ctx.importDataAwareProperty( OUSTR("linked-cell" ), _xAttributes ); + bool bHasSrcRange = ctx.importDataAwareProperty( OUSTR("source-cell-range" ), _xAttributes ); @@ -7455,14 +7399,14 @@ index 37a561f..a5aee90 100644 MenuPopupElement * p = static_cast< MenuPopupElement * >( _popup.get() ); - if ( !sCellRange.getLength() ) + if ( !bHasSrcRange ) - xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ), + xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ), makeAny( p->getItemValues() ) ); - if ( !sLinkedCell.getLength() ) + if ( !bHasLinkedCell ) - xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") ), + xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") ), makeAny( p->getSelectedItems() ) ); } -@@ -2085,26 +1989,9 @@ Reference< xml::input::XElement > ComboBoxElement::startChildElement( +@@ -2086,26 +1990,9 @@ Reference< xml::input::XElement > ComboBoxElement::startChildElement( void ComboBoxElement::endElement() throw (xml::sax::SAXException, RuntimeException) { @@ -7485,26 +7429,26 @@ index 37a561f..a5aee90 100644 - ControlImportContext ctx( _pImport, getControlId( _xAttributes ), -- sService ); +- sService ); + getControlModelName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ), _xAttributes ) ); Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() ); - + Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) ); -@@ -2146,10 +2033,10 @@ void ComboBoxElement::endElement() +@@ -2147,10 +2034,10 @@ void ComboBoxElement::endElement() ctx.importAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ), OUString( RTL_CONSTASCII_USTRINGPARAM("align") ), _xAttributes ); -- // import cell-link and cell source range -- importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx ); +- // import cell-link and cell source range +- importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx ); + ctx.importDataAwareProperty( OUSTR("linked-cell" ), _xAttributes ); + bool bHasSrcRange = ctx.importDataAwareProperty( OUSTR("source-cell-range" ), _xAttributes ); - -- if (_popup.is() && !sCellRange.getLength() ) + +- if (_popup.is() && !sCellRange.getLength() ) + if (_popup.is() && !bHasSrcRange ) { MenuPopupElement * p = static_cast< MenuPopupElement * >( _popup.get() ); xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ), -@@ -2216,9 +2103,7 @@ void CheckBoxElement::endElement() +@@ -2217,9 +2104,7 @@ void CheckBoxElement::endElement() ctx.importVerticalAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ), OUString( RTL_CONSTASCII_USTRINGPARAM("valign") ), _xAttributes ); @@ -7515,7 +7459,7 @@ index 37a561f..a5aee90 100644 ctx.importImagePositionProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImagePosition") ), OUString( RTL_CONSTASCII_USTRINGPARAM("image-position") ), _xAttributes ); -@@ -2319,9 +2204,7 @@ void ButtonElement::endElement() +@@ -2320,9 +2205,7 @@ void ButtonElement::endElement() ctx.importButtonTypeProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("PushButtonType") ), OUString( RTL_CONSTASCII_USTRINGPARAM("button-type") ), _xAttributes ); @@ -7526,19 +7470,19 @@ index 37a561f..a5aee90 100644 ctx.importImagePositionProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImagePosition") ), OUString( RTL_CONSTASCII_USTRINGPARAM("image-position") ), _xAttributes ); -@@ -2475,8 +2358,7 @@ Reference< xml::input::XElement > BulletinBoardElement::startChildElement( +@@ -2476,8 +2359,7 @@ Reference< xml::input::XElement > BulletinBoardElement::startChildElement( { return new ScrollBarElement( rLocalName, xAttributes, this, _pImport ); } -- // spinbutton -- else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("spinbutton") ) && isVBACompatibilityMode( _pImport ) ) +- // spinbutton +- else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("spinbutton") ) && isVBACompatibilityMode( _pImport ) ) + else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("spinbutton") )) - { - return new SpinButtonElement( rLocalName, xAttributes, this, _pImport ); - } -@@ -2489,9 +2371,18 @@ Reference< xml::input::XElement > BulletinBoardElement::startChildElement( - { - return new MultiPage( rLocalName, xAttributes, this, _pImport ); + { + return new SpinButtonElement( rLocalName, xAttributes, this, _pImport ); + } +@@ -2490,9 +2372,18 @@ Reference< xml::input::XElement > BulletinBoardElement::startChildElement( + { + return new MultiPage( rLocalName, xAttributes, this, _pImport ); } + else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("frame") )) + { @@ -7555,23 +7499,23 @@ index 37a561f..a5aee90 100644 return new BulletinBoardElement( rLocalName, xAttributes, this, _pImport ); } else -@@ -2664,10 +2555,7 @@ void WindowElement::endElement() +@@ -2665,10 +2556,7 @@ void WindowElement::endElement() OUString( RTL_CONSTASCII_USTRINGPARAM("Decoration") ), OUString( RTL_CONSTASCII_USTRINGPARAM("withtitlebar") ), _xAttributes ); -- ctx.importStringProperty( +- ctx.importStringProperty( - OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("image-src") ), - _xAttributes ); + ctx.importImageURLProperty( OUSTR( "ImageURL" ), OUSTR( "image-src" ), _xAttributes ); - ctx.importEvents( _events ); + ctx.importEvents( _events ); // avoid ring-reference: // vector< event elements > holding event elements holding this (via _pParent) diff --git xmlscript/source/xmldlg_imexp/xmldlg_import.cxx xmlscript/source/xmldlg_imexp/xmldlg_import.cxx -index 0f03070..a66c4a0 100644 +index 81ba97c..408884a 100644 --- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ xmlscript/source/xmldlg_imexp/xmldlg_import.cxx -@@ -57,13 +57,20 @@ +@@ -58,13 +58,20 @@ #include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/view/SelectionType.hpp> @@ -7595,7 +7539,7 @@ index 0f03070..a66c4a0 100644 using ::rtl::OUString; namespace xmlscript -@@ -128,6 +135,20 @@ OUString ControlElement::getControlId( +@@ -129,6 +136,20 @@ OUString ControlElement::getControlId( return aId; } @@ -7616,7 +7560,7 @@ index 0f03070..a66c4a0 100644 //################################################################################################## //__________________________________________________________________________________________________ -@@ -819,6 +840,7 @@ bool ImportContext::importDoubleProperty( +@@ -820,6 +841,7 @@ bool ImportContext::importDoubleProperty( } return false; } @@ -7624,7 +7568,7 @@ index 0f03070..a66c4a0 100644 //__________________________________________________________________________________________________ bool ImportContext::importBooleanProperty( OUString const & rPropName, OUString const & rAttrName, -@@ -970,6 +992,115 @@ bool ImportContext::importVerticalAlignProperty( +@@ -971,6 +993,115 @@ bool ImportContext::importVerticalAlignProperty( return false; } //__________________________________________________________________________________________________ @@ -7740,7 +7684,7 @@ index 0f03070..a66c4a0 100644 bool ImportContext::importImageAlignProperty( OUString const & rPropName, OUString const & rAttrName, Reference< xml::input::XAttributes > const & xAttributes ) -@@ -1892,44 +2023,22 @@ Reference< xml::input::XElement > DialogImport::getStyle( +@@ -1893,39 +2024,22 @@ Reference< xml::input::XElement > DialogImport::getStyle( } return 0; } @@ -7774,11 +7718,6 @@ index 0f03070..a66c4a0 100644 SAL_THROW( (Exception) ) { - DialogImport* pImport = new DialogImport( xContext, xDialogModel, xDocument ); -- uno::Reference< script::vba::XVBACompatibility > xVBAModeSource( pImport->getScriptLibraryContainer(), uno::UNO_QUERY ); -- -- uno::Reference< beans::XPropertySet > xDlgProps( xDialogModel, uno::UNO_QUERY ); -- if ( xVBAModeSource.is() && xDlgProps.is() && xVBAModeSource->getVBACompatibilityMode() ) -- xDlgProps->setPropertyValue( OUSTR("VBAForm"), uno::makeAny( sal_True ) ); + // single set of styles and stylenames apply to all containees + :: boost::shared_ptr< ::std::vector< ::rtl::OUString > > pStyleNames( new ::std::vector< ::rtl::OUString > ); + :: boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > > pStyles( new ::std::vector< css::uno::Reference< css::xml::input::XElement > > ); @@ -7792,14 +7731,14 @@ index 0f03070..a66c4a0 100644 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git xmlscript/util/makefile.mk xmlscript/util/makefile.mk -index 7a391cd..ef5e0b0 100644 +index bc259db..ef5e0b0 100644 --- xmlscript/util/makefile.mk +++ xmlscript/util/makefile.mk @@ -54,8 +54,8 @@ SHL1LIBS= \ $(LIB1TARGET) SHL1STDLIBS= \ -- $(COMPHELPERLIB) \ +- $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ + $(COMPHELPERLIB) \ $(CPPULIB) \ |