[Libreoffice-commits] core.git: include/rsc vcl/source
include/rsc/rsc-vcl-shared-types.hxx |2 +- vcl/source/control/field2.cxx|5 + 2 files changed, 2 insertions(+), 5 deletions(-) New commits: commit 544bd60be20d1abe195f51fc9906cdef2c8489dd Author: Noel Grandin Date: Thu Feb 16 09:49:23 2017 +0200 remove unused F_100TH_SEC from TimeFieldFormat enum Change-Id: I04b27ea7ede9dca6ca41ac910ac97a878788f2e0 diff --git a/include/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx index 3e23887..1091e64 100644 --- a/include/rsc/rsc-vcl-shared-types.hxx +++ b/include/rsc/rsc-vcl-shared-types.hxx @@ -23,7 +23,7 @@ #include #include -enum class TimeFieldFormat : sal_Int32 { F_NONE, F_SEC, F_100TH_SEC, F_SEC_CS }; +enum class TimeFieldFormat : sal_Int32 { F_NONE, F_SEC, F_SEC_CS }; enum class KeyFuncType : sal_Int32 { DONTKNOW, NEW, OPEN, SAVE, SAVEAS, PRINT, CLOSE, QUIT, diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index cab30fd..dd7acf7 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1930,7 +1930,6 @@ static bool ImplTimeProcessKeyInput( Edit*, const KeyEvent& rKEvt, (rLocaleDataWrapper.getTimePM().indexOf(cChar) != -1) || // Accept AM/PM: (cChar == 'a') || (cChar == 'A') || (cChar == 'm') || (cChar == 'M') || (cChar == 'p') || (cChar == 'P') || - ((eFormat == TimeFieldFormat::F_100TH_SEC) && string::equals(rLocaleDataWrapper.getTime100SecSep(), cChar)) || ((eFormat == TimeFieldFormat::F_SEC_CS) && string::equals(rLocaleDataWrapper.getTime100SecSep(), cChar)) || (bDuration && (cChar == '-')) ) return false; @@ -2185,8 +2184,6 @@ bool TimeFormatter::ImplTimeReformat( const OUString& rStr, OUString& rOutStr ) bool b100Sec = false; if ( meFormat != TimeFieldFormat::F_NONE ) bSecond = true; -if ( meFormat == TimeFieldFormat::F_100TH_SEC ) -b100Sec = true; if ( meFormat == TimeFieldFormat::F_SEC_CS ) { @@ -2412,7 +2409,7 @@ void TimeFormatter::ImplSetUserTime( const tools::Time& rNewTime, Selection* pNe bool b100Sec = false; if ( meFormat != TimeFieldFormat::F_NONE ) bSec = true; -if ( meFormat == TimeFieldFormat::F_100TH_SEC || meFormat == TimeFieldFormat::F_SEC_CS ) +if ( meFormat == TimeFieldFormat::F_SEC_CS ) b100Sec = true; if ( meFormat == TimeFieldFormat::F_SEC_CS ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/rsc sw/inc sw/qa sw/source
include/rsc/rscsfx.hxx |1 sw/inc/SwGetPoolIdFromName.hxx |1 sw/inc/SwStyleNameMapper.hxx | 10 +- sw/inc/docstyle.hxx |2 sw/inc/poolfmt.hxx |7 + sw/inc/tblafmt.hxx | 12 ++ sw/inc/unocore.hrc |3 sw/inc/unostyle.hxx | 13 ++- sw/qa/python/check_styles.py | 12 ++ sw/source/core/doc/SwStyleNameMapper.cxx | 30 ++- sw/source/core/doc/tblafmt.cxx | 41 + sw/source/core/unocore/unocore.src |5 + sw/source/core/unocore/unostyle.cxx | 129 ++- sw/source/uibase/app/docstyle.cxx| 66 +++ 14 files changed, 305 insertions(+), 27 deletions(-) New commits: commit 45a6fdad8101e4ba552ca4d4532d0b03b79dd15a Author: Jakub Trzebiatowski Date: Sat Jun 4 12:02:37 2016 +0200 sw UNO Cell Style family, SwXTextCellStyle Cell Family :: getByName Cell Family :: getElementNames Cell Family :: getCount Change-Id: I37d567ee284054f847c704d9fce370d174a0c48c Reviewed-on: https://gerrit.libreoffice.org/25896 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/include/rsc/rscsfx.hxx b/include/rsc/rscsfx.hxx index cc3ab9c..dadf191 100644 --- a/include/rsc/rscsfx.hxx +++ b/include/rsc/rscsfx.hxx @@ -38,6 +38,7 @@ enum class SfxStyleFamily { Page= 0x08, Pseudo = 0x10, Table = 0x20, +Cell= 0x40, All = 0x7fff }; diff --git a/sw/inc/SwGetPoolIdFromName.hxx b/sw/inc/SwGetPoolIdFromName.hxx index 55f3ca6..57e2802 100644 --- a/sw/inc/SwGetPoolIdFromName.hxx +++ b/sw/inc/SwGetPoolIdFromName.hxx @@ -32,6 +32,7 @@ namespace nsSwGetPoolIdFromName const SwGetPoolIdFromName GET_POOLID_PAGEDESC = 0x08; const SwGetPoolIdFromName GET_POOLID_NUMRULE = 0x10; const SwGetPoolIdFromName GET_POOLID_TABSTYLE = 0x20; +const SwGetPoolIdFromName GET_POOLID_CELLSTYLE= 0x40; } #endif diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 035e0c6..d4fd06e 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -94,6 +94,7 @@ protected: *m_pPageDescUINameArray, *m_pNumRuleUINameArray, *m_pTableStyleUINameArray, +*m_pCellStyleUINameArray, // Programmatic Name tables *m_pTextProgNameArray, *m_pListsProgNameArray, @@ -106,7 +107,8 @@ protected: *m_pHTMLChrFormatProgNameArray, *m_pPageDescProgNameArray, *m_pNumRuleProgNameArray, -*m_pTableStyleProgNameArray; +*m_pTableStyleProgNameArray, +*m_pCellStyleProgNameArray; static NameToIdHash *m_pParaUIMap, *m_pCharUIMap, @@ -114,13 +116,15 @@ protected: *m_pFrameUIMap, *m_pNumRuleUIMap, *m_pTableStyleUIMap, +*m_pCellStyleUIMap, *m_pParaProgMap, *m_pCharProgMap, *m_pPageProgMap, *m_pFrameProgMap, *m_pNumRuleProgMap, -*m_pTableStyleProgMap; +*m_pTableStyleProgMap, +*m_pCellStyleProgMap; static void fillNameFromId(sal_uInt16 nId, OUString &rName, bool bProgName); static const OUString& getNameFromId(sal_uInt16 nId, const OUString &rName, @@ -181,6 +185,7 @@ public: static const ::std::vector& GetPageDescUINameArray(); static const ::std::vector& GetNumRuleUINameArray(); static const ::std::vector& GetTableStyleUINameArray(); +static const ::std::vector& GetCellStyleUINameArray(); static const ::std::vector& GetTextProgNameArray(); static const ::std::vector& GetListsProgNameArray(); @@ -194,6 +199,7 @@ public: static const ::std::vector& GetPageDescProgNameArray(); static const ::std::vector& GetNumRuleProgNameArray(); static const ::std::vector& GetTableStyleProgNameArray(); +static const ::std::vector& GetCellStyleProgNameArray(); }; #endif // _NAME_MAPPER_HXX diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 89a0745..56a7568 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -37,6 +37,7 @@ class SwTextFormatColl; class SwFrameFormat; class SwNumRule; class SwTableAutoFormat; +class SwBoxAutoFormat; // Temporary StyleSheet. class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase @@ -50,6 +51,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
[Libreoffice-commits] core.git: include/rsc svl/source sw/inc sw/qa sw/source
include/rsc/rscsfx.hxx |1 svl/source/items/IndexedStyleSheets.cxx |6 ++-- sw/inc/SwGetPoolIdFromName.hxx |1 sw/inc/SwStyleNameMapper.hxx | 10 +-- sw/inc/doc.hxx |1 sw/inc/poolfmt.hrc |4 ++ sw/inc/poolfmt.hxx |9 ++ sw/inc/rcid.hrc |5 +++ sw/inc/unocore.hrc |3 +- sw/inc/unomap.hxx|3 +- sw/qa/python/check_styles.py |4 +- sw/source/core/doc/SwStyleNameMapper.cxx | 43 +-- sw/source/core/unocore/unocore.src |5 +++ sw/source/core/unocore/unomap.cxx|9 ++ sw/source/core/unocore/unomap1.cxx |6 sw/source/core/unocore/unostyle.cxx | 16 ++- sw/source/ui/utlui/poolfmt.src |7 + sw/source/uibase/app/docstyle.cxx| 12 18 files changed, 134 insertions(+), 11 deletions(-) New commits: commit 8b8159784821b7ddf031aec925353c274a10875e Author: Jakub Trzebiatowski Date: Mon May 23 09:18:52 2016 +0200 Implement basic TableStyle Family Change-Id: I3da13d26ced05e1948d483d432d6268b10c208b5 Implementing: getCount, getElementNames Reviewed-on: https://gerrit.libreoffice.org/25351 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/include/rsc/rscsfx.hxx b/include/rsc/rscsfx.hxx index b4dd3c7..cc3ab9c 100644 --- a/include/rsc/rscsfx.hxx +++ b/include/rsc/rscsfx.hxx @@ -37,6 +37,7 @@ enum class SfxStyleFamily { Frame = 0x04, Page= 0x08, Pseudo = 0x10, +Table = 0x20, All = 0x7fff }; diff --git a/svl/source/items/IndexedStyleSheets.cxx b/svl/source/items/IndexedStyleSheets.cxx index 1b1b54e..260ae10 100644 --- a/svl/source/items/IndexedStyleSheets.cxx +++ b/svl/source/items/IndexedStyleSheets.cxx @@ -19,7 +19,7 @@ using rtl::OUString; namespace { -const size_t NUMBER_OF_FAMILIES = 6; +const size_t NUMBER_OF_FAMILIES = 7; size_t family_to_index(SfxStyleFamily family) { switch (family) { @@ -33,8 +33,10 @@ size_t family_to_index(SfxStyleFamily family) return 3; case SfxStyleFamily::Pseudo: return 4; -case SfxStyleFamily::All: +case SfxStyleFamily::Table: return 5; +case SfxStyleFamily::All: +return 6; default: break; } assert(false); // only for compiler warning. all cases are handled in the switch diff --git a/sw/inc/SwGetPoolIdFromName.hxx b/sw/inc/SwGetPoolIdFromName.hxx index 9d93e26..55f3ca6 100644 --- a/sw/inc/SwGetPoolIdFromName.hxx +++ b/sw/inc/SwGetPoolIdFromName.hxx @@ -31,6 +31,7 @@ namespace nsSwGetPoolIdFromName const SwGetPoolIdFromName GET_POOLID_FRMFMT = 0x04; const SwGetPoolIdFromName GET_POOLID_PAGEDESC = 0x08; const SwGetPoolIdFromName GET_POOLID_NUMRULE = 0x10; +const SwGetPoolIdFromName GET_POOLID_TABSTYLE = 0x20; } #endif diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 89011ca..035e0c6 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -93,6 +93,7 @@ protected: *m_pHTMLChrFormatUINameArray, *m_pPageDescUINameArray, *m_pNumRuleUINameArray, +*m_pTableStyleUINameArray, // Programmatic Name tables *m_pTextProgNameArray, *m_pListsProgNameArray, @@ -104,19 +105,22 @@ protected: *m_pChrFormatProgNameArray, *m_pHTMLChrFormatProgNameArray, *m_pPageDescProgNameArray, -*m_pNumRuleProgNameArray; +*m_pNumRuleProgNameArray, +*m_pTableStyleProgNameArray; static NameToIdHash *m_pParaUIMap, *m_pCharUIMap, *m_pPageUIMap, *m_pFrameUIMap, *m_pNumRuleUIMap, +*m_pTableStyleUIMap, *m_pParaProgMap, *m_pCharProgMap, *m_pPageProgMap, *m_pFrameProgMap, -*m_pNumRuleProgMap; +*m_pNumRuleProgMap, +*m_pTableStyleProgMap; static void fillNameFromId(sal_uInt16 nId, OUString &rName, bool bProgName); static const OUString& getNameFromId(sal_uInt16 nId, const OUString &rName, @@ -176,6 +180,7 @@ public: static const ::std::vector& GetHTMLChrFormatUINameArray(); static const ::std::vector& GetPageDescUINameArray(); static const ::std::vector& GetNumRuleUINameArray(); +static const ::std::vector& GetTableSty
[Libreoffice-commits] core.git: include/rsc rsc/inc rsc/source
include/rsc/rscsfx.hxx|6 -- rsc/inc/rscclass.hxx |4 rsc/inc/rsctop.hxx|5 + rsc/source/parser/rscicpx.cxx |4 ++-- rsc/source/res/rscclass.cxx | 10 ++ rsc/source/res/rsctop.cxx | 11 +++ 6 files changed, 36 insertions(+), 4 deletions(-) New commits: commit b55b7a057f19521ad88fc6a274fcf071b798eb3e Author: Noel Grandin Date: Sun May 8 08:25:00 2016 +0200 convert SFX_SLOT_INFO to scoped enum Change-Id: Ib640fc2cfce23bf8ce92ec1549034078123c06aa Reviewed-on: https://gerrit.libreoffice.org/24752 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/rsc/rscsfx.hxx b/include/rsc/rscsfx.hxx index a3a6304..837187a 100644 --- a/include/rsc/rscsfx.hxx +++ b/include/rsc/rscsfx.hxx @@ -50,8 +50,10 @@ enum class SfxStyleItem { // SfxSlotInfo -#define RSC_SFX_SLOT_INFO_SLOTNAME 0x1 -#define RSC_SFX_SLOT_INFO_HELPTEXT 0x2 +enum class SfxSlotInfo { +SlotName = 0x1, +HelpText = 0x2 +}; #endif diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx index 9764230..870a0ee 100644 --- a/rsc/inc/rscclass.hxx +++ b/rsc/inc/rscclass.hxx @@ -68,6 +68,10 @@ public: Atom nDataBaseName ) override; ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt, + RSCVAR nVarType, SfxSlotInfo nMask, + Atom nDataBaseName ) override; +ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, + RSCINST * pDflt, RSCVAR nVarType, sal_uInt32 nMask, Atom nDataBaseName ) override; virtual voidEnumVariables( void * pData, VarEnumCallbackProc ) override; diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx index 1c3c739..59e4e07 100644 --- a/rsc/inc/rsctop.hxx +++ b/rsc/inc/rsctop.hxx @@ -87,6 +87,11 @@ public: Atom nDataBaseName = InvalidAtom ); virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, + RSCINST * pDflt, + RSCVAR nVarType, SfxSlotInfo nMask, + Atom nDataBaseName = InvalidAtom ); + +virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt = nullptr, RSCVAR nVarType = 0, sal_uInt32 nMask = 0, Atom nDataBaseName = InvalidAtom ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 0582b76..e11f08a 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -1367,10 +1367,10 @@ RscTop * RscTypCont::InitClassSfxSlotInfo( RscTop * pSuper ) nId = aNmTb.Put( "SlotName", VARNAME ); pClassSfxSlotInfo->SetVariable( nId, &aLangString, nullptr, 0, -RSC_SFX_SLOT_INFO_SLOTNAME ); +SfxSlotInfo::SlotName ); nId = aNmTb.Put( "HelpText", VARNAME ); pClassSfxSlotInfo->SetVariable( nId, &aLangString, nullptr, 0, -RSC_SFX_SLOT_INFO_HELPTEXT ); +SfxSlotInfo::HelpText ); return pClassSfxSlotInfo; } diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx index 5447270..27500f6 100644 --- a/rsc/source/res/rscclass.cxx +++ b/rsc/source/res/rscclass.cxx @@ -288,6 +288,16 @@ ERRTYPE RscClass::SetVariable( Atom nVarName, return SetVariable(nVarName, pClass, pDflt, nVarType, (sal_uInt32)nMask, nDataBaseName); } +ERRTYPE RscClass::SetVariable( Atom nVarName, + RscTop * pClass, + RSCINST * pDflt, + RSCVAR nVarType, + SfxSlotInfo nMask, + Atom nDataBaseName) +{ +return SetVariable(nVarName, pClass, pDflt, nVarType, (sal_uInt32)nMask, nDataBaseName); +} + void RscClass::EnumVariables( void * pData, VarEnumCallbackProc pProc ) { sal_uInt32 i; diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx index 210e7c3..04cc8a6 100644 --- a/rsc/source/res/rsctop.cxx +++ b/rsc/source/res/rsctop.cxx @@ -113,6 +113,17 @@ ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass, return ERR_UNKNOWN_METHOD; } +ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass, + RSCINST * pDflt, RSCVAR nVarType, SfxSlotInfo nMask, + Atom nDataBaseName ) +{ +if( pSuperClass ) +return pSuperClass->SetVariable( nVarName, pClass, pDflt, + nVarType, nMask, nDataBaseName ); +else +return ERR_UNKNOWN_METHOD; +} + void RscTop::EnumVariables( void * pData, VarEnumCallbackProc p
[Libreoffice-commits] core.git: include/rsc rsc/inc rsc/source sfx2/source
include/rsc/rscsfx.hxx | 15 +-- rsc/inc/rscclass.hxx|4 rsc/inc/rsctop.hxx |6 ++ rsc/source/parser/rscicpx.cxx | 12 ++-- rsc/source/parser/rscyacc.y | 10 +- rsc/source/res/rscclass.cxx | 10 ++ rsc/source/res/rsctop.cxx | 11 +++ sfx2/source/dialog/styfitem.cxx | 12 ++-- 8 files changed, 57 insertions(+), 23 deletions(-) New commits: commit 1edcad0daca7f00559fe7cf100438e105623b3eb Author: Noel Grandin Date: Sun May 8 08:08:17 2016 +0200 convert SFX_STYLE_ITEM to scoped enum Change-Id: I929603a12c29931074a467d1472ef686c1d4e8ee Reviewed-on: https://gerrit.libreoffice.org/24751 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/rsc/rscsfx.hxx b/include/rsc/rscsfx.hxx index cc6a23f..a3a6304 100644 --- a/include/rsc/rscsfx.hxx +++ b/include/rsc/rscsfx.hxx @@ -38,12 +38,15 @@ enum SfxStyleFamily { SFX_STYLE_FAMILY_CHAR= 1, // SfxTemplate -#define RSC_SFX_STYLE_ITEM_LIST 0x1 -#define RSC_SFX_STYLE_ITEM_BITMAP 0x2 -#define RSC_SFX_STYLE_ITEM_TEXT 0x4 -#define RSC_SFX_STYLE_ITEM_HELPTEXT 0x8 -#define RSC_SFX_STYLE_ITEM_STYLEFAMILY 0x10 -#define RSC_SFX_STYLE_ITEM_IMAGE0x20 +enum class SfxStyleItem { +None = 0x00, +List = 0x01, +Bitmap = 0x02, +Text = 0x04, +HelpText = 0x08, +StyleFamily = 0x10, +Image= 0x20 +}; // SfxSlotInfo diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx index be4854a..9764230 100644 --- a/rsc/inc/rscclass.hxx +++ b/rsc/inc/rscclass.hxx @@ -64,6 +64,10 @@ public: voidPre_dtor() override; ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt, + RSCVAR nVarType, SfxStyleItem nMask, + Atom nDataBaseName ) override; +ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, + RSCINST * pDflt, RSCVAR nVarType, sal_uInt32 nMask, Atom nDataBaseName ) override; virtual voidEnumVariables( void * pData, VarEnumCallbackProc ) override; diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx index 1f5f44c..1c3c739 100644 --- a/rsc/inc/rsctop.hxx +++ b/rsc/inc/rsctop.hxx @@ -23,6 +23,7 @@ #include #include #include +#include typedef sal_uInt32 RSCVAR; #define VAR_POINTER 0x0001 @@ -81,6 +82,11 @@ public: // sets the variable virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, + RSCINST * pDflt, + RSCVAR nVarType, SfxStyleItem nMask, + Atom nDataBaseName = InvalidAtom ); + +virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt = nullptr, RSCVAR nVarType = 0, sal_uInt32 nMask = 0, Atom nDataBaseName = InvalidAtom ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 95bb420..0582b76 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -1297,16 +1297,16 @@ RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper, nId = aNmTb.Put( "FilterList", VARNAME ); pClassSfxFamilyStyleItem->SetVariable( nId, pStrLst, nullptr, 0, - RSC_SFX_STYLE_ITEM_LIST ); + SfxStyleItem::List ); nId = aNmTb.Put( "StyleBitmap", VARNAME ); pClassSfxFamilyStyleItem->SetVariable( nId, pClassBitmap, nullptr, 0, - RSC_SFX_STYLE_ITEM_BITMAP ); + SfxStyleItem::Bitmap ); nId = aNmTb.Put( "Text", VARNAME ); pClassSfxFamilyStyleItem->SetVariable( nId, &aLangString, nullptr, 0, - RSC_SFX_STYLE_ITEM_TEXT ); + SfxStyleItem::Text ); nId = aNmTb.Put( "HelpText", VARNAME ); pClassSfxFamilyStyleItem->SetVariable( nId, &aLangString, nullptr, 0, - RSC_SFX_STYLE_ITEM_HELPTEXT ); + SfxStyleItem::HelpText ); { RscEnum * pSfxStyleFamily; pSfxStyleFamily = new RscEnum( pHS->getID( "StyleFamily" ), @@ -1321,11 +1321,11 @@ RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper, nId = aNmTb.Put( "StyleFamily", VARNAME ); pClassSfxFamilyStyleItem->SetVariable( nId, pSfxStyleFamily, nullptr, 0, - RSC_SFX_STYLE_ITEM_STYLEFAMILY ); + SfxStyleItem::StyleFamily );
[Libreoffice-commits] core.git: include/rsc rsc/inc
include/rsc/rsc-vcl-shared-types.hxx |2 +- rsc/inc/rscdb.hxx|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 95ca903043c0ad9010deaca7e32ae09cc8afbbf8 Author: Takeshi Abe Date: Mon Oct 27 22:43:48 2014 +0900 sal_Int16 as the underlying type of WindowBorderStyle because g++ 4.7.2 generates [-Werror=type-limits] as follows: > [build CXX] vcl/source/window/settings.cxx > [build CXX] vcl/source/window/paint.cxx > [build CXX] vcl/source/window/resource.cxx > [build CXX] vcl/source/window/accel.cxx > [build CXX] vcl/source/window/accmgr.cxx > [build CXX] vcl/source/window/brdwin.cxx > [build CXX] vcl/source/window/accessibility.cxx > [build CXX] vcl/source/window/legacyaccessibility.cxx > [build CXX] vcl/source/window/clipping.cxx > [build CXX] vcl/source/window/stacking.cxx > [build CXX] vcl/source/window/debug.cxx > [build CXX] vcl/source/window/globalization.cxx > [build CXX] vcl/source/window/btndlg.cxx > [build CXX] vcl/source/window/builder.cxx > [build CXX] vcl/source/window/cmdevt.cxx > [build CXX] vcl/source/window/cursor.cxx > [build CXX] vcl/source/window/debugevent.cxx > [build CXX] vcl/source/window/decoview.cxx > In file included from /home/tabe/core/include/rsc/rsc-vcl-shared-types.hxx:24:0, > from /home/tabe/core/include/vcl/keycodes.hxx:23, > from /home/tabe/core/include/vcl/keycod.hxx:26, > from /home/tabe/core/vcl/inc/svdata.hxx:35, > from /home/tabe/core/vcl/source/window/brdwin.cxx:21: > /home/tabe/core/include/o3tl/typed_flags_set.hxx: In instantiation of 'typename o3tl::typed_flags::Wrap operator&(E, E) [with E = WindowBorderStyle; typename o3tl::typed_flags::Wrap = o3tl::is_typed_flags::Wrap]': > /home/tabe/core/vcl/source/window/brdwin.cxx:1027:44: required from here > /home/tabe/core/include/o3tl/typed_flags_set.hxx:105:5: error: comparison is always true due to limited range of data type [-Werror=type-limits] > /home/tabe/core/include/o3tl/typed_flags_set.hxx:106:5: error: comparison is always true due to limited range of data type [-Werror=type-limits] > cc1plus: all warnings being treated as errors > make[1]: *** [/home/tabe/build/workdir/CxxObject/vcl/source/window/brdwin.o] Error 1 > make[1]: *** Waiting for unfinished jobs > make: *** [vcl.all] Error 2 > tabe@thunk:~/build$ Cf. a6b01d01f77f84517d267bdfe31de91b9050a70c Change-Id: Ic596eaf886d9aebb8a5b8636b5b90d5935aeadaf diff --git a/include/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx index b93864f..ca3f513 100644 --- a/include/rsc/rsc-vcl-shared-types.hxx +++ b/include/rsc/rsc-vcl-shared-types.hxx @@ -116,7 +116,7 @@ enum class SymbolType : sal_uInt16 // Border-Styles fuer SetBorder() -enum class WindowBorderStyle : sal_uInt16 +enum class WindowBorderStyle : sal_Int16 { NONE = 0x, NORMAL= 0x0001, diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 1212fad..137c958 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -38,7 +38,7 @@ class RscCont; class RscCmdLine; enum class SymbolType : sal_uInt16; enum class ToolBoxItemBits; -enum class WindowBorderStyle : sal_uInt16; +enum class WindowBorderStyle : sal_Int16; enum class TimeFieldFormat : sal_Int32; enum class KeyFuncType : sal_Int32; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/rsc
include/rsc/rsc-vcl-shared-types.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eb7aa9f1fa58ff43d4a974aec868f627755ce152 Author: Adam Co Date: Mon Oct 20 13:37:51 2014 +0300 fix problem with gcc compiler complaining on variable type Change-Id: I9a16e24e79d22b0af1710d6ac25eaa5fb19c71ff Reviewed-on: https://gerrit.libreoffice.org/12047 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/include/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx index 1c14412..1da829d 100644 --- a/include/rsc/rsc-vcl-shared-types.hxx +++ b/include/rsc/rsc-vcl-shared-types.hxx @@ -49,7 +49,7 @@ typedef sal_uInt16 MenuItemBits; #define MIB_ICON((MenuItemBits)0x0080) #define MIB_TEXT((MenuItemBits)0x0100) -enum class ToolBoxItemBits : sal_uInt16 +enum class ToolBoxItemBits { NONE= 0x, CHECKABLE = 0x0001, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/rsc
include/rsc/rsc-vcl-shared-types.hxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 7cd53eeb7fa56f248c8189c14da25da6afa9e4cb Author: Michael Stahl Date: Thu Jan 30 13:47:48 2014 +0100 vcl: another missing sal/types.h Change-Id: I2a7610d6ae41b9351fbe8dc18f6306f26d03e326 diff --git a/include/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx index 81048e0..f8090b3 100644 --- a/include/rsc/rsc-vcl-shared-types.hxx +++ b/include/rsc/rsc-vcl-shared-types.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_RSC_RSC_VCL_SHARED_TYPES_HXX #define INCLUDED_RSC_RSC_VCL_SHARED_TYPES_HXX +#include + enum TimeFieldFormat {TIMEF_NONE, TIMEF_SEC, TIMEF_100TH_SEC, TIMEF_SEC_CS, TimeFieldFormat_FORCE_EQUAL_SIZE=SAL_MAX_ENUM }; enum KeyFuncType { KEYFUNC_DONTKNOW, KEYFUNC_NEW, KEYFUNC_OPEN, KEYFUNC_SAVE, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits