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
8306e6cf
Kaydet (Commit)
8306e6cf
authored
Nis 30, 2014
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sdext, fix sal_Bool->bool conversion
in commit
1e2c8cf5
Change-Id: Id488736b183ddd02e07179fa0186a9ff342cafdf
üst
4d8e3aa0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
25 deletions
+25
-25
optimizerdialogcontrols.cxx
sdext/source/minimizer/optimizerdialogcontrols.cxx
+25
-25
No files found.
sdext/source/minimizer/optimizerdialogcontrols.cxx
Dosyayı görüntüle @
8306e6cf
...
@@ -179,7 +179,7 @@ OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon
...
@@ -179,7 +179,7 @@ OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon
OUString
(
"Width"
)
};
OUString
(
"Width"
)
};
Any
pValues
[]
=
{
Any
pValues
[]
=
{
Any
(
sal_T
rue
),
Any
(
t
rue
),
Any
(
nHeight
),
Any
(
nHeight
),
Any
(
rLabel
),
Any
(
rLabel
),
Any
(
nXPos
),
Any
(
nXPos
),
...
@@ -221,7 +221,7 @@ OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString
...
@@ -221,7 +221,7 @@ OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString
Any
pValues
[]
=
{
Any
pValues
[]
=
{
Any
(
fEffectiveMax
),
Any
(
fEffectiveMax
),
Any
(
fEffectiveMin
),
Any
(
fEffectiveMin
),
Any
(
sal_T
rue
),
Any
(
t
rue
),
Any
(
(
sal_Int32
)
12
),
Any
(
(
sal_Int32
)
12
),
Any
(
nXPos
),
Any
(
nXPos
),
Any
(
nYPos
),
Any
(
nYPos
),
...
@@ -266,7 +266,7 @@ OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon
...
@@ -266,7 +266,7 @@ OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon
OUString
(
"Width"
)
};
OUString
(
"Width"
)
};
Any
pValues
[]
=
{
Any
pValues
[]
=
{
Any
(
sal_T
rue
),
Any
(
t
rue
),
Any
(
bEnabled
),
Any
(
bEnabled
),
Any
(
nHeight
),
Any
(
nHeight
),
Any
(
(
sal_Int16
)
8
),
Any
(
(
sal_Int16
)
8
),
...
@@ -344,11 +344,11 @@ OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rCont
...
@@ -344,11 +344,11 @@ OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rCont
OUString
(
"Width"
)
};
OUString
(
"Width"
)
};
Any
pValues
[]
=
{
Any
pValues
[]
=
{
Any
(
sal_T
rue
),
Any
(
t
rue
),
Any
(
bEnabled
),
Any
(
bEnabled
),
Any
(
nHeight
),
Any
(
nHeight
),
Any
(
(
sal_Int16
)
8
),
Any
(
(
sal_Int16
)
8
),
Any
(
sal_F
alse
),
Any
(
f
alse
),
Any
(
nXPos
),
Any
(
nXPos
),
Any
(
nYPos
),
Any
(
nYPos
),
Any
(
(
sal_Int16
)
0
),
Any
(
(
sal_Int16
)
0
),
...
@@ -384,7 +384,7 @@ void OptimizerDialog::InitNavigationBar()
...
@@ -384,7 +384,7 @@ void OptimizerDialog::InitNavigationBar()
InsertButton
(
*
this
,
"btnNavFinish"
,
mxActionListener
,
nFinishPosX
,
BUTTON_POS_Y
,
BUTTON_WIDTH
,
BUTTON_HEIGHT
,
mnTabIndex
++
,
true
,
STR_FINISH
,
PushButtonType_STANDARD
);
InsertButton
(
*
this
,
"btnNavFinish"
,
mxActionListener
,
nFinishPosX
,
BUTTON_POS_Y
,
BUTTON_WIDTH
,
BUTTON_HEIGHT
,
mnTabIndex
++
,
true
,
STR_FINISH
,
PushButtonType_STANDARD
);
InsertButton
(
*
this
,
"btnNavCancel"
,
mxActionListener
,
nCancelPosX
,
BUTTON_POS_Y
,
BUTTON_WIDTH
,
BUTTON_HEIGHT
,
mnTabIndex
++
,
true
,
STR_CANCEL
,
PushButtonType_STANDARD
);
InsertButton
(
*
this
,
"btnNavCancel"
,
mxActionListener
,
nCancelPosX
,
BUTTON_POS_Y
,
BUTTON_WIDTH
,
BUTTON_HEIGHT
,
mnTabIndex
++
,
true
,
STR_CANCEL
,
PushButtonType_STANDARD
);
setControlProperty
(
"btnNavNext"
,
"DefaultButton"
,
Any
(
sal_T
rue
)
);
setControlProperty
(
"btnNavNext"
,
"DefaultButton"
,
Any
(
t
rue
)
);
}
}
...
@@ -440,9 +440,9 @@ void OptimizerDialog::InitPage0()
...
@@ -440,9 +440,9 @@ void OptimizerDialog::InitPage0()
void
OptimizerDialog
::
UpdateControlStatesPage1
()
void
OptimizerDialog
::
UpdateControlStatesPage1
()
{
{
bool
bDeleteUnusedMasterPages
(
GetConfigProperty
(
TK_DeleteUnusedMasterPages
,
sal_F
alse
)
);
bool
bDeleteUnusedMasterPages
(
GetConfigProperty
(
TK_DeleteUnusedMasterPages
,
f
alse
)
);
bool
bDeleteHiddenSlides
(
GetConfigProperty
(
TK_DeleteHiddenSlides
,
sal_F
alse
)
);
bool
bDeleteHiddenSlides
(
GetConfigProperty
(
TK_DeleteHiddenSlides
,
f
alse
)
);
bool
bDeleteNotesPages
(
GetConfigProperty
(
TK_DeleteNotesPages
,
sal_F
alse
)
);
bool
bDeleteNotesPages
(
GetConfigProperty
(
TK_DeleteNotesPages
,
f
alse
)
);
setControlProperty
(
"CheckBox0Pg3"
,
"State"
,
Any
(
(
sal_Int16
)
bDeleteUnusedMasterPages
)
);
setControlProperty
(
"CheckBox0Pg3"
,
"State"
,
Any
(
(
sal_Int16
)
bDeleteUnusedMasterPages
)
);
setControlProperty
(
"CheckBox1Pg3"
,
"State"
,
Any
(
(
sal_Int16
)
bDeleteNotesPages
)
);
setControlProperty
(
"CheckBox1Pg3"
,
"State"
,
Any
(
(
sal_Int16
)
bDeleteNotesPages
)
);
...
@@ -469,9 +469,9 @@ void OptimizerDialog::InitPage1()
...
@@ -469,9 +469,9 @@ void OptimizerDialog::InitPage1()
maControlPages
.
push_back
(
aControlList
);
maControlPages
.
push_back
(
aControlList
);
DeactivatePage
(
1
);
DeactivatePage
(
1
);
setControlProperty
(
"CheckBox3Pg3"
,
"State"
,
Any
(
sal_F
alse
)
);
setControlProperty
(
"CheckBox3Pg3"
,
"State"
,
Any
(
f
alse
)
);
setControlProperty
(
"CheckBox3Pg3"
,
"Enabled"
,
Any
(
aCustomShowList
.
getLength
()
!=
0
)
);
setControlProperty
(
"CheckBox3Pg3"
,
"Enabled"
,
Any
(
aCustomShowList
.
getLength
()
!=
0
)
);
setControlProperty
(
"ListBox0Pg3"
,
"Enabled"
,
Any
(
sal_F
alse
)
);
setControlProperty
(
"ListBox0Pg3"
,
"Enabled"
,
Any
(
f
alse
)
);
UpdateControlStatesPage1
();
UpdateControlStatesPage1
();
}
}
...
@@ -480,9 +480,9 @@ void OptimizerDialog::InitPage1()
...
@@ -480,9 +480,9 @@ void OptimizerDialog::InitPage1()
void
OptimizerDialog
::
UpdateControlStatesPage2
()
void
OptimizerDialog
::
UpdateControlStatesPage2
()
{
{
bool
bJPEGCompression
(
GetConfigProperty
(
TK_JPEGCompression
,
sal_F
alse
)
);
bool
bJPEGCompression
(
GetConfigProperty
(
TK_JPEGCompression
,
f
alse
)
);
bool
bRemoveCropArea
(
GetConfigProperty
(
TK_RemoveCropArea
,
sal_F
alse
)
);
bool
bRemoveCropArea
(
GetConfigProperty
(
TK_RemoveCropArea
,
f
alse
)
);
bool
bEmbedLinkedGraphics
(
GetConfigProperty
(
TK_EmbedLinkedGraphics
,
sal_T
rue
)
);
bool
bEmbedLinkedGraphics
(
GetConfigProperty
(
TK_EmbedLinkedGraphics
,
t
rue
)
);
sal_Int32
nJPEGQuality
(
GetConfigProperty
(
TK_JPEGQuality
,
(
sal_Int32
)
90
)
);
sal_Int32
nJPEGQuality
(
GetConfigProperty
(
TK_JPEGQuality
,
(
sal_Int32
)
90
)
);
sal_Int32
nImageResolution
(
GetConfigProperty
(
TK_ImageResolution
,
(
sal_Int32
)
0
)
);
sal_Int32
nImageResolution
(
GetConfigProperty
(
TK_ImageResolution
,
(
sal_Int32
)
0
)
);
...
@@ -545,7 +545,7 @@ void OptimizerDialog::InitPage2()
...
@@ -545,7 +545,7 @@ void OptimizerDialog::InitPage2()
void
OptimizerDialog
::
UpdateControlStatesPage3
()
void
OptimizerDialog
::
UpdateControlStatesPage3
()
{
{
bool
bConvertOLEObjects
(
GetConfigProperty
(
TK_OLEOptimization
,
sal_F
alse
)
);
bool
bConvertOLEObjects
(
GetConfigProperty
(
TK_OLEOptimization
,
f
alse
)
);
sal_Int16
nOLEOptimizationType
(
GetConfigProperty
(
TK_OLEOptimizationType
,
(
sal_Int16
)
0
)
);
sal_Int16
nOLEOptimizationType
(
GetConfigProperty
(
TK_OLEOptimizationType
,
(
sal_Int16
)
0
)
);
setControlProperty
(
"CheckBox0Pg2"
,
"State"
,
Any
(
(
sal_Int16
)
bConvertOLEObjects
)
);
setControlProperty
(
"CheckBox0Pg2"
,
"State"
,
Any
(
(
sal_Int16
)
bConvertOLEObjects
)
);
...
@@ -603,7 +603,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal, sal_Unicode nSeparator =
...
@@ -603,7 +603,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal, sal_Unicode nSeparator =
void
OptimizerDialog
::
UpdateControlStatesPage4
()
void
OptimizerDialog
::
UpdateControlStatesPage4
()
{
{
bool
bSaveAs
(
GetConfigProperty
(
TK_SaveAs
,
sal_T
rue
)
);
bool
bSaveAs
(
GetConfigProperty
(
TK_SaveAs
,
t
rue
)
);
if
(
mbIsReadonly
)
if
(
mbIsReadonly
)
{
{
setControlProperty
(
"RadioButton0Pg4"
,
"State"
,
Any
(
(
sal_Int16
)(
sal_False
)
)
);
setControlProperty
(
"RadioButton0Pg4"
,
"State"
,
Any
(
(
sal_Int16
)(
sal_False
)
)
);
...
@@ -614,7 +614,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
...
@@ -614,7 +614,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
setControlProperty
(
"RadioButton0Pg4"
,
"State"
,
Any
(
(
sal_Int16
)(
bSaveAs
==
false
)
)
);
setControlProperty
(
"RadioButton0Pg4"
,
"State"
,
Any
(
(
sal_Int16
)(
bSaveAs
==
false
)
)
);
setControlProperty
(
"RadioButton1Pg4"
,
"State"
,
Any
(
(
sal_Int16
)(
bSaveAs
==
true
)
)
);
setControlProperty
(
"RadioButton1Pg4"
,
"State"
,
Any
(
(
sal_Int16
)(
bSaveAs
==
true
)
)
);
}
}
setControlProperty
(
"ComboBox0Pg4"
,
"Enabled"
,
Any
(
sal_F
alse
)
);
setControlProperty
(
"ComboBox0Pg4"
,
"Enabled"
,
Any
(
f
alse
)
);
sal_uInt32
w
;
sal_uInt32
w
;
Sequence
<
OUString
>
aItemList
;
Sequence
<
OUString
>
aItemList
;
...
@@ -678,7 +678,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
...
@@ -678,7 +678,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
PageCollector
::
CollectNonCustomShowPages
(
mxController
->
getModel
(),
aCustomShowName
,
vNonUsedPageList
);
PageCollector
::
CollectNonCustomShowPages
(
mxController
->
getModel
(),
aCustomShowName
,
vNonUsedPageList
);
nDeletedSlides
+=
vNonUsedPageList
.
size
();
nDeletedSlides
+=
vNonUsedPageList
.
size
();
}
}
if
(
GetConfigProperty
(
TK_DeleteHiddenSlides
,
sal_F
alse
)
)
if
(
GetConfigProperty
(
TK_DeleteHiddenSlides
,
f
alse
)
)
{
{
if
(
!
aCustomShowName
.
isEmpty
()
)
if
(
!
aCustomShowName
.
isEmpty
()
)
{
{
...
@@ -717,7 +717,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
...
@@ -717,7 +717,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
}
}
}
}
}
}
if
(
GetConfigProperty
(
TK_DeleteUnusedMasterPages
,
sal_F
alse
)
)
if
(
GetConfigProperty
(
TK_DeleteUnusedMasterPages
,
f
alse
)
)
{
{
std
::
vector
<
PageCollector
::
MasterPageEntity
>
aMasterPageList
;
std
::
vector
<
PageCollector
::
MasterPageEntity
>
aMasterPageList
;
PageCollector
::
CollectMasterPages
(
mxController
->
getModel
(),
aMasterPageList
);
PageCollector
::
CollectMasterPages
(
mxController
->
getModel
(),
aMasterPageList
);
...
@@ -743,11 +743,11 @@ void OptimizerDialog::UpdateControlStatesPage4()
...
@@ -743,11 +743,11 @@ void OptimizerDialog::UpdateControlStatesPage4()
// generating graphic compression info
// generating graphic compression info
sal_Int32
nGraphics
=
0
;
sal_Int32
nGraphics
=
0
;
bool
bJPEGCompression
(
GetConfigProperty
(
TK_JPEGCompression
,
sal_F
alse
)
);
bool
bJPEGCompression
(
GetConfigProperty
(
TK_JPEGCompression
,
f
alse
)
);
sal_Int32
nJPEGQuality
(
GetConfigProperty
(
TK_JPEGQuality
,
(
sal_Int32
)
90
)
);
sal_Int32
nJPEGQuality
(
GetConfigProperty
(
TK_JPEGQuality
,
(
sal_Int32
)
90
)
);
sal_Int32
nImageResolution
(
GetConfigProperty
(
TK_ImageResolution
,
(
sal_Int32
)
0
)
);
sal_Int32
nImageResolution
(
GetConfigProperty
(
TK_ImageResolution
,
(
sal_Int32
)
0
)
);
GraphicSettings
aGraphicSettings
(
bJPEGCompression
,
nJPEGQuality
,
GetConfigProperty
(
TK_RemoveCropArea
,
sal_F
alse
),
GraphicSettings
aGraphicSettings
(
bJPEGCompression
,
nJPEGQuality
,
GetConfigProperty
(
TK_RemoveCropArea
,
f
alse
),
nImageResolution
,
GetConfigProperty
(
TK_EmbedLinkedGraphics
,
sal_T
rue
)
);
nImageResolution
,
GetConfigProperty
(
TK_EmbedLinkedGraphics
,
t
rue
)
);
GraphicCollector
::
CountGraphics
(
mxContext
,
mxController
->
getModel
(),
aGraphicSettings
,
nGraphics
);
GraphicCollector
::
CountGraphics
(
mxContext
,
mxController
->
getModel
(),
aGraphicSettings
,
nGraphics
);
if
(
nGraphics
>
1
)
if
(
nGraphics
>
1
)
{
{
...
@@ -770,7 +770,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
...
@@ -770,7 +770,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
aSummaryStrings
.
push_back
(
aStr
);
aSummaryStrings
.
push_back
(
aStr
);
}
}
if
(
GetConfigProperty
(
TK_OLEOptimization
,
sal_F
alse
)
)
if
(
GetConfigProperty
(
TK_OLEOptimization
,
f
alse
)
)
{
{
sal_Int32
nOLEReplacements
=
0
;
sal_Int32
nOLEReplacements
=
0
;
Reference
<
XDrawPagesSupplier
>
xDrawPagesSupplier
(
mxController
->
getModel
(),
UNO_QUERY_THROW
);
Reference
<
XDrawPagesSupplier
>
xDrawPagesSupplier
(
mxController
->
getModel
(),
UNO_QUERY_THROW
);
...
@@ -923,14 +923,14 @@ void OptimizerDialog::EnablePage( sal_Int16 nStep )
...
@@ -923,14 +923,14 @@ void OptimizerDialog::EnablePage( sal_Int16 nStep )
std
::
vector
<
OUString
>::
iterator
aBeg
(
maControlPages
[
nStep
].
begin
()
);
std
::
vector
<
OUString
>::
iterator
aBeg
(
maControlPages
[
nStep
].
begin
()
);
std
::
vector
<
OUString
>::
iterator
aEnd
(
maControlPages
[
nStep
].
end
()
);
std
::
vector
<
OUString
>::
iterator
aEnd
(
maControlPages
[
nStep
].
end
()
);
while
(
aBeg
!=
aEnd
)
while
(
aBeg
!=
aEnd
)
setControlProperty
(
*
aBeg
++
,
"Enabled"
,
Any
(
sal_T
rue
)
);
setControlProperty
(
*
aBeg
++
,
"Enabled"
,
Any
(
t
rue
)
);
}
}
void
OptimizerDialog
::
DisablePage
(
sal_Int16
nStep
)
void
OptimizerDialog
::
DisablePage
(
sal_Int16
nStep
)
{
{
std
::
vector
<
OUString
>::
iterator
aBeg
(
maControlPages
[
nStep
].
begin
()
);
std
::
vector
<
OUString
>::
iterator
aBeg
(
maControlPages
[
nStep
].
begin
()
);
std
::
vector
<
OUString
>::
iterator
aEnd
(
maControlPages
[
nStep
].
end
()
);
std
::
vector
<
OUString
>::
iterator
aEnd
(
maControlPages
[
nStep
].
end
()
);
while
(
aBeg
!=
aEnd
)
while
(
aBeg
!=
aEnd
)
setControlProperty
(
*
aBeg
++
,
"Enabled"
,
Any
(
sal_F
alse
)
);
setControlProperty
(
*
aBeg
++
,
"Enabled"
,
Any
(
f
alse
)
);
}
}
void
OptimizerDialog
::
ActivatePage
(
sal_Int16
nStep
)
void
OptimizerDialog
::
ActivatePage
(
sal_Int16
nStep
)
{
{
...
...
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