cui/source/options/fontsubs.cxx | 6 +++--- cui/source/options/optfltr.cxx | 6 +++--- cui/source/tabpages/autocdlg.cxx | 6 +++--- include/vcl/event.hxx | 3 +-- include/vcl/svtabbx.hxx | 3 +-- include/vcl/treelistbox.hxx | 11 ++++------- sfx2/source/sidebar/SidebarController.cxx | 2 -- vcl/source/treelist/svtabbx.cxx | 4 ++-- vcl/source/treelist/treelistbox.cxx | 3 +-- 9 files changed, 18 insertions(+), 26 deletions(-)
New commits: commit a5784b7fd63cee073d85b669f745f7f6271ab040 Author: Noel Grandin <[email protected]> AuthorDate: Mon Dec 3 20:45:41 2018 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Dec 4 09:54:07 2018 +0100 remove unused SvLBoxTabFlags enum values Change-Id: Id7cccd1eb60e9a16bac6d98aa2d8c75f6218f1be Reviewed-on: https://gerrit.libreoffice.org/64482 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index a0f14caa0973..d95fb1cc3e20 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -433,15 +433,15 @@ void SvxFontSubstCheckListBox::Resize() void SvxFontSubstCheckListBox::SetTabs() { SvSimpleTable::SetTabs(); - SvLBoxTabFlags nAdjust = SvLBoxTabFlags::ADJUST_RIGHT|SvLBoxTabFlags::ADJUST_LEFT|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::ADJUST_NUMERIC|SvLBoxTabFlags::FORCE; + SvLBoxTabFlags nAdjust = SvLBoxTabFlags::ADJUST_RIGHT|SvLBoxTabFlags::ADJUST_LEFT|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; SvLBoxTab* pTab = aTabs[1].get(); pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SvLBoxTabFlags::PUSHABLE|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; + pTab->nFlags |= SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; pTab = aTabs[2].get(); pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SvLBoxTabFlags::PUSHABLE|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; + pTab->nFlags |= SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; } void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt ) diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 611af717eae9..3c48b0132211 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -364,19 +364,19 @@ SvTreeListEntry* OfaMSFilterTabPage2::GetEntry4Type( sal_IntPtr _nType ) const void OfaMSFilterTabPage2::MSFltrSimpleTable::SetTabs() { SvSimpleTable::SetTabs(); - SvLBoxTabFlags nAdjust = SvLBoxTabFlags::ADJUST_RIGHT|SvLBoxTabFlags::ADJUST_LEFT|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::ADJUST_NUMERIC|SvLBoxTabFlags::FORCE; + SvLBoxTabFlags nAdjust = SvLBoxTabFlags::ADJUST_RIGHT|SvLBoxTabFlags::ADJUST_LEFT|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; if( aTabs.size() > 1 ) { SvLBoxTab* pTab = aTabs[1].get(); pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SvLBoxTabFlags::PUSHABLE|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; + pTab->nFlags |= SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; } if( aTabs.size() > 2 ) { SvLBoxTab* pTab = aTabs[2].get(); pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SvLBoxTabFlags::PUSHABLE|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; + pTab->nFlags |= SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; } } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 8dea15bcc137..1af32103593a 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -661,19 +661,19 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl, weld::Button&, void) void OfaACorrCheckListBox::SetTabs() { SvSimpleTable::SetTabs(); - SvLBoxTabFlags nAdjust = SvLBoxTabFlags::ADJUST_RIGHT|SvLBoxTabFlags::ADJUST_LEFT|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::ADJUST_NUMERIC|SvLBoxTabFlags::FORCE; + SvLBoxTabFlags nAdjust = SvLBoxTabFlags::ADJUST_RIGHT|SvLBoxTabFlags::ADJUST_LEFT|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; if( aTabs.size() > 1 ) { SvLBoxTab* pTab = aTabs[1].get(); pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SvLBoxTabFlags::PUSHABLE|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; + pTab->nFlags |= SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; } if( aTabs.size() > 2 ) { SvLBoxTab* pTab = aTabs[2].get(); pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SvLBoxTabFlags::PUSHABLE|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; + pTab->nFlags |= SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; } } diff --git a/include/vcl/svtabbx.hxx b/include/vcl/svtabbx.hxx index 8eebb84ce8af..8fa72066dc1b 100644 --- a/include/vcl/svtabbx.hxx +++ b/include/vcl/svtabbx.hxx @@ -30,8 +30,7 @@ enum class SvTabJustify { AdjustRight = static_cast<int>(SvLBoxTabFlags::ADJUST_RIGHT), AdjustLeft = static_cast<int>(SvLBoxTabFlags::ADJUST_LEFT), - AdjustCenter = static_cast<int>(SvLBoxTabFlags::ADJUST_CENTER), - AdjustNumeric = static_cast<int>(SvLBoxTabFlags::ADJUST_NUMERIC) + AdjustCenter = static_cast<int>(SvLBoxTabFlags::ADJUST_CENTER) }; struct TabListBoxEventData diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx index cfb6b8cf7de8..554bd734b421 100644 --- a/include/vcl/treelistbox.hxx +++ b/include/vcl/treelistbox.hxx @@ -78,21 +78,18 @@ enum class SvLBoxTabFlags ADJUST_RIGHT = 0x0002, // Item's right margin at the tabulator ADJUST_LEFT = 0x0004, // Left margin ADJUST_CENTER = 0x0008, // Center the item at the tabulator - ADJUST_NUMERIC = 0x0010, // Decimal point at the tabulator (strings) - SHOW_SELECTION = 0x0040, // Visualize selection state + SHOW_SELECTION = 0x0010, // Visualize selection state // Item needs to be able to return the surrounding polygon (D'n'D cursor) - EDITABLE = 0x0100, // Item editable at the tabulator - PUSHABLE = 0x0200, // Item acts like a Button - INV_ALWAYS = 0x0400, // Always delete the background - FORCE = 0x0800, // Switch off the default calculation of the first tabulator + EDITABLE = 0x0020, // Item editable at the tabulator + FORCE = 0x0040, // Switch off the default calculation of the first tabulator // (on which Abo Tabpage/Extras/Option/Customize, etc. rely on) // The first tab's position corresponds precisely to the Flags set // and column widths }; namespace o3tl { - template<> struct typed_flags<SvLBoxTabFlags> : is_typed_flags<SvLBoxTabFlags, 0x0f5f> {}; + template<> struct typed_flags<SvLBoxTabFlags> : is_typed_flags<SvLBoxTabFlags, 0x007f> {}; } #define SV_TAB_BORDER 8 diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx index 8713a21ce541..44164bceca97 100644 --- a/vcl/source/treelist/svtabbx.cxx +++ b/vcl/source/treelist/svtabbx.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; static constexpr SvLBoxTabFlags MYTABMASK = - SvLBoxTabFlags::ADJUST_RIGHT | SvLBoxTabFlags::ADJUST_LEFT | SvLBoxTabFlags::ADJUST_CENTER | SvLBoxTabFlags::ADJUST_NUMERIC; + SvLBoxTabFlags::ADJUST_RIGHT | SvLBoxTabFlags::ADJUST_LEFT | SvLBoxTabFlags::ADJUST_CENTER; // SvTreeListBox callback @@ -123,7 +123,7 @@ void SvTabListBox::SetTabs(sal_uInt16 nTabs, long const pTabPositions[], MapUnit aSize = LogicToLogic( aSize, &aMMSource, &aMMDest ); long nNewTab = aSize.Width(); mvTabList[nIdx].SetPos( nNewTab ); - mvTabList[nIdx].nFlags=(SvLBoxTabFlags::ADJUST_LEFT| SvLBoxTabFlags::INV_ALWAYS); + mvTabList[nIdx].nFlags = SvLBoxTabFlags::ADJUST_LEFT; } SvTreeListBox::nTreeFlags |= SvTreeFlags::RECALCTABS; if( IsUpdateMode() ) diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index fe09ca2494cb..00fdbb39fc9e 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -1457,8 +1457,7 @@ void SvTreeListBox::Resize() #define TABFLAGS_CONTEXTBMP (SvLBoxTabFlags::DYNAMIC | SvLBoxTabFlags::ADJUST_CENTER) #define TABFLAGS_CHECKBTN (SvLBoxTabFlags::DYNAMIC | \ - SvLBoxTabFlags::ADJUST_CENTER | \ - SvLBoxTabFlags::PUSHABLE) + SvLBoxTabFlags::ADJUST_CENTER) #define TAB_STARTPOS 2 commit 5c477389e8292cea26e2a0414a9d3bb6bdd369df Author: Noel Grandin <[email protected]> AuthorDate: Mon Dec 3 20:57:35 2018 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Dec 4 09:53:53 2018 +0100 remove unused DataChangedEventType enum value Change-Id: I32d3c3481f0b8bcc36613afb495b64f4eb229a67 Reviewed-on: https://gerrit.libreoffice.org/64484 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 45d7b5df750c..d1e4b61b876d 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -332,8 +332,7 @@ enum class DataChangedEventType { DISPLAY = 2, FONTS = 4, PRINTER = 5, - FONTSUBSTITUTION = 6, - USER = 10000 + FONTSUBSTITUTION = 6 }; class VCL_DLLPUBLIC DataChangedEvent diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 46d03ba097b0..a314e538763a 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -331,8 +331,6 @@ void SAL_CALL SidebarController::requestLayout() void SidebarController::BroadcastPropertyChange() { - DataChangedEvent aEvent (DataChangedEventType::USER); - mpParentWindow->NotifyAllChildren(aEvent); mpParentWindow->Invalidate(InvalidateFlags::Children); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
