Author: arielch
Date: Mon May 28 13:07:30 2012
New Revision: 1343237
URL: http://svn.apache.org/viewvc?rev=1343237&view=rev
Log:
i119460 - Use localized strings on Data Pilot fields grouped by date
Modified:
incubator/ooo/trunk/main/sc/inc/globstr.hrc
incubator/ooo/trunk/main/sc/source/core/data/dpdimsave.cxx
incubator/ooo/trunk/main/sc/source/ui/dbgui/dpgroupdlg.cxx
incubator/ooo/trunk/main/sc/source/ui/dbgui/dpgroupdlg.src
incubator/ooo/trunk/main/sc/source/ui/src/globstr.src
Modified: incubator/ooo/trunk/main/sc/inc/globstr.hrc
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/inc/globstr.hrc?rev=1343237&r1=1343236&r2=1343237&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/inc/globstr.hrc (original)
+++ incubator/ooo/trunk/main/sc/inc/globstr.hrc Mon May 28 13:07:30 2012
@@ -573,7 +573,15 @@
#define STR_UNDO_SET_TAB_BG_COLOR 438
#define STR_UNDO_SET_MULTI_TAB_BG_COLOR 439
-#define STR_COUNT 440
+#define STR_DPFIELD_GROUP_BY_SECONDS 440
+#define STR_DPFIELD_GROUP_BY_MINUTES 441
+#define STR_DPFIELD_GROUP_BY_HOURS 442
+#define STR_DPFIELD_GROUP_BY_DAYS 443
+#define STR_DPFIELD_GROUP_BY_MONTHS 444
+#define STR_DPFIELD_GROUP_BY_QUARTERS 445
+#define STR_DPFIELD_GROUP_BY_YEARS 446
+
+#define STR_COUNT 447
#endif
Modified: incubator/ooo/trunk/main/sc/source/core/data/dpdimsave.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/core/data/dpdimsave.cxx?rev=1343237&r1=1343236&r2=1343237&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/core/data/dpdimsave.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/core/data/dpdimsave.cxx Mon May 28
13:07:30 2012
@@ -36,6 +36,10 @@
#include <rtl/math.hxx>
#include <algorithm>
+#include "global.hxx"
+#include "scresid.hxx"
+#include "globstr.hrc"
+
// ============================================================================
ScDPSaveGroupItem::ScDPSaveGroupItem( const String& rName ) :
@@ -557,20 +561,33 @@ String ScDPDimensionSaveData::CreateGrou
return EMPTY_STRING;
}
+namespace {
+
+static const sal_uInt16 nDatePartIds[] =
+{
+ STR_DPFIELD_GROUP_BY_SECONDS,
+ STR_DPFIELD_GROUP_BY_MINUTES,
+ STR_DPFIELD_GROUP_BY_HOURS,
+ STR_DPFIELD_GROUP_BY_DAYS,
+ STR_DPFIELD_GROUP_BY_MONTHS,
+ STR_DPFIELD_GROUP_BY_QUARTERS,
+ STR_DPFIELD_GROUP_BY_YEARS
+};
+
+}
String ScDPDimensionSaveData::CreateDateGroupDimName( sal_Int32 nDatePart,
const ScDPObject& rObject, bool bAllowSource, const ::std::vector< String >*
pDeletedNames )
{
using namespace ::com::sun::star::sheet::DataPilotFieldGroupBy;
String aPartName;
switch( nDatePart )
{
- //! use translated strings from globstr.src
- case SECONDS: aPartName = String::CreateFromAscii( "Seconds" );
break;
- case MINUTES: aPartName = String::CreateFromAscii( "Minutes" );
break;
- case HOURS: aPartName = String::CreateFromAscii( "Hours" );
break;
- case DAYS: aPartName = String::CreateFromAscii( "Days" );
break;
- case MONTHS: aPartName = String::CreateFromAscii( "Months" );
break;
- case QUARTERS: aPartName = String::CreateFromAscii( "Quarters" );
break;
- case YEARS: aPartName = String::CreateFromAscii( "Years" );
break;
+ case SECONDS: aPartName = ScGlobal::GetRscString( nDatePartIds[0] );
break;
+ case MINUTES: aPartName = ScGlobal::GetRscString( nDatePartIds[1] );
break;
+ case HOURS: aPartName = ScGlobal::GetRscString( nDatePartIds[2] );
break;
+ case DAYS: aPartName = ScGlobal::GetRscString( nDatePartIds[3] );
break;
+ case MONTHS: aPartName = ScGlobal::GetRscString( nDatePartIds[4] );
break;
+ case QUARTERS: aPartName = ScGlobal::GetRscString( nDatePartIds[5] );
break;
+ case YEARS: aPartName = ScGlobal::GetRscString( nDatePartIds[6] );
break;
}
DBG_ASSERT( aPartName.Len() > 0,
"ScDPDimensionSaveData::CreateDateGroupDimName - invalid date part" );
return CreateGroupDimName( aPartName, rObject, bAllowSource, pDeletedNames
);
Modified: incubator/ooo/trunk/main/sc/source/ui/dbgui/dpgroupdlg.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/ui/dbgui/dpgroupdlg.cxx?rev=1343237&r1=1343236&r2=1343237&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/ui/dbgui/dpgroupdlg.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/ui/dbgui/dpgroupdlg.cxx Mon May 28
13:07:30 2012
@@ -33,11 +33,14 @@
#ifndef SC_DPGROUPDLG_HRC
#include "dpgroupdlg.hrc"
#endif
-#include <tools/resary.hxx>
+
#include "scresid.hxx"
#ifndef SC_SC_HRC
#include "sc.hrc"
#endif
+
+#include "globstr.hrc"
+
#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
// ============================================================================
@@ -56,6 +59,17 @@ static const sal_Int32 spnDateParts[] =
com::sun::star::sheet::DataPilotFieldGroupBy::YEARS
};
+static const sal_uInt16 nDatePartResIds[] =
+{
+ STR_DPFIELD_GROUP_BY_SECONDS,
+ STR_DPFIELD_GROUP_BY_MINUTES,
+ STR_DPFIELD_GROUP_BY_HOURS,
+ STR_DPFIELD_GROUP_BY_DAYS,
+ STR_DPFIELD_GROUP_BY_MONTHS,
+ STR_DPFIELD_GROUP_BY_QUARTERS,
+ STR_DPFIELD_GROUP_BY_YEARS
+};
+
} // namespace
// ============================================================================
@@ -236,12 +250,13 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( Wind
maStartHelper ( maRbAutoStart, maRbManStart, maEdStart, rNullDate ),
maEndHelper ( maRbAutoEnd, maRbManEnd, maEdEnd, rNullDate )
{
+ FreeResource();
+
maLbUnits.SetHelpId( HID_SC_DPDATEGROUP_LB );
- ResStringArray aArr( ScResId( STR_UNITS ) );
- for( sal_uInt16 nIdx = 0, nCount =
sal::static_int_cast<sal_uInt16>(aArr.Count()); nIdx < nCount; ++nIdx )
- maLbUnits.InsertEntry( aArr.GetString( nIdx ) );
- FreeResource();
+ static const size_t nCount = sizeof( nDatePartResIds ) / sizeof(
nDatePartResIds[0] );
+ for( size_t nIdx = 0 ; nIdx < nCount; ++nIdx )
+ maLbUnits.InsertEntry( ScGlobal::GetRscString( nDatePartResIds[nIdx] )
);
maEdStart.SetShowDateCentury( sal_True );
maEdEnd.SetShowDateCentury( sal_True );
@@ -251,7 +266,7 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( Wind
if( nDatePart == 0 )
nDatePart = com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS;
- for( sal_uLong nIdx = 0, nCount = maLbUnits.GetEntryCount(); nIdx <
nCount; ++nIdx )
+ for( size_t nIdx = 0; nIdx < nCount; ++nIdx )
maLbUnits.CheckEntryPos( static_cast< sal_uInt16 >( nIdx ), (nDatePart
& spnDateParts[ nIdx ]) != 0 );
if( rInfo.DateValues )
Modified: incubator/ooo/trunk/main/sc/source/ui/dbgui/dpgroupdlg.src
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/ui/dbgui/dpgroupdlg.src?rev=1343237&r1=1343236&r2=1343237&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/ui/dbgui/dpgroupdlg.src (original)
+++ incubator/ooo/trunk/main/sc/source/ui/dbgui/dpgroupdlg.src Mon May 28
13:07:30 2012
@@ -262,19 +262,6 @@ ModalDialog RID_SCDLG_DPDATEGROUP
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
- StringArray STR_UNITS
- {
- ItemList [ en-US ] =
- {
- < "Seconds" ; Default ; > ;
- < "Minutes" ; Default ; > ;
- < "Hours" ; Default ; > ;
- < "Days" ; Default ; > ;
- < "Months" ; Default ; > ;
- < "Quarters" ; Default ; > ;
- < "Years" ; Default ; > ;
- } ;
- } ;
Text [ en-US ] = "Grouping" ;
} ;
Modified: incubator/ooo/trunk/main/sc/source/ui/src/globstr.src
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/ui/src/globstr.src?rev=1343237&r1=1343236&r2=1343237&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/ui/src/globstr.src (original)
+++ incubator/ooo/trunk/main/sc/source/ui/src/globstr.src Mon May 28 13:07:30
2012
@@ -1734,5 +1734,33 @@ Resource RID_GLOBSTR
{
Text [ en-US ] = "Pivot table needs at least two rows of data
to create or refresh." ;
};
+ String STR_DPFIELD_GROUP_BY_SECONDS
+ {
+ Text [ en-US ] = "Seconds" ;
+ };
+ String STR_DPFIELD_GROUP_BY_MINUTES
+ {
+ Text [ en-US ] = "Minutes" ;
+ };
+ String STR_DPFIELD_GROUP_BY_HOURS
+ {
+ Text [ en-US ] = "Hours" ;
+ };
+ String STR_DPFIELD_GROUP_BY_DAYS
+ {
+ Text [ en-US ] = "Days" ;
+ };
+ String STR_DPFIELD_GROUP_BY_MONTHS
+ {
+ Text [ en-US ] = "Months" ;
+ };
+ String STR_DPFIELD_GROUP_BY_QUARTERS
+ {
+ Text [ en-US ] = "Quarters" ;
+ };
+ String STR_DPFIELD_GROUP_BY_YEARS
+ {
+ Text [ en-US ] = "Years" ;
+ };
};
