Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
95c586d5
Kaydet (Commit)
95c586d5
authored
Mar 27, 2013
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Change the German "Lineal" to "Ruler" in identifiers
Change-Id: I69f80a3a889b2bae148ac502d472d490c71ecb49
üst
3e786028
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
63 additions
and
63 deletions
+63
-63
appopt.cxx
sw/source/ui/app/appopt.cxx
+3
-3
swmodul1.cxx
sw/source/ui/app/swmodul1.cxx
+5
-5
edtwin3.cxx
sw/source/ui/docvw/edtwin3.cxx
+2
-2
view.hxx
sw/source/ui/inc/view.hxx
+8
-8
pggrid.cxx
sw/source/ui/misc/pggrid.cxx
+4
-4
inputwin.cxx
sw/source/ui/ribbar/inputwin.cxx
+4
-4
view.cxx
sw/source/ui/uiview/view.cxx
+5
-5
view0.cxx
sw/source/ui/uiview/view0.cxx
+1
-1
viewfunc.hxx
sw/source/ui/uiview/viewfunc.hxx
+2
-2
viewmdi.cxx
sw/source/ui/uiview/viewmdi.cxx
+5
-5
viewport.cxx
sw/source/ui/uiview/viewport.cxx
+21
-21
unomod.cxx
sw/source/ui/uno/unomod.cxx
+3
-3
No files found.
sw/source/ui/app/appopt.cxx
Dosyayı görüntüle @
95c586d5
...
@@ -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
->
GetH
Lineal
Metric
(
eUnit
);
pAppView
->
GetH
Ruler
Metric
(
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
->
GetV
Lineal
Metric
(
eUnit
);
pAppView
->
GetV
Ruler
Metric
(
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
->
ChangeV
Lineal
Metric
(
eUnit
);
pAppView
->
ChangeV
Ruler
Metric
(
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
)
)
...
...
sw/source/ui/app/swmodul1.cxx
Dosyayı görüntüle @
95c586d5
...
@@ -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
->
CreateV
Lineal
();
pView
->
CreateV
Ruler
();
else
else
pView
->
KillV
Lineal
();
pView
->
KillV
Ruler
();
// 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
->
ChangeV
Lineal
Metric
(
eVScrollMetric
);
pTmpView
->
ChangeV
Ruler
Metric
(
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
->
ChangeV
Lineal
Metric
(
eMetric
);
pTmpView
->
ChangeV
Ruler
Metric
(
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
->
ChangeV
Lineal
Metric
(
eVScrollMetric
);
pTmpView
->
ChangeV
Ruler
Metric
(
eVScrollMetric
);
pTmpView
->
ChangeTabMetric
(
eHScrollMetric
);
pTmpView
->
ChangeTabMetric
(
eHScrollMetric
);
}
}
...
...
sw/source/ui/docvw/edtwin3.cxx
Dosyayı görüntüle @
95c586d5
...
@@ -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
.
GetV
Lineal
()
:
m_rView
.
GetHLineal
();
SvxRuler
&
rRuler
=
bVerticalMode
?
m_rView
.
GetV
Ruler
()
:
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
.
GetV
Lineal
()
:
m_rView
.
GetHLineal
();
SvxRuler
&
rRuler
=
bVerticalMode
?
m_rView
.
GetV
Ruler
()
:
m_rView
.
GetHRuler
();
return
!
rRuler
.
StartDocDrag
(
rMEvt
,
RULER_TYPE_INDENT
);
return
!
rRuler
.
StartDocDrag
(
rMEvt
,
RULER_TYPE_INDENT
);
}
}
...
...
sw/source/ui/inc/view.hxx
Dosyayı görüntüle @
95c586d5
...
@@ -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
CreateV
Lineal
();
int
CreateV
Ruler
();
int
KillV
Lineal
();
int
KillV
Ruler
();
int
CreateTab
();
int
CreateTab
();
int
KillTab
();
int
KillTab
();
int
StatV
Lineal
()
const
{
return
((
Window
*
)
m_pVRuler
)
->
IsVisible
();
}
int
StatV
Ruler
()
const
{
return
((
Window
*
)
m_pVRuler
)
->
IsVisible
();
}
void
ChangeV
Lineal
Metric
(
FieldUnit
eUnit
);
void
ChangeV
Ruler
Metric
(
FieldUnit
eUnit
);
void
GetV
Lineal
Metric
(
FieldUnit
&
rToFill
)
const
;
void
GetV
Ruler
Metric
(
FieldUnit
&
rToFill
)
const
;
int
StatTab
()
const
{
return
((
Window
*
)
m_pHRuler
)
->
IsVisible
();
}
int
StatTab
()
const
{
return
((
Window
*
)
m_pHRuler
)
->
IsVisible
();
}
SvxRuler
&
GetH
Lineal
()
{
return
*
m_pHRuler
;
}
SvxRuler
&
GetH
Ruler
()
{
return
*
m_pHRuler
;
}
SvxRuler
&
GetV
Lineal
()
{
return
*
m_pVRuler
;
}
SvxRuler
&
GetV
Ruler
()
{
return
*
m_pVRuler
;
}
void
InvalidateRulerPos
();
void
InvalidateRulerPos
();
void
ChangeTabMetric
(
FieldUnit
eUnit
);
void
ChangeTabMetric
(
FieldUnit
eUnit
);
void
GetH
Lineal
Metric
(
FieldUnit
&
rToFill
)
const
;
void
GetH
Ruler
Metric
(
FieldUnit
&
rToFill
)
const
;
// Handler
// Handler
void
Execute
(
SfxRequest
&
);
void
Execute
(
SfxRequest
&
);
...
...
sw/source/ui/misc/pggrid.cxx
Dosyayı görüntüle @
95c586d5
...
@@ -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
->
GetH
Lineal
().
DrawTicks
();
pView
->
GetH
Ruler
().
DrawTicks
();
if
(
m_bVRulerChanged
)
if
(
m_bVRulerChanged
)
pView
->
GetV
Lineal
().
DrawTicks
();
pView
->
GetV
Ruler
().
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
->
GetH
Lineal
().
SetCharWidth
((
long
)(
aCharWidthMF
.
GetValue
(
FUNIT_TWIP
)
/
56.7
));
pView
->
GetH
Ruler
().
SetCharWidth
((
long
)(
aCharWidthMF
.
GetValue
(
FUNIT_TWIP
)
/
56.7
));
pView
->
GetV
Lineal
().
SetLineHeight
((
long
)(
aTextSizeMF
.
GetValue
(
FUNIT_TWIP
)
/
56.7
));
pView
->
GetV
Ruler
().
SetLineHeight
((
long
)(
aTextSizeMF
.
GetValue
(
FUNIT_TWIP
)
/
56.7
));
}
}
}
}
...
...
sw/source/ui/ribbar/inputwin.cxx
Dosyayı görüntüle @
95c586d5
...
@@ -129,8 +129,8 @@ SwInputWindow::~SwInputWindow()
...
@@ -129,8 +129,8 @@ SwInputWindow::~SwInputWindow()
//Lineale aufwecken
//Lineale aufwecken
if
(
pView
)
if
(
pView
)
{
{
pView
->
GetH
Lineal
().
SetActive
(
sal_True
);
pView
->
GetH
Ruler
().
SetActive
(
sal_True
);
pView
->
GetV
Lineal
().
SetActive
(
sal_True
);
pView
->
GetV
Ruler
().
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
->
GetH
Lineal
().
SetActive
(
sal_False
);
pView
->
GetH
Ruler
().
SetActive
(
sal_False
);
pView
->
GetV
Lineal
().
SetActive
(
sal_False
);
pView
->
GetV
Ruler
().
SetActive
(
sal_False
);
OSL_ENSURE
(
pWrtShell
,
"no WrtShell!"
);
OSL_ENSURE
(
pWrtShell
,
"no WrtShell!"
);
// Cursor in Tabelle
// Cursor in Tabelle
...
...
sw/source/ui/uiview/view.cxx
Dosyayı görüntüle @
95c586d5
...
@@ -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 H
Lineal
im
// damit unter anderem das H
Ruler
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 H
Lineal
// Set Zoom-factor from H
Ruler
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
()
)
CreateV
Lineal
();
CreateV
Ruler
();
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
()
)
CreateV
Lineal
();
CreateV
Ruler
();
else
else
KillV
Lineal
();
KillV
Ruler
();
if
(
rSh
.
GetViewOptions
()
->
IsViewHRuler
()
)
if
(
rSh
.
GetViewOptions
()
->
IsViewHRuler
()
)
CreateTab
();
CreateTab
();
else
else
...
...
sw/source/ui/uiview/view0.cxx
Dosyayı görüntüle @
95c586d5
...
@@ -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
!=
StatV
Lineal
()
);
break
;
aBool
.
SetValue
(
0
!=
StatV
Ruler
()
);
break
;
case
FN_HSCROLLBAR
:
case
FN_HSCROLLBAR
:
if
(
pOpt
->
getBrowseMode
()
)
if
(
pOpt
->
getBrowseMode
()
)
{
{
...
...
sw/source/ui/uiview/viewfunc.hxx
Dosyayı görüntüle @
95c586d5
...
@@ -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
*
pV
Lineal
=
0
,
SvxRuler
*
pV
Ruler
=
0
,
SvxRuler
*
pH
Lineal
=
0
,
SvxRuler
*
pH
Ruler
=
0
,
sal_Bool
bWebView
=
sal_False
,
sal_Bool
bWebView
=
sal_False
,
sal_Bool
bVRulerRight
=
sal_False
);
sal_Bool
bVRulerRight
=
sal_False
);
...
...
sw/source/ui/uiview/viewmdi.cxx
Dosyayı görüntüle @
95c586d5
...
@@ -538,7 +538,7 @@ void SwView::ChangeTabMetric( FieldUnit eUnit )
...
@@ -538,7 +538,7 @@ void SwView::ChangeTabMetric( FieldUnit eUnit )
}
}
}
}
void
SwView
::
ChangeV
Lineal
Metric
(
FieldUnit
eUnit
)
void
SwView
::
ChangeV
Ruler
Metric
(
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
::
GetV
Lineal
Metric
(
FieldUnit
&
eToFill
)
const
void
SwView
::
GetV
Ruler
Metric
(
FieldUnit
&
eToFill
)
const
{
{
eToFill
=
m_pVRuler
->
GetUnit
();
eToFill
=
m_pVRuler
->
GetUnit
();
}
}
void
SwView
::
GetH
Lineal
Metric
(
FieldUnit
&
eToFill
)
const
void
SwView
::
GetH
Ruler
Metric
(
FieldUnit
&
eToFill
)
const
{
{
eToFill
=
m_pHRuler
->
GetUnit
();
eToFill
=
m_pHRuler
->
GetUnit
();
}
}
int
SwView
::
CreateV
Lineal
()
int
SwView
::
CreateV
Ruler
()
{
{
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
::
KillV
Lineal
()
int
SwView
::
KillV
Ruler
()
{
{
m_pVRuler
->
Hide
();
m_pVRuler
->
Hide
();
m_pHRuler
->
SetBorderPos
(
0
);
m_pHRuler
->
SetBorderPos
(
0
);
...
...
sw/source/ui/uiview/viewport.cxx
Dosyayı görüntüle @
95c586d5
...
@@ -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
*
pV
Lineal
,
SvxRuler
*
pV
Ruler
,
SvxRuler
*
pH
Lineal
,
SvxRuler
*
pH
Ruler
,
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
bH
Lineal
=
pHLineal
&&
pHLineal
->
IsVisible
();
const
sal_Bool
bH
Ruler
=
pHRuler
&&
pHRuler
->
IsVisible
();
const
long
nHLinSzHeight
=
bH
Lineal
?
const
long
nHLinSzHeight
=
bH
Ruler
?
pH
Lineal
->
GetSizePixel
().
Height
()
:
0
;
pH
Ruler
->
GetSizePixel
().
Height
()
:
0
;
const
sal_Bool
bV
Lineal
=
pVLineal
&&
pVLineal
->
IsVisible
();
const
sal_Bool
bV
Ruler
=
pVRuler
&&
pVRuler
->
IsVisible
();
const
long
nVLinSzWidth
=
bV
Lineal
?
const
long
nVLinSzWidth
=
bV
Ruler
?
pV
Lineal
->
GetSizePixel
().
Width
()
:
0
;
pV
Ruler
->
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
(
pV
Lineal
)
if
(
pV
Ruler
)
{
{
WinBits
nStyle
=
pV
Lineal
->
GetStyle
()
&~
WB_RIGHT_ALIGNED
;
WinBits
nStyle
=
pV
Ruler
->
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
()
=
pV
Lineal
->
GetSizePixel
().
Width
();
aSize
.
Width
()
=
pV
Ruler
->
GetSizePixel
().
Width
();
pV
Lineal
->
SetStyle
(
nStyle
);
pV
Ruler
->
SetStyle
(
nStyle
);
pV
Lineal
->
SetPosSizePixel
(
aPos
,
aSize
);
pV
Ruler
->
SetPosSizePixel
(
aPos
,
aSize
);
if
(
!
pV
Lineal
->
IsVisible
())
if
(
!
pV
Ruler
->
IsVisible
())
pV
Lineal
->
Resize
();
pV
Ruler
->
Resize
();
}
}
// Lineal braucht ein Resize, sonst funktioniert es nicht im unischtbaren Zustand
// Lineal braucht ein Resize, sonst funktioniert es nicht im unischtbaren Zustand
if
(
pH
Lineal
)
if
(
pH
Ruler
)
{
{
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
()
=
pH
Lineal
->
GetSizePixel
().
Height
();
aSize
.
Height
()
=
pH
Ruler
->
GetSizePixel
().
Height
();
pH
Lineal
->
SetPosSizePixel
(
rOfst
,
aSize
);
pH
Ruler
->
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
(
!
pH
Lineal
->
IsVisible
())
if
(
!
pH
Ruler
->
IsVisible
())
pH
Lineal
->
Resize
();
pH
Ruler
->
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
(
bH
Lineal
)
if
(
bH
Ruler
)
{
{
aPos
.
Y
()
+=
nHLinSzHeight
;
aPos
.
Y
()
+=
nHLinSzHeight
;
aSize
.
Height
()
-=
nHLinSzHeight
;
aSize
.
Height
()
-=
nHLinSzHeight
;
...
...
sw/source/ui/uno/unomod.cxx
Dosyayı görüntüle @
95c586d5
...
@@ -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
->
ChangeV
Lineal
Metric
((
FieldUnit
)
eVRulerUnit
);
pView
->
ChangeV
Ruler
Metric
((
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
->
GetH
Lineal
Metric
(
eUnit
);
pView
->
GetH
Ruler
Metric
(
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
->
GetV
Lineal
Metric
(
eUnit
);
pView
->
GetV
Ruler
Metric
(
eUnit
);
rValue
<<=
(
sal_Int32
)
eUnit
;
rValue
<<=
(
sal_Int32
)
eUnit
;
}
}
else
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment