From aaa550781532849b514e1e61ace3c7db9e3db68a Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Tue, 6 Oct 2009 07:38:24 +0200
Subject: #103496#: move VCL free ConfigItems to unotools

---
 sd/source/ui/annotations/annotationmanager.cxx | 4 ++--
 sd/source/ui/annotations/annotationwindow.cxx  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'sd/source/ui/annotations')

diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 144022d10758..d339da99c96c 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -47,9 +47,9 @@
 
 #include <svtools/style.hxx>
 #include <svtools/itempool.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <svtools/syslocale.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 
 #include <sfx2/imagemgr.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index ae3c65a2b4d5..c285986452ca 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -58,8 +58,8 @@
 
 #include <svtools/langtab.hxx>
 #include <svtools/slstitm.hxx>
-#include <svtools/securityoptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/securityoptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <svtools/languageoptions.hxx>
 #include <svtools/zforlist.hxx>
 #include <svtools/svmedit.hxx>
-- 
cgit 


From 0cc66aaf7546862d515041edb9243988a3fcdd1b Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Fri, 16 Oct 2009 00:05:16 +0200
Subject: #i103496#: split svtools; improve ConfitItems

---
 sd/source/ui/annotations/annotationmanager.cxx | 6 +++---
 sd/source/ui/annotations/annotationwindow.cxx  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'sd/source/ui/annotations')

diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index d339da99c96c..49ad473db0f0 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -45,10 +45,10 @@
 #include <vcl/menu.hxx>
 #include <vcl/msgbox.hxx>
 
-#include <svtools/style.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/style.hxx>
+#include <svl/itempool.hxx>
 #include <unotools/useroptions.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <unotools/saveopt.hxx>
 
 #include <sfx2/imagemgr.hxx>
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index c285986452ca..2a7ca2df9b0d 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -57,11 +57,11 @@
 #include <svx/crsditem.hxx>
 
 #include <svtools/langtab.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <unotools/securityoptions.hxx>
 #include <unotools/useroptions.hxx>
-#include <svtools/languageoptions.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/languageoptions.hxx>
+#include <svl/zforlist.hxx>
 #include <svtools/svmedit.hxx>
 
 #include <linguistic/lngprops.hxx>
-- 
cgit 


From d1515a61d40e8939acb7b695f60d61c21c66bddb Mon Sep 17 00:00:00 2001
From: Christian Lippka <cl@openoffice.org>
Date: Wed, 25 Nov 2009 16:04:16 +0000
Subject: fixed typo

---
 sd/source/ui/annotations/annotationmanager.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sd/source/ui/annotations')

diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index bbc9bbd539f3..e24b28a0e814 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -199,7 +199,7 @@ AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase )
 {
     SdOptions* pOptions = SD_MOD()->GetSdOptions(mpDoc->GetDocumentType());
     if( pOptions )
-        mbShowAnnotations = pOptions->IsPreviewTransitions() == sal_True;
+        mbShowAnnotations = pOptions->IsShowComments() == TRUE;
 }
 
 // --------------------------------------------------------------------
-- 
cgit