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
8bfdc161
Kaydet (Commit)
8bfdc161
authored
Haz 26, 2014
tarafından
Michael Meeks
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
configmgr: re-factor findNode and clone into NodeMap.
Change-Id: Ib170b3cec17402e38bf5555e21f83f44d70bb574
üst
ff1d2ba5
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
28 additions
and
27 deletions
+28
-27
components.cxx
configmgr/source/components.cxx
+1
-1
data.cxx
configmgr/source/data.cxx
+1
-9
data.hxx
configmgr/source/data.hxx
+0
-3
groupnode.cxx
configmgr/source/groupnode.cxx
+1
-1
localizedpropertynode.cxx
configmgr/source/localizedpropertynode.cxx
+1
-1
nodemap.cxx
configmgr/source/nodemap.cxx
+12
-4
nodemap.hxx
configmgr/source/nodemap.hxx
+7
-3
setnode.cxx
configmgr/source/setnode.cxx
+1
-1
writemodfile.cxx
configmgr/source/writemodfile.cxx
+1
-1
xcuparser.cxx
configmgr/source/xcuparser.cxx
+3
-3
No files found.
configmgr/source/components.cxx
Dosyayı görüntüle @
8bfdc161
...
...
@@ -357,7 +357,7 @@ void Components::removeExtensionXcuFile(
rtl
::
Reference
<
Node
>
node
;
for
(
Path
::
const_iterator
j
(
i
->
begin
());
j
!=
i
->
end
();
++
j
)
{
parent
=
node
;
node
=
Data
::
findNode
(
Data
::
NO_LAYER
,
*
map
,
*
j
);
node
=
map
->
findNode
(
Data
::
NO_LAYER
,
*
j
);
if
(
!
node
.
is
())
{
break
;
}
...
...
configmgr/source/data.cxx
Dosyayı görüntüle @
8bfdc161
...
...
@@ -179,14 +179,6 @@ bool Data::equalTemplateNames(
}
}
rtl
::
Reference
<
Node
>
Data
::
findNode
(
int
layer
,
NodeMap
const
&
map
,
OUString
const
&
name
)
{
NodeMap
::
const_iterator
i
(
map
.
find
(
name
));
return
i
==
map
.
end
()
||
i
->
second
->
getLayer
()
>
layer
?
rtl
::
Reference
<
Node
>
()
:
i
->
second
;
}
Data
::
Data
()
:
root_
(
new
RootNode
)
{}
rtl
::
Reference
<
Node
>
Data
::
resolvePathRepresentation
(
...
...
@@ -298,7 +290,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
rtl
::
Reference
<
Node
>
Data
::
getTemplate
(
int
layer
,
OUString
const
&
fullName
)
const
{
return
findNode
(
layer
,
templates
,
fullName
);
return
templates
.
findNode
(
layer
,
fullName
);
}
NodeMap
&
Data
::
getComponents
()
const
{
...
...
configmgr/source/data.hxx
Dosyayı görüntüle @
8bfdc161
...
...
@@ -67,9 +67,6 @@ struct Data: private boost::noncopyable {
static
bool
equalTemplateNames
(
OUString
const
&
shortName
,
OUString
const
&
longName
);
static
rtl
::
Reference
<
Node
>
findNode
(
int
layer
,
NodeMap
const
&
map
,
OUString
const
&
name
);
Data
();
rtl
::
Reference
<
Node
>
resolvePathRepresentation
(
...
...
configmgr/source/groupnode.cxx
Dosyayı görüntüle @
8bfdc161
...
...
@@ -59,7 +59,7 @@ int GroupNode::getMandatory() const {
GroupNode
::
GroupNode
(
GroupNode
const
&
other
,
bool
keepTemplateName
)
:
Node
(
other
),
extensible_
(
other
.
extensible_
),
mandatory_
(
other
.
mandatory_
)
{
cloneNodeMap
(
other
.
members_
,
&
members_
);
other
.
members_
.
cloneInto
(
&
members_
);
if
(
keepTemplateName
)
{
templateName_
=
other
.
templateName_
;
}
...
...
configmgr/source/localizedpropertynode.cxx
Dosyayı görüntüle @
8bfdc161
...
...
@@ -50,7 +50,7 @@ LocalizedPropertyNode::LocalizedPropertyNode(
LocalizedPropertyNode
const
&
other
)
:
Node
(
other
),
staticType_
(
other
.
staticType_
),
nillable_
(
other
.
nillable_
)
{
cloneNodeMap
(
other
.
members_
,
&
members_
);
other
.
members_
.
cloneInto
(
&
members_
);
}
LocalizedPropertyNode
::~
LocalizedPropertyNode
()
{}
...
...
configmgr/source/nodemap.cxx
Dosyayı görüntüle @
8bfdc161
...
...
@@ -29,13 +29,21 @@
namespace
configmgr
{
void
cloneNodeMap
(
NodeMap
const
&
source
,
NodeMap
*
target
)
{
void
NodeMap
::
cloneInto
(
NodeMap
*
target
)
const
{
assert
(
target
!=
0
&&
target
->
empty
());
NodeMap
clone
(
source
);
for
(
NodeMap
::
iterator
i
(
clone
.
begin
());
i
!=
clone
.
end
();
++
i
)
{
NodeMap
Impl
clone
(
aImpl
);
for
(
NodeMap
Impl
::
iterator
i
(
clone
.
begin
());
i
!=
clone
.
end
();
++
i
)
{
i
->
second
=
i
->
second
->
clone
(
true
);
}
std
::
swap
(
clone
,
*
target
);
std
::
swap
(
clone
,
target
->
aImpl
);
}
rtl
::
Reference
<
Node
>
NodeMap
::
findNode
(
int
layer
,
OUString
const
&
name
)
const
{
const_iterator
i
(
aImpl
.
find
(
name
));
return
i
==
end
()
||
i
->
second
->
getLayer
()
>
layer
?
rtl
::
Reference
<
Node
>
()
:
i
->
second
;
}
}
...
...
configmgr/source/nodemap.hxx
Dosyayı görüntüle @
8bfdc161
...
...
@@ -31,6 +31,9 @@ typedef std::map< OUString, rtl::Reference< Node > > NodeMapImpl;
class
NodeMap
{
NodeMapImpl
aImpl
;
NodeMap
(
const
NodeMap
&
rMap
)
:
aImpl
(
rMap
.
aImpl
)
{}
public
:
typedef
NodeMapImpl
::
iterator
iterator
;
typedef
NodeMapImpl
::
const_iterator
const_iterator
;
...
...
@@ -39,7 +42,7 @@ class NodeMap
NodeMap
()
{}
~
NodeMap
()
{}
void
clear
()
{
aImpl
.
clear
();
}
bool
empty
()
{
return
aImpl
.
empty
();
}
bool
empty
()
const
{
return
aImpl
.
empty
();
}
void
erase
(
const
iterator
&
it
)
{
aImpl
.
erase
(
it
);
}
void
erase
(
const
OUString
&
aStr
)
{
aImpl
.
erase
(
aStr
);
}
iterator
find
(
const
OUString
&
aStr
)
{
return
aImpl
.
find
(
aStr
);
}
...
...
@@ -52,9 +55,10 @@ class NodeMap
iterator
end
()
{
return
aImpl
.
end
();
}
const_iterator
end
()
const
{
return
aImpl
.
end
();
}
std
::
pair
<
iterator
,
bool
>
insert
(
const
value_type
&
vt
)
{
return
aImpl
.
insert
(
vt
);
}
};
void
cloneNodeMap
(
NodeMap
const
&
source
,
NodeMap
*
target
);
rtl
::
Reference
<
Node
>
findNode
(
int
layer
,
OUString
const
&
name
)
const
;
void
cloneInto
(
NodeMap
*
target
)
const
;
};
}
...
...
configmgr/source/setnode.cxx
Dosyayı görüntüle @
8bfdc161
...
...
@@ -95,7 +95,7 @@ SetNode::SetNode(SetNode const & other, bool keepTemplateName):
additionalTemplateNames_
(
other
.
additionalTemplateNames_
),
mandatory_
(
other
.
mandatory_
)
{
cloneNodeMap
(
other
.
members_
,
&
members_
);
other
.
members_
.
cloneInto
(
&
members_
);
if
(
keepTemplateName
)
{
templateName_
=
other
.
templateName_
;
}
...
...
configmgr/source/writemodfile.cxx
Dosyayı görüntüle @
8bfdc161
...
...
@@ -568,7 +568,7 @@ void writeModFile(
{
writeModifications
(
components
,
tmp
.
handle
,
""
,
rtl
::
Reference
<
Node
>
(),
j
->
first
,
Data
::
findNode
(
Data
::
NO_LAYER
,
data
.
getComponents
()
,
j
->
first
),
data
.
getComponents
().
findNode
(
Data
::
NO_LAYER
,
j
->
first
),
j
->
second
);
}
writeData_
(
tmp
.
handle
,
RTL_CONSTASCII_STRINGPARAM
(
"</oor:items>
\n
"
));
...
...
configmgr/source/xcuparser.cxx
Dosyayı görüntüle @
8bfdc161
...
...
@@ -291,8 +291,8 @@ void XcuParser::handleComponentData(xmlreader::XmlReader & reader) {
}
}
rtl
::
Reference
<
Node
>
node
(
Data
::
findNode
(
valueParser_
.
getLayer
(),
data_
.
getComponents
(),
componentName_
));
data_
.
getComponents
().
findNode
(
valueParser_
.
getLayer
(),
componentName_
));
if
(
!
node
.
is
())
{
SAL_WARN
(
"configmgr"
,
...
...
@@ -788,7 +788,7 @@ void XcuParser::handleGroupNode(
}
}
rtl
::
Reference
<
Node
>
child
(
Data
::
findNode
(
valueParser_
.
getLayer
(),
group
->
getMembers
(),
name
));
group
->
getMembers
().
findNode
(
valueParser_
.
getLayer
(),
name
));
if
(
!
child
.
is
())
{
SAL_WARN
(
"configmgr"
,
...
...
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