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
4ded8177
Kaydet (Commit)
4ded8177
authored
Kas 29, 2013
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
convert Edit::GetCharPos from xub_StrLen to sal_Int32
Change-Id: I8fe982d0c0c0a04e2a10cff0f0ae68d51bed590a
üst
9083e8d1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
standardcontrol.cxx
extensions/source/propctrlr/standardcontrol.cxx
+1
-1
edit.hxx
include/vcl/edit.hxx
+1
-1
edit.cxx
vcl/source/control/edit.cxx
+12
-12
No files found.
extensions/source/propctrlr/standardcontrol.cxx
Dosyayı görüntüle @
4ded8177
...
...
@@ -384,7 +384,7 @@ namespace pcr
//--------------------------------------------------------------------
bool
HyperlinkInput
::
impl_textHitTest
(
const
::
Point
&
_rWindowPos
)
{
xub_StrLen
nPos
=
GetCharPos
(
_rWindowPos
);
sal_Int32
nPos
=
GetCharPos
(
_rWindowPos
);
return
(
(
nPos
!=
STRING_LEN
)
&&
(
nPos
<
GetText
().
getLength
()
)
);
}
...
...
include/vcl/edit.hxx
Dosyayı görüntüle @
4ded8177
...
...
@@ -236,7 +236,7 @@ public:
virtual
Size
CalcSize
(
sal_uInt16
nChars
)
const
;
virtual
xub_StrLen
GetMaxVisChars
()
const
;
xub_StrLen
GetCharPos
(
const
Point
&
rWindowPos
)
const
;
sal_Int32
GetCharPos
(
const
Point
&
rWindowPos
)
const
;
// shows a warning box saying "text too long, truncated"
static
void
ShowTruncationWarning
(
Window
*
pParent
);
...
...
vcl/source/control/edit.cxx
Dosyayı görüntüle @
4ded8177
...
...
@@ -1430,7 +1430,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt )
return
;
}
xub_StrLen
nChar
=
ImplGetCharPos
(
rMEvt
.
GetPosPixel
()
);
sal_Int32
nCharPos
=
ImplGetCharPos
(
rMEvt
.
GetPosPixel
()
);
Selection
aSelection
(
maSelection
);
aSelection
.
Justify
();
...
...
@@ -1451,10 +1451,10 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt )
ImplSetSelection
(
Selection
(
aBoundary
.
startPos
,
aBoundary
.
endPos
)
);
ImplCopyToSelectionClipboard
();
}
else
if
(
!
rMEvt
.
IsShift
()
&&
HasFocus
()
&&
aSelection
.
IsInside
(
nChar
)
)
else
if
(
!
rMEvt
.
IsShift
()
&&
HasFocus
()
&&
aSelection
.
IsInside
(
nChar
Pos
)
)
mbClickedInSelection
=
sal_True
;
else
if
(
rMEvt
.
IsLeft
()
)
ImplSetCursorPos
(
nChar
,
rMEvt
.
IsShift
()
);
ImplSetCursorPos
(
nChar
Pos
,
rMEvt
.
IsShift
()
);
if
(
!
mbClickedInSelection
&&
rMEvt
.
IsLeft
()
&&
(
rMEvt
.
GetClicks
()
==
1
)
)
StartTracking
(
STARTTRACK_SCROLLREPEAT
);
...
...
@@ -1471,8 +1471,8 @@ void Edit::MouseButtonUp( const MouseEvent& rMEvt )
{
if
(
mbClickedInSelection
&&
rMEvt
.
IsLeft
()
)
{
xub_StrLen
nChar
=
ImplGetCharPos
(
rMEvt
.
GetPosPixel
()
);
ImplSetCursorPos
(
nChar
,
sal_False
);
sal_Int32
nCharPos
=
ImplGetCharPos
(
rMEvt
.
GetPosPixel
()
);
ImplSetCursorPos
(
nChar
Pos
,
sal_False
);
mbClickedInSelection
=
sal_False
;
}
else
if
(
rMEvt
.
IsMiddle
()
&&
!
mbReadOnly
&&
...
...
@@ -1492,8 +1492,8 @@ void Edit::Tracking( const TrackingEvent& rTEvt )
{
if
(
mbClickedInSelection
)
{
xub_StrLen
nChar
=
ImplGetCharPos
(
rTEvt
.
GetMouseEvent
().
GetPosPixel
()
);
ImplSetCursorPos
(
nChar
,
sal_False
);
sal_Int32
nCharPos
=
ImplGetCharPos
(
rTEvt
.
GetMouseEvent
().
GetPosPixel
()
);
ImplSetCursorPos
(
nChar
Pos
,
sal_False
);
mbClickedInSelection
=
sal_False
;
}
else
if
(
rTEvt
.
GetMouseEvent
().
IsLeft
()
)
...
...
@@ -1505,8 +1505,8 @@ void Edit::Tracking( const TrackingEvent& rTEvt )
{
if
(
!
mbClickedInSelection
)
{
xub_StrLen
nChar
=
ImplGetCharPos
(
rTEvt
.
GetMouseEvent
().
GetPosPixel
()
);
ImplSetCursorPos
(
nChar
,
sal_True
);
sal_Int32
nCharPos
=
ImplGetCharPos
(
rTEvt
.
GetMouseEvent
().
GetPosPixel
()
);
ImplSetCursorPos
(
nChar
Pos
,
sal_True
);
}
}
...
...
@@ -2967,7 +2967,7 @@ xub_StrLen Edit::GetMaxVisChars() const
// -----------------------------------------------------------------------
xub_StrLen
Edit
::
GetCharPos
(
const
Point
&
rWindowPos
)
const
sal_Int32
Edit
::
GetCharPos
(
const
Point
&
rWindowPos
)
const
{
return
ImplGetCharPos
(
rWindowPos
);
}
...
...
@@ -3033,8 +3033,8 @@ void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::Dra
// Nur wenn Maus in der Selektion...
Point
aMousePos
(
rDGE
.
DragOriginX
,
rDGE
.
DragOriginY
);
xub_StrLen
nChar
=
ImplGetCharPos
(
aMousePos
);
if
(
(
nChar
>=
aSel
.
Min
())
&&
(
nChar
<
aSel
.
Max
())
)
sal_Int32
nCharPos
=
ImplGetCharPos
(
aMousePos
);
if
(
(
nChar
Pos
>=
aSel
.
Min
())
&&
(
nCharPos
<
aSel
.
Max
())
)
{
if
(
!
mpDDInfo
)
mpDDInfo
=
new
DDInfo
;
...
...
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