diff options
| author | Ashod Nakashian <ashodnakashian@yahoo.com> | 2015-11-10 19:20:12 -0500 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-12 10:47:26 +0000 |
| commit | d7801c39826f2f24f7340e1b25809d3bb65d6099 (patch) | |
| tree | 6acf82af5954e72930272fd62ac37c07664cf937 /sd | |
| parent | Vcl: Set PushButtons pressed if the uno slot is active (diff) | |
| download | core-d7801c39826f2f24f7340e1b25809d3bb65d6099.tar.gz core-d7801c39826f2f24f7340e1b25809d3bb65d6099.zip | |
Namespace cleanup and disambiguation
Change-Id: Ib6d2f8b4e71436c3a7c26bdfc9847152ebaf0739
Reviewed-on: https://gerrit.libreoffice.org/19900
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/CustomAnimationEffect.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/annotations/annotationwindow.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 103157efaaf0..7d247f16fb00 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -308,7 +308,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In Reference< XEnumerationAccess > xEA( xShape, UNO_QUERY_THROW ); Reference< XEnumeration > xEnumeration( xEA->createEnumeration(), UNO_QUERY_THROW ); - Locale aLocale; + css::lang::Locale aLocale; const OUString aStrLocaleName( "CharLocale" ); Reference< XTextRange > xParagraph; diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 55470bdb3711..20f6e169204b 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -82,7 +82,7 @@ class AnnotationWindow : public FloatingWindow SdDrawDocument* mpDoc; OutlinerView* mpOutlinerView; - Outliner* mpOutliner; + ::Outliner* mpOutliner; VclPtr<ScrollBar> mpVScrollbar; css::uno::Reference< css::office::XAnnotation > mxAnnotation; bool mbReadonly; @@ -113,7 +113,7 @@ class AnnotationWindow : public FloatingWindow DrawDocShell* DocShell() { return mpDocShell; } OutlinerView* getView() { return mpOutlinerView; } - Outliner* Engine() { return mpOutliner; } + ::Outliner* Engine() { return mpOutliner; } SdDrawDocument* Doc() { return mpDoc; } long GetPostItTextHeight(); |