diff options
Diffstat (limited to 'cui/source/options')
| -rw-r--r-- | cui/source/options/optchart.cxx | 7 | ||||
| -rw-r--r-- | cui/source/options/optsave.cxx | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index ec1aa4bc7960..d43fc3437cb2 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -69,9 +69,9 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const SfxItemSe aValSetColorBox.SetSelectHdl( LINK( this, SvxDefaultColorOptPage, BoxClickedHdl ) ); aValSetColorBox.SetStyle( aValSetColorBox.GetStyle() - | WB_VSCROLL | WB_ITEMBORDER | WB_NAMEFIELD ); + | WB_ITEMBORDER | WB_NAMEFIELD ); aValSetColorBox.SetColCount( 8 ); - aValSetColorBox.SetLineCount( 12 ); + aValSetColorBox.SetLineCount( 13 ); aValSetColorBox.SetExtraSpacing( 0 ); aValSetColorBox.Show(); @@ -143,6 +143,9 @@ void SvxDefaultColorOptPage::FillColorBox() long nCount = pColorTab->Count(); XColorEntry* pColorEntry; + if( nCount > 104 ) + aValSetColorBox.SetStyle( aValSetColorBox.GetStyle() | WB_VSCROLL ); + for( long i = 0; i < nCount; i++ ) { pColorEntry = pColorTab->GetColor( i ); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index c0747362a64d..df99ea8f597f 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -482,7 +482,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) catch(Exception& e) { (void) e; - DBG_ERROR( + OSL_FAIL( rtl::OUStringToOString( (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( |