summaryrefslogtreecommitdiff
path: root/extensions/source/propctrlr
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/propctrlr')
-rw-r--r--extensions/source/propctrlr/browserlistbox.cxx4
-rw-r--r--extensions/source/propctrlr/browserlistbox.hxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx6
-rw-r--r--extensions/source/propctrlr/propertyeditor.cxx4
-rw-r--r--extensions/source/propctrlr/propertyeditor.hxx2
-rw-r--r--extensions/source/propctrlr/usercontrol.cxx12
-rw-r--r--extensions/source/propctrlr/usercontrol.hxx6
7 files changed, 18 insertions, 18 deletions
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 81d905084fbb..bbe2b92f62d6 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -331,8 +331,8 @@ namespace pcr
}
}
- OBrowserListBox::OBrowserListBox( vcl::Window* pParent, WinBits nWinStyle)
- :Control(pParent, nWinStyle| WB_CLIPCHILDREN)
+ OBrowserListBox::OBrowserListBox( vcl::Window* pParent)
+ :Control(pParent, WB_DIALOGCONTROL | WB_CLIPCHILDREN)
,m_aLinesPlayground(VclPtr<vcl::Window>::Create(this,WB_DIALOGCONTROL | WB_CLIPCHILDREN))
,m_aVScroll(VclPtr<ScrollBar>::Create(this,WB_VSCROLL|WB_REPEAT|WB_DRAG))
,m_pHelpWindow( VclPtr<InspectorHelpWindow>::Create( this ) )
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index 9ba18cdde797..60e42da4ca3c 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -102,7 +102,7 @@ namespace pcr
void Resize() override;
public:
- OBrowserListBox( vcl::Window* pParent, WinBits nWinStyle = WB_DIALOGCONTROL );
+ OBrowserListBox( vcl::Window* pParent );
virtual ~OBrowserListBox();
virtual void dispose() override;
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index e3322ae5e16b..0078123cd0e4 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1048,7 +1048,7 @@ namespace pcr
case PROPERTY_ID_TARGET_URL:
case PROPERTY_ID_IMAGE_URL:
{
- aDescriptor.Control = new OFileUrlControl( impl_getDefaultDialogParent_nothrow(), WB_TABSTOP | WB_BORDER );
+ aDescriptor.Control = new OFileUrlControl( impl_getDefaultDialogParent_nothrow() );
aDescriptor.PrimaryButtonId = PROPERTY_ID_TARGET_URL == nPropId
? OUString(UID_PROP_DLG_ATTR_TARGET_URL)
@@ -1125,7 +1125,7 @@ namespace pcr
if ( bIsFormatKey )
{
- OFormatSampleControl* pControl = new OFormatSampleControl( impl_getDefaultDialogParent_nothrow(), WB_READONLY | WB_TABSTOP | WB_BORDER );
+ OFormatSampleControl* pControl = new OFormatSampleControl( impl_getDefaultDialogParent_nothrow() );
aDescriptor.Control = pControl;
pControl->SetFormatSupplier( pSupplier );
@@ -1309,7 +1309,7 @@ namespace pcr
{
case PROPERTY_ID_REPEAT_DELAY:
{
- OTimeDurationControl* pControl = new OTimeDurationControl( impl_getDefaultDialogParent_nothrow(), WB_BORDER | WB_TABSTOP );
+ OTimeDurationControl* pControl = new OTimeDurationControl( impl_getDefaultDialogParent_nothrow() );
aDescriptor.Control = pControl;
pControl->setMinValue( Optional< double >( true, 0 ) );
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index fd401e5bd8f2..128ffa20fabb 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -41,8 +41,8 @@ namespace pcr
// class OPropertyEditor
- OPropertyEditor::OPropertyEditor( vcl::Window* pParent, WinBits nWinStyle)
- :Control(pParent, nWinStyle)
+ OPropertyEditor::OPropertyEditor( vcl::Window* pParent)
+ :Control(pParent, WB_DIALOGCONTROL)
,m_aTabControl( VclPtr<TabControl>::Create(this) )
,m_pListener(nullptr)
,m_pObserver(nullptr)
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index eafdf3653db3..9cc621119262 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -69,7 +69,7 @@ namespace pcr
void GetFocus() override;
public:
- OPropertyEditor (vcl::Window* pParent, WinBits nWinStyle = WB_DIALOGCONTROL);
+ OPropertyEditor (vcl::Window* pParent);
virtual ~OPropertyEditor();
virtual void dispose() override;
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index ef15cd7d6364..e18281d78768 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -87,8 +87,8 @@ namespace pcr
// OFormatSampleControl
- OFormatSampleControl::OFormatSampleControl( vcl::Window* pParent, WinBits nWinStyle )
- :OFormatSampleControl_Base( PropertyControlType::Unknown, pParent, nWinStyle )
+ OFormatSampleControl::OFormatSampleControl( vcl::Window* pParent )
+ :OFormatSampleControl_Base( PropertyControlType::Unknown, pParent, WB_READONLY | WB_TABSTOP | WB_BORDER )
{
getTypedControlWindow()->setControlHelper(*this);
}
@@ -262,8 +262,8 @@ namespace pcr
//= OFileUrlControl
- OFileUrlControl::OFileUrlControl( vcl::Window* pParent, WinBits nWinStyle )
- :OFileUrlControl_Base( PropertyControlType::Unknown, pParent, nWinStyle | WB_DROPDOWN )
+ OFileUrlControl::OFileUrlControl( vcl::Window* pParent )
+ :OFileUrlControl_Base( PropertyControlType::Unknown, pParent, WB_TABSTOP | WB_BORDER | WB_DROPDOWN )
{
getTypedControlWindow()->SetDropDownLineCount( 10 );
getTypedControlWindow()->SetPlaceHolder( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ).toString() ) ;
@@ -308,8 +308,8 @@ namespace pcr
//= OTimeDurationControl
- OTimeDurationControl::OTimeDurationControl( vcl::Window* pParent, WinBits nWinStyle )
- :ONumericControl( pParent, nWinStyle )
+ OTimeDurationControl::OTimeDurationControl( vcl::Window* pParent )
+ :ONumericControl( pParent, WB_BORDER | WB_TABSTOP )
{
getTypedControlWindow()->SetUnit( FUNIT_CUSTOM );
getTypedControlWindow()->SetCustomUnitText(" ms");
diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx
index b320a9345040..2188f540f000 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -59,7 +59,7 @@ namespace pcr
class OFormatSampleControl : public OFormatSampleControl_Base
{
public:
- OFormatSampleControl( vcl::Window* pParent, WinBits nWinStyle );
+ OFormatSampleControl( vcl::Window* pParent );
// XPropertyControl
virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
@@ -128,7 +128,7 @@ namespace pcr
class OFileUrlControl : public OFileUrlControl_Base
{
public:
- OFileUrlControl( vcl::Window* pParent, WinBits nWinStyle );
+ OFileUrlControl( vcl::Window* pParent );
// XPropertyControl
virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
@@ -145,7 +145,7 @@ namespace pcr
class OTimeDurationControl : public ONumericControl
{
public:
- OTimeDurationControl( vcl::Window* pParent, WinBits nWinStyle );
+ OTimeDurationControl( vcl::Window* pParent );
virtual ~OTimeDurationControl();
// XPropertyControl