Kaydet (Commit) 95c586d5 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Change the German "Lineal" to "Ruler" in identifiers

Change-Id: I69f80a3a889b2bae148ac502d472d490c71ecb49
üst 3e786028
...@@ -177,12 +177,12 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId ) ...@@ -177,12 +177,12 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
FieldUnit eUnit = pPref->GetHScrollMetric(); FieldUnit eUnit = pPref->GetHScrollMetric();
if(pAppView) if(pAppView)
pAppView->GetHLinealMetric(eUnit); pAppView->GetHRulerMetric(eUnit);
pRet->Put(SfxUInt16Item( FN_HSCROLL_METRIC, static_cast< sal_uInt16 >(eUnit))); pRet->Put(SfxUInt16Item( FN_HSCROLL_METRIC, static_cast< sal_uInt16 >(eUnit)));
eUnit = pPref->GetVScrollMetric(); eUnit = pPref->GetVScrollMetric();
if(pAppView) if(pAppView)
pAppView->GetVLinealMetric(eUnit); pAppView->GetVRulerMetric(eUnit);
pRet->Put(SfxUInt16Item( FN_VSCROLL_METRIC, static_cast< sal_uInt16 >(eUnit) )); pRet->Put(SfxUInt16Item( FN_VSCROLL_METRIC, static_cast< sal_uInt16 >(eUnit) ));
pRet->Put(SfxUInt16Item( SID_ATTR_METRIC, static_cast< sal_uInt16 >(pPref->GetMetric()) )); pRet->Put(SfxUInt16Item( SID_ATTR_METRIC, static_cast< sal_uInt16 >(pPref->GetMetric()) ));
pRet->Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, pPref->IsApplyCharUnit())); pRet->Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, pPref->IsApplyCharUnit()));
...@@ -322,7 +322,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) ...@@ -322,7 +322,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
FieldUnit eUnit = (FieldUnit)pMetricItem->GetValue(); FieldUnit eUnit = (FieldUnit)pMetricItem->GetValue();
pPref->SetVScrollMetric(eUnit); pPref->SetVScrollMetric(eUnit);
if(pAppView) if(pAppView)
pAppView->ChangeVLinealMetric(eUnit); pAppView->ChangeVRulerMetric(eUnit);
} }
if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP, sal_False, &pItem ) ) if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP, sal_False, &pItem ) )
......
...@@ -96,9 +96,9 @@ static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, ViewShell* ...@@ -96,9 +96,9 @@ static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, ViewShell*
// Rulers on / off // Rulers on / off
if(pNewPref->IsViewVRuler()) if(pNewPref->IsViewVRuler())
pView->CreateVLineal(); pView->CreateVRuler();
else else
pView->KillVLineal(); pView->KillVRuler();
// TabWindow on / off // TabWindow on / off
if(pNewPref->IsViewHRuler()) if(pNewPref->IsViewHRuler())
...@@ -236,7 +236,7 @@ void SwModule::ApplyUserMetric( FieldUnit eMetric, sal_Bool bWeb ) ...@@ -236,7 +236,7 @@ void SwModule::ApplyUserMetric( FieldUnit eMetric, sal_Bool bWeb )
{ {
if(bWeb == (0 != PTR_CAST(SwWebView, pTmpView))) if(bWeb == (0 != PTR_CAST(SwWebView, pTmpView)))
{ {
pTmpView->ChangeVLinealMetric(eVScrollMetric); pTmpView->ChangeVRulerMetric(eVScrollMetric);
pTmpView->ChangeTabMetric(eHScrollMetric); pTmpView->ChangeTabMetric(eHScrollMetric);
} }
...@@ -273,7 +273,7 @@ void SwModule::ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, sal_Bo ...@@ -273,7 +273,7 @@ void SwModule::ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, sal_Bo
if( bHorizontal ) if( bHorizontal )
pTmpView->ChangeTabMetric(eMetric); pTmpView->ChangeTabMetric(eMetric);
else else
pTmpView->ChangeVLinealMetric(eMetric); pTmpView->ChangeVRulerMetric(eMetric);
} }
pTmpView = SwModule::GetNextView(pTmpView); pTmpView = SwModule::GetNextView(pTmpView);
} }
...@@ -331,7 +331,7 @@ void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar, sal_Bool bWeb) ...@@ -331,7 +331,7 @@ void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar, sal_Bool bWeb)
{ {
if(bWeb == (0 != PTR_CAST(SwWebView, pTmpView))) if(bWeb == (0 != PTR_CAST(SwWebView, pTmpView)))
{ {
pTmpView->ChangeVLinealMetric(eVScrollMetric); pTmpView->ChangeVRulerMetric(eVScrollMetric);
pTmpView->ChangeTabMetric(eHScrollMetric); pTmpView->ChangeTabMetric(eHScrollMetric);
} }
......
...@@ -87,7 +87,7 @@ void FrameNotify( ViewShell* pVwSh, FlyMode eMode ) ...@@ -87,7 +87,7 @@ void FrameNotify( ViewShell* pVwSh, FlyMode eMode )
// Notify for page number update // Notify for page number update
sal_Bool SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, sal_Bool bVerticalMode) sal_Bool SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, sal_Bool bVerticalMode)
{ {
SvxRuler& rRuler = bVerticalMode ? m_rView.GetVLineal() : m_rView.GetHLineal(); SvxRuler& rRuler = bVerticalMode ? m_rView.GetVRuler() : m_rView.GetHRuler();
return (!rRuler.StartDocDrag( rMEvt, RULER_TYPE_BORDER ) && return (!rRuler.StartDocDrag( rMEvt, RULER_TYPE_BORDER ) &&
!rRuler.StartDocDrag( rMEvt, RULER_TYPE_MARGIN1) && !rRuler.StartDocDrag( rMEvt, RULER_TYPE_MARGIN1) &&
!rRuler.StartDocDrag( rMEvt, RULER_TYPE_MARGIN2)); !rRuler.StartDocDrag( rMEvt, RULER_TYPE_MARGIN2));
...@@ -99,7 +99,7 @@ sal_Bool SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, sal_Bool bVertical ...@@ -99,7 +99,7 @@ sal_Bool SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, sal_Bool bVertical
sal_Bool SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt, sal_Bool SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt,
const bool bVerticalMode ) const bool bVerticalMode )
{ {
SvxRuler& rRuler = bVerticalMode ? m_rView.GetVLineal() : m_rView.GetHLineal(); SvxRuler& rRuler = bVerticalMode ? m_rView.GetVRuler() : m_rView.GetHRuler();
return !rRuler.StartDocDrag( rMEvt, RULER_TYPE_INDENT); return !rRuler.StartDocDrag( rMEvt, RULER_TYPE_INDENT);
} }
......
...@@ -508,21 +508,21 @@ public: ...@@ -508,21 +508,21 @@ public:
void EnableHScrollbar(bool bEnable); void EnableHScrollbar(bool bEnable);
void EnableVScrollbar(bool bEnable); void EnableVScrollbar(bool bEnable);
int CreateVLineal(); int CreateVRuler();
int KillVLineal(); int KillVRuler();
int CreateTab(); int CreateTab();
int KillTab(); int KillTab();
int StatVLineal() const { return ((Window*)m_pVRuler)->IsVisible(); } int StatVRuler() const { return ((Window*)m_pVRuler)->IsVisible(); }
void ChangeVLinealMetric(FieldUnit eUnit); void ChangeVRulerMetric(FieldUnit eUnit);
void GetVLinealMetric(FieldUnit& rToFill) const; void GetVRulerMetric(FieldUnit& rToFill) const;
int StatTab() const { return ((Window*)m_pHRuler)->IsVisible(); } int StatTab() const { return ((Window*)m_pHRuler)->IsVisible(); }
SvxRuler& GetHLineal() { return *m_pHRuler; } SvxRuler& GetHRuler() { return *m_pHRuler; }
SvxRuler& GetVLineal() { return *m_pVRuler; } SvxRuler& GetVRuler() { return *m_pVRuler; }
void InvalidateRulerPos(); void InvalidateRulerPos();
void ChangeTabMetric(FieldUnit eUnit); void ChangeTabMetric(FieldUnit eUnit);
void GetHLinealMetric(FieldUnit& rToFill) const; void GetHRulerMetric(FieldUnit& rToFill) const;
// Handler // Handler
void Execute(SfxRequest&); void Execute(SfxRequest&);
......
...@@ -204,9 +204,9 @@ sal_Bool SwTextGridPage::FillItemSet(SfxItemSet &rSet) ...@@ -204,9 +204,9 @@ sal_Bool SwTextGridPage::FillItemSet(SfxItemSet &rSet)
// draw ticks of ruler // draw ticks of ruler
SwView * pView = ::GetActiveView(); SwView * pView = ::GetActiveView();
if ( m_bHRulerChanged ) if ( m_bHRulerChanged )
pView->GetHLineal().DrawTicks(); pView->GetHRuler().DrawTicks();
if ( m_bVRulerChanged ) if ( m_bVRulerChanged )
pView->GetVLineal().DrawTicks(); pView->GetVRuler().DrawTicks();
return bRet; return bRet;
} }
...@@ -294,8 +294,8 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet) ...@@ -294,8 +294,8 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet)
m_bHRulerChanged = sal_True; m_bHRulerChanged = sal_True;
} }
m_bVRulerChanged = sal_True; m_bVRulerChanged = sal_True;
pView->GetHLineal().SetCharWidth((long)(aCharWidthMF.GetValue(FUNIT_TWIP)/56.7)); pView->GetHRuler().SetCharWidth((long)(aCharWidthMF.GetValue(FUNIT_TWIP)/56.7));
pView->GetVLineal().SetLineHeight((long)(aTextSizeMF.GetValue(FUNIT_TWIP)/56.7)); pView->GetVRuler().SetLineHeight((long)(aTextSizeMF.GetValue(FUNIT_TWIP)/56.7));
} }
} }
......
...@@ -129,8 +129,8 @@ SwInputWindow::~SwInputWindow() ...@@ -129,8 +129,8 @@ SwInputWindow::~SwInputWindow()
//Lineale aufwecken //Lineale aufwecken
if(pView) if(pView)
{ {
pView->GetHLineal().SetActive( sal_True ); pView->GetHRuler().SetActive( sal_True );
pView->GetVLineal().SetActive( sal_True ); pView->GetVRuler().SetActive( sal_True );
} }
delete pMgr; delete pMgr;
if(pWrtShell) if(pWrtShell)
...@@ -194,8 +194,8 @@ void SwInputWindow::ShowWin() ...@@ -194,8 +194,8 @@ void SwInputWindow::ShowWin()
//Lineale anhalten //Lineale anhalten
if(pView) if(pView)
{ {
pView->GetHLineal().SetActive( sal_False ); pView->GetHRuler().SetActive( sal_False );
pView->GetVLineal().SetActive( sal_False ); pView->GetVRuler().SetActive( sal_False );
OSL_ENSURE(pWrtShell, "no WrtShell!"); OSL_ENSURE(pWrtShell, "no WrtShell!");
// Cursor in Tabelle // Cursor in Tabelle
......
...@@ -882,7 +882,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) ...@@ -882,7 +882,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
// isn't reset, if document is already modified. // isn't reset, if document is already modified.
const bool bIsDocModified = m_pWrtShell->GetDoc()->IsModified(); const bool bIsDocModified = m_pWrtShell->GetDoc()->IsModified();
// damit unter anderem das HLineal im // damit unter anderem das HRuler im
// ReadonlyFall nicht angezeigt wird // ReadonlyFall nicht angezeigt wird
aUsrPref.SetReadonly( m_pWrtShell->GetViewOptions()->IsReadonly() ); aUsrPref.SetReadonly( m_pWrtShell->GetViewOptions()->IsReadonly() );
...@@ -912,7 +912,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) ...@@ -912,7 +912,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
StartListening( *pViewFrame, sal_True ); StartListening( *pViewFrame, sal_True );
StartListening( *pDocSh, sal_True ); StartListening( *pDocSh, sal_True );
// Set Zoom-factor from HLineal // Set Zoom-factor from HRuler
Fraction aZoomFract( aUsrPref.GetZoom(), 100 ); Fraction aZoomFract( aUsrPref.GetZoom(), 100 );
m_pHRuler->SetZoom( aZoomFract ); m_pHRuler->SetZoom( aZoomFract );
m_pVRuler->SetZoom( aZoomFract ); m_pVRuler->SetZoom( aZoomFract );
...@@ -963,7 +963,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) ...@@ -963,7 +963,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
if( aUsrPref.IsViewHRuler() ) if( aUsrPref.IsViewHRuler() )
CreateTab(); CreateTab();
if( aUsrPref.IsViewVRuler() ) if( aUsrPref.IsViewVRuler() )
CreateVLineal(); CreateVRuler();
m_pWrtShell->SetUIOptions( aUsrPref ); m_pWrtShell->SetUIOptions( aUsrPref );
m_pWrtShell->SetReadOnlyAvailable( aUsrPref.IsCursorInProtectedArea() ); m_pWrtShell->SetReadOnlyAvailable( aUsrPref.IsCursorInProtectedArea() );
...@@ -1652,9 +1652,9 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) ...@@ -1652,9 +1652,9 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
rSh.SetReadonlyOption( GetDocShell()->IsReadOnly() ); rSh.SetReadonlyOption( GetDocShell()->IsReadOnly() );
if ( rSh.GetViewOptions()->IsViewVRuler() ) if ( rSh.GetViewOptions()->IsViewVRuler() )
CreateVLineal(); CreateVRuler();
else else
KillVLineal(); KillVRuler();
if ( rSh.GetViewOptions()->IsViewHRuler() ) if ( rSh.GetViewOptions()->IsViewHRuler() )
CreateTab(); CreateTab();
else else
......
...@@ -309,7 +309,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet) ...@@ -309,7 +309,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
case FN_VIEW_SMOOTH_SCROLL: case FN_VIEW_SMOOTH_SCROLL:
aBool.SetValue( pOpt->IsSmoothScroll()); break; aBool.SetValue( pOpt->IsSmoothScroll()); break;
case FN_VLINEAL: case FN_VLINEAL:
aBool.SetValue( 0 != StatVLineal() ); break; aBool.SetValue( 0 != StatVRuler() ); break;
case FN_HSCROLLBAR: case FN_HSCROLLBAR:
if( pOpt->getBrowseMode() ) if( pOpt->getBrowseMode() )
{ {
......
...@@ -48,8 +48,8 @@ void ViewResizePixel( const Window &rRef, ...@@ -48,8 +48,8 @@ void ViewResizePixel( const Window &rRef,
ImageButton* pPageDownBtn, ImageButton* pPageDownBtn,
ImageButton* pNaviBtn, ImageButton* pNaviBtn,
Window& rScrollBarBox, Window& rScrollBarBox,
SvxRuler* pVLineal = 0, SvxRuler* pVRuler = 0,
SvxRuler* pHLineal = 0, SvxRuler* pHRuler = 0,
sal_Bool bWebView = sal_False, sal_Bool bWebView = sal_False,
sal_Bool bVRulerRight = sal_False ); sal_Bool bVRulerRight = sal_False );
......
...@@ -538,7 +538,7 @@ void SwView::ChangeTabMetric( FieldUnit eUnit ) ...@@ -538,7 +538,7 @@ void SwView::ChangeTabMetric( FieldUnit eUnit )
} }
} }
void SwView::ChangeVLinealMetric( FieldUnit eUnit ) void SwView::ChangeVRulerMetric( FieldUnit eUnit )
{ {
if(m_pVRuler->GetUnit() != eUnit) if(m_pVRuler->GetUnit() != eUnit)
{ {
...@@ -547,17 +547,17 @@ void SwView::ChangeVLinealMetric( FieldUnit eUnit ) ...@@ -547,17 +547,17 @@ void SwView::ChangeVLinealMetric( FieldUnit eUnit )
} }
} }
void SwView::GetVLinealMetric(FieldUnit& eToFill) const void SwView::GetVRulerMetric(FieldUnit& eToFill) const
{ {
eToFill = m_pVRuler->GetUnit(); eToFill = m_pVRuler->GetUnit();
} }
void SwView::GetHLinealMetric(FieldUnit& eToFill) const void SwView::GetHRulerMetric(FieldUnit& eToFill) const
{ {
eToFill = m_pHRuler->GetUnit(); eToFill = m_pHRuler->GetUnit();
} }
int SwView::CreateVLineal() int SwView::CreateVRuler()
{ {
m_pHRuler->SetBorderPos( m_pVRuler->GetSizePixel().Width()-1 ); m_pHRuler->SetBorderPos( m_pVRuler->GetSizePixel().Width()-1 );
...@@ -567,7 +567,7 @@ int SwView::CreateVLineal() ...@@ -567,7 +567,7 @@ int SwView::CreateVLineal()
return 1; return 1;
} }
int SwView::KillVLineal() int SwView::KillVRuler()
{ {
m_pVRuler->Hide(); m_pVRuler->Hide();
m_pHRuler->SetBorderPos( 0 ); m_pHRuler->SetBorderPos( 0 );
......
...@@ -846,27 +846,27 @@ void ViewResizePixel( const Window &rRef, ...@@ -846,27 +846,27 @@ void ViewResizePixel( const Window &rRef,
ImageButton* pPageDownBtn, ImageButton* pPageDownBtn,
ImageButton* pNaviBtn, ImageButton* pNaviBtn,
Window& rScrollBarBox, Window& rScrollBarBox,
SvxRuler* pVLineal, SvxRuler* pVRuler,
SvxRuler* pHLineal, SvxRuler* pHRuler,
sal_Bool bWebView, sal_Bool bWebView,
sal_Bool bVRulerRight ) sal_Bool bVRulerRight )
{ {
// ViewResizePixel wird auch von der PreView benutzt!!! // ViewResizePixel wird auch von der PreView benutzt!!!
const sal_Bool bHLineal = pHLineal && pHLineal->IsVisible(); const sal_Bool bHRuler = pHRuler && pHRuler->IsVisible();
const long nHLinSzHeight = bHLineal ? const long nHLinSzHeight = bHRuler ?
pHLineal->GetSizePixel().Height() : 0; pHRuler->GetSizePixel().Height() : 0;
const sal_Bool bVLineal = pVLineal && pVLineal->IsVisible(); const sal_Bool bVRuler = pVRuler && pVRuler->IsVisible();
const long nVLinSzWidth = bVLineal ? const long nVLinSzWidth = bVRuler ?
pVLineal->GetSizePixel().Width() : 0; pVRuler->GetSizePixel().Width() : 0;
long nScrollBarSize = rRef.GetSettings().GetStyleSettings().GetScrollBarSize(); long nScrollBarSize = rRef.GetSettings().GetStyleSettings().GetScrollBarSize();
long nHBSzHeight = rHScrollbar.IsVisible(true) ? nScrollBarSize : 0; long nHBSzHeight = rHScrollbar.IsVisible(true) ? nScrollBarSize : 0;
long nVBSzWidth = rVScrollbar.IsVisible(true) ? nScrollBarSize : 0; long nVBSzWidth = rVScrollbar.IsVisible(true) ? nScrollBarSize : 0;
if(pVLineal) if(pVRuler)
{ {
WinBits nStyle = pVLineal->GetStyle()&~WB_RIGHT_ALIGNED; WinBits nStyle = pVRuler->GetStyle()&~WB_RIGHT_ALIGNED;
Point aPos( rOfst.X(), rOfst.Y()+nHLinSzHeight ); Point aPos( rOfst.X(), rOfst.Y()+nHLinSzHeight );
if(bVRulerRight) if(bVRulerRight)
{ {
...@@ -875,25 +875,25 @@ void ViewResizePixel( const Window &rRef, ...@@ -875,25 +875,25 @@ void ViewResizePixel( const Window &rRef,
} }
Size aSize( nVLinSzWidth, rEditSz.Height() ); Size aSize( nVLinSzWidth, rEditSz.Height() );
if(!aSize.Width()) if(!aSize.Width())
aSize.Width() = pVLineal->GetSizePixel().Width(); aSize.Width() = pVRuler->GetSizePixel().Width();
pVLineal->SetStyle(nStyle); pVRuler->SetStyle(nStyle);
pVLineal->SetPosSizePixel( aPos, aSize ); pVRuler->SetPosSizePixel( aPos, aSize );
if(!pVLineal->IsVisible()) if(!pVRuler->IsVisible())
pVLineal->Resize(); pVRuler->Resize();
} }
// Lineal braucht ein Resize, sonst funktioniert es nicht im unischtbaren Zustand // Lineal braucht ein Resize, sonst funktioniert es nicht im unischtbaren Zustand
if(pHLineal) if(pHRuler)
{ {
Size aSize( rSize.Width(), nHLinSzHeight ); Size aSize( rSize.Width(), nHLinSzHeight );
if ( nVBSzWidth && !bVRulerRight) if ( nVBSzWidth && !bVRulerRight)
aSize.Width() -= nVBSzWidth; aSize.Width() -= nVBSzWidth;
if(!aSize.Height()) if(!aSize.Height())
aSize.Height() = pHLineal->GetSizePixel().Height(); aSize.Height() = pHRuler->GetSizePixel().Height();
pHLineal->SetPosSizePixel( rOfst, aSize ); pHRuler->SetPosSizePixel( rOfst, aSize );
// VCL ruft an unsichtbaren Fenstern kein Resize // VCL ruft an unsichtbaren Fenstern kein Resize
// fuer das Lineal ist das aber keine gute Idee // fuer das Lineal ist das aber keine gute Idee
if(!pHLineal->IsVisible()) if(!pHRuler->IsVisible())
pHLineal->Resize(); pHRuler->Resize();
} }
// Scrollbars und SizeBox anordnen // Scrollbars und SizeBox anordnen
...@@ -919,7 +919,7 @@ void ViewResizePixel( const Window &rRef, ...@@ -919,7 +919,7 @@ void ViewResizePixel( const Window &rRef,
if(bVRulerRight) if(bVRulerRight)
{ {
aPos.X() = rOfst.X(); aPos.X() = rOfst.X();
if(bHLineal) if(bHRuler)
{ {
aPos.Y() += nHLinSzHeight; aPos.Y() += nHLinSzHeight;
aSize.Height() -= nHLinSzHeight; aSize.Height() -= nHLinSzHeight;
......
...@@ -799,7 +799,7 @@ void SwXViewSettings::_postSetValues () ...@@ -799,7 +799,7 @@ void SwXViewSettings::_postSetValues ()
if(mbApplyHRulerMetric) if(mbApplyHRulerMetric)
pView->ChangeTabMetric((FieldUnit)eHRulerUnit); pView->ChangeTabMetric((FieldUnit)eHRulerUnit);
if(mbApplyVRulerMetric) if(mbApplyVRulerMetric)
pView->ChangeVLinealMetric((FieldUnit)eVRulerUnit); pView->ChangeVRulerMetric((FieldUnit)eVRulerUnit);
} }
else else
...@@ -942,7 +942,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u ...@@ -942,7 +942,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
if ( pView ) if ( pView )
{ {
FieldUnit eUnit; FieldUnit eUnit;
pView->GetHLinealMetric( eUnit ); pView->GetHRulerMetric( eUnit );
rValue <<= (sal_Int32)eUnit; rValue <<= (sal_Int32)eUnit;
} }
else else
...@@ -958,7 +958,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u ...@@ -958,7 +958,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
if ( pView ) if ( pView )
{ {
FieldUnit eUnit; FieldUnit eUnit;
pView->GetVLinealMetric( eUnit ); pView->GetVRulerMetric( eUnit );
rValue <<= (sal_Int32)eUnit; rValue <<= (sal_Int32)eUnit;
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment