Skip to content

C
core
Kaydet (Commit) 0a966b90 authored tarafından Ocke Janssen [oj]'s avatar Ocke Janssen [oj]
Dosyalara gözat
Seçenekler

tabcontrol: fix some compile errors

üst 265043a9
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 269 deletions
toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx
Dosyayı görüntüle @ 0a966b90
...@@ -85,5 +85,6 @@ protected: ...@@ -85,5 +85,6 @@ protected:
private: private:
sal_Int16 m_nActiveTabPageId; sal_Int16 m_nActiveTabPageId;
TabPageListenerMultiplexer m_aTabPageListeners; TabPageListenerMultiplexer m_aTabPageListeners;
::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > > m_aTabPages;
}; };
#endif // _TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX_ #endif // _TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX_
toolkit/inc/toolkit/controls/dialogcontrol.hxx
Dosyayı görüntüle @ 0a966b90
...@@ -29,273 +29,40 @@ ...@@ -29,273 +29,40 @@
#define TOOLKIT_DIALOG_CONTROL_HXX #define TOOLKIT_DIALOG_CONTROL_HXX
#include <toolkit/controls/controlmodelcontainerbase.hxx> #include <toolkit/controls/controlmodelcontainerbase.hxx>
//#include <com/sun/star/container/XNameContainer.hpp>
//#include <com/sun/star/container/XContainer.hpp>
////#include <com/sun/star/awt/XTabControllerModel.hpp>
#include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/XTopWindow.hpp>
//#include <com/sun/star/util/XChangesNotifier.hpp>
//#include <com/sun/star/util/XChangesListener.hpp>
//#include <com/sun/star/util/XModifyListener.hpp>
//#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/awt/XDialog.hpp> #include <com/sun/star/awt/XDialog.hpp>
#include <com/sun/star/resource/XStringResourceResolver.hpp> #include <com/sun/star/resource/XStringResourceResolver.hpp>
////#include <cppuhelper/implbase6.hxx>
//#include <cppuhelper/implbase5.hxx>
//#include <toolkit/helper/listenermultiplexer.hxx>
//#include <toolkit/controls/unocontrolmodel.hxx>
#include "toolkit/helper/servicenames.hxx" #include "toolkit/helper/servicenames.hxx"
#include "toolkit/helper/macros.hxx" #include "toolkit/helper/macros.hxx"
#include <toolkit/controls/unocontrolcontainer.hxx> #include <toolkit/controls/unocontrolcontainer.hxx>
//#include <com/sun/star/graphic/XGraphicObject.hpp>
//#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <list> #include <list>
// ---------------------------------------------------- // ----------------------------------------------------
// class UnoControlDialogModel // class UnoControlDialogModel
// ---------------------------------------------------- // ----------------------------------------------------
//typedef UnoControlModel UnoControlDialogModel_Base;
//typedef ::cppu::ImplHelper6 < ::com::sun::star::lang::XMultiServiceFactory
// , ::com::sun::star::container::XContainer
// , ::com::sun::star::container::XNameContainer
// , ::com::sun::star::awt::XTabControllerModel
// , ::com::sun::star::util::XChangesNotifier
// , ::com::sun::star::beans::XPropertyChangeListener
// > UnoControlDialogModel_IBase;
class UnoControlDialogModel : public ControlModelContainerBase class UnoControlDialogModel : public ControlModelContainerBase
//, public UnoControlDialogModel_Base
{ {
//public:
// // would like to make this typedef private, too, but the Forte 7 compiler does have
// // problems with this .....
// typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >, ::rtl::OUString >
// UnoControlModelHolder;
//private:
// typedef ::std::list< UnoControlModelHolder > UnoControlModelHolderList;
//
// // for grouping control models (XTabControllerModel::getGroupXXX)
// typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >
// ModelGroup;
// typedef ::std::vector< ModelGroup > AllGroups;
//
// friend struct CloneControlModel;
// friend struct FindControlModel;
// friend struct CompareControlModel;
//
//private:
// ContainerListenerMultiplexer maContainerListeners;
// ::cppu::OInterfaceContainerHelper maChangeListeners;
// UnoControlModelHolderList maModels;
//
// AllGroups maGroups;
// sal_Bool mbGroupsUpToDate;
//
protected: protected:
::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
//
// UnoControlModelHolderList::iterator ImplFindElement( const ::rtl::OUString& rName );
public: public:
UnoControlDialogModel(); UnoControlDialogModel();
UnoControlDialogModel( const UnoControlDialogModel& rModel ); UnoControlDialogModel( const UnoControlDialogModel& rModel );
~UnoControlDialogModel(); ~UnoControlDialogModel();
//UnoControlModel* Clone() const;
//// ::com::sun::star::container::XContainer
// void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
// void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
//// ::com::sun::star::container::XElementAcces
//::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);
//::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException);
//sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
//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);
//void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::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::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::lang::XMultiServiceFactory
/* ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
*/
// ::com::sun::star::io::XPersistObject // ::com::sun::star::io::XPersistObject
::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
//// XComponent
//void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException);
//// XTabControllerModel
// virtual sal_Bool SAL_CALL getGroupControl( ) throw (::com::sun::star::uno::RuntimeException);
// virtual void SAL_CALL setGroupControl( sal_Bool GroupControl ) throw (::com::sun::star::uno::RuntimeException);
// virtual void SAL_CALL setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw (::com::sun::star::uno::RuntimeException);
// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels( ) throw (::com::sun::star::uno::RuntimeException);
// virtual void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const ::rtl::OUString& GroupName ) throw (::com::sun::star::uno::RuntimeException);
// virtual sal_Int32 SAL_CALL getGroupCount( ) throw (::com::sun::star::uno::RuntimeException);
// virtual void SAL_CALL getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, ::rtl::OUString& Name ) throw (::com::sun::star::uno::RuntimeException);
// virtual void SAL_CALL getGroupByName( const ::rtl::OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group ) throw (::com::sun::star::uno::RuntimeException);
//// XChangesNotifier
// virtual void SAL_CALL addChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
// virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
//// XPropertyChangeListener
// virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException);
//// XEventListener
// using cppu::OPropertySetHelper::disposing;
// virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& evt ) throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo // XServiceInfo
DECLIMPL_SERVICEINFO_DERIVED( UnoControlDialogModel, ControlModelContainerBase, szServiceName2_UnoControlDialogModel ) DECLIMPL_SERVICEINFO_DERIVED( UnoControlDialogModel, ControlModelContainerBase, szServiceName2_UnoControlDialogModel )
//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 );
//
// void implNotifyTabModelChange( const ::rtl::OUString& _rAccessor );
//
// void implUpdateGroupStructure();
}; };
// ----------------------------------------------------
// class UnoDialogControl
// ----------------------------------------------------
//typedef ::cppu::ImplHelper6 < ::com::sun::star::container::XContainerListener
// , ::com::sun::star::awt::XTopWindow
// , ::com::sun::star::awt::XDialog
// , ::com::sun::star::util::XChangesListener
// , ::com::sun::star::util::XModifyListener
// , ::com::sun::star::awt::XWindowListener
// > UnoDialogControl_IBase;
//class ResourceListener :public ::com::sun::star::util::XModifyListener,
// public ::cppu::OWeakObject,
// public ::cppu::BaseMutex
//{
// public:
// ResourceListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener );
// virtual ~ResourceListener();
//
// void startListening( const ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver >& rResource );
// void stopListening();
//
// // XInterface
// virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
// virtual void SAL_CALL acquire() throw ();
// virtual void SAL_CALL release() throw ();
//
// // XModifyListener
// virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
//
// // XEventListener
// virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
//
// private:
// ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > m_xResource;
// ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xListener;
// bool m_bListening;
//};
//class UnoDialogControl :public UnoControlContainer
// ,public UnoDialogControl_IBase
//{
//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;
// TopWindowListenerMultiplexer maTopWindowListeners;
// bool mbWindowListener;
// bool mbSizeModified;
// bool mbPosModified;
//
//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 );
// void ImplUpdateResourceResolver();
// void ImplStartListingForResourceEvents();
//
//public:
//
// 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); }
// ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
// void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); }
// void SAL_CALL release() throw() { OWeakAggObject::release(); }
//
// void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
// void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
// void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
//
// // ::com::sun::star::awt::XTopWindow
// void SAL_CALL addTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
// void SAL_CALL removeTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
// void SAL_CALL toFront( ) throw (::com::sun::star::uno::RuntimeException);
// void SAL_CALL toBack( ) throw (::com::sun::star::uno::RuntimeException);
// void SAL_CALL setMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >& xMenu ) throw (::com::sun::star::uno::RuntimeException);
//
// // ::com::sun::star::awt::XWindowListener
// virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException);
// virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException);
// 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::XDialog
// void SAL_CALL setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException);
// ::rtl::OUString SAL_CALL getTitle() throw(::com::sun::star::uno::RuntimeException);
// sal_Int16 SAL_CALL execute() throw(::com::sun::star::uno::RuntimeException);
// void SAL_CALL endExecute() throw(::com::sun::star::uno::RuntimeException);
//
// // ::com::sun::star::lang::XTypeProvider
// ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
//
// // ::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);
// void SAL_CALL setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException);
//
// // XChangesListener
// virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
//
// // XModifyListener
// virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
//
// // ::com::sun::star::lang::XServiceInfo
// DECLIMPL_SERVICEINFO( UnoDialogControl, szServiceName2_UnoControlDialog )
//
//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 );
//
//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 );
//};
class UnoDialogControl :public ControlContainerBase, class UnoDialogControl :public ControlContainerBase,
public ::com::sun::star::awt::XTopWindow, public ::com::sun::star::awt::XTopWindow,
public ::com::sun::star::awt::XDialog, public ::com::sun::star::awt::XDialog,
...@@ -305,14 +72,6 @@ private: ...@@ -305,14 +72,6 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar > mxMenuBar; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar > mxMenuBar;
TopWindowListenerMultiplexer maTopWindowListeners; TopWindowListenerMultiplexer maTopWindowListeners;
bool mbWindowListener; bool mbWindowListener;
//::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj;
/*::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 ImplUpdateResourceResolver();
// void ImplStartListingForResourceEvents();
public: public:
......
toolkit/source/awt/makefile.mk
Dosyayı görüntüle @ 0a966b90
...@@ -66,7 +66,6 @@ SLOFILES= \ ...@@ -66,7 +66,6 @@ SLOFILES= \
$(SLO)$/asynccallback.obj\ $(SLO)$/asynccallback.obj\
$(SLO)/vclxbutton.obj\ $(SLO)/vclxbutton.obj\
$(SLO)/vclxdialog.obj\ $(SLO)/vclxdialog.obj\
$(SLO)/vclxtabpagemodel.obj\
$(SLO)/vclxtabpagecontainer.obj\ $(SLO)/vclxtabpagecontainer.obj\
$(SLO)/vclxfixedline.obj\ $(SLO)/vclxfixedline.obj\
$(SLO)/vclxplugin.obj\ $(SLO)/vclxplugin.obj\
......
toolkit/source/awt/vclxtabpagecontainer.cxx
Dosyayı görüntüle @ 0a966b90
...@@ -112,7 +112,6 @@ void SAL_CALL VCLXTabPageContainer::setProperty(const ::rtl::OUString& PropertyN ...@@ -112,7 +112,6 @@ void SAL_CALL VCLXTabPageContainer::setProperty(const ::rtl::OUString& PropertyN
TabControl* pTabPage = (TabControl*)GetWindow(); TabControl* pTabPage = (TabControl*)GetWindow();
if ( pTabPage ) if ( pTabPage )
{ {
sal_Bool bVoid = Value.getValueType().getTypeClass() == TypeClass_VOID;
VCLXWindow::setProperty( PropertyName, Value ); VCLXWindow::setProperty( PropertyName, Value );
} }
} }
...@@ -136,20 +135,27 @@ void SAL_CALL VCLXTabPageContainer::setActiveTabPageID( ::sal_Int16 _activetabpa ...@@ -136,20 +135,27 @@ void SAL_CALL VCLXTabPageContainer::setActiveTabPageID( ::sal_Int16 _activetabpa
{ {
return (getActiveTabPageID() == tabPageIndex); return (getActiveTabPageID() == tabPageIndex);
} }
Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPage( ::sal_Int16 /*tabPageIndex*/ ) throw (RuntimeException) Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPage( ::sal_Int16 tabPageIndex ) throw (RuntimeException)
{ {
return NULL; return (tabPageIndex >= 0 && tabPageIndex < static_cast<sal_Int16>(m_aTabPages.size())) ? m_aTabPages[tabPageIndex] : NULL;
} }
Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID ) throw (RuntimeException) Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID ) throw (RuntimeException)
{ {
TabControl* pTabCtrl = (TabControl*)GetWindow(); ::vos::OClearableGuard aGuard( GetMutex() );
if ( pTabCtrl ) Reference< ::com::sun::star::awt::tab::XTabPage > xTabPage;
::std::vector< Reference< ::com::sun::star::awt::tab::XTabPage > >::iterator aIter = m_aTabPages.begin();
::std::vector< Reference< ::com::sun::star::awt::tab::XTabPage > >::iterator aEnd = m_aTabPages.end();
for(;aIter != aEnd;++aIter)
{ {
TabPage* pTabPage = pTabCtrl->GetTabPage(tabPageID); Reference< awt::XControl > xControl(*aIter,UNO_QUERY );
Reference< awt::tab::XTabPageModel > xP( xControl->getModel(), UNO_QUERY );
if ( tabPageID == xP->getTabPageID() )
{
xTabPage = *aIter;
break;
}
} }
//methode um aus tabpage ein XTabpage zuerzeugen fehlt - Xcontainer methoden vielleicht nutzen return xTabPage;
//da er mit Controls arbeitet und XTabPage ist Control
return NULL;
} }
void SAL_CALL VCLXTabPageContainer::addTabPageListener( const Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException) void SAL_CALL VCLXTabPageContainer::addTabPageListener( const Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException)
{ {
...@@ -183,7 +189,7 @@ void VCLXTabPageContainer::ProcessWindowEvent( const VclWindowEvent& _rVclWindow ...@@ -183,7 +189,7 @@ void VCLXTabPageContainer::ProcessWindowEvent( const VclWindowEvent& _rVclWindow
} }
} }
} }
void SAL_CALL VCLXTabPageContainer::disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) void SAL_CALL VCLXTabPageContainer::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException)
{ {
} }
void SAL_CALL VCLXTabPageContainer::elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException) void SAL_CALL VCLXTabPageContainer::elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
...@@ -206,6 +212,7 @@ void SAL_CALL VCLXTabPageContainer::elementInserted( const ::com::sun::star::con ...@@ -206,6 +212,7 @@ void SAL_CALL VCLXTabPageContainer::elementInserted( const ::com::sun::star::con
pTabCtrl->SetHelpText(nPageID,xP->getTooltip()); pTabCtrl->SetHelpText(nPageID,xP->getTooltip());
pTabCtrl->SetPageImage(nPageID,TkResMgr::getImageFromURL(xP->getImageURL())); pTabCtrl->SetPageImage(nPageID,TkResMgr::getImageFromURL(xP->getImageURL()));
pTabCtrl->SelectTabPage(nPageID); pTabCtrl->SelectTabPage(nPageID);
m_aTabPages.push_back(xTabPage);
} }
} }
void SAL_CALL VCLXTabPageContainer::elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException) void SAL_CALL VCLXTabPageContainer::elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
...@@ -218,8 +225,9 @@ void SAL_CALL VCLXTabPageContainer::elementRemoved( const ::com::sun::star::cont ...@@ -218,8 +225,9 @@ void SAL_CALL VCLXTabPageContainer::elementRemoved( const ::com::sun::star::cont
Reference< awt::XControl > xControl(xTabPage,UNO_QUERY ); Reference< awt::XControl > xControl(xTabPage,UNO_QUERY );
Reference< awt::tab::XTabPageModel > xP( xControl->getModel(), UNO_QUERY ); Reference< awt::tab::XTabPageModel > xP( xControl->getModel(), UNO_QUERY );
pTabCtrl->RemovePage(xP->getTabPageID()); pTabCtrl->RemovePage(xP->getTabPageID());
m_aTabPages.erase(::std::remove(m_aTabPages.begin(),m_aTabPages.end(),xTabPage));
} }
} }
void SAL_CALL VCLXTabPageContainer::elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException) void SAL_CALL VCLXTabPageContainer::elementReplaced( const ::com::sun::star::container::ContainerEvent& /*Event*/ ) throw (::com::sun::star::uno::RuntimeException)
{ {
} }
toolkit/source/awt/vclxtabpagemodel.cxx
Dosyayı görüntüle @ 0a966b90
...@@ -50,7 +50,7 @@ VCLXTabPageModel::~VCLXTabPageModel() ...@@ -50,7 +50,7 @@ VCLXTabPageModel::~VCLXTabPageModel()
void SAL_CALL VCLXTabPageModel::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException) void SAL_CALL VCLXTabPageModel::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException)
{ {
/*::osl::MutexGuard aGuard( GetMutex() ); ::osl::MutexGuard aGuard( GetMutex() );
Window* pWindow = GetWindow(); Window* pWindow = GetWindow();
if ( pWindow ) if ( pWindow )
...@@ -63,7 +63,7 @@ void SAL_CALL VCLXTabPageModel::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com:: ...@@ -63,7 +63,7 @@ void SAL_CALL VCLXTabPageModel::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::
Point aPos = pDev->PixelToLogic( Point( nX, nY ) ); Point aPos = pDev->PixelToLogic( Point( nX, nY ) );
pWindow->Draw( pDev, aPos, aSize, WINDOW_DRAW_NOCONTROLS ); pWindow->Draw( pDev, aPos, aSize, WINDOW_DRAW_NOCONTROLS );
}*/ }
} }
::com::sun::star::awt::DeviceInfo VCLXTabPageModel::getInfo() throw(::com::sun::star::uno::RuntimeException) ::com::sun::star::awt::DeviceInfo VCLXTabPageModel::getInfo() throw(::com::sun::star::uno::RuntimeException)
...@@ -74,8 +74,8 @@ void SAL_CALL VCLXTabPageModel::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com:: ...@@ -74,8 +74,8 @@ void SAL_CALL VCLXTabPageModel::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::
void SAL_CALL VCLXTabPageModel::setProperty( void SAL_CALL VCLXTabPageModel::setProperty(
const ::rtl::OUString& PropertyName, const ::rtl::OUString& /*PropertyName*/,
const ::com::sun::star::uno::Any& Value ) const ::com::sun::star::uno::Any& /*Value*/ )
throw(::com::sun::star::uno::RuntimeException) throw(::com::sun::star::uno::RuntimeException)
{ {
::osl::MutexGuard aGuard( GetMutex() ); ::osl::MutexGuard aGuard( GetMutex() );
...@@ -83,8 +83,6 @@ throw(::com::sun::star::uno::RuntimeException) ...@@ -83,8 +83,6 @@ throw(::com::sun::star::uno::RuntimeException)
/*TabPage* pTabPage = (TabPage*)GetWindow(); /*TabPage* pTabPage = (TabPage*)GetWindow();
if ( pTabPage ) if ( pTabPage )
{ {
sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
VCLXWindow::setProperty( PropertyName, Value ); VCLXWindow::setProperty( PropertyName, Value );
}*/ }*/
} }
......
toolkit/source/controls/controlmodelcontainerbase.cxx
Dosyayı görüntüle @ 0a966b90
...@@ -728,9 +728,9 @@ void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XC ...@@ -728,9 +728,9 @@ void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XC
} }
////----- XInitialization ------------------------------------------------------------------- ////----- XInitialization -------------------------------------------------------------------
void SAL_CALL ControlModelContainerBase::initialize (const Sequence<Any>& rArguments) void SAL_CALL ControlModelContainerBase::initialize (const Sequence<Any>& rArguments) throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException)
{ {
sal_Int16 nPageId; sal_Int16 nPageId = -1;
if ( rArguments.getLength() == 1 ) if ( rArguments.getLength() == 1 )
{ {
if ( !( rArguments[ 0 ] >>= nPageId )) if ( !( rArguments[ 0 ] >>= nPageId ))
...@@ -1781,22 +1781,29 @@ uno::Reference< graphic::XGraphic > ControlContainerBase::Impl_getGraphicFromURL ...@@ -1781,22 +1781,29 @@ uno::Reference< graphic::XGraphic > ControlContainerBase::Impl_getGraphicFromURL
::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ) ::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl )
{ {
::rtl::OUString ret;
::rtl::OUString baseLocation; ::rtl::OUString baseLocation;
::rtl::OUString url; ::rtl::OUString url;
rbase >>= baseLocation; rbase >>= baseLocation;
rUrl >>= url; rUrl >>= url;
::rtl::OUString absoluteURL( url );
if ( url.getLength() > 0 ) if ( url.getLength() > 0 )
{ {
INetURLObject urlObj(baseLocation); INetURLObject urlObj(baseLocation);
urlObj.removeSegment(); urlObj.removeSegment();
baseLocation = urlObj.GetMainURL( INetURLObject::NO_DECODE ); baseLocation = urlObj.GetMainURL( INetURLObject::NO_DECODE );
::osl::FileBase::getAbsoluteFileURL( baseLocation, url, ret );
const INetURLObject protocolCheck( url );
const INetProtocol protocol = protocolCheck.GetProtocol();
if ( protocol == INET_PROT_NOT_VALID )
{
::rtl::OUString testAbsoluteURL;
if ( ::osl::FileBase::E_None == ::osl::FileBase::getAbsoluteFileURL( baseLocation, url, testAbsoluteURL ) )
absoluteURL = testAbsoluteURL;
}
} }
return ret; return absoluteURL;
} }
toolkit/source/controls/dialogcontrol.cxx
Dosyayı görüntüle @ 0a966b90
...@@ -460,3 +460,4 @@ throw (RuntimeException) ...@@ -460,3 +460,4 @@ throw (RuntimeException)
{ {
ImplUpdateResourceResolver(); ImplUpdateResourceResolver();
} }
toolkit/source/controls/tabpagecontainer.cxx
Dosyayı görüntüle @ 0a966b90
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <toolkit/helper/unopropertyarrayhelper.hxx> #include <toolkit/helper/unopropertyarrayhelper.hxx>
#include <toolkit/helper/property.hxx> #include <toolkit/helper/property.hxx>
#include <toolkit/controls/geometrycontrolmodel.hxx>
#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/awt/XVclWindowPeer.hpp>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
...@@ -77,6 +78,8 @@ uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropI ...@@ -77,6 +78,8 @@ uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropI
{ {
case BASEPROPERTY_DEFAULTCONTROL: case BASEPROPERTY_DEFAULTCONTROL:
return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageContainer ) ); return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageContainer ) );
case BASEPROPERTY_BORDER:
return uno::makeAny((sal_Int16) 2); // No Border
default: default:
return UnoControlModel::ImplGetDefaultValue( nPropId ); return UnoControlModel::ImplGetDefaultValue( nPropId );
} }
...@@ -284,5 +287,5 @@ Reference< XInterface > SAL_CALL UnoControlTabPageContainer_CreateInstance( cons ...@@ -284,5 +287,5 @@ Reference< XInterface > SAL_CALL UnoControlTabPageContainer_CreateInstance( cons
Reference< XInterface > SAL_CALL UnoControlTabPageContainerModel_CreateInstance( const Reference< XMultiServiceFactory >& ) Reference< XInterface > SAL_CALL UnoControlTabPageContainerModel_CreateInstance( const Reference< XMultiServiceFactory >& )
{ {
return Reference < XInterface >( ( ::cppu::OWeakObject* ) new UnoControlTabPageContainerModel ); return Reference < XInterface >( ( ::cppu::OWeakObject* ) new OGeometryControlModel<UnoControlTabPageContainerModel>() );
} }
toolkit/source/controls/tabpagemodel.cxx
Dosyayı görüntüle @ 0a966b90
...@@ -192,8 +192,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlTabPageModel::getPropertySet ...@@ -192,8 +192,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlTabPageModel::getPropertySet
} }
////----- XInitialization ------------------------------------------------------------------- ////----- XInitialization -------------------------------------------------------------------
void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArguments) void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArguments)
throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException)
{ {
sal_Int16 nPageId; sal_Int16 nPageId = -1;
if ( rArguments.getLength() == 1 ) if ( rArguments.getLength() == 1 )
{ {
if ( !( rArguments[ 0 ] >>= nPageId )) if ( !( rArguments[ 0 ] >>= nPageId ))
......
toolkit/source/controls/unocontrol.cxx
Dosyayı görüntüle @ 0a966b90
...@@ -1463,7 +1463,7 @@ sal_Bool UnoControl::supportsService( const ::rtl::OUString& rServiceName ) thro ...@@ -1463,7 +1463,7 @@ sal_Bool UnoControl::supportsService( const ::rtl::OUString& rServiceName ) thro
Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames();
const ::rtl::OUString* pArray = aSNL.getConstArray(); const ::rtl::OUString* pArray = aSNL.getConstArray();
const ::rtl::OUString* pArrayEnd = aSNL.getConstArray(); const ::rtl::OUString* pArrayEnd = aSNL.getConstArray() + aSNL.getLength();
for (; pArray != pArrayEnd; ++pArray ) for (; pArray != pArrayEnd; ++pArray )
if( *pArray == rServiceName ) if( *pArray == rServiceName )
break; break;
......
toolkit/source/helper/servicenames.cxx
Dosyayı görüntüle @ 0a966b90
...@@ -107,3 +107,4 @@ const sal_Char __FAR_DATA szServiceName_UnoControlTabPage[] = "com.sun.star.awt. ...@@ -107,3 +107,4 @@ const sal_Char __FAR_DATA szServiceName_UnoControlTabPage[] = "com.sun.star.awt.
const sal_Char __FAR_DATA szServiceName_UnoControlTabPageModel[] = "com.sun.star.awt.tab.UnoControlTabPageModel"; const sal_Char __FAR_DATA szServiceName_UnoControlTabPageModel[] = "com.sun.star.awt.tab.UnoControlTabPageModel";
const sal_Char __FAR_DATA szServiceName_UnoControlTabPageContainerModel[] = "com.sun.star.awt.tab.UnoControlTabPageContainerModel"; const sal_Char __FAR_DATA szServiceName_UnoControlTabPageContainerModel[] = "com.sun.star.awt.tab.UnoControlTabPageContainerModel";
const sal_Char __FAR_DATA szServiceName_UnoControlTabPageContainer[] = "com.sun.star.awt.tab.UnoControlTabPageContainer"; const sal_Char __FAR_DATA szServiceName_UnoControlTabPageContainer[] = "com.sun.star.awt.tab.UnoControlTabPageContainer";
toolkit/source/helper/tkresmgr.cxx
Dosyayı görüntüle @ 0a966b90
...@@ -128,3 +128,4 @@ Image TkResMgr::getImageFromURL( const ::rtl::OUString& i_rImageURL ) ...@@ -128,3 +128,4 @@ Image TkResMgr::getImageFromURL( const ::rtl::OUString& i_rImageURL )
} }
return Image(); return Image();
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment