diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-12-19 12:30:43 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-19 12:42:13 +0000 |
commit | acee1b8b8c68c5c9d7492dbcc95635e68551713f (patch) | |
tree | d5cd76cfe28e2ec4c0ba5e858465d799ce27bd2c /cui/source/tabpages | |
parent | 71eb27376a92f61c91567f2bfc2a74dba7192aab (diff) |
convert border background dialog to .ui
Change-Id: I661384b04fef7f59c2b4feffe093cf75103d55d1
Diffstat (limited to 'cui/source/tabpages')
-rw-r--r-- | cui/source/tabpages/bbdlg.cxx | 34 | ||||
-rw-r--r-- | cui/source/tabpages/bbdlg.src | 54 |
2 files changed, 9 insertions, 79 deletions
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index dc99b22a932e..30a487c7f12f 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -17,43 +17,27 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/shl.hxx> -#include <svx/dialogs.hrc> -#include <cuires.hrc> - #include "bbdlg.hxx" #include "border.hxx" #include "backgrnd.hxx" -#include <dialmgr.hxx> - -// class SvxBorderBackgroundDlg ------------------------------------------ - -SvxBorderBackgroundDlg::SvxBorderBackgroundDlg( Window *pParent, - const SfxItemSet& rCoreSet, - sal_Bool bEnableSelector ) : - - SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_BBDLG ), &rCoreSet ), - bEnableBackgroundSelector( bEnableSelector ) -{ - FreeResource(); - AddTabPage( RID_SVXPAGE_BORDER, SvxBorderTabPage::Create, 0 ); - AddTabPage( RID_SVXPAGE_BACKGROUND, SvxBackgroundTabPage::Create, 0 ); -} -// ----------------------------------------------------------------------- +SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(Window *pParent, + const SfxItemSet& rCoreSet, bool bEnableSelector) -SvxBorderBackgroundDlg::~SvxBorderBackgroundDlg() + : SfxTabDialog(pParent, "BorderBackgroundDialog", + "cui/ui/borderbackgrounddialog.ui", &rCoreSet) + , m_bEnableBackgroundSelector(bEnableSelector) + , m_nBackgroundPageId(0) { + AddTabPage("borders", SvxBorderTabPage::Create, 0 ); + m_nBackgroundPageId = AddTabPage("background", SvxBackgroundTabPage::Create, 0 ); } -// ----------------------------------------------------------------------- - void SvxBorderBackgroundDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) { // Make it possible to switch between color/graphic: - if ( bEnableBackgroundSelector && (RID_SVXPAGE_BACKGROUND == nPageId) ) + if ( m_bEnableBackgroundSelector && (nPageId == m_nBackgroundPageId) ) ((SvxBackgroundTabPage&)rTabPage).ShowSelector( ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/bbdlg.src b/cui/source/tabpages/bbdlg.src deleted file mode 100644 index da680a9f4e3a..000000000000 --- a/cui/source/tabpages/bbdlg.src +++ /dev/null @@ -1,54 +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 . - */ - -#include <cuires.hrc> -#include <svx/dialogs.hrc> - - // RID_SVXDLG_BBDLG ------------------------------------------------------ -TabDialog RID_SVXDLG_BBDLG -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 328 , 155 ) ; - Text [ en-US ] = "Border / Background" ; - Moveable = TRUE ; - // Closeable = TRUE; hat ja einen OKButton - TabControl 1 - { - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 2 , 10 ) ; - Size = MAP_APPFONT ( 260 , 135 ) ; - PageList = - { - PageItem - { - Identifier = RID_SVXPAGE_BORDER ; - Text [ en-US ] = "Borders" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_BACKGROUND ; - Text [ en-US ] = "Background" ; - }; - }; - }; -}; - // ********************************************************************** EOF - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |