compilerplugins/clang/unusedenumconstants.readonly.results | 14 -------------
uui/source/logindlg.cxx | 13 ------------
uui/source/logindlg.hxx | 4 ---
writerfilter/source/dmapper/PropertyIds.cxx | 5 ----
writerfilter/source/dmapper/PropertyIds.hxx | 9 +-------
5 files changed, 4 insertions(+), 41 deletions(-)
New commits:
commit 9fe4d2225c22e6583043c6cf6c723432e3f4b19e
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Nov 22 12:53:21 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Nov 24 11:18:53 2018 +0100
remove unused LoginFlags values
Change-Id: I378bd70afea58ef64186c0aeb8f9da51f155494d
Reviewed-on: https://gerrit.libreoffice.org/63911
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index 563b3841417f..46d07937c843 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1500,10 +1500,6 @@ tools/source/generic/poly.cxx:1122
enum (anonymous at /home/noel/libo2/tools/source/generic/poly.cxx:1122:5)
maxRecursionDepth
ucbhelper/source/client/proxydecider.cxx:119
enum ucbhelper::proxydecider_impl::InternetProxyDecider_Impl::ProxyType
Automatic
-uui/source/logindlg.hxx:29
- enum LoginFlags NoUsername
-uui/source/logindlg.hxx:30
- enum LoginFlags NoPassword
vcl/inc/fontsubset.hxx:41
enum FontType ANY_TYPE1
vcl/inc/salptype.hxx:45
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index 3f315bcc0f6a..bf9c39bf5436 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -45,22 +45,11 @@ void LoginDialog::SetPassword( const OUString& rNew )
void LoginDialog::HideControls_Impl( LoginFlags nFlags )
{
- if ( nFlags & LoginFlags::NoUsername )
- {
- m_xNameFT->hide();
- m_xNameED->hide();
- }
- else if ( nFlags & LoginFlags::UsernameReadonly )
+ if ( nFlags & LoginFlags::UsernameReadonly )
{
m_xNameED->set_sensitive( false );
}
- if ( nFlags & LoginFlags::NoPassword )
- {
- m_xPasswordFT->hide();
- m_xPasswordED->hide();
- }
-
if ( nFlags & LoginFlags::NoSavePassword )
m_xSavePasswdBtn->hide();
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index adfa31246e77..1c1fc39cd1fe 100644
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -26,8 +26,6 @@
enum class LoginFlags {
NONE = 0x0000,
- NoUsername = 0x0002, // hide "name"
- NoPassword = 0x0004, // hide "password"
NoSavePassword = 0x0008, // hide "save password"
NoErrorText = 0x0010, // hide message
UsernameReadonly = 0x0040, // "name" readonly
@@ -35,7 +33,7 @@ enum class LoginFlags {
NoUseSysCreds = 0x0100, // hide "use system credentials"
};
namespace o3tl {
- template<> struct typed_flags<LoginFlags> : is_typed_flags<LoginFlags,
0x01de> {};
+ template<> struct typed_flags<LoginFlags> : is_typed_flags<LoginFlags,
0x01d8> {};
}
commit 8f4ffbecee417fc7f3ed8fe2c62f9fdbdcc85634
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Nov 22 12:48:59 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Nov 24 11:18:45 2018 +0100
remove unused PropertyIds values
Change-Id: Id73a21bbf897af77057fb8e8c58b1e9e247584d8
Reviewed-on: https://gerrit.libreoffice.org/63910
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index f92ea5feb9c0..563b3841417f 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1512,16 +1512,6 @@ vcl/source/gdi/CommonSalLayout.cxx:128
enum (anonymous namespace)::VerticalOrientation Upright
vcl/source/gdi/CommonSalLayout.cxx:131
enum (anonymous namespace)::VerticalOrientation TransformedRotated
-writerfilter/source/dmapper/PropertyIds.hxx:134
- enum writerfilter::dmapper::PropertyIds PROP_GAMMA
-writerfilter/source/dmapper/PropertyIds.hxx:157
- enum writerfilter::dmapper::PropertyIds PROP_HORI_MIRRORED_ON_EVEN_PAGES
-writerfilter/source/dmapper/PropertyIds.hxx:158
- enum writerfilter::dmapper::PropertyIds PROP_HORI_MIRRORED_ON_ODD_PAGES
-writerfilter/source/dmapper/PropertyIds.hxx:222
- enum writerfilter::dmapper::PropertyIds PROP_PRINTER_PAPER_TRAY_INDEX
-writerfilter/source/dmapper/PropertyIds.hxx:274
- enum writerfilter::dmapper::PropertyIds PROP_VERT_MIRRORED
writerfilter/source/ooxml/OOXMLFactory.hxx:39
enum writerfilter::ooxml::ResourceType List
writerfilter/source/ooxml/OOXMLFactory.hxx:40
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index d8b99ada629e..0842f9554b99 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -153,10 +153,6 @@ OUString getPropertyName( PropertyIds eId )
case PROP_ADJUST_CONTRAST : sName = "AdjustContrast"; break;
case PROP_ADJUST_LUMINANCE : sName = "AdjustLuminance"; break;
case PROP_GRAPHIC_COLOR_MODE : sName = "GraphicColorMode"; break;
- case PROP_GAMMA : sName = "Gamma"; break;
- case PROP_HORI_MIRRORED_ON_EVEN_PAGES: sName =
"HoriMirroredOnEvenPages"; break;
- case PROP_HORI_MIRRORED_ON_ODD_PAGES : sName =
"HoriMirroredOnOddPages"; break;
- case PROP_VERT_MIRRORED : sName = "VertMirrored"; break;
case PROP_CONTOUR_OUTSIDE : sName = "ContourOutside"; break;
case PROP_CONTOUR_POLY_POLYGON : sName = "ContourPolyPolygon";
break;
case PROP_PAGE_TOGGLE : sName = "PageToggle"; break;
@@ -178,7 +174,6 @@ OUString getPropertyName( PropertyIds eId )
case PROP_TEXT_COLUMNS : sName = "TextColumns"; break;
case PROP_AUTOMATIC_DISTANCE : sName = "AutomaticDistance"; break;
case PROP_IS_LANDSCAPE : sName = "IsLandscape"; break;
- case PROP_PRINTER_PAPER_TRAY_INDEX: sName =
"PrinterPaperTrayIndex"; break;
case PROP_FIRST_PAGE : sName = "First Page"; break;
case PROP_PAGE_DESC_NAME : sName = "PageDescName"; break;
case PROP_PAGE_NUMBER_OFFSET: sName = "PageNumberOffset"; break;
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx
b/writerfilter/source/dmapper/PropertyIds.hxx
index 65ab06aa8321..6b694db5f072 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -131,7 +131,6 @@ enum PropertyIds
,PROP_FOOTNOTE_LINE_ADJUST
,PROP_FORMAT
,PROP_FULL_NAME
- ,PROP_GAMMA
,PROP_GRAPHIC
,PROP_GRAPHIC_COLOR_MODE
,PROP_GRID_BASE_HEIGHT
@@ -154,8 +153,6 @@ enum PropertyIds
,PROP_HEIGHT
,PROP_HELP
,PROP_HINT
- ,PROP_HORI_MIRRORED_ON_EVEN_PAGES
- ,PROP_HORI_MIRRORED_ON_ODD_PAGES
,PROP_HORI_ORIENT
,PROP_HORI_ORIENT_POSITION
,PROP_HORI_ORIENT_RELATION
@@ -219,7 +216,6 @@ enum PropertyIds
,PROP_POSITION_PROTECTED
,PROP_IS_PROTECTED
,PROP_PREFIX
- ,PROP_PRINTER_PAPER_TRAY_INDEX
,PROP_REDLINE_AUTHOR
,PROP_REDLINE_DATE_TIME
,PROP_REDLINE_TYPE
@@ -271,8 +267,7 @@ enum PropertyIds
,PROP_TOP_BORDER_DISTANCE
,PROP_TOP_MARGIN
,PROP_VERTICAL_MERGE
- ,PROP_VERT_MIRRORED
-/*254*/ ,PROP_GRID_STANDARD_MODE
+ ,PROP_GRID_STANDARD_MODE
,PROP_VERT_ORIENT
,PROP_VERT_ORIENT_POSITION
,PROP_VERT_ORIENT_RELATION
@@ -280,7 +275,7 @@ enum PropertyIds
,PROP_WIDTH_TYPE
,PROP_TBL_LOOK
,PROP_WRITING_MODE
-/*253*/ ,PROP_FRM_DIRECTION
+ ,PROP_FRM_DIRECTION
,PROP_EMBEDDED_OBJECT
,PROP_PARA_CONTEXT_MARGIN
,PROP_PAGE_STYLE_LAYOUT
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
