diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-10-07 16:15:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-10-07 16:45:46 +0200 |
| commit | 41c2c9ea02e6db37fd23012873fd30d665729122 (patch) | |
| tree | b019f40ebd9f50b1af3a4d8199d3bbe194c6a68e /sfx2/source/dialog | |
| parent | 8fab6ab36589d0dcd75d45feab43a0b06b7f2a3e (diff) | |
sfx2: resolve "enum ApplicationType" conflict...
... with windows.h by putting our enum into a namespace, and while we're
at it convert it to enum class etc.
Change-Id: I804cd82565e77e6ab9a9d3a529f1ea43379fe0be
Diffstat (limited to 'sfx2/source/dialog')
| -rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 14 | ||||
| -rw-r--r-- | sfx2/source/dialog/backingwindow.hxx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index d022c2e02e55..52b45188be68 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -236,24 +236,24 @@ void BackingWindow::initControls() } if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::WRITER)) - mpAllRecentThumbnails->mnFileTypes |= TYPE_WRITER; + mpAllRecentThumbnails->mnFileTypes |= sfx2::ApplicationType::TYPE_WRITER; if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::CALC)) - mpAllRecentThumbnails->mnFileTypes |= TYPE_CALC; + mpAllRecentThumbnails->mnFileTypes |= sfx2::ApplicationType::TYPE_CALC; if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::IMPRESS)) - mpAllRecentThumbnails->mnFileTypes |= TYPE_IMPRESS; + mpAllRecentThumbnails->mnFileTypes |= sfx2::ApplicationType::TYPE_IMPRESS; if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::DRAW)) - mpAllRecentThumbnails->mnFileTypes |= TYPE_DRAW; + mpAllRecentThumbnails->mnFileTypes |= sfx2::ApplicationType::TYPE_DRAW; if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::DATABASE)) - mpAllRecentThumbnails->mnFileTypes |= TYPE_DATABASE; + mpAllRecentThumbnails->mnFileTypes |= sfx2::ApplicationType::TYPE_DATABASE; if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::MATH)) - mpAllRecentThumbnails->mnFileTypes |= TYPE_MATH; + mpAllRecentThumbnails->mnFileTypes |= sfx2::ApplicationType::TYPE_MATH; - mpAllRecentThumbnails->mnFileTypes |= TYPE_OTHER; + mpAllRecentThumbnails->mnFileTypes |= sfx2::ApplicationType::TYPE_OTHER; mpAllRecentThumbnails->Reload(); mpAllRecentThumbnails->ShowTooltips( true ); mpRecentButton->SetActive(true); diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 2469409cc483..5d3259b6f367 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -79,7 +79,7 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer VclPtr<VclBox> mpButtonsBox; VclPtr<VclBox> mpSmallButtonsBox; - VclPtr<RecentDocsView> mpAllRecentThumbnails; + VclPtr<sfx2::RecentDocsView> mpAllRecentThumbnails; VclPtr<TemplateDefaultView> mpLocalView; bool mbLocalViewInitialized; |