diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-03-24 19:39:35 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-03-24 19:39:35 +0100 |
| commit | 86bd1b506fce9542fce35dd0945e642bade4f57e (patch) | |
| tree | 90989e8aeea63a7c9e0e13eb020bb623344dbc4f /unotools | |
| parent | e76302d8d7ce4b8ac7bd32ab1bfa137b58ed0004 (diff) | |
mav60: fix rebase problems
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/saveopt.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 565816d31e27..6a30149c555f 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -99,9 +99,9 @@ class SvtSaveOptions_Impl : public utl::ConfigItem bROWarnAlienFormat, bRODoPrettyPrinting, bROLoadDocPrinter, + bROODFDefaultVersion, bROUseSHA1InODF12, - bROUseBlowfishInODF12, - bROODFDefaultVersion; + bROUseBlowfishInODF12; public: SvtSaveOptions_Impl(); @@ -436,9 +436,9 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() , bDoPrettyPrinting( sal_False ) , bWarnAlienFormat( sal_True ) , bLoadDocPrinter( sal_True ) + , bUseSHA1InODF12( sal_False ) + , bUseBlowfishInODF12( sal_False ) , eODFDefaultVersion( SvtSaveOptions::ODFVER_LATEST ) - , bUseSHA1InODF12( false ) - , bUseBlowfishInODF12( false ) , bROAutoSaveTime( CFG_READONLY_DEFAULT ) , bROUseUserData( CFG_READONLY_DEFAULT ) , bROBackup( CFG_READONLY_DEFAULT ) |