diff options
author | Thomas Benisch <tbe@openoffice.org> | 2001-05-02 11:39:47 +0000 |
---|---|---|
committer | Thomas Benisch <tbe@openoffice.org> | 2001-05-02 11:39:47 +0000 |
commit | 6d03ef54d8273708c2aed99488315da763e6fe93 (patch) | |
tree | 6405512f9f1d38a14abe4c47fbb7e49c2a6c4063 | |
parent | 344db257f5c4afee3adb4e76e51af1b8165bbb6f (diff) |
added ScrollBar
-rw-r--r-- | basctl/source/dlged/dlgedfac.cxx | 33 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedobj.cxx | 12 | ||||
-rw-r--r-- | basctl/source/dlged/dlgresid.src | 8 | ||||
-rw-r--r-- | basctl/source/dlged/propbrw.cxx | 8 | ||||
-rw-r--r-- | basctl/source/inc/dlgresid.hrc | 5 |
5 files changed, 52 insertions, 14 deletions
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx index 168a7bee6d66..3db41c0e82f8 100644 --- a/basctl/source/dlged/dlgedfac.cxx +++ b/basctl/source/dlged/dlgedfac.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dlgedfac.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: tbe $ $Date: 2001-04-26 12:38:54 $ + * last change: $Author: tbe $ $Date: 2001-05-02 12:37:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,6 +88,9 @@ #include <com/sun/star/beans/XPropertySet.hpp> #endif +#ifndef _COM_SUN_STAR_AWT_SCROLLBARORIENTATION_HPP_ +#include <com/sun/star/awt/ScrollBarOrientation.hpp> +#endif using namespace ::com::sun::star; @@ -150,11 +153,11 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) pObjFactory->pNewObj = pNew; try { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xModelSet(pNew->GetUnoControlModel(), ::com::sun::star::uno::UNO_QUERY); - if (xModelSet.is()) + uno::Reference< beans::XPropertySet > xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY); + if (xPSet.is()) { sal_Bool bB = sal_True; - xModelSet->setPropertyValue(rtl::OUString::createFromAscii("Dropdown"), ::com::sun::star::uno::Any(&bB,::getBooleanCppuType())); + xPSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Dropdown" ) ), uno::Any(&bB,::getBooleanCppuType())); } } catch(...) @@ -177,8 +180,26 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) pObjFactory->pNewObj = new DlgEdObj(rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlProgressBarModel"), xDialogSFact); break; case OBJ_DLG_HSCROLLBAR: - break; + { + DlgEdObj* pNew = new DlgEdObj(rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlScrollBarModel"), xDialogSFact); + pObjFactory->pNewObj = pNew; + // set horizontal orientation + try + { + uno::Reference< beans::XPropertySet > xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY); + if (xPSet.is()) + { + uno::Any aValue; + aValue <<= (sal_Int32) ::com::sun::star::awt::ScrollBarOrientation::HORIZONTAL; + xPSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Orientation" ) ), aValue ); + } + } + catch(...) + { + } + } break; case OBJ_DLG_VSCROLLBAR: + pObjFactory->pNewObj = new DlgEdObj(rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlScrollBarModel"), xDialogSFact); break; case OBJ_DLG_URLBUTTON: break; diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 710fcb430c32..8f1fca93ce88 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dlgedobj.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: tbe $ $Date: 2001-04-26 12:39:11 $ + * last change: $Author: tbe $ $Date: 2001-05-02 12:37:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -778,6 +778,10 @@ void SAL_CALL DlgEdObj::TabIndexChange( const ::com::sun::star::beans::Property { nResId = RID_STR_CLASS_PROGRESSBAR; } + else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") )) + { + nResId = RID_STR_CLASS_SCROLLBAR; + } if (nResId) { @@ -882,6 +886,10 @@ sal_uInt16 DlgEdObj::GetObjIdentifier() const { return OBJ_DLG_SPINBUTTON; // ???change this! } + else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") )) + { + return OBJ_DLG_VSCROLLBAR; // ???change this??? OBJ_DLG_HSCROLLBAR + } else { return 0; diff --git a/basctl/source/dlged/dlgresid.src b/basctl/source/dlged/dlgresid.src index 4fedaa574777..57dc3dccc9d1 100644 --- a/basctl/source/dlged/dlgresid.src +++ b/basctl/source/dlged/dlgresid.src @@ -2,9 +2,9 @@ * * $RCSfile: dlgresid.src,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: tbe $ $Date: 2001-04-26 12:39:22 $ + * last change: $Author: tbe $ $Date: 2001-05-02 12:38:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -107,6 +107,10 @@ String RID_STR_CLASS_PROGRESSBAR { Text = "ProgressBar" ; }; +String RID_STR_CLASS_SCROLLBAR +{ + Text = "ScrollBar" ; +}; // Property Browser Headline ---------------------------------------------------------------- diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index 0c3c6795efc4..8e327d081aaf 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: propbrw.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: tbe $ $Date: 2001-04-26 12:39:30 $ + * last change: $Author: tbe $ $Date: 2001-05-02 12:38:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -477,6 +477,10 @@ void PropBrw::implSetNewObject(const Reference< XPropertySet >& _rxObject) { nResId = RID_STR_CLASS_PROGRESSBAR; } + else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") )) + { + nResId = RID_STR_CLASS_SCROLLBAR; + } if (nResId) { diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc index 057995517a6a..3207936d46fb 100644 --- a/basctl/source/inc/dlgresid.hrc +++ b/basctl/source/inc/dlgresid.hrc @@ -2,9 +2,9 @@ * * $RCSfile: dlgresid.hrc,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: tbe $ $Date: 2001-04-26 12:40:09 $ + * last change: $Author: tbe $ $Date: 2001-05-02 12:39:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,6 +79,7 @@ #define RID_STR_CLASS_FIXEDTEXT ( RID_DLG_START + 8 ) #define RID_STR_CLASS_IMAGECONTROL ( RID_DLG_START + 9 ) #define RID_STR_CLASS_PROGRESSBAR ( RID_DLG_START + 10 ) +#define RID_STR_CLASS_SCROLLBAR ( RID_DLG_START + 11 ) // Property Browser Headline Id's ----------------------------------------------------------- |