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
f7c14f57
Kaydet (Commit)
f7c14f57
authored
Kas 08, 2014
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
xmloff: remove unused parameter of SvxXMLListStyleContext::FillUnoNumRule()
Change-Id: I359f37ce778d55e6868bd1c78c0ff0d452f36088
üst
1535f393
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
20 deletions
+13
-20
xmlnumi.hxx
include/xmloff/xmlnumi.hxx
+3
-4
StoredChapterNumbering.cxx
sw/source/uibase/config/StoredChapterNumbering.cxx
+1
-1
XMLShapePropertySetContext.cxx
xmloff/source/draw/XMLShapePropertySetContext.cxx
+1
-1
XMLShapeStyleContext.cxx
xmloff/source/draw/XMLShapeStyleContext.cxx
+1
-1
xmlnumi.cxx
xmloff/source/style/xmlnumi.cxx
+7
-13
No files found.
include/xmloff/xmlnumi.hxx
Dosyayı görüntüle @
f7c14f57
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
#include <com/sun/star/style/NumberingType.hpp>
#include <com/sun/star/style/NumberingType.hpp>
namespace
com
{
namespace
sun
{
namespace
star
{
namespace
frame
{
class
XModel
;
}
}
}
}
namespace
com
{
namespace
sun
{
namespace
star
{
namespace
frame
{
class
XModel
;
}
}
}
}
class
SvI18NMap
;
class
SvxXMLListLevelStyleContext_Impl
;
class
SvxXMLListLevelStyleContext_Impl
;
typedef
std
::
vector
<
SvxXMLListLevelStyleContext_Impl
*>
SvxXMLListStyle_Impl
;
typedef
std
::
vector
<
SvxXMLListLevelStyleContext_Impl
*>
SvxXMLListStyle_Impl
;
...
@@ -72,9 +72,8 @@ public:
...
@@ -72,9 +72,8 @@ public:
::
com
::
sun
::
star
::
xml
::
sax
::
XAttributeList
>&
xAttrList
)
SAL_OVERRIDE
;
::
com
::
sun
::
star
::
xml
::
sax
::
XAttributeList
>&
xAttrList
)
SAL_OVERRIDE
;
void
FillUnoNumRule
(
void
FillUnoNumRule
(
const
::
com
::
sun
::
star
::
uno
::
Reference
<
const
css
::
uno
::
Reference
<
::
com
::
sun
::
star
::
container
::
XIndexReplace
>
&
rNumRule
,
css
::
container
::
XIndexReplace
>
&
rNumRule
)
const
;
const
SvI18NMap
*
pI18NMap
)
const
;
const
::
com
::
sun
::
star
::
uno
::
Reference
<
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
container
::
XIndexReplace
>&
GetNumRules
()
const
::
com
::
sun
::
star
::
container
::
XIndexReplace
>&
GetNumRules
()
const
...
...
sw/source/uibase/config/StoredChapterNumbering.cxx
Dosyayı görüntüle @
f7c14f57
...
@@ -346,7 +346,7 @@ public:
...
@@ -346,7 +346,7 @@ public:
uno
::
Reference
<
container
::
XIndexReplace
>
const
xRule
(
uno
::
Reference
<
container
::
XIndexReplace
>
const
xRule
(
new
sw
::
StoredChapterNumberingRules
(
m_rNumRules
,
new
sw
::
StoredChapterNumberingRules
(
m_rNumRules
,
iter
-
m_Contexts
.
begin
()));
iter
-
m_Contexts
.
begin
()));
(
*
iter
)
->
FillUnoNumRule
(
xRule
,
0
);
(
*
iter
)
->
FillUnoNumRule
(
xRule
);
// TODO: xmloff's outline-style import seems to ignore this???
// TODO: xmloff's outline-style import seems to ignore this???
uno
::
Reference
<
container
::
XNamed
>
const
xNamed
(
xRule
,
uno
::
UNO_QUERY
);
uno
::
Reference
<
container
::
XNamed
>
const
xNamed
(
xRule
,
uno
::
UNO_QUERY
);
xNamed
->
setName
((
*
iter
)
->
GetDisplayName
());
xNamed
->
setName
((
*
iter
)
->
GetDisplayName
());
...
...
xmloff/source/draw/XMLShapePropertySetContext.cxx
Dosyayı görüntüle @
f7c14f57
...
@@ -55,7 +55,7 @@ void XMLShapePropertySetContext::EndElement()
...
@@ -55,7 +55,7 @@ void XMLShapePropertySetContext::EndElement()
SvxXMLListStyleContext
*
pBulletStyle
=
static_cast
<
SvxXMLListStyleContext
*>
(
&
mxBulletStyle
);
SvxXMLListStyleContext
*
pBulletStyle
=
static_cast
<
SvxXMLListStyleContext
*>
(
&
mxBulletStyle
);
xNumRule
=
SvxXMLListStyleContext
::
CreateNumRule
(
GetImport
().
GetModel
()
);
xNumRule
=
SvxXMLListStyleContext
::
CreateNumRule
(
GetImport
().
GetModel
()
);
if
(
xNumRule
.
is
()
)
if
(
xNumRule
.
is
()
)
pBulletStyle
->
FillUnoNumRule
(
xNumRule
,
NULL
/* const SvI18NMap * ??? */
);
pBulletStyle
->
FillUnoNumRule
(
xNumRule
);
}
}
Any
aAny
;
Any
aAny
;
...
...
xmloff/source/draw/XMLShapeStyleContext.cxx
Dosyayı görüntüle @
f7c14f57
...
@@ -175,7 +175,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
...
@@ -175,7 +175,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
if
(
pListStyle
)
if
(
pListStyle
)
{
{
uno
::
Reference
<
container
::
XIndexReplace
>
xNumRule
(
SvxXMLListStyleContext
::
CreateNumRule
(
GetImport
().
GetModel
()
)
);
uno
::
Reference
<
container
::
XIndexReplace
>
xNumRule
(
SvxXMLListStyleContext
::
CreateNumRule
(
GetImport
().
GetModel
()
)
);
pListStyle
->
FillUnoNumRule
(
xNumRule
,
NULL
/* const SvI18NMap * ??? */
);
pListStyle
->
FillUnoNumRule
(
xNumRule
);
property
->
maValue
<<=
xNumRule
;
property
->
maValue
<<=
xNumRule
;
}
}
else
else
...
...
xmloff/source/style/xmlnumi.cxx
Dosyayı görüntüle @
f7c14f57
...
@@ -44,7 +44,6 @@
...
@@ -44,7 +44,6 @@
#include <xmloff/XMLBase64ImportContext.hxx>
#include <xmloff/XMLBase64ImportContext.hxx>
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmltoken.hxx>
#include <xmloff/i18nmap.hxx>
#include <xmloff/xmluconv.hxx>
#include <xmloff/xmluconv.hxx>
#include "fonthdl.hxx"
#include "fonthdl.hxx"
#include <xmloff/XMLFontStylesContext.hxx>
#include <xmloff/XMLFontStylesContext.hxx>
...
@@ -223,8 +222,7 @@ public:
...
@@ -223,8 +222,7 @@ public:
const
Reference
<
xml
::
sax
::
XAttributeList
>
&
xAttrList
)
SAL_OVERRIDE
;
const
Reference
<
xml
::
sax
::
XAttributeList
>
&
xAttrList
)
SAL_OVERRIDE
;
sal_Int32
GetLevel
()
const
{
return
nLevel
;
}
sal_Int32
GetLevel
()
const
{
return
nLevel
;
}
Sequence
<
beans
::
PropertyValue
>
GetProperties
(
Sequence
<
beans
::
PropertyValue
>
GetProperties
();
const
SvI18NMap
*
pI18NMap
=
0
);
inline
void
SetPosAndSpaceMode
(
sal_Int16
eValue
)
inline
void
SetPosAndSpaceMode
(
sal_Int16
eValue
)
{
{
...
@@ -402,8 +400,7 @@ SvXMLImportContext *SvxXMLListLevelStyleContext_Impl::CreateChildContext(
...
@@ -402,8 +400,7 @@ SvXMLImportContext *SvxXMLListLevelStyleContext_Impl::CreateChildContext(
return
pContext
;
return
pContext
;
}
}
Sequence
<
beans
::
PropertyValue
>
SvxXMLListLevelStyleContext_Impl
::
GetProperties
(
Sequence
<
beans
::
PropertyValue
>
SvxXMLListLevelStyleContext_Impl
::
GetProperties
()
const
SvI18NMap
*
pI18NMap
)
{
{
sal_Int16
eType
=
NumberingType
::
NUMBER_NONE
;
sal_Int16
eType
=
NumberingType
::
NUMBER_NONE
;
...
@@ -496,8 +493,6 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
...
@@ -496,8 +493,6 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
OUString
sDisplayTextStyleName
=
GetImport
().
GetStyleDisplayName
(
OUString
sDisplayTextStyleName
=
GetImport
().
GetStyleDisplayName
(
XML_STYLE_FAMILY_TEXT_TEXT
,
sTextStyleName
);
XML_STYLE_FAMILY_TEXT_TEXT
,
sTextStyleName
);
OUString
sStyleName
=
sDisplayTextStyleName
;
OUString
sStyleName
=
sDisplayTextStyleName
;
if
(
!
sStyleName
.
isEmpty
()
&&
pI18NMap
)
sStyleName
=
pI18NMap
->
Get
(
SFX_STYLE_FAMILY_CHAR
,
sStyleName
);
pProps
[
nPos
].
Name
=
"CharStyleName"
;
pProps
[
nPos
].
Name
=
"CharStyleName"
;
pProps
[
nPos
++
].
Value
<<=
sDisplayTextStyleName
;
pProps
[
nPos
++
].
Value
<<=
sDisplayTextStyleName
;
...
@@ -1087,8 +1082,7 @@ SvXMLImportContext *SvxXMLListStyleContext::CreateChildContext(
...
@@ -1087,8 +1082,7 @@ SvXMLImportContext *SvxXMLListStyleContext::CreateChildContext(
}
}
void
SvxXMLListStyleContext
::
FillUnoNumRule
(
void
SvxXMLListStyleContext
::
FillUnoNumRule
(
const
Reference
<
container
::
XIndexReplace
>
&
rNumRule
,
const
Reference
<
container
::
XIndexReplace
>
&
rNumRule
)
const
const
SvI18NMap
*
pI18NMap
)
const
{
{
try
try
{
{
...
@@ -1104,7 +1098,7 @@ void SvxXMLListStyleContext::FillUnoNumRule(
...
@@ -1104,7 +1098,7 @@ void SvxXMLListStyleContext::FillUnoNumRule(
if
(
nLevel
>=
0
&&
nLevel
<
l_nLevels
)
if
(
nLevel
>=
0
&&
nLevel
<
l_nLevels
)
{
{
Sequence
<
beans
::
PropertyValue
>
aProps
=
Sequence
<
beans
::
PropertyValue
>
aProps
=
pLevelStyle
->
GetProperties
(
pI18NMap
);
pLevelStyle
->
GetProperties
();
Any
aAny
;
Any
aAny
;
aAny
<<=
aProps
;
aAny
<<=
aProps
;
rNumRule
->
replaceByIndex
(
nLevel
,
aAny
);
rNumRule
->
replaceByIndex
(
nLevel
,
aAny
);
...
@@ -1142,7 +1136,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite )
...
@@ -1142,7 +1136,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite )
// We don't set xNumberingRules here, to avoid using them
// We don't set xNumberingRules here, to avoid using them
// as numbering rules.
// as numbering rules.
if
(
rNumRule
.
is
()
)
if
(
rNumRule
.
is
()
)
FillUnoNumRule
(
rNumRule
,
0
);
FillUnoNumRule
(
rNumRule
);
}
}
}
}
else
else
...
@@ -1212,7 +1206,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite )
...
@@ -1212,7 +1206,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite )
nLevels
=
xNumRules
->
getCount
();
nLevels
=
xNumRules
->
getCount
();
if
(
bOverwrite
||
bNew
)
if
(
bOverwrite
||
bNew
)
{
{
FillUnoNumRule
(
xNumRules
,
0
);
FillUnoNumRule
(
xNumRules
);
aAny
<<=
xNumRules
;
aAny
<<=
xNumRules
;
xPropSet
->
setPropertyValue
(
sNumberingRules
,
aAny
);
xPropSet
->
setPropertyValue
(
sNumberingRules
,
aAny
);
}
}
...
@@ -1241,7 +1235,7 @@ void SvxXMLListStyleContext::CreateAndInsertAuto() const
...
@@ -1241,7 +1235,7 @@ void SvxXMLListStyleContext::CreateAndInsertAuto() const
GetImport
().
GetModel
()
);
GetImport
().
GetModel
()
);
((
SvxXMLListStyleContext
*
)
this
)
->
nLevels
=
xNumRules
->
getCount
();
((
SvxXMLListStyleContext
*
)
this
)
->
nLevels
=
xNumRules
->
getCount
();
FillUnoNumRule
(
xNumRules
,
0
);
FillUnoNumRule
(
xNumRules
);
}
}
Reference
<
XIndexReplace
>
SvxXMLListStyleContext
::
CreateNumRule
(
Reference
<
XIndexReplace
>
SvxXMLListStyleContext
::
CreateNumRule
(
...
...
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