summaryrefslogtreecommitdiff
path: root/chart2/source/controller/dialogs
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-10 09:29:34 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-10 11:21:03 +0000
commit2b12a5b87b1de9ae95d9562ba21201890b1100c5 (patch)
treeae0c1b5064c4d92e65db301e4d8acd87e891b159 /chart2/source/controller/dialogs
parenta95b58060b01046a8881e97e0c5016e44200dd32 (diff)
the return of callcatcher
Change-Id: I447ebcc61ff061bce15678c6fcfd3d0a4669908f
Diffstat (limited to 'chart2/source/controller/dialogs')
-rw-r--r--chart2/source/controller/dialogs/Bitmaps.hrc3
-rw-r--r--chart2/source/controller/dialogs/Bitmaps.src9
-rw-r--r--chart2/source/controller/dialogs/RangeSelectionButton.cxx41
-rw-r--r--chart2/source/controller/dialogs/Strings.src10
-rw-r--r--chart2/source/controller/dialogs/TextDirectionListBox.cxx15
-rw-r--r--chart2/source/controller/dialogs/res_ErrorBar.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_LegendPosition.cxx8
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.hxx1
8 files changed, 1 insertions, 88 deletions
diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc
index bcf1f37b8b6c..349953b7d6a5 100644
--- a/chart2/source/controller/dialogs/Bitmaps.hrc
+++ b/chart2/source/controller/dialogs/Bitmaps.hrc
@@ -218,9 +218,6 @@
#define BMP_REGRESSION_POLYNOMIAL (RID_APP_START + 110)
#define BMP_REGRESSION_MOVING_AVERAGE (RID_APP_START + 111)
-// hide-button for range-choosing
-#define IMG_SELECTRANGE (RID_APP_START + 100)
-
// CHART_BITMAPS_HRC
#endif
diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src
index 9ee63814eea4..d4f780990e52 100644
--- a/chart2/source/controller/dialogs/Bitmaps.src
+++ b/chart2/source/controller/dialogs/Bitmaps.src
@@ -595,14 +595,5 @@ Image BMP_REGRESSION_MOVING_AVERAGE
File = "regavg.png" ;
};
};
-//---------------------
-Image IMG_SELECTRANGE
-{
- ImageBitmap = Bitmap
- {
- File = "selectrange.png";
- };
- MaskColor = STD_MASKCOLOR;
-};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx
deleted file mode 100644
index 2b14e8e77c0d..000000000000
--- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx
+++ /dev/null
@@ -1,41 +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 "RangeSelectionButton.hxx"
-#include "Bitmaps.hrc"
-#include "Strings.hrc"
-#include "ResId.hxx"
-
-namespace chart
-{
-
-RangeSelectionButton::RangeSelectionButton( Window *pParent, const ResId& rResId ) :
- ImageButton( pParent, rResId )
-{
- SetModeImage( Image( SchResId( IMG_SELECTRANGE) ) );
- this->SetQuickHelpText(SCH_RESSTR(STR_TIP_SELECT_RANGE));
-}
-
-RangeSelectionButton::~RangeSelectionButton()
-{
-}
-
-} //namespace chart
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src
index f03ce30259c7..371e2e9f6beb 100644
--- a/chart2/source/controller/dialogs/Strings.src
+++ b/chart2/source/controller/dialogs/Strings.src
@@ -373,16 +373,6 @@ String STR_OBJECT_SHAPE
Text [ en-US ] = "Drawing Object" ;
};
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-String STR_TIP_SELECT_RANGE
-{
- Text [ en-US ] = "Select data range" ;
-};
-
String STR_TIP_DATASERIES
{
Text [ en-US ] = "Data Series '%SERIESNAME'" ;
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index 25efde3be919..46149a6befc5 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -27,21 +27,6 @@
namespace chart
{
-TextDirectionListBox::TextDirectionListBox( Window* pParent, const ResId& rResId, Window* pWindow1, Window* pWindow2 ) :
- svx::FrameDirectionListBox( pParent, rResId )
-{
- InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_LTR ), FRMDIR_HORI_LEFT_TOP );
- InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_RTL ), FRMDIR_HORI_RIGHT_TOP );
- InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_SUPER ), FRMDIR_ENVIRONMENT );
-
- if( !SvtLanguageOptions().IsCTLFontEnabled() )
- {
- Hide();
- if( pWindow1 ) pWindow1->Hide();
- if( pWindow2 ) pWindow2->Hide();
- }
-}
-
TextDirectionListBox::TextDirectionListBox( Window* pParent, Window* pWindow1, Window* pWindow2 ) :
svx::FrameDirectionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_DROPDOWN)
{
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index fce3938852b1..b5a865019631 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -430,7 +430,7 @@ IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged)
return 0;
}
-IMPL_LINK( ErrorBarResources, ChooseRange, RangeSelectionButton *, pButton )
+IMPL_LINK( ErrorBarResources, ChooseRange, PushButton*, pButton )
{
OSL_ASSERT( m_apRangeSelectionHelper.get());
if( ! m_apRangeSelectionHelper.get())
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index f50a885cbf4a..fb05a6a687e2 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -242,14 +242,6 @@ void LegendPositionResources::SetChangeHdl( const Link& rLink )
m_aChangeLink = rLink;
}
-void LegendPositionResources::SetAccessibleRelationMemberOf(Window* pMemberOf)
-{
- m_pRbtLeft->SetAccessibleRelationMemberOf(pMemberOf);
- m_pRbtRight->SetAccessibleRelationMemberOf(pMemberOf);
- m_pRbtTop->SetAccessibleRelationMemberOf(pMemberOf);
- m_pRbtBottom->SetAccessibleRelationMemberOf(pMemberOf);
-}
-
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 9f3e5386dd75..3c6bf3751a29 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_RANGECHOOSER_HXX
#include "RangeSelectionListener.hxx"
-#include "RangeSelectionButton.hxx"
#include "TabPageNotifiable.hxx"
#include <com/sun/star/chart2/XChartDocument.hpp>