diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-01-04 15:43:22 +0100 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-01-04 15:43:22 +0100 |
| commit | b71823a291b10fe67cd96b81bce3fb0d91dcb893 (patch) | |
| tree | 756017bd26f549770d70b47488b4fe11aaff1504 /sd/source/ui/annotations | |
| parent | dada72080460ab3a1bf4228a38454339b1d5f204 (diff) | |
| parent | eb86211c1db0bb492669e7ac8302b89254ed4793 (diff) | |
merge to m68
Diffstat (limited to 'sd/source/ui/annotations')
| -rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 12 | ||||
| -rw-r--r-- | sd/source/ui/annotations/annotationwindow.cxx | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index bbc9bbd539f3..9e650d0da43c 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -45,11 +45,11 @@ #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> -#include <svtools/style.hxx> -#include <svtools/itempool.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/syslocale.hxx> -#include <svtools/saveopt.hxx> +#include <svl/style.hxx> +#include <svl/itempool.hxx> +#include <unotools/useroptions.hxx> +#include <unotools/syslocale.hxx> +#include <unotools/saveopt.hxx> #include <sfx2/imagemgr.hxx> #include <sfx2/viewfrm.hxx> @@ -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; } // -------------------------------------------------------------------- diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index ae3c65a2b4d5..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 <svtools/securityoptions.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/languageoptions.hxx> -#include <svtools/zforlist.hxx> +#include <svl/slstitm.hxx> +#include <unotools/securityoptions.hxx> +#include <unotools/useroptions.hxx> +#include <svl/languageoptions.hxx> +#include <svl/zforlist.hxx> #include <svtools/svmedit.hxx> #include <linguistic/lngprops.hxx> |