diff options
Diffstat (limited to 'sd/source/ui/inc')
| -rw-r--r-- | sd/source/ui/inc/dlgass.hrc | 83 | ||||
| -rw-r--r-- | sd/source/ui/inc/dlgctrls.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/inc/docprev.hxx | 4 |
3 files changed, 5 insertions, 86 deletions
diff --git a/sd/source/ui/inc/dlgass.hrc b/sd/source/ui/inc/dlgass.hrc deleted file mode 100644 index d2c1c6df52d7..000000000000 --- a/sd/source/ui/inc/dlgass.hrc +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#define BUT_FINISH 1 -#define BUT_CANCEL 2 -#define BUT_LAST 3 -#define BUT_NEXT 4 -#define BUT_HELP 5 -#define CT_PREVIEW 6 -#define CB_PREVIEW 7 -#define CB_STARTWITH 8 - -#define FB_PAGE1 9 -#define FL_PAGE1_ARTGROUP 10 -#define RB_PAGE1_EMPTY 11 -#define RB_PAGE1_TEMPLATE 12 -#define LB_PAGE1_REGION 13 -#define LB_PAGE1_TEMPLATES 14 -#define RB_PAGE1_OPEN 15 -#define LB_PAGE1_OPEN 16 -#define PB_PAGE1_OPEN 17 - -#define FB_PAGE2 30 -#define FL_PAGE2_LAYOUT 31 -#define LB_PAGE2_REGION 32 -#define LB_PAGE2_LAYOUT 33 -#define FL_PAGE2_OUTPUTTYPES 34 -#define RB_PAGE2_MEDIUM1 35 -#define RB_PAGE2_MEDIUM2 36 -#define RB_PAGE2_MEDIUM3 37 -#define RB_PAGE2_MEDIUM4 38 -#define RB_PAGE2_MEDIUM5 39 -#define RB_PAGE2_MEDIUM6 66 - -#define FB_PAGE3 40 -#define FL_PAGE3_EFFECT 41 -#define FT_PAGE3_EFFECT 42 -#define LB_PAGE3_EFFECT 43 -#define FT_PAGE3_SPEED 44 -#define LB_PAGE3_SPEED 45 -#define FL_PAGE3_PRESTYPE 46 -#define RB_PAGE3_LIVE 47 -#define RB_PAGE3_KIOSK 48 -#define FT_PAGE3_TIME 49 -#define TMF_PAGE3_TIME 50 -#define FT_PAGE3_BREAK 51 -#define TMF_PAGE3_BREAK 52 -#define CB_PAGE3_LOGO 53 - -#define FB_PAGE4 20 -#define FL_PAGE4_PERSONAL 21 -#define FT_PAGE4_ASKNAME 22 -#define EDT_PAGE4_ASKNAME 23 -#define FT_PAGE4_ASKTOPIC 24 -#define EDT_PAGE4_ASKTOPIC 25 -#define FT_PAGE4_ASKINFORMATION 26 -#define EDT_PAGE4_ASKINFORMATION 27 - -#define FB_PAGE5 60 -#define FT_PAGE5_PAGELIST 61 -#define CT_PAGE5_PAGELIST 62 -#define CB_PAGE5_SUMMARY 63 - -#define STR_CREATE 64 -#define STR_OPEN 65 -#define DLG_ASS 900 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx index 0ec249b8afc3..c4235df8f721 100644 --- a/sd/source/ui/inc/dlgctrls.hxx +++ b/sd/source/ui/inc/dlgctrls.hxx @@ -36,8 +36,8 @@ struct FadeEffectLBImpl; class SD_DLLPUBLIC FadeEffectLB : public ListBox { public: - FadeEffectLB( Window* pParent, SdResId Id ); - virtual ~FadeEffectLB(); + FadeEffectLB(Window* pParent, WinBits nStyle); + virtual ~FadeEffectLB(); virtual void Fill(); /* void selectEffectFromPage( SdPage* pPage ); */ diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 4a8efe32ac47..3155bd992aca 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/presentation/FadeEffect.hpp> #include <vcl/window.hxx> #include <tools/gen.hxx> +#include <tools/wintypes.hxx> #include <rtl/ref.hxx> @@ -49,6 +50,7 @@ protected: rtl::Reference< sd::SlideShow > mxSlideShow; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; static void CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rPoint ); void ImpPaint( GDIMetaFile* pFile, OutputDevice* pVDev ); @@ -61,7 +63,7 @@ protected: void updateViewSettings(); public: - SdDocPreviewWin( Window* pParent, const ResId& rResId ); + SdDocPreviewWin( Window* pParent, const WinBits nStyle ); virtual ~SdDocPreviewWin(); void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 ); virtual void Resize() SAL_OVERRIDE; |