Skip to content

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

Various adjustments of the pivot table 

especially relative positions were relative
to the dialog which was assumed to be then
a direct parent of the widgets so that
a simple calculation could make the positions
relative to the widgets

also now the pivot table fits into a 768 pixel high
screen

Change-Id: I86a4155439872e8273943b90f15320e560e237a4
üst 02ef234b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 509 deletions
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ cc672577
......@@ -613,6 +613,27 @@
generic-name="CondFormatList" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="ScDPPageFieldControl" name="sclo-ScDPPageFieldControl"
generic-name="ScDPPageFieldControl" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="ScDPColFieldControl" name="sclo-ScDPColFieldControl"
generic-name="ScDPColFieldControl" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="ScDPRowFieldControl" name="sclo-ScDPRowFieldControl"
generic-name="ScDPRowFieldControl" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="ScDPDataFieldControl" name="sclo-ScDPDataFieldControl"
generic-name="ScDPDataFieldControl" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="ScDPSelectFieldControl" name="sclo-ScDPSelectFieldControl"
generic-name="ScDPSelectFieldControl" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="ScDPFunctionListBox" name="scuilo-ScDPFunctionListBox"
generic-name="DPFunctionListBox" parent="GtkTreeView"
icon-name="widget-gtk-treeview"/>
......
sc/AllLangResTarget_sc.mk
Dosyayı görüntüle @ cc672577
......@@ -48,7 +48,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/cctrl/checklistmenu.src \
sc/source/ui/navipi/navipi.src \
sc/source/ui/styleui/scstyles.src \
sc/source/ui/dbgui/pivot.src \
sc/source/ui/dbgui/dpgroupdlg.src \
sc/source/ui/dbgui/pvfundlg.src \
sc/source/ui/dbgui/dapitype.src \
......
sc/inc/helpids.h
Dosyayı görüntüle @ cc672577
......@@ -140,13 +140,6 @@
#define HID_SELECTTABLES "SC_HID_SELECTTABLES"
#define HID_SC_REPLCELLSWARN "SC_HID_SC_REPLCELLSWARN"
// data pilot layout dialog
#define HID_SC_DPLAY_PAGE "SC_HID_SC_DPLAY_PAGE"
#define HID_SC_DPLAY_COLUMN "SC_HID_SC_DPLAY_COLUMN"
#define HID_SC_DPLAY_ROW "SC_HID_SC_DPLAY_ROW"
#define HID_SC_DPLAY_DATA "SC_HID_SC_DPLAY_DATA"
#define HID_SC_DPLAY_SELECT "SC_HID_SC_DPLAY_SELECT"
#define HID_SC_DRAW_RENAME "SC_HID_SC_DRAW_RENAME"
#define HID_SC_DPSUBT_OPT "SC_HID_SC_DPSUBT_OPT"
......
sc/inc/sc.hrc
Dosyayı görüntüle @ cc672577
......@@ -942,6 +942,8 @@
#define SCSTR_VALID_RANGE (STR_START + 317)
#define SCSTR_VALID_LIST (STR_START + 318)
#define SCSTR_SELECT (STR_START + 319)
// media shell
#define SCSTR_MEDIASHELL (STR_START + 401)
......@@ -1012,7 +1014,6 @@
#define RID_SCPAGE_SUBT_OPTIONS (SC_DIALOGS_START + 29)
#define RID_SCPAGE_USERLISTS (SC_DIALOGS_START + 31)
#define RID_SCDLG_PIVOTFILTER (SC_DIALOGS_START + 33)
#define RID_SCDLG_PIVOT_LAYOUT (SC_DIALOGS_START + 34)
#define RID_SCDLG_CONSOLIDATE (SC_DIALOGS_START + 35)
#define RID_SCDLG_INSERT_TABLE (SC_DIALOGS_START + 42)
......
sc/source/ui/dbgui/fieldwnd.cxx
Dosyayı görüntüle @ cc672577
......@@ -50,8 +50,8 @@
#include "dpuiglobal.hxx"
#include "calcmacros.hxx"
#include "AccessibleDataPilotControl.hxx"
#include "sc.hrc"
#include "scresid.hxx"
#include "pivot.hrc"
using namespace com::sun::star;
using ::std::vector;
......@@ -116,22 +116,11 @@ ScAccessibleDataPilotControl *ScDPFieldControlBase::AccessRef::operator -> () co
return static_cast< ScAccessibleDataPilotControl * >( mxRef.get() );
}
ScDPFieldControlBase::ScDPFieldControlBase(
ScPivotLayoutDlg* pParent, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) :
Control(pParent),
mpDlg(pParent),
mpCaption(pCaption),
mnFieldSelected(0)
{
SetHelpId( pcHelpId );
if (pCaption)
maName = MnemonicGenerator::EraseAllMnemonicChars( pCaption->GetText() );
}
ScDPFieldControlBase::ScDPFieldControlBase( Window* pParent ) :
Control (pParent),
mnFieldSelected(0)
ScDPFieldControlBase::ScDPFieldControlBase(Window* pParent)
: Control(pParent)
, mpDlg(NULL)
, mpCaption(NULL)
, mnFieldSelected(0)
{
}
......@@ -441,7 +430,7 @@ void ScDPFieldControlBase::MouseMove( const MouseEvent& rMEvt )
{
Point aScrPos = OutputToScreenPixel(rMEvt.GetPosPixel());
ScPivotFieldType eFieldType = mpDlg->GetFieldTypeAtPoint(aScrPos);
PointerStyle ePtr = mpDlg->GetPointerStyleAtPoint(aScrPos, eFieldType);
PointerStyle ePtr = mpDlg->GetPointerStyle(eFieldType);
SetPointer( Pointer( ePtr ) );
}
const FieldNames& rFields = GetFieldNames();
......@@ -700,7 +689,7 @@ void ScDPFieldControlBase::DrawInvertSelection()
Size ScDPFieldControlBase::GetStdFieldBtnSize() const
{
return mpDlg->GetStdFieldBtnSize();
return Size(approximate_char_width() * 8, FIELD_BTN_HEIGHT);
}
void ScDPFieldControlBase::MoveField( size_t nDestIndex )
......@@ -896,22 +885,14 @@ size_t ScDPFieldControlBase::GetFieldIndexByData( const ScPivotFuncData& rData )
return it == maFuncData.end() ? PIVOTFIELD_INVALID : std::distance(maFuncData.begin(), it);
}
//=============================================================================
ScDPHorFieldControl::ScDPHorFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) :
ScDPFieldControlBase(pDialog, rResId, pCaption, pcHelpId),
maScroll(this, WB_HORZ | WB_DRAG),
mnFieldBtnRowCount(0),
mnFieldBtnColCount(0)
void ScDPFieldControlBase::Resize()
{
maScroll.SetScrollHdl( LINK(this, ScDPHorFieldControl, ScrollHdl) );
maScroll.SetEndScrollHdl( LINK(this, ScDPHorFieldControl, EndScrollHdl) );
maScroll.Hide();
AppendPaintable(&maScroll);
Control::Resize();
CalcSize();
}
//=============================================================================
ScDPHorFieldControl::ScDPHorFieldControl ( Window* pParent ) :
ScDPFieldControlBase( pParent ),
maScroll(this, WB_HORZ | WB_DRAG),
......@@ -1040,6 +1021,8 @@ void ScDPHorFieldControl::CalcSize()
maScroll.SetVisibleSize(mnFieldBtnColCount);
maScroll.SetPageSize(mnFieldBtnColCount);
maScroll.SetRange(Range(0, mnFieldBtnColCount));
ResetScrollBar();
}
bool ScDPHorFieldControl::IsValidIndex(size_t /*nIndex*/) const
......@@ -1171,12 +1154,6 @@ IMPL_LINK_NOARG(ScDPHorFieldControl, EndScrollHdl)
//=============================================================================
ScDPPageFieldControl::ScDPPageFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) :
ScDPHorFieldControl(pDialog, rResId, pCaption, pcHelpId)
{
}
ScDPPageFieldControl::ScDPPageFieldControl ( Window* pParent ) :
ScDPHorFieldControl( pParent )
{
......@@ -1204,12 +1181,6 @@ OUString ScDPPageFieldControl::GetDescription() const
//=============================================================================
ScDPColFieldControl::ScDPColFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) :
ScDPHorFieldControl(pDialog, rResId, pCaption, pcHelpId)
{
}
ScDPColFieldControl::ScDPColFieldControl ( Window* pParent ) :
ScDPHorFieldControl( pParent )
{
......@@ -1236,19 +1207,6 @@ OUString ScDPColFieldControl::GetDescription() const
//=============================================================================
ScDPRowFieldControl::ScDPRowFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) :
ScDPFieldControlBase(pDialog, rResId, pCaption, pcHelpId),
maScroll(this, WB_VERT | WB_DRAG),
mnColumnBtnCount(0)
{
maScroll.SetScrollHdl( LINK(this, ScDPRowFieldControl, ScrollHdl) );
maScroll.SetEndScrollHdl( LINK(this, ScDPRowFieldControl, EndScrollHdl) );
maScroll.Show(false);
AppendPaintable(&maScroll);
}
ScDPRowFieldControl::ScDPRowFieldControl ( Window* pParent ) :
ScDPFieldControlBase( pParent ),
maScroll(this, WB_VERT | WB_DRAG),
......@@ -1372,6 +1330,7 @@ void ScDPRowFieldControl::CalcSize()
maScroll.SetRange(Range(0, mnColumnBtnCount));
maScroll.DoScroll(0);
ResetScrollBar();
}
bool ScDPRowFieldControl::IsValidIndex(size_t /*nIndex*/) const
......@@ -1484,17 +1443,10 @@ IMPL_LINK_NOARG(ScDPRowFieldControl, EndScrollHdl)
//=============================================================================
ScDPSelectFieldControl::ScDPSelectFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) :
ScDPHorFieldControl(pDialog, rResId, pCaption, pcHelpId)
{
SetName(OUString(ScResId(STR_SELECT)));
}
ScDPSelectFieldControl::ScDPSelectFieldControl( Window* pParent ):
ScDPHorFieldControl( pParent )
{
//SetName(OUString(ScResId(STR_SELECT)));
SetName(OUString(ScResId(SCSTR_SELECT)));
}
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScDPSelectFieldControl( Window *pParent, VclBuilder::stringmap & )
......@@ -1518,12 +1470,6 @@ OUString ScDPSelectFieldControl::GetDescription() const
//=============================================================================
ScDPDataFieldControl::ScDPDataFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) :
ScDPHorFieldControl(pDialog, rResId, pCaption, pcHelpId)
{
}
ScDPDataFieldControl::ScDPDataFieldControl( Window* pParent ):
ScDPHorFieldControl( pParent )
{
......
sc/source/ui/dbgui/pivot.hrc deleted 100644 → 0
Dosyayı görüntüle @ 02ef234b
/* -*- 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 "sc.hrc"
#define BTN_OK 1
#define BTN_CANCEL 2
#define BTN_HELP 3
#define BTN_MORE 4
#define BTN_REMOVE 5
#define BTN_OPTIONS 6
#define FL_LAYOUT 10
#define WND_COL 11
#define WND_ROW 12
#define WND_DATA 13
#define WND_SELECT 14
#define WND_PAGE 18
#define FT_COL 31
#define FT_ROW 32
#define FT_DATA 33
#define STR_SELECT 34
#define FT_PAGE 35
#define FT_INFO 19
#define FL_OUTPUT 20
#define FT_OUTAREA 21
#define LB_OUTAREA 22
#define ED_OUTAREA 23
#define RB_OUTAREA 24
#define BTN_IGNEMPTYROWS 25
#define BTN_DETECTCAT 26
#define BTN_TOTALCOL 27
#define BTN_TOTALROW 28
#define BTN_FILTER 29
#define BTN_DRILLDOWN 30
#define FT_INAREA 40
#define RB_INAREA 41
#define ED_INAREA 42
#define PIVOTSTR_SUM 1
#define PIVOTSTR_COUNT 2
#define PIVOTSTR_AVG 3
#define PIVOTSTR_MAX 4
#define PIVOTSTR_MIN 5
#define PIVOTSTR_PROD 6
#define PIVOTSTR_COUNT2 7
#define PIVOTSTR_DEV 8
#define PIVOTSTR_DEV2 9
#define PIVOTSTR_VAR 10
#define PIVOTSTR_VAR2 11
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/dbgui/pivot.src deleted 100644 → 0
Dosyayı görüntüle @ 02ef234b
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
* 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 "pivot.hrc"
ModelessDialog RID_SCDLG_PIVOT_LAYOUT
{
OutputSize = TRUE ;
HelpId = CMD_SID_OPENDLG_PIVOTTABLE ;
Size = MAP_APPFONT ( 350 , 216 ) ;
Hide = TRUE ;
SVLook = TRUE ;
Moveable = TRUE ;
Closeable = FALSE ;
Text [ en-US ] = "Pivot table" ;
FixedText FT_PAGE
{
Pos = MAP_APPFONT ( 194 , 168 ) ;
Size = MAP_APPFONT ( 37 , 8 ) ;
Text[ en-US ] = "Page Fields" ;
};
Control WND_PAGE
{
/* Size is calculated in the dialog code. */
Pos = MAP_APPFONT ( 20 , 14 ) ;
Size = MAP_APPFONT ( 1 , 1 ) ;
TabStop = TRUE ;
};
FixedText FT_COL
{
Pos = MAP_APPFONT ( 231 , 168 ) ;
Size = MAP_APPFONT ( 37 , 8 ) ;
Text [ en-US ] = "Column Fields" ;
};
Control WND_COL
{
/* Size is calculated in the dialog code. */
Pos = MAP_APPFONT ( 56 , 56 ) ;
Size = MAP_APPFONT ( 1 , 1 ) ;
TabStop = TRUE ;
};
FixedText FT_ROW
{
Pos = MAP_APPFONT ( 194 , 176 ) ;
Size = MAP_APPFONT ( 37 , 8 ) ;
Text [ en-US ] = "Row\nFields" ;
};
Control WND_ROW
{
/* Size is calculated in the dialog code. */
Pos = MAP_APPFONT ( 6 , 98 ) ;
Size = MAP_APPFONT ( 1 , 1 ) ;
TabStop = TRUE ;
};
FixedText FT_DATA
{
Pos = MAP_APPFONT ( 227, 176 ) ;
Size = MAP_APPFONT ( 37 , 8 ) ;
Text [ en-US ] = "Data Fields" ;
};
Control WND_DATA
{
/* Size is calculated in the dialog code. */
Pos = MAP_APPFONT ( 56 , 98 ) ;
Size = MAP_APPFONT ( 1 , 1 ) ;
TabStop = TRUE ;
};
Control WND_SELECT
{
/* Size is calculated in the dialog code. */
Pos = MAP_APPFONT ( 210 , 14 ) ;
Size = MAP_APPFONT ( 1 , 1 ) ;
TabStop = TRUE ;
};
String STR_SELECT
{
Text [ en-US ] = "Selection area";
};
FixedText FT_INFO
{
Pos = MAP_APPFONT ( 6 , 200 ) ;
Size = MAP_APPFONT ( 182 , 16 ) ;
WordBreak = TRUE ;
Text [ en-US ] = "Drag the fields into the desired position." ;
};
FixedLine FL_LAYOUT
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 282 , 8 ) ;
Text [ en-US ] = "Layout";
};
OKButton BTN_OK
{
Pos = MAP_APPFONT ( 294 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT ( 294 , 23 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
HelpButton BTN_HELP
{
Pos = MAP_APPFONT ( 294 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
PushButton BTN_REMOVE
{
HelpID = "sc:PushButton:RID_SCDLG_PIVOT_LAYOUT:BTN_REMOVE";
Pos = MAP_APPFONT ( 294 , 63 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Remove";
};
PushButton BTN_OPTIONS
{
HelpID = "sc:PushButton:RID_SCDLG_PIVOT_LAYOUT:BTN_OPTIONS";
Pos = MAP_APPFONT ( 294 , 80 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Options...";
};
MoreButton BTN_MORE
{
HelpID = "sc:MoreButton:RID_SCDLG_PIVOT_LAYOUT:BTN_MORE";
Pos = MAP_APPFONT ( 294 , 190 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
MapUnit = MAP_APPFONT ;
Delta = 90 ;
};
FixedLine FL_OUTPUT
{
Pos = MAP_APPFONT ( 6 , 216 ) ;
Size = MAP_APPFONT ( 268 , 8 ) ;
Text [ en-US ] = "Result" ;
Hide = TRUE ;
};
FixedText FT_INAREA
{
Pos = MAP_APPFONT ( 12 , 229 ) ;
Size = MAP_APPFONT ( 59 , 8 ) ;
Hide = TRUE ;
Text [ en-US ] = "Selection from" ;
};
Edit ED_INAREA
{
HelpID = "sc:Edit:RID_SCDLG_PIVOT_LAYOUT:ED_INAREA";
Border = TRUE ;
Pos = MAP_APPFONT ( 73 , 227 ) ;
Size = MAP_APPFONT ( 100 , 12 ) ;
TabStop = TRUE ;
Hide = TRUE ;
};
ImageButton RB_INAREA
{
HelpID = "sc:ImageButton:RID_SCDLG_PIVOT_LAYOUT:RB_INAREA";
Pos = MAP_APPFONT ( 177 , 226 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = TRUE ;
Hide = TRUE ;
QuickHelpText [ en-US ] = "Shrink" ;
};
FixedText FT_OUTAREA
{
Pos = MAP_APPFONT ( 12 , 247 ) ;
Size = MAP_APPFONT ( 59 , 8 ) ;
Hide = TRUE ;
Text [ en-US ] = "Results to" ;
};
ListBox LB_OUTAREA
{
HelpID = "sc:ListBox:RID_SCDLG_PIVOT_LAYOUT:LB_OUTAREA";
Border = TRUE ;
Pos = MAP_APPFONT ( 73 , 245 ) ;
Size = MAP_APPFONT ( 75 , 90 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
Hide = TRUE ;
};
Edit ED_OUTAREA
{
HelpID = "sc:Edit:RID_SCDLG_PIVOT_LAYOUT:ED_OUTAREA";
Border = TRUE ;
Pos = MAP_APPFONT ( 152 , 245 ) ;
Size = MAP_APPFONT ( 100 , 12 ) ;
TabStop = TRUE ;
Hide = TRUE ;
};
ImageButton RB_OUTAREA
{
HelpID = "sc:ImageButton:RID_SCDLG_PIVOT_LAYOUT:RB_OUTAREA";
Pos = MAP_APPFONT ( 256 , 244 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = TRUE ;
Hide = TRUE ;
QuickHelpText [ en-US ] = "Shrink" ;
};
CheckBox BTN_IGNEMPTYROWS
{
HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_IGNEMPTYROWS";
Pos = MAP_APPFONT ( 12 , 263 ) ;
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "Ignore ~empty rows" ;
};
CheckBox BTN_DETECTCAT
{
HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_DETECTCAT";
Pos = MAP_APPFONT ( 142 , 263 ) ;
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "~Identify categories" ;
};
CheckBox BTN_TOTALCOL
{
HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALCOL";
Pos = MAP_APPFONT ( 12 , 277 ) ;
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "Total columns" ;
};
CheckBox BTN_TOTALROW
{
HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALROW";
Pos = MAP_APPFONT ( 142 , 277 ) ;
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "~Total rows" ;
};
CheckBox BTN_FILTER
{
HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_FILTER";
Pos = MAP_APPFONT ( 12 , 291 ) ;
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "~Add filter" ;
};
CheckBox BTN_DRILLDOWN
{
HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_DRILLDOWN";
Pos = MAP_APPFONT ( 142 , 291 ) ;
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "Ena~ble drill to details" ;
};
String PIVOTSTR_SUM
{
Text [ en-US ] = "Sum - " ;
};
String PIVOTSTR_COUNT
{
Text [ en-US ] = "Count - " ;
};
String PIVOTSTR_AVG
{
Text [ en-US ] = "Mean - " ;
};
String PIVOTSTR_MAX
{
Text [ en-US ] = "Max - " ;
};
String PIVOTSTR_MIN
{
Text [ en-US ] = "Min - " ;
};
String PIVOTSTR_PROD
{
Text [ en-US ] = "Product - " ;
};
String PIVOTSTR_COUNT2
{
Text [ en-US ] = "Count - " ;
};
String PIVOTSTR_DEV
{
Text [ en-US ] = "StDev - " ;
};
String PIVOTSTR_DEV2
{
Text [ en-US ] = "StDevP - " ;
};
String PIVOTSTR_VAR
{
Text [ en-US ] = "Var - " ;
};
String PIVOTSTR_VAR2
{
Text [ en-US ] = "VarP - " ;
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/dbgui/pvlaydlg.cxx
Dosyayı görüntüle @ cc672577
This diff is collapsed.
sc/source/ui/inc/fieldwnd.hxx
Dosyayı görüntüle @ cc672577
......@@ -90,8 +90,6 @@ public:
Window* mpParent;
};
ScDPFieldControlBase(
ScPivotLayoutDlg* pParent, const ResId& rResId, FixedText* pCaption, const char* pcHelpId);
ScDPFieldControlBase( Window* pParent );
virtual ~ScDPFieldControlBase();
......@@ -185,6 +183,7 @@ protected:
virtual void MouseMove( const MouseEvent& rMEvt );
virtual void GetFocus();
virtual void LoseFocus();
virtual void Resize();
protected:
FieldNames& GetFieldNames();
......@@ -278,9 +277,7 @@ protected:
virtual void Redraw();
public:
ScDPHorFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId);
ScDPHorFieldControl( Window* pParent );
ScDPHorFieldControl(Window* pParent);
virtual ~ScDPHorFieldControl();
......@@ -316,8 +313,6 @@ private:
class ScDPPageFieldControl : public ScDPHorFieldControl
{
public:
ScDPPageFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId);
ScDPPageFieldControl( Window* pParent );
virtual ~ScDPPageFieldControl();
......@@ -330,8 +325,6 @@ public:
class ScDPColFieldControl : public ScDPHorFieldControl
{
public:
ScDPColFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId);
ScDPColFieldControl( Window* pParent );
virtual ~ScDPColFieldControl();
......@@ -347,8 +340,6 @@ public:
class ScDPRowFieldControl : public ScDPFieldControlBase
{
public:
ScDPRowFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId);
ScDPRowFieldControl( Window* pParent );
virtual ~ScDPRowFieldControl();
......@@ -389,8 +380,6 @@ private:
class ScDPSelectFieldControl : public ScDPHorFieldControl
{
public:
ScDPSelectFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId);
ScDPSelectFieldControl( Window* pParent );
virtual ~ScDPSelectFieldControl();
......@@ -403,8 +392,6 @@ public:
class ScDPDataFieldControl : public ScDPHorFieldControl
{
public:
ScDPDataFieldControl(
ScPivotLayoutDlg* pParent, const ResId& rResId, FixedText* pCaption, const char* pcHelpId);
ScDPDataFieldControl( Window* pParent );
virtual ~ScDPDataFieldControl();
......
sc/source/ui/inc/pvlaydlg.hxx
Dosyayı görüntüle @ cc672577
......@@ -79,6 +79,18 @@ class ScDocument;
struct ScPivotFuncData;
class ScDPObject;
#define PIVOTSTR_SUM 0
#define PIVOTSTR_COUNT 1
#define PIVOTSTR_AVG 2
#define PIVOTSTR_MAX 3
#define PIVOTSTR_MIN 4
#define PIVOTSTR_PROD 5
#define PIVOTSTR_COUNT2 6
#define PIVOTSTR_DEV 7
#define PIVOTSTR_DEV2 8
#define PIVOTSTR_VAR 9
#define PIVOTSTR_VAR2 10
class ScPivotLayoutDlg : public ScAnyRefDlg
{
/** data source type */
......@@ -113,10 +125,10 @@ public:
void DropFieldItem( const Point& rScrPos, ScPivotFieldType eToType );
/**
* Get pointer style at current mouse position during dragging of field
* Get pointer style during dragging of field
* item.
*/
PointerStyle GetPointerStyleAtPoint( const Point& rScrPos, ScPivotFieldType eFieldType );
PointerStyle GetPointerStyle( ScPivotFieldType eFieldType );
/**
* Determine the type of field at mouse cursor position.
......@@ -133,8 +145,8 @@ protected:
virtual sal_Bool Close();
private:
/** Returns the localized function name for the specified (1-based) resource index. */
inline const OUString& GetFuncName( sal_uInt16 nFuncIdx ) const { return maFuncNames[nFuncIdx-1]; }
/** Returns the localized function name for the specified resource index. */
inline const OUString& GetFuncName( sal_uInt16 nFuncIdx ) const { return maFuncNames[nFuncIdx]; }
/** Fills the field windows from the current pivot table settings. */
void InitFieldWindows();
......
sc/source/ui/src/scstring.src
Dosyayı görüntüle @ cc672577
......@@ -865,6 +865,11 @@ String SCSTR_VALERR
Text [ en-US ] = "Invalid value" ;
};
String SCSTR_SELECT
{
Text [ en-US ] = "Selection area";
};
String STR_NOFORMULASPECIFIED
{
Text [ en-US ] = "No formula specified." ;
......
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