summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lange [tl] <tl@openoffice.org>2009-12-08 13:00:42 +0100
committerThomas Lange [tl] <tl@openoffice.org>2009-12-08 13:00:42 +0100
commit96be2a9615b9243e59cc103d60c8cb5c9340df52 (patch)
treecd5107d07fa8cdf5923eff1e7471cdbb6ec04992
parent5070a0c3837870e0be038a5b246e110f79d03d84 (diff)
#i105728#, #i105730#, #i105727# intelli UI thingies
-rw-r--r--vcl/inc/vcl/print.hxx7
-rw-r--r--vcl/source/gdi/print3.cxx6
2 files changed, 11 insertions, 2 deletions
diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index e91e3db0c9d7..daea0c941dd0 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -600,19 +600,22 @@ class VCL_DLLPUBLIC PrinterOptionsHelper
sal_Bool mbAttachToDependency;
rtl::OUString maGroupHint;
sal_Bool mbInternalOnly;
+ sal_Bool mbEnabled;
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maAddProps;
UIControlOptions( const rtl::OUString& i_rDependsOnName = rtl::OUString(),
sal_Int32 i_nDependsOnEntry = -1,
sal_Bool i_bAttachToDependency = sal_False,
const rtl::OUString& i_rGroupHint = rtl::OUString(),
- sal_Bool i_bInternalOnly = sal_False
+ sal_Bool i_bInternalOnly = sal_False,
+ sal_Bool i_bEnabled = sal_True
)
: maDependsOnName( i_rDependsOnName )
, mnDependsOnEntry( i_nDependsOnEntry )
, mbAttachToDependency( i_bAttachToDependency )
, maGroupHint( i_rGroupHint )
- , mbInternalOnly( i_bInternalOnly ) {}
+ , mbInternalOnly( i_bInternalOnly )
+ , mbEnabled( i_bEnabled ) {}
};
// general control
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 2b16d2c611fd..e687fce01d1f 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1562,6 +1562,7 @@ Any PrinterOptionsHelper::getUIControlOpt( const rtl::OUString& i_rTitle,
+ i_rControlOptions.maAddProps.getLength() // additional props
+ (i_rControlOptions.maGroupHint.getLength() ? 1 : 0) // grouping
+ (i_rControlOptions.mbInternalOnly ? 1 : 0) // internal hint
+ + (i_rControlOptions.mbEnabled ? 0 : 1) // enabled
;
if( i_rControlOptions.maDependsOnName.getLength() )
{
@@ -1616,6 +1617,11 @@ Any PrinterOptionsHelper::getUIControlOpt( const rtl::OUString& i_rTitle,
aCtrl[nUsed ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InternalUIOnly" ) );
aCtrl[nUsed++].Value <<= sal_True;
}
+ if( ! i_rControlOptions.mbEnabled )
+ {
+ aCtrl[nUsed ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) );
+ aCtrl[nUsed++].Value <<= sal_False;
+ }
sal_Int32 nAddProps = i_rControlOptions.maAddProps.getLength();
for( sal_Int32 i = 0; i < nAddProps; i++ )