diff options
Diffstat (limited to 'sw/source/uibase/uno/unomod.cxx')
| -rw-r--r-- | sw/source/uibase/uno/unomod.cxx | 161 |
1 files changed, 74 insertions, 87 deletions
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index e2662e00e342..e931789c41bf 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -23,7 +23,6 @@ #include <cppuhelper/supportsservice.hxx> #include <o3tl/any.hxx> #include <osl/diagnose.h> -#include <rtl/ustrbuf.hxx> #include <svl/itemprop.hxx> #include <tools/urlobj.hxx> #include <tools/UnitConversion.hxx> @@ -115,7 +114,6 @@ enum SwPrintSettingsPropertyHandles HANDLE_PRINTSET_FAX_NAME, HANDLE_PRINTSET_PAPER_FROM_SETUP, HANDLE_PRINTSET_TABLES, - HANDLE_PRINTSET_SINGLE_JOBS, HANDLE_PRINTSET_EMPTY_PAGES, HANDLE_PRINTSET_PROSPECT_RTL, HANDLE_PRINTSET_PLACEHOLDER, @@ -201,16 +199,13 @@ static rtl::Reference<ChainablePropertySetInfo> lcl_createPrintSettingsInfo() { OUString( "PrintPaperFromSetup" ), HANDLE_PRINTSET_PAPER_FROM_SETUP , cppu::UnoType<bool>::get(), PROPERTY_NONE}, { OUString( "PrintTables" ), HANDLE_PRINTSET_TABLES , cppu::UnoType<bool>::get(), PROPERTY_NONE}, { OUString( "PrintTextPlaceholder"), HANDLE_PRINTSET_PLACEHOLDER , cppu::UnoType<bool>::get(), PROPERTY_NONE}, - { OUString( "PrintSingleJobs" ), HANDLE_PRINTSET_SINGLE_JOBS , cppu::UnoType<bool>::get(), PROPERTY_NONE}, { OUString( "PrintEmptyPages" ), HANDLE_PRINTSET_EMPTY_PAGES , cppu::UnoType<bool>::get(), PROPERTY_NONE}, { OUString(), 0, css::uno::Type(), 0} }; return new ChainablePropertySetInfo ( aPrintSettingsMap_Impl ); } -SwXModule::SwXModule() : - mxViewSettings(), - mxPrintSettings() +SwXModule::SwXModule() { } @@ -287,11 +282,11 @@ void SwXPrintSettings::_preSetValues () namespace { - bool tryBoolAccess(const uno::Any &rValue) + bool tryBoolAccess(std::u16string_view rName, const uno::Any &rValue) { - const auto xPrSet = o3tl::tryAccess<bool>(rValue); - if (!xPrSet) - throw lang::IllegalArgumentException(); + const std::optional<const bool> xPrSet = o3tl::tryAccess<bool>(rValue); + if (!xPrSet.has_value()) + throw lang::IllegalArgumentException(OUString(OUString::Concat(rName) + " no value"), nullptr, 0); return *xPrSet; } } @@ -302,62 +297,57 @@ void SwXPrintSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, { case HANDLE_PRINTSET_LEFT_PAGES: { - mpPrtOpt->SetPrintLeftPage(tryBoolAccess(rValue)); + mpPrtOpt->SetPrintLeftPage(tryBoolAccess(rInfo.maName, rValue)); } break; case HANDLE_PRINTSET_RIGHT_PAGES: { - mpPrtOpt->SetPrintRightPage(tryBoolAccess(rValue)); + mpPrtOpt->SetPrintRightPage(tryBoolAccess(rInfo.maName, rValue)); } break; case HANDLE_PRINTSET_REVERSED: { - mpPrtOpt->SetPrintReverse(tryBoolAccess(rValue)); + // no action } break; case HANDLE_PRINTSET_PROSPECT: { - mpPrtOpt->SetPrintProspect(tryBoolAccess(rValue)); + mpPrtOpt->SetPrintProspect(tryBoolAccess(rInfo.maName, rValue)); } break; case HANDLE_PRINTSET_GRAPHICS: { - mpPrtOpt->SetPrintGraphic(tryBoolAccess(rValue)); + mpPrtOpt->SetPrintGraphic(tryBoolAccess(rInfo.maName, rValue)); } break; case HANDLE_PRINTSET_TABLES: { - mpPrtOpt->SetPrintTable(tryBoolAccess(rValue)); + // no action } break; case HANDLE_PRINTSET_DRAWINGS: { - mpPrtOpt->SetPrintDraw(tryBoolAccess(rValue)); + mpPrtOpt->SetPrintGraphic(tryBoolAccess(rInfo.maName, rValue)); } break; case HANDLE_PRINTSET_CONTROLS: { - mpPrtOpt->SetPrintControl(tryBoolAccess(rValue)); + mpPrtOpt->SetPrintControl(tryBoolAccess(rInfo.maName, rValue)); } break; case HANDLE_PRINTSET_PAGE_BACKGROUND: { - mpPrtOpt->SetPrintPageBackground(tryBoolAccess(rValue)); + mpPrtOpt->SetPrintPageBackground(tryBoolAccess(rInfo.maName, rValue)); } break; case HANDLE_PRINTSET_BLACK_FONTS: { - mpPrtOpt->SetPrintBlackFont(tryBoolAccess(rValue)); - } - break; - case HANDLE_PRINTSET_SINGLE_JOBS: - { - mpPrtOpt->SetPrintSingleJobs(tryBoolAccess(rValue)); + mpPrtOpt->SetPrintBlackFont(tryBoolAccess(rInfo.maName, rValue)); } break; case HANDLE_PRINTSET_PAPER_FROM_SETUP: { - mpPrtOpt->SetPaperFromSetup(tryBoolAccess(rValue)); + mpPrtOpt->SetPaperFromSetup(tryBoolAccess(rInfo.maName, rValue)); } break; case HANDLE_PRINTSET_ANNOTATION_MODE: @@ -366,14 +356,14 @@ void SwXPrintSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, rValue >>= nTmp; SwPostItMode nVal = static_cast<SwPostItMode>(nTmp); if(nVal > SwPostItMode::EndPage) - throw lang::IllegalArgumentException(); + throw lang::IllegalArgumentException(OUString::number(nTmp) + " > SwPostItMode::EndPage", nullptr, 0); mpPrtOpt->SetPrintPostIts(nVal); } break; case HANDLE_PRINTSET_EMPTY_PAGES: { - mpPrtOpt->SetPrintEmptyPages(tryBoolAccess(rValue)); + mpPrtOpt->SetPrintEmptyPages(tryBoolAccess(rInfo.maName, rValue)); } break; case HANDLE_PRINTSET_FAX_NAME: @@ -387,17 +377,17 @@ void SwXPrintSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, break; case HANDLE_PRINTSET_PROSPECT_RTL: { - mpPrtOpt->SetPrintProspect_RTL(tryBoolAccess(rValue)); + mpPrtOpt->SetPrintProspect_RTL(tryBoolAccess(rInfo.maName, rValue)); } break; case HANDLE_PRINTSET_PLACEHOLDER: { - mpPrtOpt->SetPrintTextPlaceholder(tryBoolAccess(rValue)); + mpPrtOpt->SetPrintTextPlaceholder(tryBoolAccess(rInfo.maName, rValue)); } break; case HANDLE_PRINTSET_HIDDEN_TEXT: { - mpPrtOpt->SetPrintHiddenText(tryBoolAccess(rValue)); + mpPrtOpt->SetPrintHiddenText(tryBoolAccess(rInfo.maName, rValue)); } break; default: @@ -438,7 +428,7 @@ void SwXPrintSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, rValue <<= mpPrtOpt->IsPrintRightPage(); break; case HANDLE_PRINTSET_REVERSED: - rValue <<= mpPrtOpt->IsPrintReverse(); + rValue <<= false; break; case HANDLE_PRINTSET_PROSPECT: rValue <<= mpPrtOpt->IsPrintProspect(); @@ -447,10 +437,10 @@ void SwXPrintSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, rValue <<= mpPrtOpt->IsPrintGraphic(); break; case HANDLE_PRINTSET_TABLES: - rValue <<= mpPrtOpt->IsPrintTable(); + rValue <<= true; break; case HANDLE_PRINTSET_DRAWINGS: - rValue <<= mpPrtOpt->IsPrintDraw(); + rValue <<= mpPrtOpt->IsPrintGraphic(); break; case HANDLE_PRINTSET_CONTROLS: rValue <<= mpPrtOpt->IsPrintControl(); @@ -461,9 +451,6 @@ void SwXPrintSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, case HANDLE_PRINTSET_BLACK_FONTS: rValue <<= mpPrtOpt->IsPrintBlackFont(); break; - case HANDLE_PRINTSET_SINGLE_JOBS: - rValue <<= mpPrtOpt->IsPrintSingleJobs(); - break; case HANDLE_PRINTSET_EMPTY_PAGES: rValue <<= mpPrtOpt->IsPrintEmptyPages(); break; @@ -523,17 +510,17 @@ Sequence< OUString > SwXPrintSettings::getSupportedServiceNames() SwXViewSettings::SwXViewSettings(SwView* pVw) : ChainablePropertySet( lcl_createViewSettingsInfo().get(), &Application::GetSolarMutex() ) - , pView(pVw) + , m_pView(pVw) , mpConstViewOption(nullptr) - , bObjectValid(true) + , m_bObjectValid(true) , mbApplyZoom(false) - , eHRulerUnit(FieldUnit::CM) + , m_eHRulerUnit(FieldUnit::CM) , mbApplyHRulerMetric(false) - , eVRulerUnit(FieldUnit::CM) + , m_eVRulerUnit(FieldUnit::CM) , mbApplyVRulerMetric(false) { // This property only exists if we have a view (ie, not at the module ) - if ( !pView ) + if ( !m_pView ) mxInfo->remove ( "HelpURL" ); } @@ -547,18 +534,18 @@ SwXViewSettings::~SwXViewSettings() void SwXViewSettings::_preSetValues () { const SwViewOption* pVOpt = nullptr; - if(pView) + if(m_pView) { if(!IsValid()) return; - pVOpt = pView->GetWrtShell().GetViewOptions(); + pVOpt = m_pView->GetWrtShell().GetViewOptions(); } else pVOpt = SW_MOD()->GetViewOption(false); mpViewOption.reset( new SwViewOption (*pVOpt) ); mbApplyZoom = false; - if(pView) + if(m_pView) mpViewOption->SetStarOneSetting(true); } @@ -578,10 +565,10 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c case HANDLE_VIEWSET_DRAWINGS : mpViewOption->SetDraw(*o3tl::doAccess<bool>(rValue)); break; case HANDLE_VIEWSET_FIELD_COMMANDS : mpViewOption->SetFieldName(*o3tl::doAccess<bool>(rValue)); break; case HANDLE_VIEWSET_ANNOTATIONS : mpViewOption->SetPostIts(*o3tl::doAccess<bool>(rValue)); break; - case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : SwViewOption::SetAppearanceFlag(ViewOptFlags::FieldShadings, *o3tl::doAccess<bool>(rValue), true); break; + case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : mpViewOption->SetAppearanceFlag(ViewOptFlags::FieldShadings, *o3tl::doAccess<bool>(rValue), true); break; case HANDLE_VIEWSET_NONPRINTING_CHARACTERS: mpViewOption->SetViewMetaChars( *o3tl::doAccess<bool>(rValue) ); break; - case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : SwViewOption::SetAppearanceFlag(ViewOptFlags::FieldShadings, *o3tl::doAccess<bool>(rValue), true); break; - case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : SwViewOption::SetAppearanceFlag(ViewOptFlags::FieldShadings, *o3tl::doAccess<bool>(rValue), true); break; + case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : mpViewOption->SetAppearanceFlag(ViewOptFlags::FieldShadings, *o3tl::doAccess<bool>(rValue), true); break; + case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : mpViewOption->SetAppearanceFlag(ViewOptFlags::FieldShadings, *o3tl::doAccess<bool>(rValue), true); break; case HANDLE_VIEWSET_PARA_BREAKS : mpViewOption->SetParagraph(*o3tl::doAccess<bool>(rValue)); break; case HANDLE_VIEWSET_SOFT_HYPHENS : mpViewOption->SetSoftHyph(*o3tl::doAccess<bool>(rValue)); break; case HANDLE_VIEWSET_SPACES : mpViewOption->SetBlank(*o3tl::doAccess<bool>(rValue)); break; @@ -592,8 +579,8 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c case HANDLE_VIEWSET_HIDDEN_TEXT : mpViewOption->SetShowHiddenField(*o3tl::doAccess<bool>(rValue)); break; case HANDLE_VIEWSET_HIDDEN_CHARACTERS : mpViewOption->SetShowHiddenChar(*o3tl::doAccess<bool>(rValue)); break; case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : mpViewOption->SetShowHiddenPara(*o3tl::doAccess<bool>(rValue)); break; - case HANDLE_VIEWSET_TABLE_BOUNDARIES : SwViewOption::SetAppearanceFlag(ViewOptFlags::TableBoundaries, *o3tl::doAccess<bool>(rValue), true); break; - case HANDLE_VIEWSET_TEXT_BOUNDARIES : SwViewOption::SetDocBoundaries(*o3tl::doAccess<bool>(rValue)); break; + case HANDLE_VIEWSET_TABLE_BOUNDARIES : mpViewOption->SetAppearanceFlag(ViewOptFlags::TableBoundaries, *o3tl::doAccess<bool>(rValue), true); break; + case HANDLE_VIEWSET_TEXT_BOUNDARIES : mpViewOption->SetDocBoundaries(*o3tl::doAccess<bool>(rValue)); break; case HANDLE_VIEWSET_SMOOTH_SCROLLING : mpViewOption->SetSmoothScroll(*o3tl::doAccess<bool>(rValue)); break; case HANDLE_VIEWSET_SHOW_CONTENT_TIPS : mpViewOption->SetShowContentTips(*o3tl::doAccess<bool>(rValue)); break; case HANDLE_VIEWSET_IS_RASTER_VISIBLE : mpViewOption->SetGridVisible(*o3tl::doAccess<bool>(rValue)); break; @@ -610,7 +597,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c if(!(rValue >>= nTmp) || nTmp < 10) throw IllegalArgumentException(); Size aSize( mpViewOption->GetSnapSize() ); - aSize.setWidth( convertMm100ToTwip( nTmp ) ); + aSize.setWidth( o3tl::toTwips(nTmp, o3tl::Length::mm100) ); mpViewOption->SetSnapSize( aSize ); } break; @@ -620,7 +607,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c if(!(rValue >>= nTmp) || nTmp < 10) throw IllegalArgumentException(); Size aSize( mpViewOption->GetSnapSize() ); - aSize.setHeight( convertMm100ToTwip( nTmp ) ); + aSize.setHeight( o3tl::toTwips(nTmp, o3tl::Length::mm100) ); mpViewOption->SetSnapSize( aSize ); } break; @@ -645,7 +632,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c sal_Int16 nZoom = 0; if(!(rValue >>= nZoom) || nZoom > MAXZOOM || nZoom < MINZOOM) throw lang::IllegalArgumentException(); - mpViewOption->SetZoom(static_cast<sal_uInt16>(nZoom)); + mpViewOption->SetZoom(o3tl::narrowing<sal_uInt16>(nZoom)); mbApplyZoom = true; } break; @@ -682,34 +669,34 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c break; case HANDLE_VIEWSET_ONLINE_LAYOUT : { - if ( pView ) + if ( m_pView ) { bool bVal = *o3tl::doAccess<bool>(rValue); - SwViewOption aOpt(*pView->GetWrtShell().GetViewOptions()); + SwViewOption aOpt(*m_pView->GetWrtShell().GetViewOptions()); if (!bVal != !aOpt.getBrowseMode()) { aOpt.setBrowseMode( bVal ); - pView->GetWrtShell().ApplyViewOptions( aOpt ); + m_pView->GetWrtShell().ApplyViewOptions( aOpt ); // must be set in mpViewOption as this will overwrite settings in _post! if(mpViewOption) mpViewOption->setBrowseMode(bVal); - pView->GetDocShell()->ToggleLayoutMode(pView); + m_pView->GetDocShell()->ToggleLayoutMode(m_pView); } } } break; case HANDLE_VIEWSET_HIDE_WHITESPACE: { - if ( pView ) + if ( m_pView ) { bool bVal = *o3tl::doAccess<bool>(rValue); - SwViewOption aOpt(*pView->GetWrtShell().GetViewOptions()); + SwViewOption aOpt(*m_pView->GetWrtShell().GetViewOptions()); if (!bVal != !aOpt.IsHideWhitespaceMode()) { aOpt.SetHideWhitespaceMode( bVal ); - pView->GetWrtShell().ApplyViewOptions( aOpt ); + m_pView->GetWrtShell().ApplyViewOptions( aOpt ); // must be set in mpViewOption as this will overwrite settings in _post! if(mpViewOption) @@ -720,7 +707,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c break; case HANDLE_VIEWSET_HELP_URL: { - if ( !pView ) + if ( !m_pView ) throw UnknownPropertyException(); OUString sHelpURL; @@ -731,7 +718,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c if ( aHID.GetProtocol() != INetProtocol::Hid ) throw IllegalArgumentException (); - pView->GetEditWin().SetHelpId( OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) ); + m_pView->GetEditWin().SetHelpId( aHID.GetURLPath() ); } break; case HANDLE_VIEWSET_HORI_RULER_METRIC: @@ -748,12 +735,12 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c case FieldUnit::INCH: if( rInfo.mnHandle == HANDLE_VIEWSET_HORI_RULER_METRIC ) { - eHRulerUnit = static_cast<FieldUnit>(nUnit); + m_eHRulerUnit = static_cast<FieldUnit>(nUnit); mbApplyHRulerMetric = true; } else { - eVRulerUnit = static_cast<FieldUnit>(nUnit); + m_eVRulerUnit = static_cast<FieldUnit>(nUnit); mbApplyVRulerMetric = true; } break; @@ -769,26 +756,26 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c void SwXViewSettings::_postSetValues() { - if( pView ) + if( m_pView ) { if(mbApplyZoom ) - pView->SetZoom( mpViewOption->GetZoomType(), + m_pView->SetZoom( mpViewOption->GetZoomType(), mpViewOption->GetZoom(), true ); if(mbApplyHRulerMetric) - pView->ChangeTabMetric(eHRulerUnit); + m_pView->ChangeTabMetric(m_eHRulerUnit); if(mbApplyVRulerMetric) - pView->ChangeVRulerMetric(eVRulerUnit); + m_pView->ChangeVRulerMetric(m_eVRulerUnit); } else { if(mbApplyHRulerMetric) - SW_MOD()->ApplyRulerMetric( eHRulerUnit, true, false ); + SW_MOD()->ApplyRulerMetric( m_eHRulerUnit, true, false ); if(mbApplyVRulerMetric) - SW_MOD()->ApplyRulerMetric( eVRulerUnit, false, false ); + SW_MOD()->ApplyRulerMetric( m_eVRulerUnit, false, false ); } - SW_MOD()->ApplyUsrPref( *mpViewOption, pView, pView ? SvViewOpt::DestViewOnly + SW_MOD()->ApplyUsrPref( *mpViewOption, m_pView, m_pView ? SvViewOpt::DestViewOnly : SvViewOpt::DestText ); mpViewOption.reset(); @@ -796,11 +783,11 @@ void SwXViewSettings::_postSetValues() void SwXViewSettings::_preGetValues () { - if(pView) + if(m_pView) { if(!IsValid()) return; - mpConstViewOption = pView->GetWrtShell().GetViewOptions(); + mpConstViewOption = m_pView->GetWrtShell().GetViewOptions(); } else mpConstViewOption = SW_MOD()->GetViewOption(false); @@ -823,10 +810,10 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u case HANDLE_VIEWSET_DRAWINGS : bBoolVal = mpConstViewOption->IsDraw(); break; case HANDLE_VIEWSET_FIELD_COMMANDS : bBoolVal = mpConstViewOption->IsFieldName(); break; case HANDLE_VIEWSET_ANNOTATIONS : bBoolVal = mpConstViewOption->IsPostIts(); break; - case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : bBoolVal = SwViewOption::IsFieldShadings(); break; + case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : bBoolVal = mpConstViewOption->IsFieldShadings(); break; case HANDLE_VIEWSET_NONPRINTING_CHARACTERS: bBoolVal = mpConstViewOption->IsViewMetaChars(); break; - case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : bBoolVal = SwViewOption::IsFieldShadings(); break; - case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : bBoolVal = SwViewOption::IsFieldShadings(); break; + case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : bBoolVal = mpConstViewOption->IsFieldShadings(); break; + case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : bBoolVal = mpConstViewOption->IsFieldShadings(); break; case HANDLE_VIEWSET_PARA_BREAKS : bBoolVal = mpConstViewOption->IsParagraph(true); break; case HANDLE_VIEWSET_SOFT_HYPHENS : bBoolVal = mpConstViewOption->IsSoftHyph(); break; case HANDLE_VIEWSET_SPACES : bBoolVal = mpConstViewOption->IsBlank(true); break; @@ -838,8 +825,8 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u case HANDLE_VIEWSET_HIDDEN_CHARACTERS : bBoolVal = mpConstViewOption->IsShowHiddenChar(true); break; case HANDLE_VIEWSET_HIDE_WHITESPACE : bBoolVal = mpConstViewOption->IsHideWhitespaceMode(); break; case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : bBoolVal = mpConstViewOption->IsShowHiddenPara(); break; - case HANDLE_VIEWSET_TABLE_BOUNDARIES : bBoolVal = SwViewOption::IsTableBoundaries(); break; - case HANDLE_VIEWSET_TEXT_BOUNDARIES : bBoolVal = SwViewOption::IsDocBoundaries(); break; + case HANDLE_VIEWSET_TABLE_BOUNDARIES : bBoolVal = mpConstViewOption->IsTableBoundaries(); break; + case HANDLE_VIEWSET_TEXT_BOUNDARIES : bBoolVal = mpConstViewOption->IsDocBoundaries(); break; case HANDLE_VIEWSET_SMOOTH_SCROLLING : bBoolVal = mpConstViewOption->IsSmoothScroll(); break; case HANDLE_VIEWSET_SHOW_CONTENT_TIPS : bBoolVal = mpConstViewOption->IsShowContentTips(); break; case HANDLE_VIEWSET_INLINECHANGES_TIPS : bBoolVal = mpConstViewOption->IsShowInlineTooltips(); break; @@ -896,26 +883,26 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u } break; case HANDLE_VIEWSET_ONLINE_LAYOUT: - if(pView) - bBoolVal = pView->GetWrtShell().GetViewOptions()->getBrowseMode(); + if(m_pView) + bBoolVal = m_pView->GetWrtShell().GetViewOptions()->getBrowseMode(); break; case HANDLE_VIEWSET_HELP_URL : { - if ( !pView ) + if ( !m_pView ) throw UnknownPropertyException(); bBool = false; - SwEditWin &rEditWin = pView->GetEditWin(); - OUString sHelpURL = INET_HID_SCHEME + OUString::fromUtf8( rEditWin.GetHelpId() ); + SwEditWin &rEditWin = m_pView->GetEditWin(); + OUString sHelpURL = INET_HID_SCHEME + rEditWin.GetHelpId(); rValue <<= sHelpURL; } break; case HANDLE_VIEWSET_HORI_RULER_METRIC: { - if ( pView ) + if ( m_pView ) { FieldUnit eUnit; - pView->GetHRulerMetric( eUnit ); + m_pView->GetHRulerMetric( eUnit ); rValue <<= static_cast<sal_Int32>(eUnit); } else @@ -928,10 +915,10 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u break; case HANDLE_VIEWSET_VERT_RULER_METRIC: { - if ( pView ) + if ( m_pView ) { FieldUnit eUnit; - pView->GetVRulerMetric( eUnit ); + m_pView->GetVRulerMetric( eUnit ); rValue <<= static_cast<sal_Int32>(eUnit); } else |