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
50b39947
Kaydet (Commit)
50b39947
authored
Mar 22, 2016
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
loplugin:constantparam in sdext
Change-Id: Ib349a856665776ef51524b3c6613774f739bbdfe
üst
4665a216
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
44 deletions
+18
-44
optimizerdialog.cxx
sdext/source/minimizer/optimizerdialog.cxx
+7
-7
optimizerdialog.hxx
sdext/source/minimizer/optimizerdialog.hxx
+1
-1
PresenterPaneBorderPainter.cxx
sdext/source/presenter/PresenterPaneBorderPainter.cxx
+5
-28
PresenterScrollBar.cxx
sdext/source/presenter/PresenterScrollBar.cxx
+4
-6
PresenterScrollBar.hxx
sdext/source/presenter/PresenterScrollBar.hxx
+1
-2
No files found.
sdext/source/minimizer/optimizerdialog.cxx
Dosyayı görüntüle @
50b39947
...
...
@@ -105,11 +105,11 @@ void OptimizerDialog::InitRoadmap()
Reference
<
XPropertySet
>
xPropertySet
(
mxRoadmapControlModel
,
UNO_QUERY_THROW
);
xPropertySet
->
setPropertyValue
(
"Name"
,
Any
(
OUString
(
"rdmNavi"
)
)
);
mxRoadmapControl
=
mxDialog
->
getControl
(
"rdmNavi"
);
InsertRoadmapItem
(
0
,
true
,
getString
(
STR_INTRODUCTION
),
ITEM_ID_INTRODUCTION
);
InsertRoadmapItem
(
1
,
true
,
getString
(
STR_SLIDES
),
ITEM_ID_SLIDES
);
InsertRoadmapItem
(
2
,
true
,
getString
(
STR_IMAGE_OPTIMIZATION
),
ITEM_ID_GRAPHIC_OPTIMIZATION
);
InsertRoadmapItem
(
3
,
true
,
getString
(
STR_OLE_OBJECTS
),
ITEM_ID_OLE_OPTIMIZATION
);
InsertRoadmapItem
(
4
,
true
,
getString
(
STR_SUMMARY
),
ITEM_ID_SUMMARY
);
InsertRoadmapItem
(
0
,
getString
(
STR_INTRODUCTION
),
ITEM_ID_INTRODUCTION
);
InsertRoadmapItem
(
1
,
getString
(
STR_SLIDES
),
ITEM_ID_SLIDES
);
InsertRoadmapItem
(
2
,
getString
(
STR_IMAGE_OPTIMIZATION
),
ITEM_ID_GRAPHIC_OPTIMIZATION
);
InsertRoadmapItem
(
3
,
getString
(
STR_OLE_OBJECTS
),
ITEM_ID_OLE_OPTIMIZATION
);
InsertRoadmapItem
(
4
,
getString
(
STR_SUMMARY
),
ITEM_ID_SUMMARY
);
// Well, that's messy, but the
// BMP_PRESENTATION_MINIMIZER from sd module cannot be used here directly
...
...
@@ -128,7 +128,7 @@ void OptimizerDialog::InitRoadmap()
}
void
OptimizerDialog
::
InsertRoadmapItem
(
const
sal_Int32
nIndex
,
const
bool
bEnabled
,
const
OUString
&
rLabel
,
const
sal_Int32
nItemID
)
void
OptimizerDialog
::
InsertRoadmapItem
(
const
sal_Int32
nIndex
,
const
OUString
&
rLabel
,
const
sal_Int32
nItemID
)
{
try
{
...
...
@@ -137,7 +137,7 @@ void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const bool bEna
Reference
<
XInterface
>
xRoadmapItem
(
xSFRoadmap
->
createInstance
(),
UNO_QUERY_THROW
);
Reference
<
XPropertySet
>
xPropertySet
(
xRoadmapItem
,
UNO_QUERY_THROW
);
xPropertySet
->
setPropertyValue
(
"Label"
,
Any
(
rLabel
)
);
xPropertySet
->
setPropertyValue
(
"Enabled"
,
Any
(
bEnabled
)
);
xPropertySet
->
setPropertyValue
(
"Enabled"
,
Any
(
true
)
);
xPropertySet
->
setPropertyValue
(
"ID"
,
Any
(
nItemID
)
);
aIndexContainerRoadmap
->
insertByIndex
(
nIndex
,
Any
(
xRoadmapItem
)
);
}
...
...
sdext/source/minimizer/optimizerdialog.hxx
Dosyayı görüntüle @
50b39947
...
...
@@ -101,7 +101,7 @@ private:
void
ActivatePage
(
sal_Int16
nStep
);
void
DeactivatePage
(
sal_Int16
nStep
);
void
InsertRoadmapItem
(
const
sal_Int32
nIndex
,
const
bool
bEnabled
,
const
OUString
&
rLabel
,
const
sal_Int32
nItemID
);
void
InsertRoadmapItem
(
const
sal_Int32
nIndex
,
const
OUString
&
rLabel
,
const
sal_Int32
nItemID
);
public
:
...
...
sdext/source/presenter/PresenterPaneBorderPainter.cxx
Dosyayı görüntüle @
50b39947
...
...
@@ -120,8 +120,7 @@ public:
const
std
::
shared_ptr
<
RendererPaneStyle
>&
rpStyle
,
const
awt
::
Rectangle
&
rUpdateBox
,
const
awt
::
Rectangle
&
rOuterBox
,
const
awt
::
Rectangle
&
rInnerBox
,
const
bool
bPaintBackground
);
const
awt
::
Rectangle
&
rInnerBox
);
void
SetupClipping
(
const
awt
::
Rectangle
&
rUpdateBox
,
const
awt
::
Rectangle
&
rOuterBox
,
...
...
@@ -491,7 +490,7 @@ void PresenterPaneBorderPainter::Renderer::PaintBorder (
PaintBitmap
(
aCenterBox
,
rUpdateBox
,
+
1
,
+
1
,
0
,
0
,
false
,
pBottomRight
,
pBackground
);
// Paint the title.
PaintTitle
(
rsTitle
,
pStyle
,
rUpdateBox
,
aOuterBox
,
aInnerBox
,
false
);
PaintTitle
(
rsTitle
,
pStyle
,
rUpdateBox
,
aOuterBox
,
aInnerBox
);
// In a double buffering environment request to make the changes visible.
Reference
<
rendering
::
XSpriteCanvas
>
xSpriteCanvas
(
mxCanvas
,
UNO_QUERY
);
...
...
@@ -504,8 +503,7 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
const
std
::
shared_ptr
<
RendererPaneStyle
>&
rpStyle
,
const
awt
::
Rectangle
&
rUpdateBox
,
const
awt
::
Rectangle
&
rOuterBox
,
const
awt
::
Rectangle
&
rInnerBox
,
bool
bPaintBackground
)
const
awt
::
Rectangle
&
rInnerBox
)
{
if
(
!
mxCanvas
.
is
())
return
;
...
...
@@ -566,35 +564,14 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
Sequence
<
double
>
(
4
),
rendering
::
CompositeOperation
::
SOURCE
);
if
(
bPaintBackground
)
{
PresenterCanvasHelper
::
SetDeviceColor
(
aRenderState
,
util
::
Color
(
0x00ffffff
));
Sequence
<
Sequence
<
geometry
::
RealPoint2D
>
>
aPolygons
(
1
);
aPolygons
[
0
]
=
Sequence
<
geometry
::
RealPoint2D
>
(
4
);
aPolygons
[
0
][
0
]
=
geometry
::
RealPoint2D
(
0
,
-
nTextHeight
);
aPolygons
[
0
][
1
]
=
geometry
::
RealPoint2D
(
0
,
0
);
aPolygons
[
0
][
2
]
=
geometry
::
RealPoint2D
(
nTextWidth
,
0
);
aPolygons
[
0
][
3
]
=
geometry
::
RealPoint2D
(
nTextWidth
,
-
nTextHeight
);
Reference
<
rendering
::
XPolyPolygon2D
>
xPolygon
(
mxCanvas
->
getDevice
()
->
createCompatibleLinePolyPolygon
(
aPolygons
),
UNO_QUERY
);
if
(
xPolygon
.
is
())
xPolygon
->
setClosed
(
0
,
sal_True
);
mxCanvas
->
fillPolyPolygon
(
xPolygon
,
maViewState
,
aRenderState
);
}
else
{
PresenterCanvasHelper
::
SetDeviceColor
(
PresenterCanvasHelper
::
SetDeviceColor
(
aRenderState
,
rpStyle
->
mpFont
->
mnColor
);
mxCanvas
->
drawTextLayout
(
mxCanvas
->
drawTextLayout
(
xLayout
,
maViewState
,
aRenderState
);
}
}
std
::
shared_ptr
<
RendererPaneStyle
>
...
...
sdext/source/presenter/PresenterScrollBar.cxx
Dosyayı görüntüle @
50b39947
...
...
@@ -186,14 +186,13 @@ void PresenterScrollBar::SetThumbPosition (
double
nPosition
,
const
bool
bAsynchronousUpdate
)
{
SetThumbPosition
(
nPosition
,
bAsynchronousUpdate
,
true
,
true
);
SetThumbPosition
(
nPosition
,
bAsynchronousUpdate
,
true
);
}
void
PresenterScrollBar
::
SetThumbPosition
(
double
nPosition
,
const
bool
bAsynchronousUpdate
,
const
bool
bValidate
,
const
bool
bNotify
)
const
bool
bValidate
)
{
if
(
bValidate
)
nPosition
=
ValidateThumbPosition
(
nPosition
);
...
...
@@ -204,8 +203,7 @@ void PresenterScrollBar::SetThumbPosition (
UpdateBorders
();
Repaint
(
GetRectangle
(
Total
),
bAsynchronousUpdate
);
if
(
bNotify
)
NotifyThumbPositionChange
();
NotifyThumbPositionChange
();
}
}
...
...
@@ -444,7 +442,7 @@ void SAL_CALL PresenterScrollBar::mouseDragged (const css::awt::MouseEvent& rEve
UpdateDragAnchor
(
nDragDistance
);
if
(
nDragDistance
!=
0
)
{
SetThumbPosition
(
mnThumbPosition
+
nDragDistance
,
false
,
true
,
true
);
SetThumbPosition
(
mnThumbPosition
+
nDragDistance
,
false
,
true
);
}
}
...
...
sdext/source/presenter/PresenterScrollBar.hxx
Dosyayı görüntüle @
50b39947
...
...
@@ -228,8 +228,7 @@ protected:
void
SetThumbPosition
(
double
nPosition
,
const
bool
bAsynchronousRepaint
,
const
bool
bValidate
,
const
bool
bNotify
);
const
bool
bValidate
);
private
:
class
MousePressRepeater
;
...
...
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