include/svx/sidebar/LinePropertyPanelBase.hxx | 2 -- svx/source/sidebar/line/LinePropertyPanel.hxx | 2 -- svx/source/sidebar/line/LineWidthPopup.cxx | 2 +- sw/inc/unoprnms.hxx | 1 - 4 files changed, 1 insertion(+), 6 deletions(-)
New commits: commit c8334639bfbacd85288571e2650b3341aa38bbbd Author: Noel Grandin <[email protected]> AuthorDate: Wed Dec 18 10:04:46 2019 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Dec 20 12:27:18 2019 +0100 loplugin:duplicate-defines duplicate in same file Change-Id: If3b285595859f1bd8f5e04ca3b81e6727a7d633d Reviewed-on: https://gerrit.libreoffice.org/85558 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index d324be62bf0a..fa20045add15 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -375,7 +375,6 @@ #define UNO_NAME_FOOTER_TEXT_LEFT "FooterTextLeft" #define UNO_NAME_FOOTER_TEXT_RIGHT "FooterTextRight" #define UNO_NAME_HEADER_BACK_COLOR "HeaderBackColor" -#define UNO_NAME_HEADER_GRAPHIC "HeaderBackGraphic" #define UNO_NAME_HEADER_BACK_TRANSPARENT "HeaderBackTransparent" #define UNO_NAME_HEADER_LEFT_BORDER "HeaderLeftBorder" #define UNO_NAME_HEADER_RIGHT_BORDER "HeaderRightBorder" commit 337665f7e45258fac57ab034f500672eb5aaec2f Author: Noel Grandin <[email protected]> AuthorDate: Wed Dec 18 09:21:41 2019 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Dec 20 12:27:11 2019 +0100 loplugin:duplicate-defines only used in one place, so just inline it Change-Id: I198dd22888beab4c7b72e053943d337c9123a03a Reviewed-on: https://gerrit.libreoffice.org/85554 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index d12ddbdc7b53..c19061877cef 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -44,8 +44,6 @@ class ListBox; class ToolBox; class FloatingWindow; -#define SIDEBAR_LINE_WIDTH_GLOBAL_VALUE "PopupPanel_LineWidth" - namespace sfx2 { namespace sidebar { class SidebarToolBox; diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index be8406a3c8c9..5ad1c850cd26 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -43,8 +43,6 @@ class ListBox; class ToolBox; class FloatingWindow; -#define SIDEBAR_LINE_WIDTH_GLOBAL_VALUE "PopupPanel_LineWidth" - namespace svx { namespace sidebar diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 8df03806ad1e..d4964d3642e6 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -174,7 +174,7 @@ void LineWidthPopup::SetWidthSelect(long lValue, bool bValuable, MapUnit eMapUni m_bVSFocus = true; m_xVSWidth->SetSelItem(0); m_eMapUnit = eMapUnit; - SvtViewOptions aWinOpt( EViewType::Window, SIDEBAR_LINE_WIDTH_GLOBAL_VALUE ); + SvtViewOptions aWinOpt( EViewType::Window, "PopupPanel_LineWidth" ); if (aWinOpt.Exists()) { css::uno::Sequence <css::beans::NamedValue> aSeq = aWinOpt.GetUserData(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
