summaryrefslogtreecommitdiff
path: root/sd/source/ui/presenter
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/presenter')
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.cxx6
-rw-r--r--sd/source/ui/presenter/PresenterHelper.cxx8
-rw-r--r--sd/source/ui/presenter/PresenterPreviewCache.cxx10
-rw-r--r--sd/source/ui/presenter/PresenterTextView.cxx14
-rw-r--r--sd/source/ui/presenter/SlideRenderer.cxx8
5 files changed, 23 insertions, 23 deletions
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 45b90299bc3b..35afe646a52f 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -985,9 +985,9 @@ void PresenterCustomSprite::ThrowIfDisposed()
} } // end of namespace ::sd::presenter
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Draw_PresenterCanvasFactory_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_PresenterCanvasFactory_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new sd::presenter::PresenterCanvas());
}
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index 6316ad0ddf34..b2ff18223acb 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -157,7 +157,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas (
// common: first any is VCL pointer to window (for VCL canvas)
aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow));
aArg[1] = Any();
- aArg[2] = makeAny(::com::sun::star::awt::Rectangle());
+ aArg[2] = makeAny(css::awt::Rectangle());
aArg[3] = makeAny(sal_False);
aArg[4] = makeAny(rxWindow);
@@ -465,9 +465,9 @@ awt::Rectangle PresenterHelper::getWindowExtentsRelative (
} } // end of namespace ::sd::presenter
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Draw_PresenterHelper_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_PresenterHelper_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new sd::presenter::PresenterHelper(context));
}
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index 7295472de3c1..9be1ee005d37 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -57,7 +57,7 @@ public:
virtual const SdrPage* GetPage (CacheKey aKey) override;
virtual std::shared_ptr<std::vector<CacheKey> > GetEntryList (bool bVisible) override;
virtual sal_Int32 GetPriority (CacheKey aKey) override;
- virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() override;
+ virtual css::uno::Reference<css::uno::XInterface> GetModel() override;
private:
Reference<container::XIndexAccess> mxSlides;
@@ -188,7 +188,7 @@ void SAL_CALL PresenterPreviewCache::resume()
}
void PresenterPreviewCache::ThrowIfDisposed()
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
@@ -376,9 +376,9 @@ void PresenterPreviewCache::PresenterCacheContext::CallListeners (
} } // end of namespace ::sd::presenter
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new sd::presenter::PresenterPreviewCache(context));
}
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index e90e3f56256c..85d157264cb3 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -218,7 +218,7 @@ Any PresenterTextView::SetPropertyValue (
}
void PresenterTextView::ThrowIfDisposed()
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (PresenterTextViewInterfaceBase::rBHelper.bDisposed
|| PresenterTextViewInterfaceBase::rBHelper.bInDispose
@@ -299,9 +299,9 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine()
{ LANGUAGE_ARABIC_SAUDI_ARABIA, LANGUAGE_NONE,
DefaultFontType::CTL_TEXT, EE_CHAR_FONTINFO_CTL }
};
- aTable[0].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN);
- aTable[1].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN);
- aTable[2].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+ aTable[0].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN);
+ aTable[1].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CJK, css::i18n::ScriptType::ASIAN);
+ aTable[2].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CTL, css::i18n::ScriptType::COMPLEX);
for (int i = 0; i < 3; ++i)
{
@@ -518,9 +518,9 @@ void PresenterTextView::Implementation::CheckTop()
} } // end of namespace ::sd::presenter
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Draw_PresenterTextView_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_PresenterTextView_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new sd::presenter::PresenterTextView(context));
}
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index b60da234939a..f794fe3ff506 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -198,7 +198,7 @@ BitmapEx SlideRenderer::CreatePreview (
}
void SlideRenderer::ThrowIfDisposed()
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (SlideRendererInterfaceBase::rBHelper.bDisposed || SlideRendererInterfaceBase::rBHelper.bInDispose)
{
@@ -210,9 +210,9 @@ void SlideRenderer::ThrowIfDisposed()
} } // end of namespace ::sd::presenter
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Draw_SlideRenderer_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_SlideRenderer_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new sd::presenter::SlideRenderer(context));
}