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
e5301736
Kaydet (Commit)
e5301736
authored
Agu 18, 2016
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
convert SdrViewContext to scoped enum
Change-Id: Ic41d522cdb7f80614bd5f269fe1d63f022d8dd84
üst
565e08cd
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
21 deletions
+23
-21
svdview.hxx
include/svx/svdview.hxx
+8
-6
motionpathtag.cxx
sd/source/ui/animations/motionpathtag.cxx
+1
-1
ToolBarManager.cxx
sd/source/ui/view/ToolBarManager.cxx
+5
-5
sdview.cxx
sd/source/ui/view/sdview.cxx
+1
-1
svdview.cxx
svx/source/svdraw/svdview.cxx
+7
-7
wrtsh1.cxx
sw/source/uibase/wrtsh/wrtsh1.cxx
+1
-1
No files found.
include/svx/svdview.hxx
Dosyayı görüntüle @
e5301736
...
...
@@ -51,12 +51,14 @@
class
SvxURLField
;
enum
SdrViewContext
{
SDRCONTEXT_STANDARD
,
SDRCONTEXT_POINTEDIT
,
SDRCONTEXT_GLUEPOINTEDIT
,
SDRCONTEXT_GRAPHIC
,
SDRCONTEXT_MEDIA
,
SDRCONTEXT_TABLE
};
enum
class
SdrViewContext
{
Standard
,
PointEdit
,
GluePointEdit
,
Graphic
,
Media
,
Table
};
enum
class
SdrEventKind
{
NONE
,
...
...
sd/source/ui/animations/motionpathtag.cxx
Dosyayı görüntüle @
e5301736
...
...
@@ -839,7 +839,7 @@ bool MotionPathTag::getContext( SdrViewContext& rContext )
{
if
(
mpPathObj
&&
isSelected
()
&&
!
mrView
.
IsFrameDragSingles
()
)
{
rContext
=
S
DRCONTEXT_POINTEDIT
;
rContext
=
S
drViewContext
::
PointEdit
;
return
true
;
}
else
...
...
sd/source/ui/view/ToolBarManager.cxx
Dosyayı görüntüle @
e5301736
...
...
@@ -1086,22 +1086,22 @@ void ToolBarRules::SelectionHasChanged (
switch
(
rView
.
GetContext
())
{
case
S
DRCONTEXT_GRAPHIC
:
case
S
drViewContext
:
:
Graphic
:
if
(
!
bTextEdit
)
mpToolBarManager
->
SetToolBarShell
(
ToolBarManager
::
TBG_FUNCTION
,
RID_DRAW_GRAF_TOOLBOX
);
break
;
case
S
DRCONTEXT_MEDIA
:
case
S
drViewContext
:
:
Media
:
if
(
!
bTextEdit
)
mpToolBarManager
->
SetToolBarShell
(
ToolBarManager
::
TBG_FUNCTION
,
RID_DRAW_MEDIA_TOOLBOX
);
break
;
case
S
DRCONTEXT_TABLE
:
case
S
drViewContext
:
:
Table
:
mpToolBarManager
->
SetToolBarShell
(
ToolBarManager
::
TBG_FUNCTION
,
RID_DRAW_TABLE_TOOLBOX
);
bTextEdit
=
true
;
break
;
case
S
DRCONTEXT_STANDARD
:
case
S
drViewContext
:
:
Standard
:
default
:
if
(
!
bTextEdit
)
{
...
...
@@ -1135,7 +1135,7 @@ void ToolBarRules::SelectionHasChanged (
mpToolBarManager
->
AddToolBarShell
(
ToolBarManager
::
TBG_FUNCTION
,
RID_SVX_FONTWORK_BAR
);
// Switch on additional context-sensitive tool bars.
if
(
rView
.
GetContext
()
==
S
DRCONTEXT_POINTEDIT
)
if
(
rView
.
GetContext
()
==
S
drViewContext
::
PointEdit
)
mpToolBarManager
->
AddToolBarShell
(
ToolBarManager
::
TBG_FUNCTION
,
RID_BEZIER_TOOLBOX
);
}
...
...
sd/source/ui/view/sdview.cxx
Dosyayı görüntüle @
e5301736
...
...
@@ -1137,7 +1137,7 @@ void View::updateHandles()
SdrViewContext
View
::
GetContext
()
const
{
SdrViewContext
eContext
=
S
DRCONTEXT_STANDARD
;
SdrViewContext
eContext
=
S
drViewContext
::
Standard
;
if
(
maSmartTags
.
getContext
(
eContext
)
)
return
eContext
;
else
...
...
svx/source/svdraw/svdview.cxx
Dosyayı görüntüle @
e5301736
...
...
@@ -1296,7 +1296,7 @@ OUString SdrView::GetStatusText()
SdrViewContext
SdrView
::
GetContext
()
const
{
if
(
IsGluePointEditMode
()
)
return
S
DRCONTEXT_GLUEPOINTEDIT
;
return
S
drViewContext
::
GluePointEdit
;
const
size_t
nMarkCount
=
GetMarkedObjectCount
();
...
...
@@ -1308,7 +1308,7 @@ SdrViewContext SdrView::GetContext() const
bPath
=
false
;
if
(
bPath
)
return
S
DRCONTEXT_POINTEDIT
;
return
S
drViewContext
::
PointEdit
;
}
if
(
GetMarkedObjectCount
()
)
...
...
@@ -1334,14 +1334,14 @@ SdrViewContext SdrView::GetContext() const
}
if
(
bGraf
)
return
S
DRCONTEXT_GRAPHIC
;
return
S
drViewContext
::
Graphic
;
else
if
(
bMedia
)
return
S
DRCONTEXT_MEDIA
;
return
S
drViewContext
::
Media
;
else
if
(
bTable
)
return
S
DRCONTEXT_TABLE
;
return
S
drViewContext
::
Table
;
}
return
S
DRCONTEXT_STANDARD
;
return
S
drViewContext
::
Standard
;
}
void
SdrView
::
MarkAll
()
...
...
@@ -1398,7 +1398,7 @@ void SdrView::DeleteMarked()
{
DeleteMarkedGluePoints
();
}
else
if
(
GetContext
()
==
S
DRCONTEXT_POINTEDIT
&&
HasMarkedPoints
())
else
if
(
GetContext
()
==
S
drViewContext
::
PointEdit
&&
HasMarkedPoints
())
{
DeleteMarkedPoints
();
}
...
...
sw/source/uibase/wrtsh/wrtsh1.cxx
Dosyayı görüntüle @
e5301736
...
...
@@ -1381,7 +1381,7 @@ SelectionType SwWrtShell::GetSelectionType() const
if
(
_rView
.
IsBezierEditMode
())
nCnt
|=
nsSelectionType
::
SEL_BEZ
;
else
if
(
GetDrawView
()
->
GetContext
()
==
S
DRCONTEXT_MEDIA
)
else
if
(
GetDrawView
()
->
GetContext
()
==
S
drViewContext
::
Media
)
nCnt
|=
nsSelectionType
::
SEL_MEDIA
;
if
(
svx
::
checkForSelectedCustomShapes
(
...
...
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