diff options
| author | Noel Power <noel.power@suse.com> | 2012-09-05 17:59:46 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2012-09-11 16:04:10 +0100 |
| commit | 7d69c50413884d5cba1498b5af3298820fb4621b (patch) | |
| tree | 7ca333ed444140c00146069ef034084c7ec9abc4 /toolkit/inc | |
| parent | 595f467ec8de68f3faeacd02005f613bcf61f42c (diff) | |
misc fixes and improvements
hook in new properties into the property controller
allow new values to be passed to control
Change-Id: Ibbf1c1de4bfc7cb15e46d0d6704a025e5f0d048c
Diffstat (limited to 'toolkit/inc')
| -rw-r--r-- | toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx | 2 | ||||
| -rw-r--r-- | toolkit/inc/toolkit/helper/property.hxx | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx index d307c2aca3bb..1135138e863b 100644 --- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx +++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx @@ -48,6 +48,7 @@ #include <com/sun/star/awt/tab/XTabPageModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> +#include <tools/gen.hxx> // ---------------------------------------------------- // class ControlModelContainerBase // ---------------------------------------------------- @@ -223,6 +224,7 @@ typedef ::cppu::AggImplInheritanceHelper2 < UnoControlContainer class ControlContainerBase : public ContainerControl_IBase { + ::Size ImplGetSizePixel( const ::Size& inSize ); protected: bool mbSizeModified; bool mbPosModified; diff --git a/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx index 4a1c07bb102f..f496026a47df 100644 --- a/toolkit/inc/toolkit/helper/property.hxx +++ b/toolkit/inc/toolkit/helper/property.hxx @@ -211,8 +211,10 @@ namespace rtl { #define BASEPROPERTY_ROW_HEADER_WIDTH 158 #define BASEPROPERTY_COLUMN_HEADER_HEIGHT 159 #define BASEPROPERTY_USE_GRID_LINES 160 -#define BASEPROPERTY_HORISCROLL 161 -#define BASEPROPERTY_VERTSCROLL 162 +#define BASEPROPERTY_SCROLLWIDTH 161 +#define BASEPROPERTY_SCROLLHEIGHT 162 +#define BASEPROPERTY_SCROLLTOP 163 +#define BASEPROPERTY_SCROLLLEFT 164 // These properties are not bound, they are always extracted from the BASEPROPERTY_FONTDESCRIPTOR property |