Skip to content

C
core
Kaydet (Commit) 20d52860 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

res ctor OCommonBehaviourTabPage::OCommonBehaviourTabPage can go now 

Change-Id: I0697faa1e66b912e3090c149efdf409c33b31b9c
üst 10bae418
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 111 deletions
dbaccess/AllLangResTarget_dbu.mk
Dosyayı görüntüle @ 20d52860
......@@ -61,7 +61,6 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,dbaccess/dbu,\
))
$(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\
dbaccess/source/ui/dlg/AutoControls_tmpl.hrc \
dbaccess/source/ui/inc/toolbox_tmpl.hrc \
))
......
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
Dosyayı görüntüle @ 20d52860
......@@ -31,7 +31,6 @@
#include <osl/process.h>
#include <vcl/msgbox.hxx>
#include "dbadmin.hxx"
#include "dbadmin.hrc"
#include <comphelper/types.hxx>
#include <vcl/stdtext.hxx>
#include "sqlmessage.hxx"
......
dbaccess/source/ui/dlg/adminpages.cxx
Dosyayı görüntüle @ 20d52860
......@@ -18,7 +18,6 @@
*/
#include "adminpages.hxx"
#include "dbadmin.hrc"
#include "dbadmin.hxx"
#include "dbu_dlg.hrc"
#include <svl/stritem.hxx>
......
dbaccess/source/ui/dlg/advancedsettings.cxx
Dosyayı görüntüle @ 20d52860
......@@ -26,7 +26,6 @@
#include "optionalboolitem.hxx"
#include "dbu_resource.hrc"
#include "dbu_dlg.hrc"
#include "dbadmin.hrc"
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
......
dbaccess/source/ui/dlg/dbadmin.cxx
Dosyayı görüntüle @ 20d52860
......@@ -21,7 +21,6 @@
#include "DbAdminImpl.hxx"
#include "DriverSettings.hxx"
#include "adminpages.hxx"
#include "dbadmin.hrc"
#include "dbadmin.hxx"
#include "dbu_dlg.hrc"
#include <svl/stritem.hxx>
......
dbaccess/source/ui/dlg/dbadmin.hrc deleted 100644 → 0
Dosyayı görüntüle @ 10bae418
/* -*- 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 .
*/
#ifndef _DBAUI_DBADMIN_HRC_
#define _DBAUI_DBADMIN_HRC_
// control ids
#define FT_OPTIONS 5
#define FT_HOSTNAME 10
#define FT_PORTNUMBER 12
#define ET_OPTIONS 3
#define ET_HOSTNAME 5
#define CB_USECATALOG 4
#define NF_PORTNUMBER 1
#endif // _DBAUI_DBADMIN_HRC_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/dlg/dbadmin.src
Dosyayı görüntüle @ 20d52860
......@@ -20,7 +20,6 @@
#include "dbaccess_helpid.hrc"
#include "AutoControls.hrc"
#include "dbu_dlg.hrc"
#include "dbadmin.hrc"
#include "browserids.hxx"
String STR_DATABASE_TYPE_CHANGE
......
dbaccess/source/ui/dlg/dbadmin2.src
Dosyayı görüntüle @ 20d52860
......@@ -19,7 +19,6 @@
#include "dbaccess_helpid.hrc"
#include "dbu_dlg.hrc"
#include "dbadmin.hrc"
#include "browserids.hxx"
#include "toolbox.hrc"
#include "AutoControls.hrc"
......
dbaccess/source/ui/dlg/dbwiz.cxx
Dosyayı görüntüle @ 20d52860
......@@ -18,7 +18,6 @@
*/
#include "dbwiz.hxx"
#include "dbadmin.hrc"
#include "dbu_dlg.hrc"
#include "dsitems.hxx"
#include "dsnItem.hxx"
......
dbaccess/source/ui/dlg/dbwizsetup.cxx
Dosyayı görüntüle @ 20d52860
......@@ -42,7 +42,6 @@
#include "dbaccess_helpid.hrc"
#include "ConnectionPageSetup.hxx"
#include "UITools.hxx"
#include "dbadmin.hrc"
#include <dbaccess/AsyncronousLink.hxx>
#include <sfx2/filedlghelper.hxx>
#include <cppuhelper/exc_hlp.hxx>
......
dbaccess/source/ui/dlg/detailpages.cxx
Dosyayı görüntüle @ 20d52860
......@@ -30,7 +30,6 @@
#include "dbaccess_helpid.hrc"
#include "dbu_dlg.hrc"
#include "dbadmin.hrc"
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
......@@ -58,66 +57,8 @@ namespace dbaui
using namespace ::com::sun::star::container;
using namespace ::dbtools;
// OCommonBehaviourTabPage
OCommonBehaviourTabPage::OCommonBehaviourTabPage(Window* pParent, sal_uInt16 nResId, const SfxItemSet& _rCoreAttrs,
sal_uInt32 nControlFlags,bool _bFreeResource)
:OGenericAdministrationPage(pParent, ModuleRes(nResId), _rCoreAttrs)
,m_pOptionsLabel(NULL)
,m_pOptions(NULL)
,m_pDataConvertFixedLine(NULL)
,m_pDataConvertLabel(NULL)
,m_pCharsetLabel(NULL)
,m_pCharset(NULL)
,m_pAutoFixedLine(NULL)
,m_pAutoRetrievingEnabled(NULL)
,m_pAutoIncrementLabel(NULL)
,m_pAutoIncrement(NULL)
,m_pAutoRetrievingLabel(NULL)
,m_pAutoRetrieving(NULL)
,m_nControlFlags(nControlFlags)
,m_bDelete(true)
{
if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS)
{
m_pOptionsLabel = new FixedText(this, ModuleRes(FT_OPTIONS));
m_pOptions = new Edit(this, ModuleRes(ET_OPTIONS));
m_pOptions->SetModifyHdl(getControlModifiedLink());
}
if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
{
m_pDataConvertFixedLine = new FixedLine(this, ModuleRes(FL_DATACONVERT));
m_pCharsetLabel = new FixedText(this, ModuleRes(FT_CHARSET));
m_pCharset = new CharSetListBox(this, ModuleRes(LB_CHARSET));
m_pCharset->SetSelectHdl(getControlModifiedLink());
}
Window* pWindows[] = { m_pAutoRetrievingEnabled, m_pAutoFixedLine,
m_pAutoIncrementLabel, m_pAutoIncrement,
m_pAutoRetrievingLabel, m_pAutoRetrieving };
sal_Int32 nCount = sizeof(pWindows) / sizeof(pWindows[0]);
for (sal_Int32 i=1; i < nCount; ++i)
{
if ( pWindows[i] )
{
Window* pPrev = pWindows[i-1];
for (sal_Int32 j = i-1; pPrev == NULL && j >= 0 ; --j)
{
pPrev = pWindows[j];
}
if ( pPrev )
pWindows[i]->SetZOrder(pPrev, WINDOW_ZORDER_BEHIND);
}
}
if ( _bFreeResource )
FreeResource();
}
OCommonBehaviourTabPage::OCommonBehaviourTabPage(Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs,
OCommonBehaviourTabPage::OCommonBehaviourTabPage(Window* pParent, const OString& rId,
const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs,
sal_uInt32 nControlFlags)
:OGenericAdministrationPage(pParent, rId, rUIXMLDescription, _rCoreAttrs)
......
dbaccess/source/ui/dlg/detailpages.hxx
Dosyayı görüntüle @ 20d52860
......@@ -73,7 +73,6 @@ namespace dbaui
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
// nControlFlags is a combination of the CBTP_xxx-constants
OCommonBehaviourTabPage(Window* pParent, sal_uInt16 nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource = true);
OCommonBehaviourTabPage(Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags);
protected:
......
dbaccess/source/ui/dlg/generalpage.cxx
Dosyayı görüntüle @ 20d52860
......@@ -21,7 +21,6 @@
#include "generalpage.hxx"
#include <connectivity/dbexception.hxx>
#include "dbu_dlg.hrc"
#include "dbadmin.hrc"
#include "dsitems.hxx"
#include "dbustrings.hrc"
#include "dbadmin.hxx"
......
dbaccess/source/ui/dlg/tablespage.cxx
Dosyayı görüntüle @ 20d52860
......@@ -19,7 +19,6 @@
#include "tablespage.hxx"
#include "dbu_dlg.hrc"
#include "dbadmin.hrc"
#include "dsitems.hxx"
#include "browserids.hxx"
#include "datasourceconnector.hxx"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment