From b2582ea74b258c3f59e862a66b4acadd22043586 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 10 Dec 2008 13:41:25 +0000 Subject: CWS-TOOLING: integrate CWS dba31f 2008-12-10 14:16:09 +0100 oj r265185 : #i96658# remove is 2008-12-10 08:46:07 +0100 oj r265147 : remove duplicate ids 2008-12-10 08:35:02 +0100 oj r265146 : #i96658# remove is 2008-12-09 11:44:35 +0100 oj r265072 : use of tools::StringresourceList 2008-12-09 11:43:41 +0100 oj r265071 : new class to read string elements from a Resource 2008-12-09 11:41:56 +0100 oj r265070 : export StringListResource 2008-12-09 11:38:17 +0100 oj r265068 : change string ; to more string objects 2008-12-08 12:11:43 +0100 oj r264985 : change default-license-id to lic-en-US 2008-12-05 12:06:09 +0100 oj r264896 : disable check to uncheck 2008-12-04 08:58:50 +0100 oj r264814 : #i96517,i96520,i96522# d&d, background, state fixed 2008-12-04 08:53:29 +0100 oj r264813 : #i96434# use document ui name from filter 2008-12-04 08:41:06 +0100 oj r264812 : #i96434# use document ui name from filter 2008-12-02 13:48:49 +0100 lla r264697 : #i96526# extra string for default otr wasn't found 2008-11-28 11:46:31 +0100 oj r264536 : move toolbar and resize add field dlg 2008-11-28 08:38:22 +0100 oj r264526 : load string resources 2008-11-27 19:28:52 +0100 oj r264520 : unsigned 2008-11-27 19:10:19 +0100 oj r264517 : move class into unnamed namespace 2008-11-27 18:33:38 +0100 oj r264514 : wrong param 2008-11-27 16:52:39 +0100 oj r264510 : #i96622# wrong string replacement 2008-11-27 16:46:03 +0100 oj r264509 : remove unused var 2008-11-27 13:37:16 +0100 oj r264484 : #i96432# notify only when not in special mode of the page 2008-11-27 13:16:47 +0100 oj r264479 : #i95224# accept alias in group by 2008-11-27 12:35:19 +0100 oj r264477 : #i95416# always show localized strings in the start marker 2008-11-27 09:49:29 +0100 oj r264455 : #i93460# set split pos 2008-11-27 09:05:27 +0100 oj r264447 : #i96453# use extension from mimetype / mediatype 2008-11-26 16:24:43 +0100 oj r264416 : #i96520# #i96522# #i96519# some changes at the add field dialog 2008-11-26 16:20:27 +0100 oj r264414 : #i93420# prevent to register a none system file url 2008-11-26 16:19:02 +0100 oj r264413 : #i96522# new class to paste multiple objects 2008-11-26 10:06:12 +0100 oj r264349 : #i96191# introduce new error message and check if type was defined aand should not be changed 2008-11-26 10:06:12 +0100 oj r264348 : #i96191# throw error when decimal is to big 2008-11-25 12:08:59 +0100 oj r264281 : #i96431# correct state for align and move 2008-11-25 11:54:47 +0100 oj r264280 : #i96428# when new bind to first table 2008-11-25 11:49:55 +0100 oj r264279 : #i96434# add report output format to inspection 2008-11-25 11:49:05 +0100 oj r264278 : #i96434# add report output format to inspection 2008-11-24 10:46:23 +0100 oj r264215 : #i96458# size width for controls 2008-11-24 09:28:56 +0100 oj r264199 : #i96459# mark detail section when nothing is selected 2008-11-20 12:02:35 +0100 oj r264038 : #i96191# fix check for prec 2008-11-20 08:06:32 +0100 oj r264026 : #i90949# patch MID function 2008-11-11 13:14:58 +0100 oj r263555 : #i96086# apply patch 2008-11-11 11:34:46 +0100 oj r263549 : #i94128# correct height of section when controls moved outside 2008-11-11 07:52:08 +0100 oj r263544 : #i94729# fix string with ; as sep 2008-11-11 07:45:27 +0100 oj r263543 : #i95222# export chart title style 2008-11-11 07:43:37 +0100 oj r263542 : #i92541# fix line height --- extensions/source/propctrlr/formcomponenthandler.cxx | 10 ++++------ extensions/source/propctrlr/formres.src | 11 +++++++++-- extensions/source/propctrlr/formresid.hrc | 2 ++ extensions/source/propctrlr/handlerhelper.cxx | 10 +++++----- extensions/source/propctrlr/propres.src | 12 ++++++++++-- extensions/source/propctrlr/propresid.hrc | 3 +-- extensions/source/propctrlr/stringrepresentation.cxx | 11 +++++++---- wizards/source/formwizard/dbwizres.src | 4 ++++ 8 files changed, 42 insertions(+), 21 deletions(-) diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 160d8dea87c4..1e54e00a5d1b 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -114,6 +114,7 @@ #include #include #include +#include #include @@ -1164,19 +1165,16 @@ namespace pcr // boolean values if ( eType == TypeClass_BOOLEAN ) { - String aEntries; + USHORT nResId = RID_RSC_ENUM_YESNO; if ( ( nPropId == PROPERTY_ID_SHOW_POSITION ) || ( nPropId == PROPERTY_ID_SHOW_NAVIGATION ) || ( nPropId == PROPERTY_ID_SHOW_RECORDACTIONS ) || ( nPropId == PROPERTY_ID_SHOW_FILTERSORT ) ) - aEntries = String( PcrRes( RID_STR_SHOW_HIDE ) ); - else - aEntries = String( PcrRes( RID_STR_BOOL ) ); + nResId = RID_RSC_ENUM_SHOWHIDE; ::std::vector< ::rtl::OUString > aListEntries; - for ( xub_StrLen i=0; i<2; ++i ) - aListEntries.push_back( aEntries.GetToken(i) ); + tools::StringListResource aRes(PcrRes(nResId),aListEntries); aDescriptor.Control = PropertyHandlerHelper::createListBoxControl( _rxControlFactory, aListEntries, sal_False, sal_False ); bNeedDefaultStringIfVoidAllowed = true; } diff --git a/extensions/source/propctrlr/formres.src b/extensions/source/propctrlr/formres.src index 66faf679467d..c05934b60d65 100644 --- a/extensions/source/propctrlr/formres.src +++ b/extensions/source/propctrlr/formres.src @@ -1213,9 +1213,16 @@ String RID_STR_TEXTTYPE Text [ en-US ] = "Text type"; }; -String RID_STR_SHOW_HIDE +Resource RID_RSC_ENUM_SHOWHIDE { - Text [ en-US ] = "Hide;Show" ; + String 1 + { + Text [ en-US ] = "Hide" ; + }; + String 2 + { + Text [ en-US ] = "Show" ; + }; }; String RID_STR_XML_DATA_MODEL { diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc index db494a5ceaa3..5dadc9d2fa36 100644 --- a/extensions/source/propctrlr/formresid.hrc +++ b/extensions/source/propctrlr/formresid.hrc @@ -337,6 +337,8 @@ #define RID_RSC_ENUM_SUBMIT_TARGET ( RID_PROPCONTROLLER_START + 24 ) #define RID_RSC_ENUM_SELECTION_TYPE ( RID_PROPCONTROLLER_START + 25 ) #define RID_RSC_ENUM_SCALE_MODE ( RID_PROPCONTROLLER_START + 26 ) +#define RID_RSC_ENUM_YESNO ( RID_PROPCONTROLLER_START + 27 ) +#define RID_RSC_ENUM_SHOWHIDE ( RID_PROPCONTROLLER_START + 28 ) // ----------------------------------------------------------------------- // - ImageList - local ids diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 1671fe3b4e50..84952cd6546e 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -34,6 +34,7 @@ #ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" #endif +#include "formresid.hrc" #include #ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" @@ -55,6 +56,7 @@ /** === end UNO includes === **/ #include #include +#include #include #include @@ -91,11 +93,9 @@ namespace pcr // special handling for booleans (this will become a list) if ( _rProperty.Type.getTypeClass() == TypeClass_BOOLEAN ) { - String aBoolOptions = String( PcrRes( RID_STR_BOOL ) ); - Sequence< ::rtl::OUString > aEntries(2); - for ( xub_StrLen i=0; i<2; ++i ) - aEntries[i] = aBoolOptions.GetToken( i ); - _out_rDescriptor.Control = createListBoxControl( _rxControlFactory, aEntries, bReadOnlyControl, sal_False ); + ::std::vector< ::rtl::OUString > aListEntries; + tools::StringListResource aRes(PcrRes(RID_RSC_ENUM_YESNO),aListEntries); + _out_rDescriptor.Control = createListBoxControl( _rxControlFactory, aListEntries, bReadOnlyControl, sal_False ); return; } diff --git a/extensions/source/propctrlr/propres.src b/extensions/source/propctrlr/propres.src index 207915e1dee9..7ce673f8136f 100644 --- a/extensions/source/propctrlr/propres.src +++ b/extensions/source/propctrlr/propres.src @@ -31,6 +31,7 @@ #ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" #endif +#include "formresid.hrc" String RID_STR_STANDARD { @@ -44,9 +45,16 @@ String RID_STR_PROPPAGE_DATA { Text [ en-US ] = "Data" ; }; -String RID_STR_BOOL +Resource RID_RSC_ENUM_YESNO { - Text [ en-US ] = "No;Yes" ; + String 1 + { + Text [ en-US ] = "No" ; + }; + String 2 + { + Text [ en-US ] = "Yes" ; + }; }; String RID_STR_HELP_SECTION_LABEL { diff --git a/extensions/source/propctrlr/propresid.hrc b/extensions/source/propctrlr/propresid.hrc index aa66089b34d7..705638accf98 100644 --- a/extensions/source/propctrlr/propresid.hrc +++ b/extensions/source/propctrlr/propresid.hrc @@ -44,8 +44,7 @@ #define RID_STR_STANDARD ( RID_PROPCONTROLLER_START + 0 ) #define RID_STR_PROPPAGE_DEFAULT ( RID_PROPCONTROLLER_START + 1 ) #define RID_STR_PROPPAGE_DATA ( RID_PROPCONTROLLER_START + 2 ) -#define RID_STR_BOOL ( RID_PROPCONTROLLER_START + 3 ) -#define RID_STR_HELP_SECTION_LABEL ( RID_PROPCONTROLLER_START + 4 ) +#define RID_STR_HELP_SECTION_LABEL ( RID_PROPCONTROLLER_START + 3 ) #define RID_EMBED_IMAGE_PLACEHOLDER ( RID_PROPCONTROLLER_START + 5 ) #endif // EXTENSIONS_PROPRESID_HRC diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 8fff44d57cdc..530f5de8797b 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -54,6 +54,7 @@ #endif #include #include +#include #include #ifndef _EXTENSIONS_PROPCTRLR_MODULEPCR_HXX_ #include "modulepcr.hxx" @@ -375,10 +376,11 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, case uno::TypeClass_BOOLEAN: { - String aEntries( PcrRes( RID_STR_BOOL ) ); + ::std::vector< ::rtl::OUString > aListEntries; + tools::StringListResource aRes(PcrRes(RID_RSC_ENUM_YESNO),aListEntries); sal_Bool bValue = sal_False; _rValue >>= bValue; - _rStringRep = bValue ? aEntries.GetToken( 1 ) : aEntries.GetToken( 0 ); + _rStringRep = bValue ? aListEntries[1] : aListEntries[0]; } break; @@ -513,8 +515,9 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _ case uno::TypeClass_BOOLEAN: { - String sBooleanValues( PcrRes( RID_STR_BOOL ) ); - if ( sBooleanValues.GetToken(0) == String( _rStringRep ) ) + ::std::vector< ::rtl::OUString > aListEntries; + tools::StringListResource aRes(PcrRes(RID_RSC_ENUM_YESNO),aListEntries); + if ( aListEntries[0] == _rStringRep ) _rValue <<= (sal_Bool)sal_False; else _rValue <<= (sal_Bool)sal_True; diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src index fdb61b806073..e0a563f81db2 100644 --- a/wizards/source/formwizard/dbwizres.src +++ b/wizards/source/formwizard/dbwizres.src @@ -1465,6 +1465,10 @@ String RID_DB_REPORT_WIZARD_START + 91 { Text [ en-US ] = "Page count:"; }; +String RID_DB_REPORT_WIZARD_START + 92 +{ + Text [ en-US ] = "No valid report template was found."; +}; // ============================================================================ -- cgit