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
2cc0109c
Kaydet (Commit)
2cc0109c
authored
Agu 14, 2014
tarafından
Markus Mohrhard
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
use correct namespace for table protection elements, fdo#82128
Change-Id: I5b9cb4a76739a0c91597c0470c737439d2b07e4f
üst
0ad58a0a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
xmlexprt.cxx
sc/source/filter/xml/xmlexprt.cxx
+3
-3
xmlimprt.cxx
sc/source/filter/xml/xmlimprt.cxx
+3
-0
xmltabi.cxx
sc/source/filter/xml/xmltabi.cxx
+1
-1
No files found.
sc/source/filter/xml/xmlexprt.cxx
Dosyayı görüntüle @
2cc0109c
...
@@ -2939,12 +2939,12 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe
...
@@ -2939,12 +2939,12 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe
if
(
pProtect
&&
pProtect
->
isProtected
()
&&
getDefaultVersion
()
>
SvtSaveOptions
::
ODFVER_012
)
if
(
pProtect
&&
pProtect
->
isProtected
()
&&
getDefaultVersion
()
>
SvtSaveOptions
::
ODFVER_012
)
{
{
if
(
pProtect
->
isOptionEnabled
(
ScTableProtection
::
SELECT_LOCKED_CELLS
))
if
(
pProtect
->
isOptionEnabled
(
ScTableProtection
::
SELECT_LOCKED_CELLS
))
AddAttribute
(
XML_NAMESPACE_
OFFICE
_EXT
,
XML_SELECT_PROTECTED_CELLS
,
XML_TRUE
);
AddAttribute
(
XML_NAMESPACE_
LO
_EXT
,
XML_SELECT_PROTECTED_CELLS
,
XML_TRUE
);
if
(
pProtect
->
isOptionEnabled
(
ScTableProtection
::
SELECT_UNLOCKED_CELLS
))
if
(
pProtect
->
isOptionEnabled
(
ScTableProtection
::
SELECT_UNLOCKED_CELLS
))
AddAttribute
(
XML_NAMESPACE_
OFFICE
_EXT
,
XML_SELECT_UNPROTECTED_CELLS
,
XML_TRUE
);
AddAttribute
(
XML_NAMESPACE_
LO
_EXT
,
XML_SELECT_UNPROTECTED_CELLS
,
XML_TRUE
);
OUString
aElemName
=
GetNamespaceMap
().
GetQNameByKey
(
OUString
aElemName
=
GetNamespaceMap
().
GetQNameByKey
(
XML_NAMESPACE_
OFFICE
_EXT
,
GetXMLToken
(
XML_TABLE_PROTECTION
));
XML_NAMESPACE_
LO
_EXT
,
GetXMLToken
(
XML_TABLE_PROTECTION
));
SvXMLElementExport
aElemProtected
(
*
this
,
aElemName
,
true
,
true
);
SvXMLElementExport
aElemProtected
(
*
this
,
aElemName
,
true
,
true
);
}
}
...
...
sc/source/filter/xml/xmlimprt.cxx
Dosyayı görüntüle @
2cc0109c
...
@@ -805,6 +805,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
...
@@ -805,6 +805,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
{
XML_NAMESPACE_TABLE
,
XML_TABLE_COLUMNS
,
XML_TOK_TABLE_COLS
},
{
XML_NAMESPACE_TABLE
,
XML_TABLE_COLUMNS
,
XML_TOK_TABLE_COLS
},
{
XML_NAMESPACE_TABLE
,
XML_TABLE_COLUMN
,
XML_TOK_TABLE_COL
},
{
XML_NAMESPACE_TABLE
,
XML_TABLE_COLUMN
,
XML_TOK_TABLE_COL
},
{
XML_NAMESPACE_TABLE
,
XML_TABLE_PROTECTION
,
XML_TOK_TABLE_PROTECTION
},
{
XML_NAMESPACE_TABLE
,
XML_TABLE_PROTECTION
,
XML_TOK_TABLE_PROTECTION
},
{
XML_NAMESPACE_LO_EXT
,
XML_TABLE_PROTECTION
,
XML_TOK_TABLE_PROTECTION_EXT
},
{
XML_NAMESPACE_OFFICE_EXT
,
XML_TABLE_PROTECTION
,
XML_TOK_TABLE_PROTECTION_EXT
},
{
XML_NAMESPACE_OFFICE_EXT
,
XML_TABLE_PROTECTION
,
XML_TOK_TABLE_PROTECTION_EXT
},
{
XML_NAMESPACE_TABLE
,
XML_TABLE_ROW_GROUP
,
XML_TOK_TABLE_ROW_GROUP
},
{
XML_NAMESPACE_TABLE
,
XML_TABLE_ROW_GROUP
,
XML_TOK_TABLE_ROW_GROUP
},
{
XML_NAMESPACE_TABLE
,
XML_TABLE_HEADER_ROWS
,
XML_TOK_TABLE_HEADER_ROWS
},
{
XML_NAMESPACE_TABLE
,
XML_TABLE_HEADER_ROWS
,
XML_TOK_TABLE_HEADER_ROWS
},
...
@@ -835,7 +836,9 @@ const SvXMLTokenMap& ScXMLImport::GetTableProtectionAttrTokenMap()
...
@@ -835,7 +836,9 @@ const SvXMLTokenMap& ScXMLImport::GetTableProtectionAttrTokenMap()
{
XML_NAMESPACE_TABLE
,
XML_SELECT_PROTECTED_CELLS
,
XML_TOK_TABLE_SELECT_PROTECTED_CELLS
},
{
XML_NAMESPACE_TABLE
,
XML_SELECT_PROTECTED_CELLS
,
XML_TOK_TABLE_SELECT_PROTECTED_CELLS
},
{
XML_NAMESPACE_TABLE
,
XML_SELECT_UNPROTECTED_CELLS
,
XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS
},
{
XML_NAMESPACE_TABLE
,
XML_SELECT_UNPROTECTED_CELLS
,
XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS
},
{
XML_NAMESPACE_OFFICE_EXT
,
XML_SELECT_PROTECTED_CELLS
,
XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT
},
{
XML_NAMESPACE_OFFICE_EXT
,
XML_SELECT_PROTECTED_CELLS
,
XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT
},
{
XML_NAMESPACE_LO_EXT
,
XML_SELECT_PROTECTED_CELLS
,
XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT
},
{
XML_NAMESPACE_OFFICE_EXT
,
XML_SELECT_UNPROTECTED_CELLS
,
XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT
},
{
XML_NAMESPACE_OFFICE_EXT
,
XML_SELECT_UNPROTECTED_CELLS
,
XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT
},
{
XML_NAMESPACE_LO_EXT
,
XML_SELECT_UNPROTECTED_CELLS
,
XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT
},
XML_TOKEN_MAP_END
XML_TOKEN_MAP_END
};
};
pTableProtectionElemTokenMap
=
new
SvXMLTokenMap
(
aTableProtectionTokenMap
);
pTableProtectionElemTokenMap
=
new
SvXMLTokenMap
(
aTableProtectionTokenMap
);
...
...
sc/source/filter/xml/xmltabi.cxx
Dosyayı görüntüle @
2cc0109c
...
@@ -459,7 +459,7 @@ ScXMLTableProtectionContext::ScXMLTableProtectionContext(
...
@@ -459,7 +459,7 @@ ScXMLTableProtectionContext::ScXMLTableProtectionContext(
bSelectUnprotectedCells
=
IsXMLToken
(
aValue
,
XML_TRUE
);
bSelectUnprotectedCells
=
IsXMLToken
(
aValue
,
XML_TRUE
);
break
;
break
;
default
:
default
:
;
SAL_WARN
(
"sc"
,
"unknown attribute: "
<<
aAttrName
)
;
}
}
}
}
...
...
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