diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-03-27 08:56:50 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-03-27 08:57:37 +0200 |
commit | 95c586d5c034115fd252c5fb0e4637bf9dc68a4d (patch) | |
tree | 9bfe13eb04440ca863a13f1f8cf2330a655947d1 /sw | |
parent | postgresql-sdbc-impl: does not need these externals for MSVC (diff) | |
download | core-95c586d5c034115fd252c5fb0e4637bf9dc68a4d.tar.gz core-95c586d5c034115fd252c5fb0e4637bf9dc68a4d.zip |
Change the German "Lineal" to "Ruler" in identifiers
Change-Id: I69f80a3a889b2bae148ac502d472d490c71ecb49
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/app/appopt.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/app/swmodul1.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/docvw/edtwin3.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/inc/view.hxx | 16 | ||||
-rw-r--r-- | sw/source/ui/misc/pggrid.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/ribbar/inputwin.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/uiview/view.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/uiview/view0.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewfunc.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewmdi.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewport.cxx | 42 | ||||
-rw-r--r-- | sw/source/ui/uno/unomod.cxx | 6 |
12 files changed, 63 insertions, 63 deletions
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index d6dbd72af0ce..dc1f4228212e 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -177,12 +177,12 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId ) FieldUnit eUnit = pPref->GetHScrollMetric(); if(pAppView) - pAppView->GetHLinealMetric(eUnit); + pAppView->GetHRulerMetric(eUnit); pRet->Put(SfxUInt16Item( FN_HSCROLL_METRIC, static_cast< sal_uInt16 >(eUnit))); eUnit = pPref->GetVScrollMetric(); if(pAppView) - pAppView->GetVLinealMetric(eUnit); + pAppView->GetVRulerMetric(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(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, pPref->IsApplyCharUnit())); @@ -322,7 +322,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) FieldUnit eUnit = (FieldUnit)pMetricItem->GetValue(); pPref->SetVScrollMetric(eUnit); if(pAppView) - pAppView->ChangeVLinealMetric(eUnit); + pAppView->ChangeVRulerMetric(eUnit); } if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP, sal_False, &pItem ) ) diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx index 024aafd614d0..eb485a65ed41 100644 --- a/sw/source/ui/app/swmodul1.cxx +++ b/sw/source/ui/app/swmodul1.cxx @@ -96,9 +96,9 @@ static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, ViewShell* // Rulers on / off if(pNewPref->IsViewVRuler()) - pView->CreateVLineal(); + pView->CreateVRuler(); else - pView->KillVLineal(); + pView->KillVRuler(); // TabWindow on / off if(pNewPref->IsViewHRuler()) @@ -236,7 +236,7 @@ void SwModule::ApplyUserMetric( FieldUnit eMetric, sal_Bool bWeb ) { if(bWeb == (0 != PTR_CAST(SwWebView, pTmpView))) { - pTmpView->ChangeVLinealMetric(eVScrollMetric); + pTmpView->ChangeVRulerMetric(eVScrollMetric); pTmpView->ChangeTabMetric(eHScrollMetric); } @@ -273,7 +273,7 @@ void SwModule::ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, sal_Bo if( bHorizontal ) pTmpView->ChangeTabMetric(eMetric); else - pTmpView->ChangeVLinealMetric(eMetric); + pTmpView->ChangeVRulerMetric(eMetric); } pTmpView = SwModule::GetNextView(pTmpView); } @@ -331,7 +331,7 @@ void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar, sal_Bool bWeb) { if(bWeb == (0 != PTR_CAST(SwWebView, pTmpView))) { - pTmpView->ChangeVLinealMetric(eVScrollMetric); + pTmpView->ChangeVRulerMetric(eVScrollMetric); pTmpView->ChangeTabMetric(eHScrollMetric); } diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx index ca77b5004110..542201c287c1 100644 --- a/sw/source/ui/docvw/edtwin3.cxx +++ b/sw/source/ui/docvw/edtwin3.cxx @@ -87,7 +87,7 @@ void FrameNotify( ViewShell* pVwSh, FlyMode eMode ) // Notify for page number update 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 ) && !rRuler.StartDocDrag( rMEvt, RULER_TYPE_MARGIN1) && !rRuler.StartDocDrag( rMEvt, RULER_TYPE_MARGIN2)); @@ -99,7 +99,7 @@ sal_Bool SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, sal_Bool bVertical sal_Bool SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt, 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); } diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 3c06d7ddbb07..62bbf1f52b9f 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -508,21 +508,21 @@ public: void EnableHScrollbar(bool bEnable); void EnableVScrollbar(bool bEnable); - int CreateVLineal(); - int KillVLineal(); + int CreateVRuler(); + int KillVRuler(); int CreateTab(); int KillTab(); - int StatVLineal() const { return ((Window*)m_pVRuler)->IsVisible(); } - void ChangeVLinealMetric(FieldUnit eUnit); - void GetVLinealMetric(FieldUnit& rToFill) const; + int StatVRuler() const { return ((Window*)m_pVRuler)->IsVisible(); } + void ChangeVRulerMetric(FieldUnit eUnit); + void GetVRulerMetric(FieldUnit& rToFill) const; int StatTab() const { return ((Window*)m_pHRuler)->IsVisible(); } - SvxRuler& GetHLineal() { return *m_pHRuler; } - SvxRuler& GetVLineal() { return *m_pVRuler; } + SvxRuler& GetHRuler() { return *m_pHRuler; } + SvxRuler& GetVRuler() { return *m_pVRuler; } void InvalidateRulerPos(); void ChangeTabMetric(FieldUnit eUnit); - void GetHLinealMetric(FieldUnit& rToFill) const; + void GetHRulerMetric(FieldUnit& rToFill) const; // Handler void Execute(SfxRequest&); diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index c8819df4e673..4480b58d925c 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -204,9 +204,9 @@ sal_Bool SwTextGridPage::FillItemSet(SfxItemSet &rSet) // draw ticks of ruler SwView * pView = ::GetActiveView(); if ( m_bHRulerChanged ) - pView->GetHLineal().DrawTicks(); + pView->GetHRuler().DrawTicks(); if ( m_bVRulerChanged ) - pView->GetVLineal().DrawTicks(); + pView->GetVRuler().DrawTicks(); return bRet; } @@ -294,8 +294,8 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet) m_bHRulerChanged = sal_True; } m_bVRulerChanged = sal_True; - pView->GetHLineal().SetCharWidth((long)(aCharWidthMF.GetValue(FUNIT_TWIP)/56.7)); - pView->GetVLineal().SetLineHeight((long)(aTextSizeMF.GetValue(FUNIT_TWIP)/56.7)); + pView->GetHRuler().SetCharWidth((long)(aCharWidthMF.GetValue(FUNIT_TWIP)/56.7)); + pView->GetVRuler().SetLineHeight((long)(aTextSizeMF.GetValue(FUNIT_TWIP)/56.7)); } } diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx index 8016e803d5e4..96000789843c 100644 --- a/sw/source/ui/ribbar/inputwin.cxx +++ b/sw/source/ui/ribbar/inputwin.cxx @@ -129,8 +129,8 @@ SwInputWindow::~SwInputWindow() //Lineale aufwecken if(pView) { - pView->GetHLineal().SetActive( sal_True ); - pView->GetVLineal().SetActive( sal_True ); + pView->GetHRuler().SetActive( sal_True ); + pView->GetVRuler().SetActive( sal_True ); } delete pMgr; if(pWrtShell) @@ -194,8 +194,8 @@ void SwInputWindow::ShowWin() //Lineale anhalten if(pView) { - pView->GetHLineal().SetActive( sal_False ); - pView->GetVLineal().SetActive( sal_False ); + pView->GetHRuler().SetActive( sal_False ); + pView->GetVRuler().SetActive( sal_False ); OSL_ENSURE(pWrtShell, "no WrtShell!"); // Cursor in Tabelle diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index d02089e9677f..84c269959f3c 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -882,7 +882,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) // isn't reset, if document is already modified. const bool bIsDocModified = m_pWrtShell->GetDoc()->IsModified(); - // damit unter anderem das HLineal im + // damit unter anderem das HRuler im // ReadonlyFall nicht angezeigt wird aUsrPref.SetReadonly( m_pWrtShell->GetViewOptions()->IsReadonly() ); @@ -912,7 +912,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) StartListening( *pViewFrame, sal_True ); StartListening( *pDocSh, sal_True ); - // Set Zoom-factor from HLineal + // Set Zoom-factor from HRuler Fraction aZoomFract( aUsrPref.GetZoom(), 100 ); m_pHRuler->SetZoom( aZoomFract ); m_pVRuler->SetZoom( aZoomFract ); @@ -963,7 +963,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) if( aUsrPref.IsViewHRuler() ) CreateTab(); if( aUsrPref.IsViewVRuler() ) - CreateVLineal(); + CreateVRuler(); m_pWrtShell->SetUIOptions( aUsrPref ); m_pWrtShell->SetReadOnlyAvailable( aUsrPref.IsCursorInProtectedArea() ); @@ -1652,9 +1652,9 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) rSh.SetReadonlyOption( GetDocShell()->IsReadOnly() ); if ( rSh.GetViewOptions()->IsViewVRuler() ) - CreateVLineal(); + CreateVRuler(); else - KillVLineal(); + KillVRuler(); if ( rSh.GetViewOptions()->IsViewHRuler() ) CreateTab(); else diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index 596ef1f033ca..4a82653125a0 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -309,7 +309,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet) case FN_VIEW_SMOOTH_SCROLL: aBool.SetValue( pOpt->IsSmoothScroll()); break; case FN_VLINEAL: - aBool.SetValue( 0 != StatVLineal() ); break; + aBool.SetValue( 0 != StatVRuler() ); break; case FN_HSCROLLBAR: if( pOpt->getBrowseMode() ) { diff --git a/sw/source/ui/uiview/viewfunc.hxx b/sw/source/ui/uiview/viewfunc.hxx index 9262f197be90..cfef646ca3d3 100644 --- a/sw/source/ui/uiview/viewfunc.hxx +++ b/sw/source/ui/uiview/viewfunc.hxx @@ -48,8 +48,8 @@ void ViewResizePixel( const Window &rRef, ImageButton* pPageDownBtn, ImageButton* pNaviBtn, Window& rScrollBarBox, - SvxRuler* pVLineal = 0, - SvxRuler* pHLineal = 0, + SvxRuler* pVRuler = 0, + SvxRuler* pHRuler = 0, sal_Bool bWebView = sal_False, sal_Bool bVRulerRight = sal_False ); diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index d359ce9bf061..c10c99019fd6 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -538,7 +538,7 @@ void SwView::ChangeTabMetric( FieldUnit eUnit ) } } -void SwView::ChangeVLinealMetric( FieldUnit eUnit ) +void SwView::ChangeVRulerMetric( FieldUnit eUnit ) { if(m_pVRuler->GetUnit() != 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(); } -void SwView::GetHLinealMetric(FieldUnit& eToFill) const +void SwView::GetHRulerMetric(FieldUnit& eToFill) const { eToFill = m_pHRuler->GetUnit(); } -int SwView::CreateVLineal() +int SwView::CreateVRuler() { m_pHRuler->SetBorderPos( m_pVRuler->GetSizePixel().Width()-1 ); @@ -567,7 +567,7 @@ int SwView::CreateVLineal() return 1; } -int SwView::KillVLineal() +int SwView::KillVRuler() { m_pVRuler->Hide(); m_pHRuler->SetBorderPos( 0 ); diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index f488c652ccf8..1550da73cde2 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -846,27 +846,27 @@ void ViewResizePixel( const Window &rRef, ImageButton* pPageDownBtn, ImageButton* pNaviBtn, Window& rScrollBarBox, - SvxRuler* pVLineal, - SvxRuler* pHLineal, + SvxRuler* pVRuler, + SvxRuler* pHRuler, sal_Bool bWebView, sal_Bool bVRulerRight ) { // ViewResizePixel wird auch von der PreView benutzt!!! - const sal_Bool bHLineal = pHLineal && pHLineal->IsVisible(); - const long nHLinSzHeight = bHLineal ? - pHLineal->GetSizePixel().Height() : 0; - const sal_Bool bVLineal = pVLineal && pVLineal->IsVisible(); - const long nVLinSzWidth = bVLineal ? - pVLineal->GetSizePixel().Width() : 0; + const sal_Bool bHRuler = pHRuler && pHRuler->IsVisible(); + const long nHLinSzHeight = bHRuler ? + pHRuler->GetSizePixel().Height() : 0; + const sal_Bool bVRuler = pVRuler && pVRuler->IsVisible(); + const long nVLinSzWidth = bVRuler ? + pVRuler->GetSizePixel().Width() : 0; long nScrollBarSize = rRef.GetSettings().GetStyleSettings().GetScrollBarSize(); long nHBSzHeight = rHScrollbar.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 ); if(bVRulerRight) { @@ -875,25 +875,25 @@ void ViewResizePixel( const Window &rRef, } Size aSize( nVLinSzWidth, rEditSz.Height() ); if(!aSize.Width()) - aSize.Width() = pVLineal->GetSizePixel().Width(); - pVLineal->SetStyle(nStyle); - pVLineal->SetPosSizePixel( aPos, aSize ); - if(!pVLineal->IsVisible()) - pVLineal->Resize(); + aSize.Width() = pVRuler->GetSizePixel().Width(); + pVRuler->SetStyle(nStyle); + pVRuler->SetPosSizePixel( aPos, aSize ); + if(!pVRuler->IsVisible()) + pVRuler->Resize(); } // Lineal braucht ein Resize, sonst funktioniert es nicht im unischtbaren Zustand - if(pHLineal) + if(pHRuler) { Size aSize( rSize.Width(), nHLinSzHeight ); if ( nVBSzWidth && !bVRulerRight) aSize.Width() -= nVBSzWidth; if(!aSize.Height()) - aSize.Height() = pHLineal->GetSizePixel().Height(); - pHLineal->SetPosSizePixel( rOfst, aSize ); + aSize.Height() = pHRuler->GetSizePixel().Height(); + pHRuler->SetPosSizePixel( rOfst, aSize ); // VCL ruft an unsichtbaren Fenstern kein Resize // fuer das Lineal ist das aber keine gute Idee - if(!pHLineal->IsVisible()) - pHLineal->Resize(); + if(!pHRuler->IsVisible()) + pHRuler->Resize(); } // Scrollbars und SizeBox anordnen @@ -919,7 +919,7 @@ void ViewResizePixel( const Window &rRef, if(bVRulerRight) { aPos.X() = rOfst.X(); - if(bHLineal) + if(bHRuler) { aPos.Y() += nHLinSzHeight; aSize.Height() -= nHLinSzHeight; diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index f5fdca03beb3..a606d298fdac 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -799,7 +799,7 @@ void SwXViewSettings::_postSetValues () if(mbApplyHRulerMetric) pView->ChangeTabMetric((FieldUnit)eHRulerUnit); if(mbApplyVRulerMetric) - pView->ChangeVLinealMetric((FieldUnit)eVRulerUnit); + pView->ChangeVRulerMetric((FieldUnit)eVRulerUnit); } else @@ -942,7 +942,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u if ( pView ) { FieldUnit eUnit; - pView->GetHLinealMetric( eUnit ); + pView->GetHRulerMetric( eUnit ); rValue <<= (sal_Int32)eUnit; } else @@ -958,7 +958,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u if ( pView ) { FieldUnit eUnit; - pView->GetVLinealMetric( eUnit ); + pView->GetVRulerMetric( eUnit ); rValue <<= (sal_Int32)eUnit; } else |