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
ef947839
Kaydet (Commit)
ef947839
authored
Agu 15, 2013
tarafından
Tomaž Vajngerl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fdo#59524 Enable encryption for docx, pptx and standard OOXML formats
Change-Id: Id00fde15188be3fb7209d8f14f2f2f07ebd211b0
üst
e06e0fd5
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
24 additions
and
8 deletions
+24
-8
MS_Word_2007_XML.xcu
filter/source/config/fragments/filters/MS_Word_2007_XML.xcu
+1
-1
OOXML_Text.xcu
filter/source/config/fragments/filters/OOXML_Text.xcu
+1
-1
calc_OOXML.xcu
filter/source/config/fragments/filters/calc_OOXML.xcu
+1
-1
impress_MS_PowerPoint_2007_XML.xcu
...nfig/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu
+1
-1
impress_MS_PowerPoint_2007_XML_AutoPlay.xcu
...ments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu
+1
-1
impress_OOXML.xcu
filter/source/config/fragments/filters/impress_OOXML.xcu
+1
-1
impress_OOXML_AutoPlay.xcu
...ource/config/fragments/filters/impress_OOXML_AutoPlay.xcu
+1
-1
filedlghelper.cxx
sfx2/source/dialog/filedlghelper.cxx
+17
-1
No files found.
filter/source/config/fragments/filters/MS_Word_2007_XML.xcu
Dosyayı görüntüle @
ef947839
...
...
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="MS Word 2007 XML" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER
ENCRYPTION PASSWORDTOMODIFY
</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop>
<prop oor:name="UserData"><value>OXML</value></prop>
...
...
filter/source/config/fragments/filters/OOXML_Text.xcu
Dosyayı görüntüle @
ef947839
...
...
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="Office Open XML Text" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER
ENCRYPTION PASSWORDTOMODIFY
</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop>
<prop oor:name="UserData"><value></value></prop>
...
...
filter/source/config/fragments/filters/calc_OOXML.xcu
Dosyayı görüntüle @
ef947839
...
...
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="Calc Office Open XML" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED
ENCRYPTION PASSWORDTOMODIFY
</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.oox.xls.ExcelFilter</value></prop>
<prop oor:name="UserData"><value>OOXML</value></prop>
...
...
filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu
Dosyayı görüntüle @
ef947839
...
...
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="Impress MS PowerPoint 2007 XML" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED
ENCRYPTION PASSWORDTOMODIFY
</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.oox.ppt.PowerPointImport</value></prop>
<prop oor:name="UserData"/>
...
...
filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu
Dosyayı görüntüle @
ef947839
...
...
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="Impress MS PowerPoint 2007 XML AutoPlay" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED STARTPRESENTATION</value></prop>
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED STARTPRESENTATION
ENCRYPTION PASSWORDTOMODIFY
</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.oox.ppt.PowerPointImport</value></prop>
<prop oor:name="UserData"/>
...
...
filter/source/config/fragments/filters/impress_OOXML.xcu
Dosyayı görüntüle @
ef947839
...
...
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="Impress Office Open XML" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED
ENCRYPTION PASSWORDTOMODIFY
</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.oox.ppt.PowerPointImport</value></prop>
<prop oor:name="UserData"><value>OOXML</value></prop>
...
...
filter/source/config/fragments/filters/impress_OOXML_AutoPlay.xcu
Dosyayı görüntüle @
ef947839
...
...
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="Impress Office Open XML AutoPlay" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED STARTPRESENTATION</value></prop>
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED STARTPRESENTATION
ENCRYPTION PASSWORDTOMODIFY
</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.oox.ppt.PowerPointImport</value></prop>
<prop oor:name="UserData"/>
...
...
sfx2/source/dialog/filedlghelper.cxx
Dosyayı görüntüle @
ef947839
...
...
@@ -122,6 +122,21 @@ using namespace ::cppu;
namespace
sfx2
{
namespace
{
bool
lclSupportsOOXMLEncryption
(
OUString
aFilterName
)
{
return
aFilterName
==
"Calc MS Excel 2007 XML"
||
aFilterName
==
"MS Word 2007 XML"
||
aFilterName
==
"Impress MS PowerPoint 2007 XML"
||
aFilterName
==
"Impress MS PowerPoint 2007 XML AutoPlay"
||
aFilterName
==
"Calc Office Open XML"
||
aFilterName
==
"Impress Office Open XML"
||
aFilterName
==
"Impress Office Open XML AutoPlay"
||
aFilterName
==
"Office Open XML Text"
;
}
}
const
OUString
*
GetLastFilterConfigId
(
FileDialogHelper
::
Context
_eContext
)
{
static
const
OUString
aSD_EXPORT_IDENTIFIER
(
"SdExportLastFilter"
);
...
...
@@ -2719,7 +2734,8 @@ ErrCode RequestPassword(const SfxFilter* pCurrentFilter, OUString& aURL, SfxItem
// TODO/LATER: The filters should show the password dialog themself in future
if
(
bMSType
)
{
if
(
pCurrentFilter
->
GetFilterName
()
==
"Calc MS Excel 2007 XML"
)
// Check if filter supports OOXML encryption
if
(
lclSupportsOOXMLEncryption
(
pCurrentFilter
->
GetFilterName
()
)
)
{
::
comphelper
::
SequenceAsHashMap
aHashData
;
aHashData
[
OUString
(
"Password"
)
]
<<=
pPasswordRequest
->
getPassword
();
...
...
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