diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:47:31 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:47:31 +0200 |
commit | 9e5584a82633442467a53ccc08c3380070178a38 (patch) | |
tree | 03ecad6d69523ff70217dd583ac757500135697d /unotools/inc | |
parent | Remove all traces of SvLongsSort (diff) | |
parent | Add forgotten vcl/source/app/brand.cxx. (diff) | |
download | core-9e5584a82633442467a53ccc08c3380070178a38.tar.gz core-9e5584a82633442467a53ccc08c3380070178a38.zip |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
cppcanvas/source/mtfrenderer/implrenderer.cxx
i18npool/inc/i18npool/lang.h
i18npool/source/isolang/isolang.cxx
svtools/source/filter/exportdialog.cxx
svtools/source/graphic/grfmgr.cxx
vcl/aqua/source/dtrans/aqua_service.cxx
vcl/aqua/source/window/salframe.cxx
vcl/inc/sft.hxx
vcl/inc/unx/pspgraphics.h
vcl/inc/vcl/cursor.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/settings.hxx
vcl/prj/d.lst
vcl/source/app/settings.cxx
vcl/source/control/edit.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/window/cursor.cxx
vcl/source/window/window.cxx
vcl/unx/generic/fontmanager/fontconfig.cxx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
vcl/unx/kde4/KDESalGraphics.cxx
Diffstat (limited to 'unotools/inc')
-rw-r--r-- | unotools/inc/unotools/saveopt.hxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/unotools/inc/unotools/saveopt.hxx b/unotools/inc/unotools/saveopt.hxx index c2db897c0e74..43f60c5b4b19 100644 --- a/unotools/inc/unotools/saveopt.hxx +++ b/unotools/inc/unotools/saveopt.hxx @@ -54,7 +54,9 @@ public: E_DOPRETTYPRINTING, E_WARNALIENFORMAT, E_LOADDOCPRINTER, - E_ODFDEFAULTVERSION + E_ODFDEFAULTVERSION, + E_USESHA1INODF12, + E_USEBLOWFISHINODF12 }; // keep enum values sorted that a less or greater compare maps to older and newer versions! @@ -120,6 +122,12 @@ public: void SetODFDefaultVersion( ODFDefaultVersion eVersion ); ODFDefaultVersion GetODFDefaultVersion() const; + void SetUseSHA1InODF12( sal_Bool bUse ); + sal_Bool IsUseSHA1InODF12() const; + + void SetUseBlowfishInODF12( sal_Bool bUse ); + sal_Bool IsUseBlowfishInODF12() const; + sal_Bool IsReadOnly( EOption eOption ) const; }; |