From 86bd1b506fce9542fce35dd0945e642bade4f57e Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Thu, 24 Mar 2011 19:39:35 +0100
Subject: mav60: fix rebase problems

---
 unotools/source/config/saveopt.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'unotools')

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 )
-- 
cgit v1.2.1