summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-08-15 11:25:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-08-15 17:02:59 +0100
commit748ed65ffba9d69ed333fd1347c30dd7a3a944b8 (patch)
tree7785130c92eda7425d6a843f7ada9b549c8ecee3 /framework
parent1ea4f163c5a2f531dcfda7899b322636a735c618 (diff)
drop TabControl resource loader
Change-Id: Idb909c205dfadaadeb8b98ce08fe2f4286cfce26
Diffstat (limited to 'framework')
-rw-r--r--framework/AllLangResTarget_fwe.mk1
-rw-r--r--framework/inc/classes/fwktabwindow.hxx4
-rw-r--r--framework/inc/framework.hrc33
-rw-r--r--framework/source/classes/fwktabwindow.cxx15
-rw-r--r--framework/source/services/fwk_services.src32
5 files changed, 7 insertions, 78 deletions
diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk
index 8875133588c9..a59cb9a4cfed 100644
--- a/framework/AllLangResTarget_fwe.mk
+++ b/framework/AllLangResTarget_fwe.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_AllLangResTarget_set_reslocation,fwe,framework))
$(eval $(call gb_AllLangResTarget_add_srs,fwe,\
fwe/fwk_classes \
- fwe/fwk_services \
))
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index ea450142077d..323dc9d8247a 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -44,9 +44,9 @@ namespace framework
class FwkTabControl : public TabControl
{
public:
- FwkTabControl( Window* pParent, const ResId& rResId );
+ FwkTabControl(Window* pParent);
- void BroadcastEvent( sal_uLong nEvent );
+ void BroadcastEvent( sal_uLong nEvent );
};
class FwkTabPage : public TabPage
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
deleted file mode 100644
index 2b969e1d6d7b..000000000000
--- a/framework/inc/framework.hrc
+++ /dev/null
@@ -1,33 +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 .
- */
-
-#ifndef _FRAMEWORK_HRC
-#define _FRAMEWORK_HRC
-
-#include <svl/solar.hrc>
-
-#define RID_FWK_START 2409
-
-// Ids of TabWindow
-#define WIN_TABWINDOW (RID_FWK_START+0)
-#define TC_TABCONTROL 1
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index f7af3e77b04b..64973e673f3f 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -20,7 +20,6 @@
// autogen include statement, do not remove
#include <classes/fwktabwindow.hxx>
-#include "framework.hrc"
#include <classes/fwkresid.hxx>
#include <com/sun/star/awt/PosSize.hpp>
@@ -49,9 +48,8 @@ namespace framework
{
// class FwkTabControl ---------------------------------------------------
-FwkTabControl::FwkTabControl( Window* pParent, const ResId& rResId ) :
-
- TabControl( pParent, rResId )
+FwkTabControl::FwkTabControl(Window* pParent)
+ : TabControl(pParent)
{
}
@@ -174,12 +172,9 @@ void FwkTabPage::Resize()
}
// class FwkTabWindow ---------------------------------------------
-
-FwkTabWindow::FwkTabWindow( Window* pParent ) :
-
- Window( pParent, FwkResId( WIN_TABWINDOW ) ),
-
- m_aTabCtrl ( this, FwkResId( TC_TABCONTROL ) )
+FwkTabWindow::FwkTabWindow( Window* pParent )
+ : Window(pParent)
+ , m_aTabCtrl(this)
{
m_xWinProvider = awt::ContainerWindowProvider::create( ::comphelper::getProcessComponentContext() );
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
deleted file mode 100644
index 00f6b16f9f66..000000000000
--- a/framework/source/services/fwk_services.src
+++ /dev/null
@@ -1,32 +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 "framework.hrc"
-
-Window WIN_TABWINDOW
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- TabControl TC_TABCONTROL
- {
- OutputSize = TRUE ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */