diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-12-03 10:25:09 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-03 11:32:32 +0000 |
commit | 00a3143b31b4f60cafcf5dcd94f4891bb920671a (patch) | |
tree | cc8435e1d7330a3db4808124df6cd4feb0d5a297 /sd/source/ui/inc | |
parent | 5a23dee0648d5ca177e07e9da150d159fa40831f (diff) |
convert the last tabpage in sd to .ui
Change-Id: I49eb93ec73d0783ab62eab5ce469526dd069e0b0
Diffstat (limited to 'sd/source/ui/inc')
-rw-r--r-- | sd/source/ui/inc/tpaction.hrc | 40 | ||||
-rw-r--r-- | sd/source/ui/inc/tpaction.hxx | 40 |
2 files changed, 18 insertions, 62 deletions
diff --git a/sd/source/ui/inc/tpaction.hrc b/sd/source/ui/inc/tpaction.hrc deleted file mode 100644 index ae7048181f35..000000000000 --- a/sd/source/ui/inc/tpaction.hrc +++ /dev/null @@ -1,40 +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 LB_EFFECT 1 -#define LB_ACTION 3 -#define LB_OLE_ACTION 4 -#define LB_TREE 5 -#define LB_TREE_DOCUMENT 6 -#define BTN_SEARCH 1 -#define BTN_SEEK 2 -#define FL_EFFECT 1 -#define FL_SEPARATOR 2 -#define EDT_SOUND 1 -#define EDT_BOOKMARK 2 -#define EDT_DOCUMENT 3 -#define EDT_PROGRAM 4 -#define EDT_MACRO 5 -#define FT_ACTION 2 -#define FT_SPEED 4 -#define FT_TREE 5 -#define TP_ANIMATION 787 -#define TP_ANIMATION_ACTION 789 -#define STR_PATHNAME 1 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 92f314f6fc4f..17675fd3f7a4 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -23,8 +23,8 @@ #include <com/sun/star/presentation/ClickAction.hpp> #include <com/sun/star/presentation/AnimationEffect.hpp> -#include <vcl/group.hxx> #include <vcl/fixed.hxx> +#include <vcl/layout.hxx> #include <svx/dlgctrl.hxx> #include <sfx2/tabdlg.hxx> #include <sfx2/basedlgs.hxx> @@ -40,15 +40,12 @@ class SdDrawDocument; /** * Effect-SingleTab-Dialog */ -class SdActionDlg : public SfxNoLayoutSingleTabDialog +class SdActionDlg : public SfxSingleTabDialog { private: const SfxItemSet& rOutAttrs; - public: - - SdActionDlg( Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ); - ~SdActionDlg() {}; + SdActionDlg(Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView); }; /** @@ -57,22 +54,21 @@ public: class SdTPAction : public SfxTabPage { private: - FixedText aFtAction; // always visible - ListBox aLbAction; - - FixedText aFtTree; // jump destination controls - SdPageObjsTLB aLbTree; - SdPageObjsTLB aLbTreeDocument; - ListBox aLbOLEAction; - - FixedLine aFlSeparator; - Edit aEdtSound; - Edit aEdtBookmark; - Edit aEdtDocument; - Edit aEdtProgram; - Edit aEdtMacro; - PushButton aBtnSearch; - PushButton aBtnSeek; + ListBox* m_pLbAction; + + FixedText* m_pFtTree; // jump destination controls + SdPageObjsTLB* m_pLbTree; + SdPageObjsTLB* m_pLbTreeDocument; + ListBox* m_pLbOLEAction; + + VclFrame* m_pFrame; + Edit* m_pEdtSound; + Edit* m_pEdtBookmark; + Edit* m_pEdtDocument; + Edit* m_pEdtProgram; + Edit* m_pEdtMacro; + PushButton* m_pBtnSearch; + PushButton* m_pBtnSeek; const SfxItemSet& rOutAttrs; const ::sd::View* mpView; |