diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-10-29 12:22:30 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-10-29 12:22:30 +0000 |
commit | 2de41c091cabf245f3759908418e82e27aca477f (patch) | |
tree | 0af4cbf0d37773787872984faf4f96cb5c4ab776 /sw/source/ui | |
parent | 110cdebe9e63efeac995dedd931772ddfffdd320 (diff) |
CWS-TOOLING: integrate CWS c07v026_OOO320
2009-10-19 10:26:11 +0200 mav r277008 : #b6886425# use standard solution to encode the URL for the Gnome
2009-10-19 08:38:28 +0200 mav r276998 : #b6886425# encode the URL correctly for the Gnome
2009-10-07 12:49:32 +0200 os r276749 : #b6887668# resize items depending on the item text length
2009-09-28 18:42:32 +0200 dr r276499 : #b6883075# shrink print ranges to Excel sheet limits
2009-09-28 16:50:25 +0200 od r276497 : #b6882166# method <SwSectionFrm::SimpleFormat(..)>
- assure notification on position changes, otherwise the layout will not be correct.
2009-09-15 18:31:37 +0200 dr r276185 : #b6872823# check cursor before using, patch by aw
2009-09-09 10:52:52 +0200 od r275975 : #b6879723# correct handling of new list level attributes regarding paragraph indent values,
especially in case of OOo 2.0 and former hidden compatibility option "Ignore first line
indent on numbering"
2009-09-08 11:10:31 +0200 od r275918 : #b6876367# method <lcl_SetTxtFmtColl(..)>
- do not reset list attributes at paragraph, if its applied list style
will not change due to the newly applied paragraph style.
2009-09-07 12:48:58 +0200 obo r275890 : Merge from c07v025 into this CWS
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/uno/unomod.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index 2f7716bac1..d5315fbd33 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -576,17 +576,17 @@ void SwXPrintSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, break; case HANDLE_PRINTSET_PROSPECT_RTL: { - rValue <<= mpPrtOpt->IsPrintProspect_RTL(); + bBoolVal = mpPrtOpt->IsPrintProspect_RTL(); } break; case HANDLE_PRINTSET_PLACEHOLDER: { - rValue <<= mpPrtOpt->IsPrintTextPlaceholder(); + bBoolVal = mpPrtOpt->IsPrintTextPlaceholder(); } break; case HANDLE_PRINTSET_HIDDEN_TEXT: { - rValue <<= mpPrtOpt->IsPrintHiddenText(); + bBoolVal = mpPrtOpt->IsPrintHiddenText(); } break; default: @@ -823,7 +823,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c break; case HANDLE_VIEWSET_HORI_RULER_METRIC: case HANDLE_VIEWSET_VERT_RULER_METRIC: - { + { sal_Int32 nUnit = -1; if( rValue >>= nUnit ) switch( nUnit ) @@ -844,9 +844,9 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c mbApplyVRulerMetric = sal_True; } break; - default: + default: throw IllegalArgumentException(); - } + } } break; default: @@ -862,17 +862,17 @@ void SwXViewSettings::_postSetValues () if(mbApplyZoom ) pView->SetZoom( (SvxZoomType)mpViewOption->GetZoomType(), mpViewOption->GetZoom(), sal_True ); - if(mbApplyHRulerMetric) + if(mbApplyHRulerMetric) pView->ChangeTabMetric((FieldUnit)eHRulerUnit); - if(mbApplyVRulerMetric) + if(mbApplyVRulerMetric) pView->ChangeVLinealMetric((FieldUnit)eVRulerUnit); - + } else { - if(mbApplyHRulerMetric) + if(mbApplyHRulerMetric) SW_MOD()->ApplyRulerMetric( (FieldUnit)eHRulerUnit, sal_True, bWeb ); - if(mbApplyVRulerMetric) + if(mbApplyVRulerMetric) SW_MOD()->ApplyRulerMetric( (FieldUnit)eVRulerUnit, sal_False, bWeb ); } @@ -880,7 +880,7 @@ void SwXViewSettings::_postSetValues () SW_MOD()->ApplyUsrPref( *mpViewOption, pView, pView ? VIEWOPT_DEST_VIEW_ONLY : bWeb ? VIEWOPT_DEST_WEB : VIEWOPT_DEST_TEXT ); - + delete mpViewOption; mpViewOption = NULL; @@ -1004,7 +1004,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u } break; case HANDLE_VIEWSET_HORI_RULER_METRIC: - { + { if ( pView ) { FieldUnit eUnit; @@ -1015,12 +1015,12 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u { const SwMasterUsrPref* pUsrPref = SW_MOD()->GetUsrPref( bWeb ); rValue <<= (sal_Int32)pUsrPref->GetHScrollMetric(); - } + } bBool = sal_False; } break; case HANDLE_VIEWSET_VERT_RULER_METRIC: - { + { if ( pView ) { FieldUnit eUnit; @@ -1031,7 +1031,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u { const SwMasterUsrPref* pUsrPref = SW_MOD()->GetUsrPref( bWeb ); rValue <<= (sal_Int32)pUsrPref->GetVScrollMetric(); - } + } bBool = sal_False; } break; |