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
839a8250
Kaydet (Commit)
839a8250
authored
Nis 16, 2012
tarafından
Olivier Hallot
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
More RTL_CONSTASCII_USTRINGPARAM removals
sd ... filters
üst
ff3fd933
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
53 additions
and
58 deletions
+53
-58
stlpool.cxx
sd/source/core/stlpool.cxx
+1
-1
sdcgmfilter.cxx
sd/source/filter/cgm/sdcgmfilter.cxx
+2
-2
eppt.cxx
sd/source/filter/eppt/eppt.cxx
+0
-0
epptso.cxx
sd/source/filter/eppt/epptso.cxx
+0
-0
pptexanimations.cxx
sd/source/filter/eppt/pptexanimations.cxx
+19
-19
pptexsoundcollection.cxx
sd/source/filter/eppt/pptexsoundcollection.cxx
+1
-1
pptx-epptbase.cxx
sd/source/filter/eppt/pptx-epptbase.cxx
+21
-22
pptx-epptooxml.cxx
sd/source/filter/eppt/pptx-epptooxml.cxx
+6
-8
pptx-stylesheet.cxx
sd/source/filter/eppt/pptx-stylesheet.cxx
+3
-5
pptx-text.cxx
sd/source/filter/eppt/pptx-text.cxx
+0
-0
No files found.
sd/source/core/stlpool.cxx
Dosyayı görüntüle @
839a8250
...
@@ -1168,7 +1168,7 @@ void SdStyleSheetPool::throwIfDisposed() throw(::com::sun::star::uno::RuntimeExc
...
@@ -1168,7 +1168,7 @@ void SdStyleSheetPool::throwIfDisposed() throw(::com::sun::star::uno::RuntimeExc
OUString
SAL_CALL
SdStyleSheetPool
::
getImplementationName
()
throw
(
RuntimeException
)
OUString
SAL_CALL
SdStyleSheetPool
::
getImplementationName
()
throw
(
RuntimeException
)
{
{
return
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"SdStyleSheetPool"
)
);
return
OUString
(
"SdStyleSheetPool"
);
}
}
// --------------------------------------------------------------------
// --------------------------------------------------------------------
...
...
sd/source/filter/cgm/sdcgmfilter.cxx
Dosyayı görüntüle @
839a8250
...
@@ -93,7 +93,7 @@ sal_Bool SdCGMFilter::Import()
...
@@ -93,7 +93,7 @@ sal_Bool SdCGMFilter::Import()
if
(
pLibrary
&&
mxModel
.
is
()
)
if
(
pLibrary
&&
mxModel
.
is
()
)
{
{
ImportCGM
FncImportCGM
=
reinterpret_cast
<
ImportCGM
>
(
pLibrary
->
getFunctionSymbol
(
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"ImportCGM"
)
)
)
);
ImportCGM
FncImportCGM
=
reinterpret_cast
<
ImportCGM
>
(
pLibrary
->
getFunctionSymbol
(
"ImportCGM"
)
);
::
rtl
::
OUString
aFileURL
(
mrMedium
.
GetURLObject
().
GetMainURL
(
INetURLObject
::
NO_DECODE
)
);
::
rtl
::
OUString
aFileURL
(
mrMedium
.
GetURLObject
().
GetMainURL
(
INetURLObject
::
NO_DECODE
)
);
sal_uInt32
nRetValue
;
sal_uInt32
nRetValue
;
...
@@ -137,7 +137,7 @@ sal_Bool SdCGMFilter::Export()
...
@@ -137,7 +137,7 @@ sal_Bool SdCGMFilter::Export()
if
(
pLibrary
&&
mxModel
.
is
()
)
if
(
pLibrary
&&
mxModel
.
is
()
)
{
{
ExportCGM
FncCGMExport
=
reinterpret_cast
<
ExportCGM
>
(
pLibrary
->
getFunctionSymbol
(
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"ExportCGM"
)
)
)
);
ExportCGM
FncCGMExport
=
reinterpret_cast
<
ExportCGM
>
(
pLibrary
->
getFunctionSymbol
(
"ExportCGM"
)
);
if
(
FncCGMExport
)
if
(
FncCGMExport
)
{
{
...
...
sd/source/filter/eppt/eppt.cxx
Dosyayı görüntüle @
839a8250
This diff is collapsed.
Click to expand it.
sd/source/filter/eppt/epptso.cxx
Dosyayı görüntüle @
839a8250
This diff is collapsed.
Click to expand it.
sd/source/filter/eppt/pptexanimations.cxx
Dosyayı görüntüle @
839a8250
...
@@ -926,7 +926,7 @@ sal_uInt32 AnimationExporter::GetPresetID( const rtl::OUString& rPreset, sal_uIn
...
@@ -926,7 +926,7 @@ sal_uInt32 AnimationExporter::GetPresetID( const rtl::OUString& rPreset, sal_uIn
sal_uInt32
nPresetId
=
0
;
sal_uInt32
nPresetId
=
0
;
bPresetId
=
sal_False
;
bPresetId
=
sal_False
;
if
(
rPreset
.
match
(
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"ppt_"
)
),
0
)
)
if
(
rPreset
.
match
(
rtl
::
OUString
(
"ppt_"
),
0
)
)
{
{
sal_Int32
nLast
=
rPreset
.
lastIndexOf
(
'_'
);
sal_Int32
nLast
=
rPreset
.
lastIndexOf
(
'_'
);
if
(
(
nLast
!=
-
1
)
&&
(
(
nLast
+
1
)
<
rPreset
.
getLength
()
)
)
if
(
(
nLast
!=
-
1
)
&&
(
(
nLast
+
1
)
<
rPreset
.
getLength
()
)
)
...
@@ -1445,26 +1445,26 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
...
@@ -1445,26 +1445,26 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
{
{
sal_Int32
nColor
=
0
;
sal_Int32
nColor
=
0
;
Sequence
<
double
>
aHSL
(
3
);
Sequence
<
double
>
aHSL
(
3
);
rtl
::
OUString
aP
(
RTL_CONSTASCII_USTRINGPARAM
(
","
)
);
rtl
::
OUString
aP
(
","
);
if
(
rSourceValue
>>=
aHSL
)
if
(
rSourceValue
>>=
aHSL
)
{
{
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"hsl("
)
)
;
aDest
+=
"hsl("
;
aDest
+=
rtl
::
OUString
::
valueOf
(
(
sal_Int32
)(
aHSL
[
0
]
/
(
360.0
/
255
)
)
);
aDest
+=
rtl
::
OUString
::
valueOf
(
(
sal_Int32
)(
aHSL
[
0
]
/
(
360.0
/
255
)
)
);
aDest
+=
aP
;
aDest
+=
aP
;
aDest
+=
rtl
::
OUString
::
valueOf
(
(
sal_Int32
)(
aHSL
[
1
]
*
255.0
)
);
aDest
+=
rtl
::
OUString
::
valueOf
(
(
sal_Int32
)(
aHSL
[
1
]
*
255.0
)
);
aDest
+=
aP
;
aDest
+=
aP
;
aDest
+=
rtl
::
OUString
::
valueOf
(
(
sal_Int32
)(
aHSL
[
2
]
*
255.0
)
);
aDest
+=
rtl
::
OUString
::
valueOf
(
(
sal_Int32
)(
aHSL
[
2
]
*
255.0
)
);
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
")"
)
)
;
aDest
+=
")"
;
}
}
else
if
(
rSourceValue
>>=
nColor
)
else
if
(
rSourceValue
>>=
nColor
)
{
{
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"rgb("
)
)
;
aDest
+=
"rgb("
;
aDest
+=
rtl
::
OUString
::
valueOf
(
(
sal_Int32
)(
(
sal_Int8
)
nColor
)
);
aDest
+=
rtl
::
OUString
::
valueOf
(
(
sal_Int32
)(
(
sal_Int8
)
nColor
)
);
aDest
+=
aP
;
aDest
+=
aP
;
aDest
+=
rtl
::
OUString
::
valueOf
(
(
sal_Int32
)(
(
sal_Int8
)(
nColor
>>
8
)
)
);
aDest
+=
rtl
::
OUString
::
valueOf
(
(
sal_Int32
)(
(
sal_Int8
)(
nColor
>>
8
)
)
);
aDest
+=
aP
;
aDest
+=
aP
;
aDest
+=
rtl
::
OUString
::
valueOf
(
(
sal_Int32
)(
(
sal_Int8
)(
nColor
>>
16
)
)
);
aDest
+=
rtl
::
OUString
::
valueOf
(
(
sal_Int32
)(
(
sal_Int8
)(
nColor
>>
16
)
)
);
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
")"
)
)
;
aDest
+=
")"
;
}
}
}
}
else
if
(
rAttributeName
==
"FillStyle"
)
else
if
(
rAttributeName
==
"FillStyle"
)
...
@@ -1473,9 +1473,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
...
@@ -1473,9 +1473,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
if
(
rSourceValue
>>=
eFillStyle
)
if
(
rSourceValue
>>=
eFillStyle
)
{
{
if
(
eFillStyle
==
::
com
::
sun
::
star
::
drawing
::
FillStyle_NONE
)
if
(
eFillStyle
==
::
com
::
sun
::
star
::
drawing
::
FillStyle_NONE
)
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"none"
)
)
;
// ?
aDest
+=
"none"
;
// ?
else
else
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"solid"
)
)
;
aDest
+=
"solid"
;
}
}
}
}
else
if
(
rAttributeName
==
"LineStyle"
)
else
if
(
rAttributeName
==
"LineStyle"
)
...
@@ -1484,9 +1484,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
...
@@ -1484,9 +1484,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
if
(
rSourceValue
>>=
eLineStyle
)
if
(
rSourceValue
>>=
eLineStyle
)
{
{
if
(
eLineStyle
==
::
com
::
sun
::
star
::
drawing
::
LineStyle_NONE
)
if
(
eLineStyle
==
::
com
::
sun
::
star
::
drawing
::
LineStyle_NONE
)
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"false"
)
)
;
aDest
+=
"false"
;
else
else
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"true"
)
)
;
aDest
+=
"true"
;
}
}
}
}
else
if
(
rAttributeName
==
"CharWeight"
)
else
if
(
rAttributeName
==
"CharWeight"
)
...
@@ -1495,9 +1495,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
...
@@ -1495,9 +1495,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
if
(
rSourceValue
>>=
fFontWeight
)
if
(
rSourceValue
>>=
fFontWeight
)
{
{
if
(
fFontWeight
==
com
::
sun
::
star
::
awt
::
FontWeight
::
BOLD
)
if
(
fFontWeight
==
com
::
sun
::
star
::
awt
::
FontWeight
::
BOLD
)
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"bold"
)
)
;
aDest
+=
"bold"
;
else
else
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"normal"
)
)
;
aDest
+=
"normal"
;
}
}
}
}
else
if
(
rAttributeName
==
"CharUnderline"
)
else
if
(
rAttributeName
==
"CharUnderline"
)
...
@@ -1506,9 +1506,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
...
@@ -1506,9 +1506,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
if
(
rSourceValue
>>=
nFontUnderline
)
if
(
rSourceValue
>>=
nFontUnderline
)
{
{
if
(
nFontUnderline
==
com
::
sun
::
star
::
awt
::
FontUnderline
::
NONE
)
if
(
nFontUnderline
==
com
::
sun
::
star
::
awt
::
FontUnderline
::
NONE
)
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"false"
)
)
;
aDest
+=
"false"
;
else
else
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"true"
)
)
;
aDest
+=
"true"
;
}
}
}
}
else
if
(
rAttributeName
==
"CharPosture"
)
else
if
(
rAttributeName
==
"CharPosture"
)
...
@@ -1517,9 +1517,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
...
@@ -1517,9 +1517,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
if
(
rSourceValue
>>=
eFontSlant
)
if
(
rSourceValue
>>=
eFontSlant
)
{
{
if
(
eFontSlant
==
com
::
sun
::
star
::
awt
::
FontSlant_ITALIC
)
if
(
eFontSlant
==
com
::
sun
::
star
::
awt
::
FontSlant_ITALIC
)
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"italic"
)
)
;
aDest
+=
"italic"
;
else
else
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"normal"
)
)
;
// ?
aDest
+=
"normal"
;
// ?
}
}
}
}
else
if
(
rAttributeName
==
"Visibility"
)
else
if
(
rAttributeName
==
"Visibility"
)
...
@@ -1528,9 +1528,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
...
@@ -1528,9 +1528,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
if
(
rSourceValue
>>=
bVisible
)
if
(
rSourceValue
>>=
bVisible
)
{
{
if
(
bVisible
)
if
(
bVisible
)
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"visible"
)
)
;
aDest
+=
"visible"
;
else
else
aDest
+=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"hidden"
)
)
;
aDest
+=
"hidden"
;
}
}
}
}
Any
aRet
;
Any
aRet
;
...
@@ -1703,7 +1703,7 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X
...
@@ -1703,7 +1703,7 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X
{
{
if
(
nForceAttributeNames
==
1
)
if
(
nForceAttributeNames
==
1
)
{
{
aAttributeName
=
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"r"
))
;
aAttributeName
=
"r"
;
}
}
}
}
sal_Int32
nIndex
=
0
;
sal_Int32
nIndex
=
0
;
...
...
sd/source/filter/eppt/pptexsoundcollection.cxx
Dosyayı görüntüle @
839a8250
...
@@ -46,7 +46,7 @@ ExSoundEntry::ExSoundEntry(const rtl::OUString& rString)
...
@@ -46,7 +46,7 @@ ExSoundEntry::ExSoundEntry(const rtl::OUString& rString)
::
ucbhelper
::
Content
aCnt
(
aSoundURL
,
::
ucbhelper
::
Content
aCnt
(
aSoundURL
,
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
ucb
::
XCommandEnvironment
>
()
);
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
ucb
::
XCommandEnvironment
>
()
);
sal_Int64
nVal
=
0
;
sal_Int64
nVal
=
0
;
::
cppu
::
convertPropertyValue
(
nVal
,
aCnt
.
getPropertyValue
(
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"Size"
)
)
)
);
::
cppu
::
convertPropertyValue
(
nVal
,
aCnt
.
getPropertyValue
(
::
rtl
::
OUString
(
"Size"
)
)
);
nFileSize
=
(
sal_uInt32
)
nVal
;
nFileSize
=
(
sal_uInt32
)
nVal
;
}
}
catch
(
::
com
::
sun
::
star
::
uno
::
Exception
&
)
catch
(
::
com
::
sun
::
star
::
uno
::
Exception
&
)
...
...
sd/source/filter/eppt/pptx-epptbase.cxx
Dosyayı görüntüle @
839a8250
...
@@ -178,7 +178,7 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert
...
@@ -178,7 +178,7 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert
if
(
!
InitSOIface
()
)
if
(
!
InitSOIface
()
)
return
;
return
;
FontCollectionEntry
aDefaultFontDesc
(
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"Times New Roman"
)
),
FontCollectionEntry
aDefaultFontDesc
(
rtl
::
OUString
(
"Times New Roman"
),
ROMAN
,
ROMAN
,
awt
::
FontPitch
::
VARIABLE
,
awt
::
FontPitch
::
VARIABLE
,
RTL_TEXTENCODING_MS_1252
);
RTL_TEXTENCODING_MS_1252
);
...
@@ -188,10 +188,10 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert
...
@@ -188,10 +188,10 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert
return
;
return
;
sal_Int32
nWidth
=
21000
;
sal_Int32
nWidth
=
21000
;
if
(
ImplGetPropertyValue
(
mXPagePropSet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"Width"
)
)
)
)
if
(
ImplGetPropertyValue
(
mXPagePropSet
,
rtl
::
OUString
(
"Width"
)
)
)
mAny
>>=
nWidth
;
mAny
>>=
nWidth
;
sal_Int32
nHeight
=
29700
;
sal_Int32
nHeight
=
29700
;
if
(
ImplGetPropertyValue
(
mXPagePropSet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"Height"
)
)
)
)
if
(
ImplGetPropertyValue
(
mXPagePropSet
,
rtl
::
OUString
(
"Height"
)
)
)
mAny
>>=
nHeight
;
mAny
>>=
nHeight
;
maNotesPageSize
=
MapSize
(
awt
::
Size
(
nWidth
,
nHeight
)
);
maNotesPageSize
=
MapSize
(
awt
::
Size
(
nWidth
,
nHeight
)
);
...
@@ -200,10 +200,10 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert
...
@@ -200,10 +200,10 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert
return
;
return
;
nWidth
=
28000
;
nWidth
=
28000
;
if
(
ImplGetPropertyValue
(
mXPagePropSet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"Width"
)
)
)
)
if
(
ImplGetPropertyValue
(
mXPagePropSet
,
rtl
::
OUString
(
"Width"
)
)
)
mAny
>>=
nWidth
;
mAny
>>=
nWidth
;
nHeight
=
21000
;
nHeight
=
21000
;
if
(
ImplGetPropertyValue
(
mXPagePropSet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"Height"
)
)
)
)
if
(
ImplGetPropertyValue
(
mXPagePropSet
,
rtl
::
OUString
(
"Height"
)
)
)
mAny
>>=
nHeight
;
mAny
>>=
nHeight
;
maDestPageSize
=
MapSize
(
awt
::
Size
(
nWidth
,
nHeight
)
);
maDestPageSize
=
MapSize
(
awt
::
Size
(
nWidth
,
nHeight
)
);
...
@@ -334,7 +334,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
...
@@ -334,7 +334,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
/* try to get the "real" background PropertySet. If the normal page is not supporting this property, it is
/* try to get the "real" background PropertySet. If the normal page is not supporting this property, it is
taken the property from the master */
taken the property from the master */
sal_Bool
bHasBackground
=
GetPropertyValue
(
aAny
,
mXPagePropSet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"Background"
)
),
sal_True
);
sal_Bool
bHasBackground
=
GetPropertyValue
(
aAny
,
mXPagePropSet
,
rtl
::
OUString
(
"Background"
),
sal_True
);
if
(
bHasBackground
)
if
(
bHasBackground
)
bHasBackground
=
(
aAny
>>=
mXBackgroundPropSet
);
bHasBackground
=
(
aAny
>>=
mXBackgroundPropSet
);
if
(
!
bHasBackground
)
if
(
!
bHasBackground
)
...
@@ -351,8 +351,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
...
@@ -351,8 +351,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
(
aXMasterDrawPage
,
UNO_QUERY
);
(
aXMasterDrawPage
,
UNO_QUERY
);
if
(
aXMasterPagePropSet
.
is
()
)
if
(
aXMasterPagePropSet
.
is
()
)
{
{
sal_Bool
bBackground
=
GetPropertyValue
(
aAny
,
aXMasterPagePropSet
,
sal_Bool
bBackground
=
GetPropertyValue
(
aAny
,
aXMasterPagePropSet
,
rtl
::
OUString
(
"Background"
)
);
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"Background"
)
)
);
if
(
bBackground
)
if
(
bBackground
)
{
{
aAny
>>=
mXBackgroundPropSet
;
aAny
>>=
mXBackgroundPropSet
;
...
@@ -379,7 +378,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
...
@@ -379,7 +378,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
SetCurrentStyleSheet
(
nMasterNum
);
SetCurrentStyleSheet
(
nMasterNum
);
Reference
<
XPropertySet
>
aXBackgroundPropSet
;
Reference
<
XPropertySet
>
aXBackgroundPropSet
;
sal_Bool
bHasBackground
=
GetPropertyValue
(
aAny
,
mXPagePropSet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"Background"
)
)
);
sal_Bool
bHasBackground
=
GetPropertyValue
(
aAny
,
mXPagePropSet
,
rtl
::
OUString
(
"Background"
)
);
if
(
bHasBackground
)
if
(
bHasBackground
)
bHasBackground
=
(
aAny
>>=
aXBackgroundPropSet
);
bHasBackground
=
(
aAny
>>=
aXBackgroundPropSet
);
...
@@ -398,7 +397,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
...
@@ -398,7 +397,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
}
}
}
}
*/
*/
if
(
GetPropertyValue
(
aAny
,
mXPagePropSet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"IsBackgroundObjectsVisible"
)
)
)
)
if
(
GetPropertyValue
(
aAny
,
mXPagePropSet
,
rtl
::
OUString
(
"IsBackgroundObjectsVisible"
)
)
)
{
{
sal_Bool
bBackgroundObjectsVisible
=
sal_False
;
sal_Bool
bBackgroundObjectsVisible
=
sal_False
;
if
(
aAny
>>=
bBackgroundObjectsVisible
)
if
(
aAny
>>=
bBackgroundObjectsVisible
)
...
@@ -434,7 +433,7 @@ sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum )
...
@@ -434,7 +433,7 @@ sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum )
return
sal_False
;
return
sal_False
;
SetCurrentStyleSheet
(
nPageNum
);
SetCurrentStyleSheet
(
nPageNum
);
if
(
!
ImplGetPropertyValue
(
mXPagePropSet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"Background"
)
)
)
)
// Backgroundshape laden
if
(
!
ImplGetPropertyValue
(
mXPagePropSet
,
rtl
::
OUString
(
"Background"
)
)
)
// Backgroundshape laden
return
sal_False
;
return
sal_False
;
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
beans
::
XPropertySet
>
aXBackgroundPropSet
;
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
beans
::
XPropertySet
>
aXBackgroundPropSet
;
if
(
!
(
mAny
>>=
aXBackgroundPropSet
)
)
if
(
!
(
mAny
>>=
aXBackgroundPropSet
)
)
...
@@ -451,7 +450,7 @@ sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference
...
@@ -451,7 +450,7 @@ sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference
{
{
::
com
::
sun
::
star
::
uno
::
Any
aAny
;
::
com
::
sun
::
star
::
uno
::
Any
aAny
;
sal_Int32
nLayout
=
20
;
sal_Int32
nLayout
=
20
;
if
(
GetPropertyValue
(
aAny
,
rXPropSet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"Layout"
)
)
),
sal_True
)
if
(
GetPropertyValue
(
aAny
,
rXPropSet
,
rtl
::
OUString
(
"Layout"
)
),
sal_True
)
aAny
>>=
nLayout
;
aAny
>>=
nLayout
;
DBG
(
printf
(
"GetLayoutOffset %"
SAL_PRIdINT32
"
\n
"
,
nLayout
));
DBG
(
printf
(
"GetLayoutOffset %"
SAL_PRIdINT32
"
\n
"
,
nLayout
));
...
@@ -509,7 +508,7 @@ sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType )
...
@@ -509,7 +508,7 @@ sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType )
if
(
aXPropertySet
.
is
()
)
if
(
aXPropertySet
.
is
()
)
{
{
if
(
ImplGetPropertyValue
(
aXPropertySet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"Number"
)
)
)
)
if
(
ImplGetPropertyValue
(
aXPropertySet
,
rtl
::
OUString
(
"Number"
)
)
)
nRetValue
|=
*
(
sal_Int16
*
)
mAny
.
getValue
();
nRetValue
|=
*
(
sal_Int16
*
)
mAny
.
getValue
();
if
(
nRetValue
&
0xffff
)
// ueberlauf vermeiden
if
(
nRetValue
&
0xffff
)
// ueberlauf vermeiden
nRetValue
--
;
nRetValue
--
;
...
@@ -556,7 +555,7 @@ sal_Bool PPTWriterBase::GetStyleSheets()
...
@@ -556,7 +555,7 @@ sal_Bool PPTWriterBase::GetStyleSheets()
Reference
<
XPropertySet
>
Reference
<
XPropertySet
>
aXPropSet
(
mXModel
,
UNO_QUERY
);
aXPropSet
(
mXModel
,
UNO_QUERY
);
sal_uInt16
nDefaultTab
=
(
aXPropSet
.
is
()
&&
ImplGetPropertyValue
(
aXPropSet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"TabStop"
)
)
)
)
sal_uInt16
nDefaultTab
=
(
aXPropSet
.
is
()
&&
ImplGetPropertyValue
(
aXPropSet
,
rtl
::
OUString
(
"TabStop"
)
)
)
?
(
sal_uInt16
)(
*
(
sal_Int32
*
)
mAny
.
getValue
()
/
4.40972
)
?
(
sal_uInt16
)(
*
(
sal_Int32
*
)
mAny
.
getValue
()
/
4.40972
)
:
1250
;
:
1250
;
...
@@ -581,25 +580,25 @@ sal_Bool PPTWriterBase::GetStyleSheets()
...
@@ -581,25 +580,25 @@ sal_Bool PPTWriterBase::GetStyleSheets()
case
EPP_TEXTTYPE_CenterTitle
:
case
EPP_TEXTTYPE_CenterTitle
:
case
EPP_TEXTTYPE_Title
:
case
EPP_TEXTTYPE_Title
:
{
{
aStyle
=
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"title"
)
);
aStyle
=
rtl
::
OUString
(
"title"
);
aFamily
=
aXNamed
->
getName
();
aFamily
=
aXNamed
->
getName
();
}
}
break
;
break
;
case
EPP_TEXTTYPE_Body
:
case
EPP_TEXTTYPE_Body
:
{
{
aStyle
=
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"outline1"
)
);
// SD_LT_SEPARATOR
aStyle
=
rtl
::
OUString
(
"outline1"
);
// SD_LT_SEPARATOR
aFamily
=
aXNamed
->
getName
();
aFamily
=
aXNamed
->
getName
();
}
}
break
;
break
;
case
EPP_TEXTTYPE_Other
:
case
EPP_TEXTTYPE_Other
:
{
{
aStyle
=
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"standard"
)
);
aStyle
=
rtl
::
OUString
(
"standard"
);
aFamily
=
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"graphics"
)
);
aFamily
=
rtl
::
OUString
(
"graphics"
);
}
}
break
;
break
;
case
EPP_TEXTTYPE_CenterBody
:
case
EPP_TEXTTYPE_CenterBody
:
{
{
aStyle
=
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"subtitle"
)
);
aStyle
=
rtl
::
OUString
(
"subtitle"
);
aFamily
=
aXNamed
->
getName
();
aFamily
=
aXNamed
->
getName
();
}
}
break
;
break
;
...
@@ -774,14 +773,14 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup )
...
@@ -774,14 +773,14 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup )
mType
=
aTypeBuffer
.
makeStringAndClear
();
mType
=
aTypeBuffer
.
makeStringAndClear
();
mbPresObj
=
mbEmptyPresObj
=
sal_False
;
mbPresObj
=
mbEmptyPresObj
=
sal_False
;
if
(
ImplGetPropertyValue
(
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"IsPresentationObject"
)
)
)
)
if
(
ImplGetPropertyValue
(
rtl
::
OUString
(
"IsPresentationObject"
)
)
)
mAny
>>=
mbPresObj
;
mAny
>>=
mbPresObj
;
if
(
mbPresObj
&&
ImplGetPropertyValue
(
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"IsEmptyPresentationObject"
)
)
)
)
if
(
mbPresObj
&&
ImplGetPropertyValue
(
rtl
::
OUString
(
"IsEmptyPresentationObject"
)
)
)
mAny
>>=
mbEmptyPresObj
;
mAny
>>=
mbEmptyPresObj
;
mnAngle
=
(
PropValue
::
GetPropertyValue
(
aAny
,
mnAngle
=
(
PropValue
::
GetPropertyValue
(
aAny
,
mXPropSet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"RotateAngle"
)
),
sal_True
)
)
mXPropSet
,
rtl
::
OUString
(
"RotateAngle"
),
sal_True
)
)
?
*
((
sal_Int32
*
)
aAny
.
getValue
()
)
?
*
((
sal_Int32
*
)
aAny
.
getValue
()
)
:
0
;
:
0
;
...
...
sd/source/filter/eppt/pptx-epptooxml.cxx
Dosyayı görüntüle @
839a8250
...
@@ -357,7 +357,7 @@ bool PowerPointExport::exportDocument() throw()
...
@@ -357,7 +357,7 @@ bool PowerPointExport::exportDocument() throw()
mXModel
.
set
(
getModel
(),
UNO_QUERY
);
mXModel
.
set
(
getModel
(),
UNO_QUERY
);
mXStatusIndicator
.
set
(
getStatusIndicator
(),
UNO_QUERY
);
mXStatusIndicator
.
set
(
getStatusIndicator
(),
UNO_QUERY
);
rtl
::
OUString
sBaseURI
(
RTL_CONSTASCII_USTRINGPARAM
(
"BaseURI"
)
);
rtl
::
OUString
sBaseURI
(
"BaseURI"
);
std
::
vector
<
PropertyValue
>
aProperties
;
std
::
vector
<
PropertyValue
>
aProperties
;
PropertyValue
aProperty
;
PropertyValue
aProperty
;
aProperty
.
Name
=
sBaseURI
;
aProperty
.
Name
=
sBaseURI
;
...
@@ -391,7 +391,7 @@ bool PowerPointExport::exportDocument() throw()
...
@@ -391,7 +391,7 @@ bool PowerPointExport::exportDocument() throw()
::
oox
::
ole
::
VbaProject
*
PowerPointExport
::
implCreateVbaProject
()
const
::
oox
::
ole
::
VbaProject
*
PowerPointExport
::
implCreateVbaProject
()
const
{
{
return
new
::
oox
::
ole
::
VbaProject
(
getComponentContext
(),
getModel
(),
CREATE_OUSTRING
(
"Impress"
)
);
return
new
::
oox
::
ole
::
VbaProject
(
getComponentContext
(),
getModel
(),
"Impress"
);
}
}
void
PowerPointExport
::
ImplWriteBackground
(
FSHelperPtr
pFS
,
Reference
<
XPropertySet
>
rXPropSet
)
void
PowerPointExport
::
ImplWriteBackground
(
FSHelperPtr
pFS
,
Reference
<
XPropertySet
>
rXPropSet
)
...
@@ -446,7 +446,7 @@ void PowerPointExport::ImplWriteBackground( FSHelperPtr pFS, Reference< XPropert
...
@@ -446,7 +446,7 @@ void PowerPointExport::ImplWriteBackground( FSHelperPtr pFS, Reference< XPropert
</p:grpSpPr>"
</p:grpSpPr>"
#define GETA(propName) \
#define GETA(propName) \
ImplGetPropertyValue( mXPagePropSet,
String( RTL_CONSTASCII_USTRINGPARAM( #propName )
) )
ImplGetPropertyValue( mXPagePropSet,
rtl::OUString( #propName
) )
#define GET(variable, propName) \
#define GET(variable, propName) \
if ( GETA(propName) ) \
if ( GETA(propName) ) \
...
@@ -2123,7 +2123,7 @@ sal_Bool PowerPointExport::WriteNotesMaster()
...
@@ -2123,7 +2123,7 @@ sal_Bool PowerPointExport::WriteNotesMaster()
pFS
->
startElementNS
(
XML_p
,
XML_cSld
,
FSEND
);
pFS
->
startElementNS
(
XML_p
,
XML_cSld
,
FSEND
);
Reference
<
XPropertySet
>
aXBackgroundPropSet
;
Reference
<
XPropertySet
>
aXBackgroundPropSet
;
if
(
ImplGetPropertyValue
(
mXPagePropSet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"Background"
)
)
)
&&
if
(
ImplGetPropertyValue
(
mXPagePropSet
,
rtl
::
OUString
(
"Background"
)
)
&&
(
mAny
>>=
aXBackgroundPropSet
)
)
(
mAny
>>=
aXBackgroundPropSet
)
)
ImplWriteBackground
(
pFS
,
aXBackgroundPropSet
);
ImplWriteBackground
(
pFS
,
aXBackgroundPropSet
);
...
@@ -2162,16 +2162,14 @@ sal_Bool PowerPointExport::ImplCreateMainNotes()
...
@@ -2162,16 +2162,14 @@ sal_Bool PowerPointExport::ImplCreateMainNotes()
return
sal_True
;
return
sal_True
;
}
}
#define IMPL_NAME "com.sun.star.comp.Impress.oox.PowerPointExport"
OUString
SAL_CALL
PowerPointExport_getImplementationName
()
throw
()
OUString
SAL_CALL
PowerPointExport_getImplementationName
()
throw
()
{
{
return
CREATE_OUSTRING
(
IMPL_NAME
);
return
OUString
(
"com.sun.star.comp.Impress.oox.PowerPointExport"
);
}
}
uno
::
Sequence
<
OUString
>
SAL_CALL
PowerPointExport_getSupportedServiceNames
()
throw
()
uno
::
Sequence
<
OUString
>
SAL_CALL
PowerPointExport_getSupportedServiceNames
()
throw
()
{
{
const
OUString
aServiceName
=
CREATE_OUSTRING
(
"com.sun.star.comp.ooxpptx"
);
const
OUString
aServiceName
(
"com.sun.star.comp.ooxpptx"
);
const
Sequence
<
OUString
>
aSeq
(
&
aServiceName
,
1
);
const
Sequence
<
OUString
>
aSeq
(
&
aServiceName
,
1
);
return
aSeq
;
return
aSeq
;
}
}
...
...
sd/source/filter/eppt/pptx-stylesheet.cxx
Dosyayı görüntüle @
839a8250
...
@@ -117,7 +117,7 @@ void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo
...
@@ -117,7 +117,7 @@ void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo
{
{
sal_Bool
bIsDark
=
sal_False
;
sal_Bool
bIsDark
=
sal_False
;
::
com
::
sun
::
star
::
uno
::
Any
aAny
;
::
com
::
sun
::
star
::
uno
::
Any
aAny
;
if
(
PropValue
::
GetPropertyValue
(
aAny
,
rPagePropSet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"IsBackgroundDark"
)
),
sal_True
)
)
if
(
PropValue
::
GetPropertyValue
(
aAny
,
rPagePropSet
,
rtl
::
OUString
(
"IsBackgroundDark"
),
sal_True
)
)
aAny
>>=
bIsDark
;
aAny
>>=
bIsDark
;
nFontColor
=
bIsDark
?
0xffffff
:
0x000000
;
nFontColor
=
bIsDark
?
0xffffff
:
0x000000
;
}
}
...
@@ -248,9 +248,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co
...
@@ -248,9 +248,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co
if
(
nLineSpacing
>
0
)
// if nLinespacing is < 0 the linespacing is an absolute spacing
if
(
nLineSpacing
>
0
)
// if nLinespacing is < 0 the linespacing is an absolute spacing
{
{
sal_Bool
bFixedLineSpacing
=
sal_False
;
sal_Bool
bFixedLineSpacing
=
sal_False
;
uno
::
Any
aAny
=
rXPropSet
->
getPropertyValue
(
::
rtl
::
OUString
(
uno
::
Any
aAny
=
rXPropSet
->
getPropertyValue
(
::
rtl
::
OUString
(
"FontIndependentLineSpacing"
)
);
RTL_CONSTASCII_USTRINGPARAM
(
"FontIndependentLineSpacing"
)
)
);
if
(
!
(
aAny
>>=
bFixedLineSpacing
)
||
!
bFixedLineSpacing
)
if
(
!
(
aAny
>>=
bFixedLineSpacing
)
||
!
bFixedLineSpacing
)
{
{
const
FontCollectionEntry
*
pDesc
=
rFontCollection
.
GetById
(
rCharLevel
.
mnFont
);
const
FontCollectionEntry
*
pDesc
=
rFontCollection
.
GetById
(
rCharLevel
.
mnFont
);
...
@@ -362,7 +360,7 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo
...
@@ -362,7 +360,7 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo
{
{
sal_Bool
bIsDark
=
sal_False
;
sal_Bool
bIsDark
=
sal_False
;
::
com
::
sun
::
star
::
uno
::
Any
aAny
;
::
com
::
sun
::
star
::
uno
::
Any
aAny
;
if
(
PropValue
::
GetPropertyValue
(
aAny
,
rPagePropSet
,
String
(
RTL_CONSTASCII_USTRINGPARAM
(
"IsBackgroundDark"
)
),
sal_True
)
)
if
(
PropValue
::
GetPropertyValue
(
aAny
,
rPagePropSet
,
rtl
::
OUString
(
"IsBackgroundDark"
),
sal_True
)
)
aAny
>>=
bIsDark
;
aAny
>>=
bIsDark
;
nBulletColor
=
bIsDark
?
0xffffff
:
0x000000
;
nBulletColor
=
bIsDark
?
0xffffff
:
0x000000
;
}
}
...
...
sd/source/filter/eppt/pptx-text.cxx
Dosyayı görüntüle @
839a8250
This diff is collapsed.
Click to expand it.
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